added extended_agent_card route

Author: martimfasantos

src/a2a/server/apps/jsonrpc/fastapi_app.py

@@ -49,14 +49,16 @@ def __init__(
     def build(
         self,
         agent_card_url: str = '/.well-known/agent.json',
+        extended_agent_card_url: str = '/agent/authenticatedExtendedCard',
         rpc_url: str = '/',
         **kwargs: Any,
     ) -> FastAPI:
         """Builds and returns the FastAPI application instance.
 
         Args:
             agent_card_url: The URL for the agent card endpoint.
-            rpc_url: The URL for the A2A JSON-RPC endpoint
+            rpc_url: The URL for the A2A JSON-RPC endpoint.
+            extended_agent_card_url: The URL for the authenticated extended agent card endpoint.
             **kwargs: Additional keyword arguments to pass to the FastAPI constructor.
 
         Returns:
@@ -71,5 +73,10 @@ async def handle_a2a_request(request: Request):
         @app.get(agent_card_url)
         async def get_agent_card(request: Request):
             return await self._handle_get_agent_card(request)
+        
+        if self.agent_card.supportsAuthenticatedExtendedCard:
+            @app.get(extended_agent_card_url)
+            async def get_extended_agent_card(request: Request):
+                return await self._handle_get_authenticated_extended_agent_card(request)
 
         return app

src/a2a/server/apps/jsonrpc/starlette_app.py

@@ -50,18 +50,20 @@ def __init__(
     def routes(
         self,
         agent_card_url: str = '/.well-known/agent.json',
+        extended_agent_card_url: str = '/agent/authenticatedExtendedCard',
         rpc_url: str = '/',
     ) -> list[Route]:
         """Returns the Starlette Routes for handling A2A requests.
 
         Args:
             agent_card_url: The URL path for the agent card endpoint.
             rpc_url: The URL path for the A2A JSON-RPC endpoint (POST requests).
+            extended_agent_card_url: The URL for the authenticated extended agent card endpoint.
 
         Returns:
             A list of Starlette Route objects.
         """
-        return [
+        app_routes = [
             Route(
                 rpc_url,
                 self._handle_requests,
@@ -76,9 +78,21 @@ def routes(
             ),
         ]
 
+        if self.agent_card.supportsAuthenticatedExtendedCard:
+            app_routes.append(
+                Route(
+                    extended_agent_card_url,
+                    self._handle_get_authenticated_extended_agent_card,
+                    methods=['GET'],
+                    name='authenticated_extended_agent_card',
+                )
+            )
+        return app_routes
+
     def build(
         self,
         agent_card_url: str = '/.well-known/agent.json',
+        extended_agent_card_url: str = '/agent/authenticatedExtendedCard',
         rpc_url: str = '/',
         **kwargs: Any,
     ) -> Starlette:
@@ -87,16 +101,19 @@ def build(
         Args:
             agent_card_url: The URL path for the agent card endpoint.
             rpc_url: The URL path for the A2A JSON-RPC endpoint (POST requests).
+            extended_agent_card_url: The URL for the authenticated extended agent card endpoint.
             **kwargs: Additional keyword arguments to pass to the Starlette
               constructor.
 
         Returns:
             A configured Starlette application instance.
         """
-        routes = self.routes(agent_card_url, rpc_url)
+        app_routes = self.routes(
+            agent_card_url, extended_agent_card_url, rpc_url
+        )
         if 'routes' in kwargs:
-            kwargs['routes'] += routes
+            kwargs['routes'].extend(app_routes)
         else:
-            kwargs['routes'] = routes
+            kwargs['routes'] = app_routes
 
         return Starlette(**kwargs)

tests/server/test_integration.py

@@ -132,25 +132,15 @@ def handler():
 
 
 @pytest.fixture
-def starlette_app(agent_card: AgentCard, handler: mock.AsyncMock):
+def app(agent_card: AgentCard, handler: mock.AsyncMock):
     return A2AStarletteApplication(agent_card, handler)
 
 @pytest.fixture
-def starlette_client(app: A2AStarletteApplication, **kwargs):
+def client(app: A2AStarletteApplication, **kwargs):
     """Create a test client with the Starlette app."""
     return TestClient(app.build(**kwargs))
 
 
-@pytest.fixture
-def fastapi_app(agent_card: AgentCard, handler: mock.AsyncMock):
-    return A2AFastAPIApplication(agent_card, handler)
-
-@pytest.fixture
-def fastapi_client(app: A2AFastAPIApplication, **kwargs):
-    """Create a test client with the FastAPI app."""
-    return TestClient(app.build(**kwargs))
-
-
 # === BASIC FUNCTIONALITY TESTS ===
 
 
@@ -164,7 +154,7 @@ def test_agent_card_endpoint(client: TestClient, agent_card: AgentCard):
     assert 'streaming' in data['capabilities']
 
 
-def test_authenticated_extended_agent_card_endpoint_not_supported_starlette(
+def test_authenticated_extended_agent_card_endpoint_not_supported(
     agent_card: AgentCard, handler: mock.AsyncMock
 ):
     """Test extended card endpoint returns 404 if not supported by main card."""
@@ -200,6 +190,7 @@ def test_authenticated_extended_agent_card_endpoint_supported_with_specific_exte
     agent_card.supportsAuthenticatedExtendedCard = (
         True  # Main card must support it
     )
+    print(agent_card)
     app_instance = A2AStarletteApplication(
         agent_card, handler, extended_agent_card=extended_agent_card_fixture
     )