Refactor transport request methods to use explicit json and params keyword arguments and streamline http_kwargs passing.

Author: guglielmo-san

src/a2a/client/transports/jsonrpc.py

@@ -349,6 +349,7 @@ async def _send_request(
         context: ClientCallContext | None = None,
     ) -> dict[str, Any]:
         http_kwargs = self._get_http_args(context)
+        
         request = self.httpx_client.build_request(
             'POST', self.url, json=payload, **(http_kwargs or {})
         )
@@ -358,22 +359,16 @@ async def _send_stream_request(
         self,
         rpc_request_payload: dict[str, Any],
         context: ClientCallContext | None = None,
-        **kwargs: Any,
     ) -> AsyncGenerator[StreamResponse]:
         http_kwargs = self._get_http_args(context)
-        final_kwargs = dict(http_kwargs or {})
-        final_kwargs.update(kwargs)
-        headers = dict(self.httpx_client.headers.items())
-        headers.update(final_kwargs.get('headers', {}))
-        final_kwargs['headers'] = headers
 
         async for sse_data in send_http_stream_request(
             self.httpx_client,
             'POST',
             self.url,
             None,
             json=rpc_request_payload,
-            **final_kwargs,
+            **http_kwargs,
         ):
             json_rpc_response = JSONRPC20Response.from_json(sse_data)
             if json_rpc_response.error:

src/a2a/client/transports/rest.py

