Make ServerCallContext mandatory in compat rest dapter

Author: sokoliva

src/a2a/compat/v0_3/rest_adapter.py

@@ -109,7 +109,7 @@ async def event_generator(
         )
 
     async def handle_get_agent_card(
-        self, request: Request, call_context: ServerCallContext | None = None
+        self, request: Request, call_context: ServerCallContext
     ) -> dict[str, Any]:
         """Handles GET requests for the agent card endpoint."""
         card_to_serve = self.agent_card
@@ -119,7 +119,7 @@ async def handle_get_agent_card(
         return v03_card.model_dump(mode='json', exclude_none=True)
 
     async def handle_authenticated_agent_card(
-        self, request: Request, call_context: ServerCallContext | None = None
+        self, request: Request, call_context: ServerCallContext
     ) -> dict[str, Any]:
         """Hook for per credential agent card response."""
         if not self.agent_card.capabilities.extended_agent_card:

src/a2a/server/routes/jsonrpc_routes.py

@@ -21,7 +21,6 @@
 from a2a.server.request_handlers.request_handler import RequestHandler
 from a2a.server.routes.jsonrpc_dispatcher import (
     CallContextBuilder,
-    DefaultCallContextBuilder,
     JsonRpcDispatcher,
 )
 from a2a.types.a2a_pb2 import AgentCard
@@ -75,7 +74,7 @@ def create_jsonrpc_routes(  # noqa: PLR0913
         agent_card=agent_card,
         request_handler=request_handler,
         extended_agent_card=extended_agent_card,
-        context_builder=context_builder or DefaultCallContextBuilder(),
+        context_builder=context_builder,
         card_modifier=card_modifier,
         extended_card_modifier=extended_card_modifier,
         enable_v0_3_compat=enable_v0_3_compat,

src/a2a/server/routes/rest_routes.py

@@ -100,7 +100,7 @@ def create_rest_routes(  # noqa: PLR0913
             agent_card=agent_card,
             http_handler=request_handler,
             extended_agent_card=extended_agent_card,
-            context_builder=context_builder or DefaultCallContextBuilder(),
+            context_builder=context_builder,
             card_modifier=card_modifier,
             extended_card_modifier=extended_card_modifier,
         )
@@ -176,7 +176,7 @@ async def event_generator() -> AsyncIterator[str]:
         return EventSourceResponse(event_generator())
 
     async def _handle_authenticated_agent_card(
-        request: 'Request', call_context: ServerCallContext | None = None
+        request: 'Request', call_context: ServerCallContext
     ) -> dict[str, Any]:
         if not agent_card.capabilities.extended_agent_card:
             raise ExtendedAgentCardNotConfiguredError(
@@ -185,10 +185,8 @@ async def _handle_authenticated_agent_card(
         card_to_serve = extended_agent_card or agent_card
 
         if extended_card_modifier:
-            # Re-generate context if none passed to replicate RESTAdapter exact logic
-            context = call_context or _build_call_context(request)
             card_to_serve = await maybe_await(
-                extended_card_modifier(card_to_serve, context)
+                extended_card_modifier(card_to_serve, call_context)
             )
         elif card_modifier:
             card_to_serve = await maybe_await(card_modifier(card_to_serve))