Fixes after merge

Author: ishymko

src/a2a/client/base_client.py

@@ -21,8 +21,8 @@
     DeleteTaskPushNotificationConfigRequest,
     GetTaskPushNotificationConfigRequest,
     GetTaskRequest,
-    ListTaskPushNotificationConfigRequest,
-    ListTaskPushNotificationConfigResponse,
+    ListTaskPushNotificationConfigsRequest,
+    ListTaskPushNotificationConfigsResponse,
     ListTasksRequest,
     ListTasksResponse,
     Message,
@@ -252,20 +252,20 @@ async def get_task_callback(
 
     async def list_task_callback(
         self,
-        request: ListTaskPushNotificationConfigRequest,
+        request: ListTaskPushNotificationConfigsRequest,
         *,
         context: ClientCallContext | None = None,
         extensions: list[str] | None = None,
-    ) -> ListTaskPushNotificationConfigResponse:
+    ) -> ListTaskPushNotificationConfigsResponse:
         """Lists push notification configurations for a specific task.
 
         Args:
-            request: The `ListTaskPushNotificationConfigRequest` object specifying the request.
+            request: The `ListTaskPushNotificationConfigsRequest` object specifying the request.
             context: The client call context.
             extensions: List of extensions to be activated.
 
         Returns:
-            A `ListTaskPushNotificationConfigResponse` object.
+            A `ListTaskPushNotificationConfigsResponse` object.
         """
         return await self._transport.list_task_callback(
             request, context=context, extensions=extensions

src/a2a/client/client.py

@@ -16,8 +16,8 @@
     DeleteTaskPushNotificationConfigRequest,
     GetTaskPushNotificationConfigRequest,
     GetTaskRequest,
-    ListTaskPushNotificationConfigRequest,
-    ListTaskPushNotificationConfigResponse,
+    ListTaskPushNotificationConfigsRequest,
+    ListTaskPushNotificationConfigsResponse,
     ListTasksRequest,
     ListTasksResponse,
     Message,
@@ -181,11 +181,11 @@ async def get_task_callback(
     @abstractmethod
     async def list_task_callback(
         self,
-        request: ListTaskPushNotificationConfigRequest,
+        request: ListTaskPushNotificationConfigsRequest,
         *,
         context: ClientCallContext | None = None,
         extensions: list[str] | None = None,
-    ) -> ListTaskPushNotificationConfigResponse:
+    ) -> ListTaskPushNotificationConfigsResponse:
         """Lists push notification configurations for a specific task."""
 
     @abstractmethod

src/a2a/client/transports/base.py

@@ -12,8 +12,8 @@
     DeleteTaskPushNotificationConfigRequest,
     GetTaskPushNotificationConfigRequest,
     GetTaskRequest,
-    ListTaskPushNotificationConfigRequest,
-    ListTaskPushNotificationConfigResponse,
+    ListTaskPushNotificationConfigsRequest,
+    ListTaskPushNotificationConfigsResponse,
     ListTasksRequest,
     ListTasksResponse,
     SendMessageRequest,
@@ -116,11 +116,11 @@ async def get_task_callback(
     @abstractmethod
     async def list_task_callback(
         self,
-        request: ListTaskPushNotificationConfigRequest,
+        request: ListTaskPushNotificationConfigsRequest,
         *,
         context: ClientCallContext | None = None,
         extensions: list[str] | None = None,
-    ) -> ListTaskPushNotificationConfigResponse:
+    ) -> ListTaskPushNotificationConfigsResponse:
         """Lists push notification configurations for a specific task."""
 
     @abstractmethod

src/a2a/client/transports/grpc.py

@@ -26,8 +26,8 @@
     DeleteTaskPushNotificationConfigRequest,
     GetTaskPushNotificationConfigRequest,
     GetTaskRequest,
-    ListTaskPushNotificationConfigRequest,
-    ListTaskPushNotificationConfigResponse,
+    ListTaskPushNotificationConfigsRequest,
+    ListTaskPushNotificationConfigsResponse,
     ListTasksRequest,
     ListTasksResponse,
     SendMessageRequest,
@@ -203,13 +203,13 @@ async def get_task_callback(
 
     async def list_task_callback(
         self,
-        request: ListTaskPushNotificationConfigRequest,
+        request: ListTaskPushNotificationConfigsRequest,
         *,
         context: ClientCallContext | None = None,
         extensions: list[str] | None = None,
-    ) -> ListTaskPushNotificationConfigResponse:
+    ) -> ListTaskPushNotificationConfigsResponse:
         """Lists push notification configurations for a specific task."""
-        return await self.stub.ListTaskPushNotificationConfig(
+        return await self.stub.ListTaskPushNotificationConfigs(
             request,
             metadata=self._get_grpc_metadata(extensions),
         )

src/a2a/client/transports/jsonrpc.py

@@ -28,8 +28,8 @@
     GetExtendedAgentCardRequest,
     GetTaskPushNotificationConfigRequest,
     GetTaskRequest,
-    ListTaskPushNotificationConfigRequest,
-    ListTaskPushNotificationConfigResponse,
+    ListTaskPushNotificationConfigsRequest,
+    ListTaskPushNotificationConfigsResponse,
     ListTasksRequest,
     ListTasksResponse,
     SendMessageRequest,
@@ -369,14 +369,14 @@ async def get_task_callback(
 
     async def list_task_callback(
         self,
-        request: ListTaskPushNotificationConfigRequest,
+        request: ListTaskPushNotificationConfigsRequest,
         *,
         context: ClientCallContext | None = None,
         extensions: list[str] | None = None,
-    ) -> ListTaskPushNotificationConfigResponse:
+    ) -> ListTaskPushNotificationConfigsResponse:
         """Lists push notification configurations for a specific task."""
         rpc_request = JSONRPC20Request(
-            method='ListTaskPushNotificationConfig',
+            method='ListTaskPushNotificationConfigs',
             params=json_format.MessageToDict(request),
             _id=str(uuid4()),
         )
@@ -385,7 +385,7 @@ async def list_task_callback(
             extensions if extensions is not None else self.extensions,
         )
         payload, modified_kwargs = await self._apply_interceptors(
-            'ListTaskPushNotificationConfig',
+            'ListTaskPushNotificationConfigs',
             cast('dict[str, Any]', rpc_request.data),
             modified_kwargs,
             context,
@@ -394,10 +394,10 @@ async def list_task_callback(
         json_rpc_response = JSONRPC20Response(**response_data)
         if json_rpc_response.error:
             raise A2AClientJSONRPCError(json_rpc_response.error)
-        response: ListTaskPushNotificationConfigResponse = (
+        response: ListTaskPushNotificationConfigsResponse = (
             json_format.ParseDict(
                 json_rpc_response.result,
-                ListTaskPushNotificationConfigResponse(),
+                ListTaskPushNotificationConfigsResponse(),
             )
         )
         return response

src/a2a/client/transports/rest.py

@@ -25,8 +25,8 @@
     DeleteTaskPushNotificationConfigRequest,
     GetTaskPushNotificationConfigRequest,
     GetTaskRequest,
-    ListTaskPushNotificationConfigRequest,
-    ListTaskPushNotificationConfigResponse,
+    ListTaskPushNotificationConfigsRequest,
+    ListTaskPushNotificationConfigsResponse,
     ListTasksRequest,
     ListTasksResponse,
     SendMessageRequest,
@@ -358,11 +358,11 @@ async def get_task_callback(
 
     async def list_task_callback(
         self,
-        request: ListTaskPushNotificationConfigRequest,
+        request: ListTaskPushNotificationConfigsRequest,
         *,
         context: ClientCallContext | None = None,
         extensions: list[str] | None = None,
-    ) -> ListTaskPushNotificationConfigResponse:
+    ) -> ListTaskPushNotificationConfigsResponse:
         """Lists push notification configurations for a specific task."""
         params = MessageToDict(request)
         modified_kwargs = update_extension_header(
@@ -381,8 +381,8 @@ async def list_task_callback(
             params,
             modified_kwargs,
         )
-        response: ListTaskPushNotificationConfigResponse = ParseDict(
-            response_data, ListTaskPushNotificationConfigResponse()
+        response: ListTaskPushNotificationConfigsResponse = ParseDict(
+            response_data, ListTaskPushNotificationConfigsResponse()
         )
         return response
 

src/a2a/server/request_handlers/grpc_handler.py

@@ -294,29 +294,29 @@ async def CreateTaskPushNotificationConfig(
             await self.abort_context(e, context)
         return a2a_pb2.TaskPushNotificationConfig()
 
-    async def ListTaskPushNotificationConfig(
+    async def ListTaskPushNotificationConfigs(
         self,
-        request: a2a_pb2.ListTaskPushNotificationConfigRequest,
+        request: a2a_pb2.ListTaskPushNotificationConfigsRequest,
         context: grpc.aio.ServicerContext,
-    ) -> a2a_pb2.ListTaskPushNotificationConfigResponse:
+    ) -> a2a_pb2.ListTaskPushNotificationConfigsResponse:
         """Handles the 'ListTaskPushNotificationConfig' gRPC method.
 
         Args:
-            request: The incoming `ListTaskPushNotificationConfigRequest` object.
+            request: The incoming `ListTaskPushNotificationConfigsRequest` object.
             context: Context provided by the server.
 
         Returns:
-            A `ListTaskPushNotificationConfigResponse` object containing the configs.
+            A `ListTaskPushNotificationConfigsResponse` object containing the configs.
         """
         try:
             server_context = self.context_builder.build(context)
-            return await self.request_handler.on_list_task_push_notification_config(
+            return await self.request_handler.on_list_task_push_notification_configs(
                 request,
                 server_context,
             )
         except ServerError as e:
             await self.abort_context(e, context)
-        return a2a_pb2.ListTaskPushNotificationConfigResponse()
+        return a2a_pb2.ListTaskPushNotificationConfigsResponse()
 
     async def DeleteTaskPushNotificationConfig(
         self,

src/a2a/server/request_handlers/rest_handler.py

@@ -319,15 +319,15 @@ async def list_push_notifications(
             A list of `dict` representing the `TaskPushNotificationConfig` objects.
         """
         task_id = request.path_params['id']
-        params = a2a_pb2.ListTaskPushNotificationConfigRequest(task_id=task_id)
+        params = a2a_pb2.ListTaskPushNotificationConfigsRequest(task_id=task_id)
 
         # Parse query params, keeping arrays/repeated fields in mind if there are any
         ParseDict(
             dict(request.query_params), params, ignore_unknown_fields=True
         )
 
         result = (
-            await self.request_handler.on_list_task_push_notification_config(
+            await self.request_handler.on_list_task_push_notification_configs(
                 params, context
             )
         )

tests/client/transports/test_grpc_client.py

@@ -15,8 +15,8 @@
     CreateTaskPushNotificationConfigRequest,
     DeleteTaskPushNotificationConfigRequest,
     GetTaskPushNotificationConfigRequest,
-    ListTaskPushNotificationConfigRequest,
-    ListTaskPushNotificationConfigResponse,
+    ListTaskPushNotificationConfigsRequest,
+    ListTaskPushNotificationConfigsResponse,
     GetTaskRequest,
     Message,
     Part,
@@ -45,7 +45,7 @@ def mock_grpc_stub() -> AsyncMock:
     stub.CancelTask = AsyncMock()
     stub.CreateTaskPushNotificationConfig = AsyncMock()
     stub.GetTaskPushNotificationConfig = AsyncMock()
-    stub.ListTaskPushNotificationConfig = AsyncMock()
+    stub.ListTaskPushNotificationConfigs = AsyncMock()
     stub.DeleteTaskPushNotificationConfig = AsyncMock()
     return stub
 
@@ -538,18 +538,18 @@ async def test_list_task_callback(
     sample_task_push_notification_config: TaskPushNotificationConfig,
 ) -> None:
     """Test retrieving task push notification configs."""
-    mock_grpc_stub.ListTaskPushNotificationConfig.return_value = (
-        a2a_pb2.ListTaskPushNotificationConfigResponse(
+    mock_grpc_stub.ListTaskPushNotificationConfigs.return_value = (
+        a2a_pb2.ListTaskPushNotificationConfigsResponse(
             configs=[sample_task_push_notification_config]
         )
     )
 
     response = await grpc_transport.list_task_callback(
-        ListTaskPushNotificationConfigRequest(task_id='task-1')
+        ListTaskPushNotificationConfigsRequest(task_id='task-1')
     )
 
-    mock_grpc_stub.ListTaskPushNotificationConfig.assert_awaited_once_with(
-        a2a_pb2.ListTaskPushNotificationConfigRequest(task_id='task-1'),
+    mock_grpc_stub.ListTaskPushNotificationConfigs.assert_awaited_once_with(
+        a2a_pb2.ListTaskPushNotificationConfigsRequest(task_id='task-1'),
         metadata=[
             (
                 HTTP_EXTENSION_HEADER.lower(),

tests/client/transports/test_jsonrpc_client.py

@@ -26,8 +26,8 @@
     CreateTaskPushNotificationConfigRequest,
     DeleteTaskPushNotificationConfigRequest,
     GetTaskPushNotificationConfigRequest,
-    ListTaskPushNotificationConfigRequest,
-    ListTaskPushNotificationConfigResponse,
+    ListTaskPushNotificationConfigsRequest,
+    ListTaskPushNotificationConfigsResponse,
     GetTaskRequest,
     Message,
     Part,
@@ -371,7 +371,6 @@ async def test_list_task_callback_success(
                 'configs': [
                     {
                         'task_id': f'{task_id}',
-                        'id': 'config-1',
                         'push_notification_config': {
                             'id': 'config-1',
                             'url': 'https://example.com',
@@ -383,7 +382,7 @@ async def test_list_task_callback_success(
         mock_response.raise_for_status = MagicMock()
         mock_httpx_client.post.return_value = mock_response
 
-        request = ListTaskPushNotificationConfigRequest(
+        request = ListTaskPushNotificationConfigsRequest(
             task_id=f'{task_id}',
         )
         response = await transport.list_task_callback(request)
@@ -392,7 +391,7 @@ async def test_list_task_callback_success(
         assert response.configs[0].task_id == task_id
         call_args = mock_httpx_client.post.call_args
         payload = call_args[1]['json']
-        assert payload['method'] == 'ListTaskPushNotificationConfig'
+        assert payload['method'] == 'ListTaskPushNotificationConfigs'
 
     @pytest.mark.asyncio
     async def test_delete_task_callback_success(
@@ -406,7 +405,6 @@ async def test_delete_task_callback_success(
             'id': '1',
             'result': {
                 'task_id': f'{task_id}',
-                'id': 'config-1',
             },
         }
         mock_response.raise_for_status = MagicMock()