update GetAgentCard method

Author: sokoliva

itk/main.py

@@ -341,7 +341,7 @@ async def main_async(http_port: int, grpc_port: int) -> None:
 
     server = grpc.aio.server()
 
-    compat_servicer = CompatGrpcHandler(agent_card, handler)
+    compat_servicer = CompatGrpcHandler(handler)
     a2a_v0_3_pb2_grpc.add_A2AServiceServicer_to_server(compat_servicer, server)
     servicer = GrpcHandler(handler)
     a2a_pb2_grpc.add_A2AServiceServicer_to_server(servicer, server)

samples/hello_world_agent.py

@@ -221,7 +221,7 @@ async def serve(
 
     compat_grpc_server = grpc.aio.server()
     compat_grpc_server.add_insecure_port(f'{host}:{compat_grpc_port}')
-    compat_servicer = CompatGrpcHandler(agent_card, request_handler)
+    compat_servicer = CompatGrpcHandler(request_handler)
     a2a_v0_3_pb2_grpc.add_A2AServiceServicer_to_server(
         compat_servicer, compat_grpc_server
     )

src/a2a/compat/v0_3/grpc_handler.py

@@ -12,7 +12,6 @@
 from a2a.compat.v0_3 import (
     a2a_v0_3_pb2,
     a2a_v0_3_pb2_grpc,
-    conversions,
     proto_utils,
 )
 from a2a.compat.v0_3 import (
@@ -27,9 +26,7 @@
     GrpcServerCallContextBuilder,
 )
 from a2a.server.request_handlers.request_handler import RequestHandler
-from a2a.types.a2a_pb2 import AgentCard
 from a2a.utils.errors import A2AError, InvalidParamsError
-from a2a.utils.helpers import maybe_await
 
 
 logger = logging.getLogger(__name__)
@@ -42,29 +39,21 @@ class CompatGrpcHandler(a2a_v0_3_pb2_grpc.A2AServiceServicer):
 
     def __init__(
         self,
-        agent_card: AgentCard,
         request_handler: RequestHandler,
         context_builder: GrpcServerCallContextBuilder | None = None,
-        card_modifier: Callable[[AgentCard], Awaitable[AgentCard] | AgentCard]
-        | None = None,
     ):
         """Initializes the CompatGrpcHandler.
 
         Args:
-            agent_card: The AgentCard describing the agent's capabilities (v1.0).
             request_handler: The underlying `RequestHandler` instance to
                              delegate requests to.
             context_builder: The CallContextBuilder object. If none the
                              DefaultCallContextBuilder is used.
-            card_modifier: An optional callback to dynamically modify the public
-              agent card before it is served.
         """
-        self.agent_card = agent_card
         self.handler03 = RequestHandler03(request_handler=request_handler)
         self._context_builder = (
             context_builder or DefaultGrpcServerCallContextBuilder()
         )
-        self.card_modifier = card_modifier
 
     async def _handle_unary(
         self,
@@ -348,32 +337,20 @@ async def GetAgentCard(
         request: a2a_v0_3_pb2.GetAgentCardRequest,
         context: grpc.aio.ServicerContext,
     ) -> a2a_v0_3_pb2.AgentCard:
-        """Get the agent card for the agent served (v0.3)."""
-        card_to_serve = self.agent_card
-        if self.card_modifier:
-            card_to_serve = await maybe_await(self.card_modifier(card_to_serve))
-        compat_card = proto_utils.ToProto.agent_card(
-            conversions.to_compat_agent_card(card_to_serve)
-        )
-
-        if self.agent_card.capabilities.extended_agent_card:
-
-            async def _handler(
-                server_context: ServerCallContext,
-            ) -> a2a_v0_3_pb2.AgentCard:
-                req_v03 = types_v03.GetAuthenticatedExtendedCardRequest(id=0)
-                res_v03 = await self.handler03.on_get_extended_agent_card(
-                    req_v03, server_context
-                )
-                if res_v03:
-                    return proto_utils.ToProto.agent_card(res_v03)
-                return compat_card
+        """Get the extended agent card for the agent served (v0.3)."""
 
-            return await self._handle_unary(
-                context, _handler, a2a_v0_3_pb2.AgentCard()
+        async def _handler(
+            server_context: ServerCallContext,
+        ) -> a2a_v0_3_pb2.AgentCard:
+            req_v03 = types_v03.GetAuthenticatedExtendedCardRequest(id=0)
+            res_v03 = await self.handler03.on_get_extended_agent_card(
+                req_v03, server_context
             )
+            return proto_utils.ToProto.agent_card(res_v03)
 
-        return compat_card
+        return await self._handle_unary(
+            context, _handler, a2a_v0_3_pb2.AgentCard()
+        )
 
     async def DeleteTaskPushNotificationConfig(
         self,

tck/sut_agent.py

@@ -229,7 +229,7 @@ def serve(task_store: TaskStore) -> None:
     grpc_server = grpc.aio.server()
     grpc_server.add_insecure_port(f'[::]:{grpc_port}')
     servicer = GrpcHandler(request_handler)
-    compat_servicer = CompatGrpcHandler(agent_card, request_handler)
+    compat_servicer = CompatGrpcHandler(request_handler)
     a2a_grpc.add_A2AServiceServicer_to_server(servicer, grpc_server)
     a2a_v0_3_grpc.add_A2AServiceServicer_to_server(compat_servicer, grpc_server)
 

tests/compat/v0_3/test_grpc_handler.py

@@ -37,7 +37,7 @@ def sample_agent_card() -> a2a_pb2.AgentCard:
         capabilities=a2a_pb2.AgentCapabilities(
             streaming=True,
             push_notifications=True,
-            extended_agent_card=False,
+            extended_agent_card=True,
         ),
         supported_interfaces=[
             a2a_pb2.AgentInterface(
@@ -53,10 +53,8 @@ def sample_agent_card() -> a2a_pb2.AgentCard:
 def handler(
     mock_request_handler: AsyncMock, sample_agent_card: a2a_pb2.AgentCard
 ) -> compat_grpc_handler.CompatGrpcHandler:
-    mock_request_handler.agent_card = sample_agent_card
     return compat_grpc_handler.CompatGrpcHandler(
         request_handler=mock_request_handler,
-        agent_card=sample_agent_card,
     )
 
 
@@ -439,36 +437,11 @@ async def test_list_push_config_success(
 
 @pytest.mark.asyncio
 async def test_get_agent_card_success(
-    handler: compat_grpc_handler.CompatGrpcHandler,
-    mock_grpc_context: AsyncMock,
-) -> None:
-    request = a2a_v0_3_pb2.GetAgentCardRequest()
-    response = await handler.GetAgentCard(request, mock_grpc_context)
-
-    expected_res = a2a_v0_3_pb2.AgentCard(
-        name='Test Agent',
-        description='A test agent',
-        url='http://jsonrpc.v03.com',
-        version='1.0.0',
-        protocol_version='0.3',
-        supports_authenticated_extended_card=False,
-        preferred_transport='JSONRPC',
-        capabilities=a2a_v0_3_pb2.AgentCapabilities(
-            streaming=True,
-            push_notifications=True,
-        ),
-    )
-    assert response == expected_res
-
-
-@pytest.mark.asyncio
-async def test_get_extended_card_success(
     handler: compat_grpc_handler.CompatGrpcHandler,
     mock_request_handler: AsyncMock,
     mock_grpc_context: AsyncMock,
     sample_agent_card: a2a_pb2.AgentCard,
 ) -> None:
-    handler.agent_card.capabilities.extended_agent_card = True
     request = a2a_v0_3_pb2.GetAgentCardRequest()
     mock_request_handler.on_get_extended_agent_card.return_value = (
         sample_agent_card

tests/integration/cross_version/client_server/server_1_0.py

@@ -196,7 +196,7 @@ async def main_async(http_port: int, grpc_port: int):
     servicer = GrpcHandler(handler)
     a2a_pb2_grpc.add_A2AServiceServicer_to_server(servicer, server)
 
-    compat_servicer = CompatGrpcHandler(agent_card, handler)
+    compat_servicer = CompatGrpcHandler(handler)
     a2a_v0_3_pb2_grpc.add_A2AServiceServicer_to_server(compat_servicer, server)
 
     server.add_insecure_port(f'127.0.0.1:{grpc_port}')

tests/integration/test_client_server_integration.py

@@ -369,7 +369,6 @@ async def grpc_03_server_and_handler(
     server_address = f'localhost:{port}'
     servicer = CompatGrpcHandler(
         request_handler=mock_request_handler,
-        agent_card=agent_card,
     )
     a2a_v0_3_pb2_grpc.add_A2AServiceServicer_to_server(servicer, server)
     await server.start()