Pass a default and an extended card to the starlette app. Also add tests

Author: dmandar

examples/helloworld/__main__.py

@@ -6,7 +6,6 @@
 from a2a.server.request_handlers import DefaultRequestHandler
 from a2a.server.tasks import InMemoryTaskStore
 from a2a.types import (
-    AgentAuthentication,
     AgentCapabilities,
     AgentCard,
     AgentSkill,
@@ -30,17 +29,30 @@
         examples=['super hi', 'give me a super hello'],
     )
 
-    agent_card = AgentCard(
+    # This will be the public-facing agent card
+    public_agent_card = AgentCard(
         name='Hello World Agent',
         description='Just a hello world agent',
         url='http://localhost:9999/',
         version='1.0.0',
         defaultInputModes=['text'],
         defaultOutputModes=['text'],
         capabilities=AgentCapabilities(streaming=True),
-        skills=[skill, extended_skill],  # Include both skills
-        authentication=AgentAuthentication(schemes=['public']),
-        # Adding this line to enable extended card support:
+        skills=[skill],  # Only the basic skill for the public card
+        supportsAuthenticatedExtendedCard=True,
+    )
+
+    # This will be the authenticated extended agent card
+    # It includes the additional 'extended_skill'
+    specific_extended_agent_card = AgentCard(
+        name='Hello World Agent - Extended Edition', # Different name for clarity
+        description='The full-featured hello world agent for authenticated users.',
+        url='http://localhost:9999/',
+        version='1.0.1', # Could even be a different version
+        defaultInputModes=['text'],
+        defaultOutputModes=['text'],
+        capabilities=AgentCapabilities(streaming=True), # Could have different capabilities
+        skills=[skill, extended_skill],  # Both skills for the extended card
         supportsAuthenticatedExtendedCard=True,
     )
 
@@ -49,9 +61,9 @@
         task_store=InMemoryTaskStore(),
     )
 
-    server = A2AStarletteApplication(
-        agent_card=agent_card, http_handler=request_handler
-    )
+    server = A2AStarletteApplication(agent_card=public_agent_card,
+                                     http_handler=request_handler,
+                                     extended_agent_card=specific_extended_agent_card)
     import uvicorn
 
     uvicorn.run(server.build(), host='0.0.0.0', port=9999)

examples/helloworld/test_client.py

@@ -1,7 +1,10 @@
-from a2a.client import A2AClient
+import logging  # Import the logging module
 from typing import Any
-import httpx
 from uuid import uuid4
