refactor: reorder parameters in JsonRpcTransport and RestTransport constructors for compatability with legacy.py

Author: sokoliva

src/a2a/client/client_factory.py

@@ -76,22 +76,22 @@ def _register_defaults(
             self.register(
                 TransportProtocol.jsonrpc,
                 lambda card, url, config, interceptors: JsonRpcTransport(
-                    config.httpx_client or httpx.AsyncClient(),
-                    config.extensions or None,
-                    card,
-                    url,
-                    interceptors,
+                    httpx_client=config.httpx_client or httpx.AsyncClient(),
+                    agent_card=card,
+                    url=url,
+                    interceptors=interceptors,
+                    client_extensions=config.extensions or None,
                 ),
             )
         if TransportProtocol.http_json in supported:
             self.register(
                 TransportProtocol.http_json,
                 lambda card, url, config, interceptors: RestTransport(
                     config.httpx_client or httpx.AsyncClient(),
-                    config.extensions or None,
                     card,
                     url,
                     interceptors,
+                    config.extensions or None,
                 ),
             )
         if TransportProtocol.grpc in supported:

src/a2a/client/transports/jsonrpc.py

@@ -60,10 +60,10 @@ class JsonRpcTransport(ClientTransport):
     def __init__(
         self,
         httpx_client: httpx.AsyncClient,
-        client_extensions: list[str] | None = None,
         agent_card: AgentCard | None = None,
         url: str | None = None,
         interceptors: list[ClientCallInterceptor] | None = None,
+        client_extensions: list[str] | None = None,
     ):
         """Initializes the JsonRpcTransport."""
         if url:
@@ -74,14 +74,14 @@ def __init__(
             raise ValueError('Must provide either agent_card or url')
 
         self.httpx_client = httpx_client
-        self.client_extensions = client_extensions
         self.agent_card = agent_card
         self.interceptors = interceptors or []
         self._needs_extended_card = (
             agent_card.supports_authenticated_extended_card
             if agent_card
             else True
         )
+        self.client_extensions = client_extensions
 
     def _update_extension_header(
         self, http_kwargs: dict[str, Any]

src/a2a/client/transports/rest.py

@@ -41,10 +41,10 @@ class RestTransport(ClientTransport):
     def __init__(
         self,
         httpx_client: httpx.AsyncClient,
-        client_extensions: list[str] | None = None,
         agent_card: AgentCard | None = None,
         url: str | None = None,
         interceptors: list[ClientCallInterceptor] | None = None,
+        client_extensions: list[str] | None = None,
     ):
         """Initializes the RestTransport."""
         if url:
@@ -56,14 +56,14 @@ def __init__(
         if self.url.endswith('/'):
             self.url = self.url[:-1]
         self.httpx_client = httpx_client
-        self.client_extensions = client_extensions
         self.agent_card = agent_card
         self.interceptors = interceptors or []
         self._needs_extended_card = (
             agent_card.supports_authenticated_extended_card
             if agent_card
             else True
         )
+        self.client_extensions = client_extensions
 
     def _update_extension_header(
         self, http_kwargs: dict[str, Any]

tests/client/test_jsonrpc_client.py

@@ -794,7 +794,9 @@ def test_update_extension_header_no_initial_headers(
     ):
         extensions = ['test_extension_1', 'test_extension_2']
         client = JsonRpcTransport(
-            mock_httpx_client, extensions, mock_agent_card
+            httpx_client=mock_httpx_client,
+            agent_card=mock_agent_card,
+            client_extensions=extensions,
         )
         http_kwargs = {}
         result_kwargs = client._update_extension_header(http_kwargs)
@@ -809,7 +811,9 @@ def test_update_extension_header_with_existing_other_headers(
     ):
         extensions = ['test_extension_1']
         client = JsonRpcTransport(
-            mock_httpx_client, extensions, mock_agent_card
+            httpx_client=mock_httpx_client,
+            agent_card=mock_agent_card,
+            client_extensions=extensions,
         )
         http_kwargs = {'headers': {'X_Other': 'Test'}}
         result_kwargs = client._update_extension_header(http_kwargs)
@@ -824,7 +828,9 @@ def test_update_extension_header_merge_with_existing_extensions(
     ):
         extensions = ['test_extension_1', 'test_extension_2']
         client = JsonRpcTransport(
-            mock_httpx_client, extensions, mock_agent_card
+            httpx_client=mock_httpx_client,
+            agent_card=mock_agent_card,
+            client_extensions=extensions,
         )
         http_kwargs = {
             'headers': {

tests/client/test_rest_client.py

@@ -37,7 +37,11 @@ def test_update_extension_header_no_initial_headers(
         self, mock_httpx_client: AsyncMock, mock_agent_card: MagicMock
     ):
         extensions = ['test_extension_1', 'test_extension_2']
-        client = RestTransport(mock_httpx_client, extensions, mock_agent_card)
+        client = RestTransport(
+            httpx_client=mock_httpx_client,
+            agent_card=mock_agent_card,
+            client_extensions=extensions,
+        )
         http_kwargs = {}
         result_kwargs = client._update_extension_header(http_kwargs)
         actual_extensions = set(
@@ -50,7 +54,11 @@ def test_update_extension_header_merge_with_existing_extensions(
         self, mock_httpx_client: AsyncMock, mock_agent_card: MagicMock
     ):
         extensions = ['test_extension_2', 'test_extension_3']
-        client = RestTransport(mock_httpx_client, extensions, mock_agent_card)
+        client = RestTransport(
+            httpx_client=mock_httpx_client,
+            agent_card=mock_agent_card,
+            client_extensions=extensions,
+        )
         http_kwargs = {
             'headers': {
                 HTTP_EXTENSION_HEADER: 'test_extension_1, test_extension_2'
@@ -71,7 +79,11 @@ def test_update_extension_header_with_other_headers(
         self, mock_httpx_client: AsyncMock, mock_agent_card: MagicMock
     ):
         extensions = ['test_extension_1']
-        client = RestTransport(mock_httpx_client, extensions, mock_agent_card)
+        client = RestTransport(
+            httpx_client=mock_httpx_client,
+            agent_card=mock_agent_card,
+            client_extensions=extensions,
+        )
         http_kwargs = {'headers': {'X_Other': 'Test'}}
         result_kwargs = client._update_extension_header(http_kwargs)
         headers = result_kwargs.get('headers', {})