fix: Fix all the failing unit tests due to cyclic dependency, snake case variable renaming and module name change for patches

Author: aneeshgarg

src/a2a/client/__init__.py

@@ -25,11 +25,6 @@
     A2AClientJSONError,
     A2AClientTimeoutError,
 )
-from a2a.client.grpc_client import (
-    GrpcClient,
-    GrpcTransportClient,
-    NewGrpcClient,
-)
 from a2a.client.helpers import create_text_message_object
 from a2a.client.jsonrpc_client import (
     JsonRpcClient,
@@ -47,27 +42,34 @@
 # For backward compatability define this alias. This will be deprecated in
 # a future release.
 A2AClient = JsonRpcTransportClient
-A2AGrpcClient = GrpcTransportClient
 
 logger = logging.getLogger(__name__)
 
 try:
-    from a2a.client.grpc_client import A2AGrpcClient  # type: ignore
+    from a2a.client.grpc_client import (
+        GrpcClient,
+        GrpcTransportClient,  # type: ignore
+        NewGrpcClient,
+    )
 except ImportError as e:
     _original_error = e
     logger.debug(
         'A2AGrpcClient not loaded. This is expected if gRPC dependencies are not installed. Error: %s',
         _original_error,
     )
 
-    class A2AGrpcClient:  # type: ignore
+    class GrpcTransportClient:  # type: ignore
         """Placeholder for A2AGrpcClient when dependencies are not installed."""
 
         def __init__(self, *args, **kwargs):
             raise ImportError(
                 'To use A2AGrpcClient, its dependencies must be installed. '
                 'You can install them with \'pip install "a2a-sdk[grpc]"\''
             ) from _original_error
+finally:
+    # For backward compatability define this alias. This will be deprecated in
+    # a future release.
+    A2AGrpcClient = GrpcTransportClient  # type: ignore
 
 
 __all__ = [

src/a2a/client/grpc_client.py

@@ -65,7 +65,9 @@ def __init__(
         # If they don't provide an agent card, but do have a stub, lookup the
         # card from the stub.
         self._needs_extended_card = (
-            agent_card.supportsAuthenticatedExtendedCard if agent_card else True
+            agent_card.supports_authenticated_extended_card
+            if agent_card
+            else True
         )
 
     async def send_message(

src/a2a/client/jsonrpc_client.py

@@ -9,7 +9,6 @@
 
 from httpx_sse import SSEError, aconnect_sse
 
-from a2a.client import A2AClient
 from a2a.client.client import (
     A2ACardResolver,
     Client,
@@ -95,7 +94,7 @@ def __init__(
         # their auth credentials based on the public card and get the updated
         # card.
         self._needs_extended_card = (
-            not agent_card.supportsAuthenticatedExtendedCard
+            not agent_card.supports_authenticated_extended_card
             if agent_card
             else True
         )
@@ -130,7 +129,7 @@ async def get_client_from_agent_card_url(
         base_url: str,
         agent_card_path: str = AGENT_CARD_WELL_KNOWN_PATH,
         http_kwargs: dict[str, Any] | None = None,
-    ) -> 'A2AClient':
+    ) -> 'JsonRpcTransportClient':
         """[deprecated] Fetches the public AgentCard and initializes an A2A client.
 
         This method will always fetch the public agent card. If an authenticated
@@ -157,7 +156,9 @@ async def get_client_from_agent_card_url(
         ).get_agent_card(
             http_kwargs=http_kwargs
         )  # Fetches public card by default
-        return A2AClient(httpx_client=httpx_client, agent_card=agent_card)
+        return JsonRpcTransportClient(
+            httpx_client=httpx_client, agent_card=agent_card
+        )
 
     async def send_message(
         self,

src/a2a/client/rest_client.py

@@ -75,7 +75,7 @@ def __init__(
         # their auth credentials based on the public card and get the updated
         # card.
         self._needs_extended_card = (
-            not agent_card.supportsAuthenticatedExtendedCard
+            not agent_card.supports_authenticated_extended_card
             if agent_card
             else True
         )
@@ -536,7 +536,9 @@ async def get_card(
         if not card:
             resolver = A2ACardResolver(self.httpx_client, self.url)
             card = await resolver.get_agent_card(http_kwargs=http_kwargs)
-            self._needs_extended_card = card.supportsAuthenticatedExtendedCard
+            self._needs_extended_card = (
+                card.supports_authenticated_extended_card
+            )
             self.agent_card = card
 
         if not self._needs_extended_card:

tests/client/test_client.py

@@ -115,7 +115,11 @@ def mock_httpx_client() -> AsyncMock:
 
 @pytest.fixture
 def mock_agent_card() -> MagicMock:
-    return MagicMock(spec=AgentCard, url='http://agent.example.com/api')
+    mock = MagicMock(spec=AgentCard, url='http://agent.example.com/api')
+    # The attribute is accessed in the client's __init__ to determine if an
+    # extended card needs to be fetched.
+    mock.supports_authenticated_extended_card = False
+    return mock
 
 
 async def async_iterable_from_list(
@@ -397,7 +401,7 @@ async def test_get_client_from_agent_card_url_success(
         mock_resolver_instance.get_agent_card.return_value = mock_agent_card
 
         with patch(
-            'a2a.client.client.A2ACardResolver',
+            'a2a.client.jsonrpc_client.A2ACardResolver',
             return_value=mock_resolver_instance,
         ) as mock_resolver_class:
             client = await A2AClient.get_client_from_agent_card_url(
@@ -426,7 +430,7 @@ async def test_get_client_from_agent_card_url_resolver_error(
     ):
         error_to_raise = A2AClientHTTPError(404, 'Agent card not found')
         with patch(
-            'a2a.client.client.A2ACardResolver.get_agent_card',
+            'a2a.client.jsonrpc_client.A2ACardResolver.get_agent_card',
             new_callable=AsyncMock,
             side_effect=error_to_raise,
         ):
@@ -528,7 +532,7 @@ async def test_send_message_error_response(
             ) == InvalidParamsError().model_dump(exclude_none=True)
 
     @pytest.mark.asyncio
-    @patch('a2a.client.client.aconnect_sse')
+    @patch('a2a.client.jsonrpc_client.aconnect_sse')
     async def test_send_message_streaming_success_request(
         self,
         mock_aconnect_sse: AsyncMock,
@@ -617,7 +621,7 @@ async def test_send_message_streaming_success_request(
             )  # Default timeout for streaming
 
     @pytest.mark.asyncio
-    @patch('a2a.client.client.aconnect_sse')
+    @patch('a2a.client.jsonrpc_client.aconnect_sse')
     async def test_send_message_streaming_http_kwargs_passed(
         self,
         mock_aconnect_sse: AsyncMock,
@@ -658,7 +662,7 @@ async def test_send_message_streaming_http_kwargs_passed(
         )  # Ensure custom timeout is used
 
     @pytest.mark.asyncio
-    @patch('a2a.client.client.aconnect_sse')
+    @patch('a2a.client.jsonrpc_client.aconnect_sse')
     async def test_send_message_streaming_sse_error_handling(
         self,
         mock_aconnect_sse: AsyncMock,
@@ -693,7 +697,7 @@ async def test_send_message_streaming_sse_error_handling(
         assert 'Simulated SSE protocol error' in str(exc_info.value)
 
     @pytest.mark.asyncio
-    @patch('a2a.client.client.aconnect_sse')
+    @patch('a2a.client.jsonrpc_client.aconnect_sse')
     async def test_send_message_streaming_json_decode_error_handling(
         self,
         mock_aconnect_sse: AsyncMock,
@@ -731,7 +735,7 @@ async def test_send_message_streaming_json_decode_error_handling(
         )  # Example of JSONDecodeError message
 
     @pytest.mark.asyncio
-    @patch('a2a.client.client.aconnect_sse')
+    @patch('a2a.client.jsonrpc_client.aconnect_sse')
     async def test_send_message_streaming_httpx_request_error_handling(
         self,
         mock_aconnect_sse: AsyncMock,
@@ -858,7 +862,7 @@ async def test_set_task_callback_success(
                 client, '_send_request', new_callable=AsyncMock
             ) as mock_send_req,
             patch(
-                'a2a.client.client.uuid4',
+                'a2a.client.jsonrpc_client.uuid4',
                 return_value=MagicMock(hex='testuuid'),
             ) as mock_uuid,
         ):
@@ -1003,7 +1007,7 @@ async def test_get_task_callback_success(
                 client, '_send_request', new_callable=AsyncMock
             ) as mock_send_req,
             patch(
-                'a2a.client.client.uuid4',
+                'a2a.client.jsonrpc_client.uuid4',
                 return_value=MagicMock(hex='testgetuuid'),
             ) as mock_uuid,
         ):