fix

Author: guglielmo-san

src/a2a/compat/v0_3/grpc_handler.py

@@ -61,7 +61,9 @@ def __init__(
         """
         self.agent_card = agent_card
         self.handler03 = RequestHandler03(request_handler=request_handler)
-        self._context_builder = context_builder or DefaultGrpcServerCallContextBuilder()
+        self._context_builder = (
+            context_builder or DefaultGrpcServerCallContextBuilder()
+        )
         self.card_modifier = card_modifier
 
     async def _handle_unary(

src/a2a/compat/v0_3/jsonrpc_adapter.py

@@ -38,8 +38,8 @@
     JSONRPCError as CoreJSONRPCError,
 )
 from a2a.server.routes.common import (
-    ServerCallContextBuilder,
     DefaultServerCallContextBuilder,
+    ServerCallContextBuilder,
 )
 from a2a.utils import constants
 from a2a.utils.errors import ExtendedAgentCardNotConfiguredError
@@ -70,7 +70,7 @@ def __init__(  # noqa: PLR0913
         agent_card: 'AgentCard',
         http_handler: 'RequestHandler',
         extended_agent_card: 'AgentCard | None' = None,
-        context_builder: 'ContextBuilder | None' = None,
+        context_builder: 'ServerCallContextBuilder | None' = None,
         card_modifier: 'Callable[[AgentCard], Awaitable[AgentCard] | AgentCard] | None' = None,
         extended_card_modifier: 'Callable[[AgentCard, ServerCallContext], Awaitable[AgentCard] | AgentCard] | None' = None,
     ):
@@ -81,7 +81,9 @@ def __init__(  # noqa: PLR0913
         self.handler = RequestHandler03(
             request_handler=http_handler,
         )
-        self._context_builder = context_builder or DefaultServerCallContextBuilder()
+        self._context_builder = (
+            context_builder or DefaultServerCallContextBuilder()
+        )
 
     def supports_method(self, method: str) -> bool:
         """Returns True if the v0.3 adapter supports the given method name."""

src/a2a/compat/v0_3/rest_adapter.py

@@ -35,8 +35,8 @@
 from a2a.compat.v0_3.rest_handler import REST03Handler
 from a2a.server.context import ServerCallContext
 from a2a.server.routes.common import (
-    ServerCallContextBuilder,
     DefaultServerCallContextBuilder,
+    ServerCallContextBuilder,
 )
 from a2a.utils.error_handlers import (
     rest_error_handler,
@@ -63,7 +63,7 @@ def __init__(  # noqa: PLR0913
         agent_card: 'AgentCard',
         http_handler: 'RequestHandler',
         extended_agent_card: 'AgentCard | None' = None,
-        context_builder: 'ContextBuilder | None' = None,
+        context_builder: 'ServerCallContextBuilder | None' = None,
         card_modifier: 'Callable[[AgentCard], Awaitable[AgentCard] | AgentCard] | None' = None,
         extended_card_modifier: 'Callable[[AgentCard, ServerCallContext], Awaitable[AgentCard] | AgentCard] | None' = None,
     ):
@@ -74,7 +74,9 @@ def __init__(  # noqa: PLR0913
         self.handler = REST03Handler(
             agent_card=agent_card, request_handler=http_handler
         )
-        self._context_builder = context_builder or DefaultServerCallContextBuilder()
+        self._context_builder = (
+            context_builder or DefaultServerCallContextBuilder()
+        )
 
     @rest_error_handler
     async def _handle_request(

src/a2a/server/request_handlers/__init__.py

@@ -19,8 +19,8 @@
 
 try:
     from a2a.server.request_handlers.grpc_handler import (
-        GrpcHandler,  # type: ignore
         DefaultGrpcServerCallContextBuilder,
+        GrpcHandler,  # type: ignore
         GrpcServerCallContextBuilder,
     )
 except ImportError as e:
@@ -41,12 +41,12 @@ def __init__(self, *args, **kwargs):
 
 
 __all__ = [
+    'DefaultGrpcServerCallContextBuilder',
     'DefaultRequestHandler',
     'GrpcHandler',
+    'GrpcServerCallContextBuilder',
     'RequestHandler',
     'build_error_response',
-    'DefaultGrpcServerCallContextBuilder',
-    'GrpcServerCallContextBuilder',
     'prepare_response_object',
     'validate_request_params',
 ]

src/a2a/server/request_handlers/grpc_handler.py

@@ -129,7 +129,9 @@ def __init__(
         """
         self.agent_card = agent_card
         self.request_handler = request_handler
-        self._context_builder = context_builder or DefaultGrpcServerCallContextBuilder()
+        self._context_builder = (
+            context_builder or DefaultGrpcServerCallContextBuilder()
+        )
         self.card_modifier = card_modifier
 
     async def _handle_unary(

src/a2a/server/routes/__init__.py

@@ -1,14 +1,17 @@
 """A2A Routes."""
 
 from a2a.server.routes.agent_card_routes import create_agent_card_routes
-from a2a.server.routes.common import ServerCallContextBuilder, DefaultServerCallContextBuilder
+from a2a.server.routes.common import (
+    DefaultServerCallContextBuilder,
+    ServerCallContextBuilder,
+)
 from a2a.server.routes.jsonrpc_routes import create_jsonrpc_routes
 from a2a.server.routes.rest_routes import create_rest_routes
 
 
 __all__ = [
-    'ContextBuilder',
-    'DefaultContextBuilder',
+    'DefaultServerCallContextBuilder',
+    'ServerCallContextBuilder',
     'create_agent_card_routes',
     'create_jsonrpc_routes',
     'create_rest_routes',

src/a2a/server/routes/jsonrpc_dispatcher.py

@@ -28,8 +28,8 @@
     build_error_response,
 )
 from a2a.server.routes.common import (
-    ServerCallContextBuilder,
     DefaultServerCallContextBuilder,
+    ServerCallContextBuilder,
 )
 from a2a.types import A2ARequest
 from a2a.types.a2a_pb2 import (
@@ -183,7 +183,9 @@ def __init__(  # noqa: PLR0913
         self.extended_agent_card = extended_agent_card
         self.card_modifier = card_modifier
         self.extended_card_modifier = extended_card_modifier
-        self._context_builder = context_builder or DefaultServerCallContextBuilder()
+        self._context_builder = (
+            context_builder or DefaultServerCallContextBuilder()
+        )
         self.enable_v0_3_compat = enable_v0_3_compat
         self._v03_adapter: JSONRPC03Adapter | None = None
 

src/a2a/server/routes/rest_dispatcher.py

@@ -9,8 +9,8 @@
 from a2a.server.context import ServerCallContext
 from a2a.server.request_handlers.request_handler import RequestHandler
 from a2a.server.routes.common import (
-    ServerCallContextBuilder,
     DefaultServerCallContextBuilder,
+    ServerCallContextBuilder,
 )
 from a2a.types import a2a_pb2
 from a2a.types.a2a_pb2 import (
@@ -106,7 +106,9 @@ def __init__(  # noqa: PLR0913
         self.extended_agent_card = extended_agent_card
         self.card_modifier = card_modifier
         self.extended_card_modifier = extended_card_modifier
-        self._context_builder = context_builder or DefaultServerCallContextBuilder()
+        self._context_builder = (
+            context_builder or DefaultServerCallContextBuilder()
+        )
         self.request_handler = request_handler
 
     def _build_call_context(self, request: Request) -> ServerCallContext: