refactor: Extract common HTTP argument parsing logic into a shared helper function used by REST and JSON-RPC transports.

Author: guglielmo-san

src/a2a/client/transports/http_helpers.py

@@ -9,6 +9,7 @@
 from httpx_sse import SSEError, aconnect_sse
 
 from a2a.client.errors import A2AClientError, A2AClientTimeoutError
+from a2a.client.middleware import ClientCallContext
 
 
 @contextmanager
@@ -40,6 +41,15 @@ def handle_http_exceptions(
     except json.JSONDecodeError as e:
         raise A2AClientError(f'JSON Decode Error: {e}') from e
 
+def get_http_args(
+    context: ClientCallContext | None
+) -> dict[str, Any]:
+    http_kwargs: dict[str, Any] = {}
+    if context and context.service_parameters:
+        http_kwargs['headers'] = context.service_parameters.copy()
+    if context and context.timeout is not None:
+        http_kwargs['timeout'] = httpx.Timeout(context.timeout)
+    return http_kwargs
 
 async def send_http_request(
     httpx_client: httpx.AsyncClient,

src/a2a/client/transports/jsonrpc.py

@@ -16,6 +16,7 @@
 from a2a.client.transports.http_helpers import (
     send_http_request,
     send_http_stream_request,
+    get_http_args,
 )
 from a2a.types.a2a_pb2 import (
     AgentCard,
@@ -322,16 +323,6 @@ async def close(self) -> None:
         """Closes the httpx client."""
         await self.httpx_client.aclose()
 
-    def _get_http_args(
-        self, context: ClientCallContext | None
-    ) -> dict[str, Any]:
-        http_kwargs: dict[str, Any] = {}
-        if context and context.service_parameters:
-            http_kwargs['headers'] = context.service_parameters.copy()
-        if context and context.timeout is not None:
-            http_kwargs['timeout'] = httpx.Timeout(context.timeout)
-        return http_kwargs
-
     def _create_jsonrpc_error(self, error_dict: dict[str, Any]) -> Exception:
         """Creates the appropriate A2AError from a JSON-RPC error dictionary."""
         code = error_dict.get('code')
@@ -348,7 +339,7 @@ async def _send_request(
         payload: dict[str, Any],
         context: ClientCallContext | None = None,
     ) -> dict[str, Any]:
-        http_kwargs = self._get_http_args(context)
+        http_kwargs = get_http_args(context)
 
         request = self.httpx_client.build_request(
             'POST', self.url, json=payload, **(http_kwargs or {})
@@ -360,7 +351,7 @@ async def _send_stream_request(
         rpc_request_payload: dict[str, Any],
         context: ClientCallContext | None = None,
     ) -> AsyncGenerator[StreamResponse]:
-        http_kwargs = self._get_http_args(context)
+        http_kwargs = get_http_args(context)
 
         async for sse_data in send_http_stream_request(
             self.httpx_client,

src/a2a/client/transports/rest.py

@@ -15,6 +15,7 @@
 from a2a.client.transports.http_helpers import (
     send_http_request,
     send_http_stream_request,
+    get_http_args,
 )
 from a2a.types.a2a_pb2 import (
     AgentCard,
@@ -295,16 +296,6 @@ def _get_path(self, base_path: str, tenant: str) -> str:
         """Returns the full path, prepending the tenant if provided."""
         return f'/{tenant}{base_path}' if tenant else base_path
 
-    def _get_http_args(
-        self, context: ClientCallContext | None
-    ) -> dict[str, Any]:
-        http_kwargs: dict[str, Any] = {}
-        if context and context.service_parameters:
-            http_kwargs['headers'] = context.service_parameters.copy()
-        if context and context.timeout is not None:
-            http_kwargs['timeout'] = httpx.Timeout(context.timeout)
-        return http_kwargs
-
     def _handle_http_error(self, e: httpx.HTTPStatusError) -> NoReturn:
         """Handles HTTP status errors and raises the appropriate A2AError."""
         try:
@@ -339,7 +330,7 @@ async def _send_stream_request(
         json: dict[str, Any] | None = None,
     ) -> AsyncGenerator[StreamResponse]:
         path = self._get_path(target, tenant)
-        http_kwargs = self._get_http_args(context)
+        http_kwargs = get_http_args(context)
 
         async for sse_data in send_http_stream_request(
             self.httpx_client,
@@ -368,7 +359,7 @@ async def _execute_request(
         params: dict[str, Any] | None = None,
     ) -> dict[str, Any]:
         path = self._get_path(target, tenant)
-        http_kwargs = self._get_http_args(context)
+        http_kwargs = get_http_args(context)
 
         request = self.httpx_client.build_request(
             method,