@@ -75,8 +75,8 @@ async def send_message(
             'POST',
             '/message:send',
             request.tenant,
-            MessageToDict(request),
             context=context,
+            json=MessageToDict(request),
         )
         response: SendMessageResponse = ParseDict(
             response_data, SendMessageResponse()
@@ -90,14 +90,13 @@ async def send_message_streaming(
         context: ClientCallContext | None = None,
     ) -> AsyncGenerator[StreamResponse]:
         """Sends a streaming message request to the agent and yields responses as they arrive."""
-        http_kwargs = self._get_http_args(context)
         payload = MessageToDict(request)
 
         async for event in self._send_stream_request(
             'POST',
             '/message:stream',
             request.tenant,
-            http_kwargs=http_kwargs,
+            context=context,
             json=payload,
         ):
             yield event
@@ -117,8 +116,8 @@ async def get_task(
             'GET',
             f'/tasks/{request.id}',
             request.tenant,
-            params,
             context=context,
+            params=params,
         )
         response: Task = ParseDict(response_data, Task())
         return response
@@ -134,8 +133,8 @@ async def list_tasks(
             'GET',
             '/tasks',
             request.tenant,
-            _model_to_query_params(request),
             context=context,
+            params=MessageToDict(request),
         )
         response: ListTasksResponse = ParseDict(
             response_data, ListTasksResponse()
@@ -153,8 +152,8 @@ async def cancel_task(
             'POST',
             f'/tasks/{request.id}:cancel',
             request.tenant,
-            MessageToDict(request),
             context=context,
+            json=MessageToDict(request),
         )
         response: Task = ParseDict(response_data, Task())
         return response
@@ -170,8 +169,8 @@ async def create_task_push_notification_config(
             'POST',
             f'/tasks/{request.task_id}/pushNotificationConfigs',
             request.tenant,
-            MessageToDict(request),
             context=context,
+            json=MessageToDict(request),
         )
         response: TaskPushNotificationConfig = ParseDict(
             response_data, TaskPushNotificationConfig()
@@ -195,8 +194,8 @@ async def get_task_push_notification_config(
             'GET',
             f'/tasks/{request.task_id}/pushNotificationConfigs/{request.id}',
             request.tenant,
-            params,
             context=context,
+            params=params,
         )
         response: TaskPushNotificationConfig = ParseDict(
             response_data, TaskPushNotificationConfig()
@@ -218,8 +217,8 @@ async def list_task_push_notification_configs(
             'GET',
             f'/tasks/{request.task_id}/pushNotificationConfigs',
             request.tenant,
-            params,
             context=context,
+            params=params,
         )
         response: ListTaskPushNotificationConfigsResponse = ParseDict(
             response_data, ListTaskPushNotificationConfigsResponse()
@@ -243,8 +242,8 @@ async def delete_task_push_notification_config(
             'DELETE',
             f'/tasks/{request.task_id}/pushNotificationConfigs/{request.id}',
             request.tenant,
-            params,
             context=context,
+            params=params,
         )
 
     async def subscribe(
@@ -254,13 +253,11 @@ async def subscribe(
         context: ClientCallContext | None = None,
     ) -> AsyncGenerator[StreamResponse]:
         """Reconnects to get task updates."""
-        http_kwargs = self._get_http_args(context)
-
         async for event in self._send_stream_request(
             'GET',
             f'/tasks/{request.id}:subscribe',
             request.tenant,
-            http_kwargs=http_kwargs,
+            context=context,
         ):
             yield event
 
@@ -278,7 +275,7 @@ async def get_extended_agent_card(
             return card
 
         response_data = await self._execute_request(
-            'GET', '/extendedAgentCard', request.tenant, {}, context
+            'GET', '/extendedAgentCard', request.tenant, context=context
         )
         response: AgentCard = ParseDict(response_data, AgentCard())
 
@@ -338,22 +335,19 @@ async def _send_stream_request(
         target: str,
         tenant: str,
         context: ClientCallContext | None = None,
-        **kwargs: Any,
+        *,
+        json: dict[str, Any] | None = None,
     ) -> AsyncGenerator[StreamResponse]:
-        http_kwargs = self._get_http_args(context)
-        headers = http_kwargs.get('headers')
-        timeout = http_kwargs.get('timeout', httpx.USE_CLIENT_DEFAULT)
-
         path = self._get_path(target, tenant)
+        http_kwargs = self._get_http_args(context)
 
         async for sse_data in send_http_stream_request(
             self.httpx_client,
             method,
             f'{self.url}{path}',
             self._handle_http_error,
-            headers=headers,
-            timeout=timeout,
-            **kwargs,
+            json=json,
+            **http_kwargs,
         ):
             event: StreamResponse = Parse(sse_data, StreamResponse())
             yield event
@@ -368,26 +362,20 @@ async def _execute_request(
         method: str,
         target: str,
         tenant: str,
-        payload: dict[str, Any] | None = None,
         context: ClientCallContext | None = None,
+        *,
+        json: dict[str, Any] | None = None,
+        params: dict[str, Any] | None = None,
     ) -> dict[str, Any]:
         path = self._get_path(target, tenant)
         http_kwargs = self._get_http_args(context)
-        payload = payload or {}
-
-        headers = http_kwargs.get('headers')
-        timeout = http_kwargs.get('timeout', httpx.USE_CLIENT_DEFAULT)
-
-        json_payload = payload if method == 'POST' else None
-        params = payload if method != 'POST' else None
 
         request = self.httpx_client.build_request(
             method,
             f'{self.url}{path}',
-            json=json_payload,
+            json=json,
             params=params,
-            headers=headers,  # type: ignore[arg-type]
-            timeout=timeout,  # type: ignore[arg-type]
+            **http_kwargs,
         )
         return await self._send_request(request)
 

tests/client/transports/test_rest_client.py

@@ -363,13 +363,11 @@ async def test_get_card_with_extended_card_support_with_extensions(
             await client.get_extended_agent_card(request, context=context)
 
         mock_execute_request.assert_called_once()
-        # _execute_request(method, target, tenant, payload, context)
+        # _execute_request(method, target, tenant, context)
         call_args = mock_execute_request.call_args
-        assert (
-            call_args[1].get('context') == context or call_args[0][4] == context
-        )
+        assert call_args[1].get('context') == context or call_args[0][3] == context
 
-        _context = call_args[1].get('context') or call_args[0][4]
+        _context = call_args[1].get('context') or call_args[0][3]
         assert _context.service_parameters == {
             HTTP_EXTENSION_HEADER: extensions_str
         }