wip

Author: guglielmo-san

src/a2a/compat/v0_3/jsonrpc_adapter.py

@@ -10,8 +10,8 @@
 if TYPE_CHECKING:
     from starlette.requests import Request
 
-    from a2a.server.routes.jsonrpc_dispatcher import CallContextBuilder
     from a2a.server.request_handlers.request_handler import RequestHandler
+    from a2a.server.routes.jsonrpc_dispatcher import CallContextBuilder
     from a2a.types.a2a_pb2 import AgentCard
 
     _package_starlette_installed = True

src/a2a/compat/v0_3/rest_adapter.py

@@ -33,11 +33,11 @@
 
 from a2a.compat.v0_3 import conversions
 from a2a.compat.v0_3.rest_handler import REST03Handler
+from a2a.server.context import ServerCallContext
 from a2a.server.routes.jsonrpc_dispatcher import (
     CallContextBuilder,
     DefaultCallContextBuilder,
 )
-from a2a.server.context import ServerCallContext
 from a2a.utils.error_handlers import (
     rest_error_handler,
     rest_stream_error_handler,

src/a2a/server/routes/__init__.py

@@ -1,12 +1,12 @@
 """A2A Server Routes."""
 
-from a2a.server.routes.agent_card_route import AgentCardRoute
+from a2a.server.routes.agent_card_route import AgentCardRoutes
 from a2a.server.routes.jsonrpc_dispatcher import (
     CallContextBuilder,
     DefaultCallContextBuilder,
     StarletteUserProxy,
 )
-from a2a.server.routes.jsonrpc_route import JsonRpcRoute
+from a2a.server.routes.jsonrpc_route import JsonRpcRoutes
 from a2a.server.routes.rest_routes import RestRoutes
 
 

src/a2a/server/routes/agent_card_route.py

@@ -36,7 +36,7 @@
 logger = logging.getLogger(__name__)
 
 
-class AgentCardRoute:
+class AgentCardRoutes:
     """Provides the Starlette Route for the A2A protocol agent card endpoint."""
 
     def __init__(
@@ -75,9 +75,11 @@ async def get_agent_card(request: Request) -> Response:
                 )
             return JSONResponse(agent_card_to_dict(card_to_serve))
 
-        self.route = Route(
-            path=card_url,
-            endpoint=get_agent_card,
-            methods=['GET'],
-            middleware=middleware,
-        )
+        self.routes = [
+            Route(
+                path=card_url,
+                endpoint=get_agent_card,
+                methods=['GET'],
+                middleware=middleware,
+            )
+        ]

src/a2a/server/routes/jsonrpc_dispatcher.py

@@ -417,7 +417,9 @@ async def handle_requests(self, request: Request) -> Response:  # noqa: PLR0911,
             call_context.state['method'] = method
             call_context.state['request_id'] = request_id
 
-            handler_result: AsyncGenerator[dict[str, Any], None] | dict[str, Any]
+            handler_result: (
+                AsyncGenerator[dict[str, Any], None] | dict[str, Any]
+            )
             # Route streaming requests by method name
             if method in ('SendStreamingMessage', 'SubscribeToTask'):
                 handler_result = await self._process_streaming_request(

src/a2a/server/routes/jsonrpc_route.py

@@ -35,7 +35,7 @@
 logger = logging.getLogger(__name__)
 
 
-class JsonRpcRoute:
+class JsonRpcRoutes:
     """Provides the Starlette Route for the A2A protocol JSON-RPC endpoint.
 
     Handles incoming JSON-RPC requests, routes them to the appropriate
@@ -96,9 +96,11 @@ def __init__(  # noqa: PLR0913
             enable_v0_3_compat=enable_v0_3_compat,
         )
 
-        self.route = Route(
-            path=rpc_url,
-            endpoint=self.dispatcher.handle_requests,
-            methods=['POST'],
-            middleware=middleware,
-        )
+        self.routes = [
+            Route(
+                path=rpc_url,
+                endpoint=self.dispatcher.handle_requests,
+                methods=['POST'],
+                middleware=middleware,
+            )
+        ]

src/a2a/server/routes/rest_routes.py

@@ -135,7 +135,6 @@ def __init__(  # noqa: PLR0913
                 context_builder=context_builder,
             )
 
-
         self._setup_routes(rpc_url)
 
     def _build_call_context(self, request: Request) -> ServerCallContext:

tck/sut_agent.py

@@ -21,7 +21,7 @@
     DefaultRequestHandler,
 )
 from a2a.server.request_handlers.grpc_handler import GrpcHandler
-from a2a.server.routes import AgentCardRoute, JsonRpcRoute, RestRoutes
+from a2a.server.routes import AgentCardRoutes, JsonRpcRoutes, RestRoutes
 from a2a.server.tasks.inmemory_task_store import InMemoryTaskStore
 from a2a.server.tasks.task_store import TaskStore
 from a2a.types import (
@@ -194,30 +194,30 @@ def serve(task_store: TaskStore) -> None:
         task_store=task_store,
     )
 
-    main_app = Starlette()
-
     # Agent Card
-    agent_card_router = AgentCardRoute(
+    agent_card_routes = AgentCardRoutes(
         agent_card=agent_card,
         card_url=AGENT_CARD_URL,
     )
-    main_app.routes.append(agent_card_router.route)
-
     # JSONRPC
-    jsonrpc_router = JsonRpcRoute(
+    jsonrpc_routes = JsonRpcRoutes(
         agent_card=agent_card,
         request_handler=request_handler,
         rpc_url=JSONRPC_URL,
     )
-    main_app.routes.append(jsonrpc_router.route)
-
     # REST
-    rest_router = RestRoutes(
+    rest_routes = RestRoutes(
         agent_card=agent_card,
         request_handler=request_handler,
         rpc_url=REST_URL,
     )
-    main_app.routes.extend(rest_router.routes)
+
+    routes = [
+        *agent_card_routes.routes,
+        *jsonrpc_routes.routes,
+        *rest_routes.routes,
+    ]
+    main_app = Starlette(routes=routes)
 
     config = uvicorn.Config(
         main_app, host='127.0.0.1', port=http_port, log_level='info'

tests/compat/v0_3/test_jsonrpc_app_compat.py

@@ -6,7 +6,8 @@
 import pytest
 from starlette.testclient import TestClient
 
-from a2a.server.apps.jsonrpc.starlette_app import A2AStarletteApplication
+from starlette.applications import Starlette
+from a2a.server.routes import JsonRpcRoutes
 from a2a.server.request_handlers.request_handler import RequestHandler
 from a2a.types.a2a_pb2 import (
     AgentCard,
@@ -50,16 +51,18 @@ 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
-    return A2AStarletteApplication(
+    router = JsonRpcRoutes(
         agent_card=mock_agent_card,
-        http_handler=mock_handler,
+        request_handler=mock_handler,
         enable_v0_3_compat=True,
+        rpc_url='/',
     )
+    return Starlette(routes=router.routes)
 
 
 @pytest.fixture
 def client(test_app):
-    return TestClient(test_app.build())
+    return TestClient(test_app)
 
 
 def test_send_message_v03_compat(

tests/compat/v0_3/test_rest_fastapi_app_compat.py

@@ -9,7 +9,8 @@
 from google.protobuf import json_format
 from httpx import ASGITransport, AsyncClient
 
-from a2a.server.apps.rest.fastapi_app import A2ARESTFastAPIApplication
+from starlette.applications import Starlette
+from a2a.server.routes import RestRoutes
 from a2a.server.request_handlers.request_handler import RequestHandler
 from a2a.types.a2a_pb2 import (
     AgentCard,
@@ -50,17 +51,19 @@ async def request_handler() -> RequestHandler:
 async def app(
     agent_card: AgentCard,
     request_handler: RequestHandler,
-) -> FastAPI:
-    """Builds the FastAPI application for testing."""
-    return A2ARESTFastAPIApplication(
-        agent_card,
-        request_handler,
+) -> Starlette:
+    """Builds the Starlette application for testing."""
+    rest_routes = RestRoutes(
+        agent_card=agent_card,
+        request_handler=request_handler,
         enable_v0_3_compat=True,
-    ).build(agent_card_url='/well-known/agent.json', rpc_url='')
+        rpc_url='',
+    )
+    return Starlette(routes=rest_routes.routes)
 
 
 @pytest.fixture
-async def client(app: FastAPI) -> AsyncClient:
+async def client(app: Starlette) -> AsyncClient:
     return AsyncClient(
         transport=ASGITransport(app=app), base_url='http://testapp'
     )