fix

Author: guglielmo-san

src/a2a/server/routes/agent_card_routes.py

@@ -1,26 +1,21 @@
-import logging
-
 from collections.abc import Awaitable, Callable
 from typing import TYPE_CHECKING, Any
 
 
 if TYPE_CHECKING:
-    from starlette.middleware import Middleware
     from starlette.requests import Request
     from starlette.responses import JSONResponse, Response
     from starlette.routing import Route
 
     _package_starlette_installed = True
 else:
     try:
-        from starlette.middleware import Middleware
         from starlette.requests import Request
         from starlette.responses import JSONResponse, Response
         from starlette.routing import Route
 
         _package_starlette_installed = True
     except ImportError:
-        Middleware = Any
         Route = Any
         Request = Any
         Response = Any
@@ -34,9 +29,6 @@
 from a2a.utils.helpers import maybe_await
 
 
-logger = logging.getLogger(__name__)
-
-
 def create_agent_card_routes(
     agent_card: AgentCard,
     card_modifier: Callable[[AgentCard], Awaitable[AgentCard] | AgentCard]

src/a2a/server/routes/jsonrpc_routes.py

@@ -1,24 +1,18 @@
-import logging
-
 from collections.abc import Awaitable, Callable
 from typing import TYPE_CHECKING, Any
 
 
 if TYPE_CHECKING:
-    from starlette.middleware import Middleware
-    from starlette.routing import Route, Router
+    from starlette.routing import Route
 
     _package_starlette_installed = True
 else:
     try:
-        from starlette.middleware import Middleware
-        from starlette.routing import Route, Router
+        from starlette.routing import Route
 
         _package_starlette_installed = True
     except ImportError:
-        Middleware = Any
         Route = Any
-        Router = Any
 
         _package_starlette_installed = False
 
@@ -30,15 +24,12 @@
     JsonRpcDispatcher,
 )
 from a2a.types.a2a_pb2 import AgentCard
-from a2a.utils.constants import DEFAULT_RPC_URL
-
-
-logger = logging.getLogger(__name__)
 
 
 def create_jsonrpc_routes(  # noqa: PLR0913
     agent_card: AgentCard,
     request_handler: RequestHandler,
+    rpc_url: str,
     extended_agent_card: AgentCard | None = None,
     context_builder: CallContextBuilder | None = None,
     card_modifier: Callable[[AgentCard], Awaitable[AgentCard] | AgentCard]
@@ -48,7 +39,6 @@ def create_jsonrpc_routes(  # noqa: PLR0913
     ]
     | None = None,
     enable_v0_3_compat: bool = False,
-    rpc_url: str = DEFAULT_RPC_URL,
 ) -> list['Route']:
     """Creates the Starlette Route for the A2A protocol JSON-RPC endpoint.
 
@@ -60,6 +50,7 @@ def create_jsonrpc_routes(  # noqa: PLR0913
         agent_card: The AgentCard describing the agent's capabilities.
         request_handler: The handler instance responsible for processing A2A
           requests via http.
+        rpc_url: The URL prefix for the RPC endpoints.
         extended_agent_card: An optional, distinct AgentCard to be served
           at the authenticated extended card endpoint.
         context_builder: The CallContextBuilder used to construct the
@@ -71,7 +62,6 @@ def create_jsonrpc_routes(  # noqa: PLR0913
           the extended agent card before it is served. It receives the
           call context.
         enable_v0_3_compat: Whether to enable v0.3 backward compatibility on the same endpoint.
-        rpc_url: The URL prefix for the RPC endpoints.
     """
     if not _package_starlette_installed:
         raise ImportError(

tests/server/routes/test_agent_card_routes.py

@@ -1,11 +1,9 @@
-# ruff: noqa: INP001
 import asyncio
 from typing import Any
 from unittest.mock import AsyncMock, MagicMock
 
 import pytest
 from starlette.testclient import TestClient
-from starlette.middleware import Middleware
 from starlette.applications import Starlette
 
 from a2a.server.routes.agent_card_routes import create_agent_card_routes

tests/server/routes/test_jsonrpc_dispatcher.py

@@ -1,4 +1,3 @@
-# ruff: noqa: INP001
 import json
 from typing import Any
 from unittest.mock import AsyncMock, MagicMock, patch

tests/server/routes/test_jsonrpc_routes.py

@@ -1,10 +1,8 @@
-# ruff: noqa: INP001
 from typing import Any
 from unittest.mock import AsyncMock, MagicMock
 
 import pytest
 from starlette.testclient import TestClient
-from starlette.middleware import Middleware
 from starlette.applications import Starlette
 
 from a2a.server.routes.jsonrpc_routes import create_jsonrpc_routes
@@ -25,7 +23,9 @@ def mock_handler():
 def test_routes_creation(agent_card, mock_handler):
     """Tests that create_jsonrpc_routes creates Route objects list."""
     routes = create_jsonrpc_routes(
-        agent_card=agent_card, request_handler=mock_handler
+        agent_card=agent_card,
+        request_handler=mock_handler,
+        rpc_url='/a2a/jsonrpc',
     )
 
     assert isinstance(routes, list)