Fix some proto<->types conversion code

Author: mikeas1

src/a2a/client/grpc_client.py

@@ -229,7 +229,9 @@ async def set_task_callback(
                 ),
             )
         )
-        return proto_utils.FromProto.task_push_notification_config(config)
+        return proto_utils.FromProto.task_push_notification_config_request(
+            config
+        )
 
     async def get_task_callback(
         self,
@@ -251,7 +253,9 @@ async def get_task_callback(
                 name=f'tasks/{request.id}/pushNotification/undefined',
             )
         )
-        return proto_utils.FromProto.task_push_notification_config(config)
+        return proto_utils.FromProto.task_push_notification_config_request(
+            config
+        )
 
     async def get_card(
         self,

src/a2a/client/rest_client.py

@@ -6,7 +6,7 @@
 
 import httpx
 
-from google.protobuf.json_format import MessageToDict, Parse
+from google.protobuf.json_format import MessageToDict, Parse, ParseDict
 from httpx_sse import SSEError, aconnect_sse
 
 from a2a.client.card_resolver import A2ACardResolver
@@ -121,7 +121,7 @@ async def send_message(
         """
         pb = a2a_pb2.SendMessageRequest(
             request=proto_utils.ToProto.message(request.message),
-            configuration=proto_utils.ToProto.send_message_config(
+            configuration=proto_utils.ToProto.message_send_configuration(
                 request.configuration
             ),
             metadata=(
@@ -141,7 +141,7 @@ async def send_message(
             '/v1/message:send', payload, modified_kwargs
         )
         response_pb = a2a_pb2.SendMessageResponse()
-        Parse(response_data, response_pb)
+        ParseDict(response_data, response_pb)
         return proto_utils.FromProto.task_or_message(response_pb)
 
     async def send_message_streaming(
@@ -173,7 +173,7 @@ async def send_message_streaming(
         """
         pb = a2a_pb2.SendMessageRequest(
             request=proto_utils.ToProto.message(request.message),
-            configuration=proto_utils.ToProto.send_message_config(
+            configuration=proto_utils.ToProto.message_send_configuration(
                 request.configuration
             ),
             metadata=(
@@ -322,13 +322,13 @@ async def get_task(
         )
         response_data = await self._send_get_request(
             f'/v1/tasks/{request.taskId}',
-            {'historyLength': request.history_length}
+            {'historyLength': str(request.history_length)}
             if request.history_length
             else {},
             modified_kwargs,
         )
         task = a2a_pb2.Task()
-        Parse(response_data, task)
+        ParseDict(response_data, task)
         return proto_utils.FromProto.task(task)
 
     async def cancel_task(
@@ -365,7 +365,7 @@ async def cancel_task(
             f'/v1/tasks/{request.id}:cancel', payload, modified_kwargs
         )
         task = a2a_pb2.Task()
-        Parse(response_data, task)
+        ParseDict(response_data, task)
         return proto_utils.FromProto.task(task)
 
     async def set_task_callback(
@@ -406,7 +406,7 @@ async def set_task_callback(
             modified_kwargs,
         )
         config = a2a_pb2.TaskPushNotificationConfig()
-        Parse(response_data, config)
+        ParseDict(response_data, config)
         return proto_utils.FromProto.task_push_notification_config(config)
 
     async def get_task_callback(
@@ -447,7 +447,7 @@ async def get_task_callback(
             modified_kwargs,
         )
         config = a2a_pb2.TaskPushNotificationConfig()
-        Parse(response_data, config)
+        ParseDict(response_data, config)
         return proto_utils.FromProto.task_push_notification_config(config)
 
     async def resubscribe(
@@ -548,8 +548,8 @@ async def get_card(
             return card
 
         # Apply interceptors before sending
-        payload, modified_kwargs = await self._apply_interceptors(
-            '',
+        _, modified_kwargs = await self._apply_interceptors(
+            {},
             http_kwargs,
             context,
         )

src/a2a/server/request_handlers/grpc_handler.py

@@ -286,7 +286,7 @@ async def CreateTaskPushNotificationConfig(
             server_context = self.context_builder.build(context)
             config = (
                 await self.request_handler.on_set_task_push_notification_config(
-                    proto_utils.FromProto.task_push_notification_config(
+                    proto_utils.FromProto.task_push_notification_config_request(
                         request,
                     ),
                     server_context,

src/a2a/server/request_handlers/rest_handler.py

@@ -258,8 +258,10 @@ async def set_push_notification(
             params = a2a_pb2.TaskPushNotificationConfig()
             Parse(body, params)
             params = TaskPushNotificationConfig.model_validate(body)
-            a2a_request = proto_utils.FromProto.task_push_notification_config(
-                params,
+            a2a_request = (
+                proto_utils.FromProto.task_push_notification_config_request(
+                    params,
+                )
             )
             config = (
                 await self.request_handler.on_set_task_push_notification_config(

src/a2a/utils/proto_utils.py

@@ -496,6 +496,14 @@ def file(
             return types.FileWithUri(uri=file.file_with_uri)
         return types.FileWithBytes(bytes=file.file_with_bytes.decode('utf-8'))
 
+    @classmethod
+    def task_or_message(
+        cls, event: a2a_pb2.SendMessageResponse
+    ) -> types.Task | types.Message:
+        if event.HasField('msg'):
+            return cls.message(event.msg)
+        return cls.task(event.task)
+
     @classmethod
     def task(cls, task: a2a_pb2.Task) -> types.Task:
         return types.Task(
@@ -643,7 +651,7 @@ def task_id_params(
         return types.TaskIdParams(id=m.group(1))
 
     @classmethod
-    def task_push_notification_config(
+    def task_push_notification_config_request(
         cls,
         request: a2a_pb2.CreateTaskPushNotificationConfigRequest,
     ) -> types.TaskPushNotificationConfig:
@@ -661,6 +669,25 @@ def task_push_notification_config(
             task_id=m.group(1),
         )
 
+    @classmethod
+    def task_push_notification_config(
+        cls,
+        config: a2a_pb2.TaskPushNotificationConfig,
+    ) -> types.TaskPushNotificationConfig:
+        m = re.match(_TASK_PUSH_CONFIG_NAME_MATCH, config.name)
+        if not m:
+            raise ServerError(
+                error=types.InvalidParamsError(
+                    message=f'Bad TaskPushNotificationConfig resource name {config.name}'
+                )
+            )
+        return types.TaskPushNotificationConfig(
+            push_notification_config=cls.push_notification_config(
+                config.push_notification_config,
+            ),
+            task_id=m.group(1),
+        )
+
     @classmethod
     def agent_card(
         cls,