+
+import httpx
+
+from a2a.client import A2AClient
 from a2a.types import (
     SendMessageRequest,
     MessageSendParams,
@@ -10,6 +13,9 @@
 
 
 async def main() -> None:
+    # Configure logging to show INFO level messages
+    logging.basicConfig(level=logging.INFO)
+
     async with httpx.AsyncClient() as httpx_client:
         client = await A2AClient.get_client_from_agent_card_url(
             httpx_client, 'http://localhost:9999'

src/a2a/client/client.py

@@ -1,10 +1,12 @@
 import json
+import logging
 from collections.abc import AsyncGenerator
 from typing import Any
 from uuid import uuid4
 
 import httpx
 from httpx_sse import SSEError, aconnect_sse
+from pydantic import ValidationError
 
 from a2a.client.errors import A2AClientHTTPError, A2AClientJSONError
 from a2a.types import (AgentCard, CancelTaskRequest, CancelTaskResponse,
@@ -17,6 +19,7 @@
                        SetTaskPushNotificationConfigResponse)
 from a2a.utils.telemetry import SpanKind, trace_class
 
+logger = logging.getLogger(__name__)
 
 class A2ACardResolver:
     """Agent Card resolver."""
@@ -122,9 +125,7 @@ async def get_agent_card(
                     'Successfully fetched extended agent card data: %s',
                     extended_agent_card_data,
                 )  # Added for verbosity
-                print(
-                    f'DEBUG: Fetched extended agent card data:\n{json.dumps(extended_agent_card_data, indent=2)}'
-                )  # Added for direct output
+                
                 # This new card data replaces the old one entirely
                 agent_card = AgentCard.model_validate(extended_agent_card_data)
                 logger.info(

src/a2a/server/apps/starlette_app.py

@@ -34,15 +34,23 @@ class A2AStarletteApplication:
     (SSE).
     """
 
-    def __init__(self, agent_card: AgentCard, http_handler: RequestHandler):
+    def __init__(
+        self,
+        agent_card: AgentCard,
+        http_handler: RequestHandler,
+        extended_agent_card: AgentCard | None = None,
+    ):
         """Initializes the A2AStarletteApplication.
 
         Args:
             agent_card: The AgentCard describing the agent's capabilities.
             http_handler: The handler instance responsible for processing A2A
               requests via http.
+            extended_agent_card: An optional, distinct AgentCard to be served
+              at the authenticated extended card endpoint.
         """
         self.agent_card = agent_card
+        self.extended_agent_card = extended_agent_card
         self.handler = JSONRPCHandler(
             agent_card=agent_card, request_handler=http_handler
         )
@@ -264,44 +272,11 @@ async def _handle_get_agent_card(self, request: Request) -> JSONResponse:
         Returns:
             A JSONResponse containing the agent card data.
         """
-
-        # Construct the public view of the agent card.
-        public_card_data = {
-            'version': self.agent_card.version,
-            'name': self.agent_card.name,
-            'providerName': self.agent_card.provider.organization
-            if self.agent_card.provider
-            else None,
-            'url': self.agent_card.url,
-            'authentication': self.agent_card.authentication.model_dump(
-                mode='json', exclude_none=True
-            )
-            if self.agent_card.authentication
-            else None,  # authentication is a single object, can be None if made Optional
-            'skills': [
-                f.model_dump(mode='json', exclude_none=True)
-                for f in self.agent_card.skills
-                if f.id == 'hello_world'  # Explicitly filter for public skills
-            ]
-            if self.agent_card.skills
-            else [],  # Default to empty list if no skills
-            'capabilities': self.agent_card.capabilities.model_dump(
-                mode='json', exclude_none=True
-            ),
-            'supportsAuthenticatedExtendedCard': (
-                self.agent_card.supportsAuthenticatedExtendedCard
-            ),
-            # Include other fields from types.py AgentCard designated as public
-            'description': self.agent_card.description,
-            'documentationUrl': self.agent_card.documentationUrl,
-            'defaultInputModes': self.agent_card.defaultInputModes,
-            'defaultOutputModes': self.agent_card.defaultOutputModes,
-        }
-        # Filter out None values from the public card data.
-        public_card_data_cleaned = {
-            k: v for k, v in public_card_data.items() if v is not None
-        }
-        return JSONResponse(public_card_data_cleaned)
+        # The public agent card is a direct serialization of the agent_card
+        # provided at initialization.
+        return JSONResponse(
+            self.agent_card.model_dump(mode='json', exclude_none=True)
+        )
 
     async def _handle_get_authenticated_extended_agent_card(
         self, request: Request
@@ -313,11 +288,15 @@ async def _handle_get_authenticated_extended_agent_card(
                 status_code=404,
             )
 
-        # Authentication and authorization are NOT YET IMPLEMENTED for this endpoint.
-        # As per current requirements, if 'supportsAuthenticatedExtendedCard' is true,
-        # this endpoint returns the complete agent card.
-        # In the future, proper authentication checks will be added here, and the
-        # returned card may be filtered based on the client's authorization scopes.
+        # If an explicit extended_agent_card is provided, serve that.
+        if self.extended_agent_card:
+            return JSONResponse(
+                self.extended_agent_card.model_dump(
+                    mode='json', exclude_none=True
+                )
+            )
+        # Otherwise, if supportsAuthenticatedExtendedCard is true but no specific
+        # extended card is set, serve the main agent_card.
         return JSONResponse(
             self.agent_card.model_dump(mode='json', exclude_none=True)
         )

tests/README.md

@@ -0,0 +1,11 @@
+## Running the tests
+
+1. Run the tests
+    ```bash
+    uv run pytest -v -s client/test_client.py
+    ```
+
+In case of failures, you can cleanup the cache:
+
+1. `uv clean`
+2. `rm -fR .pytest_cache .venv __pycache__`