remove agent_card property

Author: sokoliva

src/a2a/server/request_handlers/default_request_handler.py

@@ -144,11 +144,6 @@ def __init__(  # noqa: PLR0913
         # asyncio tasks and to surface unexpected exceptions.
         self._background_tasks = set()
 
-    @property
-    def agent_card(self) -> AgentCard:
-        """The agent card to be served by default."""
-        return self._agent_card
-
     @validate_request_params
     async def on_get_task(
         self,
@@ -424,7 +419,7 @@ async def push_notification_callback(event: Event) -> None:
 
     @validate_request_params
     @validate(
-        lambda self: self.agent_card.capabilities.streaming,
+        lambda self: self._agent_card.capabilities.streaming,
         'Streaming is not supported by the agent',
     )
     async def on_message_send_stream(
@@ -517,10 +512,7 @@ async def _cleanup_producer(
 
     @validate_request_params
     @validate(
-        lambda self: (
-            self.agent_card.capabilities.push_notifications
-            and self._push_config_store
-        ),
+        lambda self: self._agent_card.capabilities.push_notifications,
         error_message='Push notifications are not supported by the agent',
         error_type=PushNotificationNotSupportedError,
     )
@@ -533,12 +525,15 @@ async def on_create_task_push_notification_config(
 
         Requires a `PushNotifier` to be configured.
         """
+        if not self._push_config_store:
+            raise PushNotificationNotSupportedError
+
         task_id = params.task_id
         task: Task | None = await self.task_store.get(task_id, context)
         if not task:
             raise TaskNotFoundError
 
-        await self._push_config_store.set_info(  # type: ignore[union-attr]
+        await self._push_config_store.set_info(
             task_id,
             params,
             context,
@@ -548,10 +543,7 @@ async def on_create_task_push_notification_config(
 
     @validate_request_params
     @validate(
-        lambda self: (
-            self.agent_card.capabilities.push_notifications
-            and self._push_config_store
-        ),
+        lambda self: self._agent_card.capabilities.push_notifications,
         error_message='Push notifications are not supported by the agent',
         error_type=PushNotificationNotSupportedError,
     )
@@ -564,14 +556,17 @@ async def on_get_task_push_notification_config(
 
         Requires a `PushConfigStore` to be configured.
         """
+        if not self._push_config_store:
+            raise PushNotificationNotSupportedError
+
         task_id = params.task_id
         config_id = params.id
         task: Task | None = await self.task_store.get(task_id, context)
         if not task:
             raise TaskNotFoundError
 
         push_notification_configs: list[TaskPushNotificationConfig] = (
-            await self._push_config_store.get_info(task_id, context) or []  # type: ignore[union-attr]
+            await self._push_config_store.get_info(task_id, context) or []
         )
 
         for config in push_notification_configs:
@@ -582,7 +577,7 @@ async def on_get_task_push_notification_config(
 
     @validate_request_params
     @validate(
-        lambda self: self.agent_card.capabilities.streaming,
+        lambda self: self._agent_card.capabilities.streaming,
         'Streaming is not supported by the agent',
     )
     async def on_subscribe_to_task(
@@ -629,10 +624,7 @@ async def on_subscribe_to_task(
 
     @validate_request_params
     @validate(
-        lambda self: (
-            self.agent_card.capabilities.push_notifications
-            and self._push_config_store
-        ),
+        lambda self: self._agent_card.capabilities.push_notifications,
         error_message='Push notifications are not supported by the agent',
         error_type=PushNotificationNotSupportedError,
     )
@@ -645,12 +637,15 @@ async def on_list_task_push_notification_configs(
 
         Requires a `PushConfigStore` to be configured.
         """
+        if not self._push_config_store:
+            raise PushNotificationNotSupportedError
+
         task_id = params.task_id
         task: Task | None = await self.task_store.get(task_id, context)
         if not task:
             raise TaskNotFoundError
 
-        push_notification_config_list = await self._push_config_store.get_info(  # type: ignore[union-attr]
+        push_notification_config_list = await self._push_config_store.get_info(
             task_id, context
         )
 
@@ -660,10 +655,7 @@ async def on_list_task_push_notification_configs(
 
     @validate_request_params
     @validate(
-        lambda self: (
-            self.agent_card.capabilities.push_notifications
-            and self._push_config_store
-        ),
+        lambda self: self._agent_card.capabilities.push_notifications,
         error_message='Push notifications are not supported by the agent',
         error_type=PushNotificationNotSupportedError,
     )
@@ -676,17 +668,24 @@ async def on_delete_task_push_notification_config(
 
         Requires a `PushConfigStore` to be configured.
         """
+        if not self._push_config_store:
+            raise PushNotificationNotSupportedError
+
         task_id = params.task_id
         config_id = params.id
         task: Task | None = await self.task_store.get(task_id, context)
         if not task:
             raise TaskNotFoundError
 
-        await self._push_config_store.delete_info(task_id, context, config_id)  # type: ignore[union-attr]
+        await self._push_config_store.delete_info(task_id, context, config_id)
 
     @validate_request_params
     @validate(
-        lambda self: self.agent_card.capabilities.extended_agent_card,
+        lambda self: self._agent_card.capabilities.extended_agent_card,
+        error_message='The agent does not support authenticated extended cards',
+    )
+    @validate(
+        lambda self: self.extended_agent_card,
         error_message='The agent does not have an extended agent card configured',
         error_type=ExtendedAgentCardNotConfiguredError,
     )
@@ -699,12 +698,11 @@ async def on_get_extended_agent_card(
 
         Requires `capabilities.extended_agent_card` to be true.
         """
-        card = self.extended_agent_card or self.agent_card
+        extended_card = self.extended_agent_card
 
         if self.extended_card_modifier:
-            return await maybe_await(self.extended_card_modifier(card, context))
-
-        if self.card_modifier:
-            return await maybe_await(self.card_modifier(card))
+            return await maybe_await(
+                self.extended_card_modifier(extended_card, context)
+            )
 
-        return card
+        return extended_card

src/a2a/server/request_handlers/request_handler.py

@@ -36,11 +36,6 @@ class RequestHandler(ABC):
     provide to handle incoming A2A requests from any transport (gRPC, REST, JSON-RPC).
     """
 
-    @property
-    @abstractmethod
-    def agent_card(self) -> AgentCard:
-        """The core agent card to serve logic against."""
-
     @abstractmethod
     async def on_get_task(
         self,

src/a2a/server/routes/jsonrpc_dispatcher.py

@@ -220,15 +220,15 @@ def __init__(
 
         if self.enable_v0_3_compat:
             self._v03_adapter = JSONRPC03Adapter(
-                agent_card=request_handler.agent_card,
+                agent_card=getattr(request_handler, '_agent_card', None),
                 http_handler=request_handler,
                 extended_agent_card=getattr(
-                    request_handler, 'extended_agent_card', None
+                    request_handler, '_extended_agent_card', None
                 ),
                 context_builder=self._context_builder,
-                card_modifier=getattr(request_handler, 'card_modifier', None),
+                card_modifier=getattr(request_handler, '_card_modifier', None),
                 extended_card_modifier=getattr(
-                    request_handler, 'extended_card_modifier', None
+                    request_handler, '_extended_card_modifier', None
                 ),
             )
 

src/a2a/server/routes/rest_routes.py

@@ -70,15 +70,15 @@ def create_rest_routes(
     routes: list[BaseRoute] = []
     if enable_v0_3_compat:
         v03_adapter = REST03Adapter(
-            agent_card=request_handler.agent_card,
+            agent_card=getattr(request_handler, '_agent_card', None),
             http_handler=request_handler,
             extended_agent_card=getattr(
-                request_handler, 'extended_agent_card', None
+                request_handler, '_extended_agent_card', None
             ),
             context_builder=context_builder,
-            card_modifier=getattr(request_handler, 'card_modifier', None),
+            card_modifier=getattr(request_handler, '_card_modifier', None),
             extended_card_modifier=getattr(
-                request_handler, 'extended_card_modifier', None
+                request_handler, '_extended_card_modifier', None
             ),
         )
         v03_routes = v03_adapter.routes()

tests/compat/v0_3/test_jsonrpc_app_compat.py

@@ -51,7 +51,7 @@ def test_app(mock_handler):
     mock_agent_card.capabilities.streaming = False
     mock_agent_card.capabilities.push_notifications = True
     mock_agent_card.capabilities.extended_agent_card = True
-    mock_handler.agent_card = mock_agent_card
+    mock_handler._agent_card = mock_agent_card
     jsonrpc_routes = create_jsonrpc_routes(
         request_handler=mock_handler,
         enable_v0_3_compat=True,

tests/compat/v0_3/test_rest_routes_compat.py

@@ -53,7 +53,7 @@ async def app(
     request_handler: RequestHandler,
 ) -> Starlette:
     """Builds the Starlette application for testing."""
-    request_handler.agent_card = agent_card
+    request_handler._agent_card = agent_card
     rest_routes = create_rest_routes(
         request_handler=request_handler, enable_v0_3_compat=True
     )

tests/e2e/push_notifications/agent_app.py

@@ -142,10 +142,13 @@ def create_agent_app(
     """Creates a new HTTP+REST Starlette application for the test agent."""
     push_config_store = InMemoryPushNotificationConfigStore()
     card = test_agent_card(url)
+    extended_card = test_agent_card(url)
+    extended_card.name = 'Test Agent Extended'
     handler = DefaultRequestHandler(
         agent_executor=TestAgentExecutor(),
         task_store=InMemoryTaskStore(),
         agent_card=card,
+        extended_agent_card=extended_card,
         push_config_store=push_config_store,
         push_sender=BasePushNotificationSender(
             httpx_client=notification_client,

tests/integration/test_client_server_integration.py

@@ -150,7 +150,7 @@ def mock_request_handler(agent_card) -> AsyncMock:
     handler = AsyncMock(spec=RequestHandler)
 
     # Configure on_message_send for non-streaming calls
-    handler.agent_card = agent_card
+    handler._agent_card = agent_card
     handler.on_message_send.return_value = TASK_FROM_BLOCKING
 
     # Configure on_message_send_stream for streaming calls

tests/server/request_handlers/test_default_request_handler.py

@@ -2894,7 +2894,7 @@ async def test_on_get_extended_agent_card_unsupported(agent_card):
     params = GetExtendedAgentCardRequest()
     context = create_server_call_context()
 
-    with pytest.raises(ExtendedAgentCardNotConfiguredError):
+    with pytest.raises(UnsupportedOperationError):
         await request_handler.on_get_extended_agent_card(params, context)
 
 

tests/server/request_handlers/test_grpc_handler.py

@@ -53,7 +53,7 @@ def sample_agent_card() -> types.AgentCard:
 def grpc_handler(
     mock_request_handler: AsyncMock, sample_agent_card: types.AgentCard
 ) -> GrpcHandler:
-    mock_request_handler.agent_card = sample_agent_card
+    mock_request_handler._agent_card = sample_agent_card
     return GrpcHandler(request_handler=mock_request_handler)
 
 
@@ -219,7 +219,7 @@ async def side_effect_func(*_args, **_kwargs):
     mock_request_handler.on_get_extended_agent_card.side_effect = (
         side_effect_func
     )
-    mock_request_handler.agent_card = sample_agent_card
+    mock_request_handler._agent_card = sample_agent_card
     grpc_handler_modified = GrpcHandler(request_handler=mock_request_handler)
     request_proto = a2a_pb2.GetExtendedAgentCardRequest()
     response = await grpc_handler_modified.GetExtendedAgentCard(
@@ -249,7 +249,7 @@ async def async_modifier(*args, **kwargs):
         return modifier(sample_agent_card)
 
     mock_request_handler.on_get_extended_agent_card.side_effect = async_modifier
-    mock_request_handler.agent_card = sample_agent_card
+    mock_request_handler._agent_card = sample_agent_card
     grpc_handler_modified = GrpcHandler(request_handler=mock_request_handler)
     request_proto = a2a_pb2.GetExtendedAgentCardRequest()
     response = await grpc_handler_modified.GetExtendedAgentCard(