Skip to content

Commit c3ee2e5

Browse files
guglielmo-sanguglielmo-san
committed
refactor: rename context builder classes and types to include ServerCall prefix for clarity
1 parent 8db4e8c commit c3ee2e5

12 files changed

Lines changed: 47 additions & 43 deletions

File tree

‎src/a2a/compat/v0_3/grpc_handler.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
from a2a.server.context import ServerCallContext
2424
from a2a.server.request_handlers.grpc_handler import (
2525
_ERROR_CODE_MAP,
26-
DefaultGrpcContextBuilder,
27-
GrpcContextBuilder,
26+
DefaultGrpcServerCallContextBuilder,
27+
GrpcServerCallContextBuilder,
2828
)
2929
from a2a.server.request_handlers.request_handler import RequestHandler
3030
from a2a.types.a2a_pb2 import AgentCard
@@ -44,7 +44,7 @@ def __init__(
4444
self,
4545
agent_card: AgentCard,
4646
request_handler: RequestHandler,
47-
context_builder: GrpcContextBuilder | None = None,
47+
context_builder: GrpcServerCallContextBuilder | None = None,
4848
card_modifier: Callable[[AgentCard], Awaitable[AgentCard] | AgentCard]
4949
| None = None,
5050
):
@@ -61,7 +61,7 @@ def __init__(
6161
"""
6262
self.agent_card = agent_card
6363
self.handler03 = RequestHandler03(request_handler=request_handler)
64-
self._context_builder = context_builder or DefaultGrpcContextBuilder()
64+
self._context_builder = context_builder or DefaultGrpcServerCallContextBuilder()
6565
self.card_modifier = card_modifier
6666

6767
async def _handle_unary(

‎src/a2a/compat/v0_3/jsonrpc_adapter.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
JSONRPCError as CoreJSONRPCError,
3939
)
4040
from a2a.server.routes.common import (
41-
ContextBuilder,
42-
DefaultContextBuilder,
41+
ServerCallContextBuilder,
42+
DefaultServerCallContextBuilder,
4343
)
4444
from a2a.utils import constants
4545
from a2a.utils.errors import ExtendedAgentCardNotConfiguredError
@@ -81,7 +81,7 @@ def __init__( # noqa: PLR0913
8181
self.handler = RequestHandler03(
8282
request_handler=http_handler,
8383
)
84-
self._context_builder = context_builder or DefaultContextBuilder()
84+
self._context_builder = context_builder or DefaultServerCallContextBuilder()
8585

8686
def supports_method(self, method: str) -> bool:
8787
"""Returns True if the v0.3 adapter supports the given method name."""

‎src/a2a/compat/v0_3/rest_adapter.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
from a2a.compat.v0_3.rest_handler import REST03Handler
3636
from a2a.server.context import ServerCallContext
3737
from a2a.server.routes.common import (
38-
ContextBuilder,
39-
DefaultContextBuilder,
38+
ServerCallContextBuilder,
39+
DefaultServerCallContextBuilder,
4040
)
4141
from a2a.utils.error_handlers import (
4242
rest_error_handler,
@@ -74,7 +74,7 @@ def __init__( # noqa: PLR0913
7474
self.handler = REST03Handler(
7575
agent_card=agent_card, request_handler=http_handler
7676
)
77-
self._context_builder = context_builder or DefaultContextBuilder()
77+
self._context_builder = context_builder or DefaultServerCallContextBuilder()
7878

7979
@rest_error_handler
8080
async def _handle_request(

‎src/a2a/server/request_handlers/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
try:
2121
from a2a.server.request_handlers.grpc_handler import (
2222
GrpcHandler, # type: ignore
23+
DefaultGrpcServerCallContextBuilder,
24+
GrpcServerCallContextBuilder,
2325
)
2426
except ImportError as e:
2527
_original_error = e
@@ -43,6 +45,8 @@ def __init__(self, *args, **kwargs):
4345
'GrpcHandler',
4446
'RequestHandler',
4547
'build_error_response',
48+
'DefaultGrpcServerCallContextBuilder',
49+
'GrpcServerCallContextBuilder',
4650
'prepare_response_object',
4751
'validate_request_params',
4852
]

‎src/a2a/server/request_handlers/grpc_handler.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@
4242
logger = logging.getLogger(__name__)
4343

4444

45-
class GrpcContextBuilder(ABC):
45+
class GrpcServerCallContextBuilder(ABC):
4646
"""Interface for building ServerCallContext from gRPC context."""
4747

4848
@abstractmethod
4949
def build(self, context: grpc.aio.ServicerContext) -> ServerCallContext:
5050
"""Builds a ServerCallContext from a gRPC ServicerContext."""
5151

5252

53-
class DefaultGrpcContextBuilder(GrpcContextBuilder):
54-
"""Default implementation of GrpcContextBuilder."""
53+
class DefaultGrpcServerCallContextBuilder(GrpcServerCallContextBuilder):
54+
"""Default implementation of GrpcServerCallContextBuilder."""
5555

5656
def build(self, context: grpc.aio.ServicerContext) -> ServerCallContext:
5757
"""Builds a ServerCallContext from a gRPC ServicerContext."""
@@ -111,7 +111,7 @@ def __init__(
111111
self,
112112
agent_card: AgentCard,
113113
request_handler: RequestHandler,
114-
context_builder: GrpcContextBuilder | None = None,
114+
context_builder: GrpcServerCallContextBuilder | None = None,
115115
card_modifier: Callable[[AgentCard], Awaitable[AgentCard] | AgentCard]
116116
| None = None,
117117
):
@@ -129,7 +129,7 @@ def __init__(
129129
"""
130130
self.agent_card = agent_card
131131
self.request_handler = request_handler
132-
self._context_builder = context_builder or DefaultGrpcContextBuilder()
132+
self._context_builder = context_builder or DefaultGrpcServerCallContextBuilder()
133133
self.card_modifier = card_modifier
134134

135135
async def _handle_unary(

‎src/a2a/server/routes/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""A2A Routes."""
22

33
from a2a.server.routes.agent_card_routes import create_agent_card_routes
4-
from a2a.server.routes.common import ContextBuilder, DefaultContextBuilder
4+
from a2a.server.routes.common import ServerCallContextBuilder, DefaultServerCallContextBuilder
55
from a2a.server.routes.jsonrpc_routes import create_jsonrpc_routes
66
from a2a.server.routes.rest_routes import create_rest_routes
77

‎src/a2a/server/routes/common.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@ def user_name(self) -> str:
3838
return self._user.display_name
3939

4040

41-
class ContextBuilder(ABC):
41+
class ServerCallContextBuilder(ABC):
4242
"""A class for building ServerCallContexts using the Starlette Request."""
4343

4444
@abstractmethod
4545
def build(self, request: Request) -> ServerCallContext:
4646
"""Builds a ServerCallContext from a Starlette Request."""
4747

4848

49-
class DefaultContextBuilder(ContextBuilder):
50-
"""A default implementation of ContextBuilder."""
49+
class DefaultServerCallContextBuilder(ServerCallContextBuilder):
50+
"""A default implementation of ServerCallContextBuilder."""
5151

5252
def build(self, request: Request) -> ServerCallContext:
5353
"""Builds a ServerCallContext from a Starlette Request.

‎src/a2a/server/routes/jsonrpc_dispatcher.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
build_error_response,
2929
)
3030
from a2a.server.routes.common import (
31-
ContextBuilder,
32-
DefaultContextBuilder,
31+
ServerCallContextBuilder,
32+
DefaultServerCallContextBuilder,
3333
)
3434
from a2a.types import A2ARequest
3535
from a2a.types.a2a_pb2 import (
@@ -144,7 +144,7 @@ def __init__( # noqa: PLR0913
144144
agent_card: AgentCard,
145145
request_handler: RequestHandler,
146146
extended_agent_card: AgentCard | None = None,
147-
context_builder: ContextBuilder | None = None,
147+
context_builder: ServerCallContextBuilder | None = None,
148148
card_modifier: Callable[[AgentCard], Awaitable[AgentCard] | AgentCard]
149149
| None = None,
150150
extended_card_modifier: Callable[
@@ -183,7 +183,7 @@ def __init__( # noqa: PLR0913
183183
self.extended_agent_card = extended_agent_card
184184
self.card_modifier = card_modifier
185185
self.extended_card_modifier = extended_card_modifier
186-
self._context_builder = context_builder or DefaultContextBuilder()
186+
self._context_builder = context_builder or DefaultServerCallContextBuilder()
187187
self.enable_v0_3_compat = enable_v0_3_compat
188188
self._v03_adapter: JSONRPC03Adapter | None = None
189189

‎src/a2a/server/routes/jsonrpc_routes.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
from a2a.server.context import ServerCallContext
2121
from a2a.server.request_handlers.request_handler import RequestHandler
22-
from a2a.server.routes.common import ContextBuilder
22+
from a2a.server.routes.common import ServerCallContextBuilder
2323
from a2a.server.routes.jsonrpc_dispatcher import JsonRpcDispatcher
2424
from a2a.types.a2a_pb2 import AgentCard
2525

@@ -29,7 +29,7 @@ def create_jsonrpc_routes( # noqa: PLR0913
2929
request_handler: RequestHandler,
3030
rpc_url: str,
3131
extended_agent_card: AgentCard | None = None,
32-
context_builder: ContextBuilder | None = None,
32+
context_builder: ServerCallContextBuilder | None = None,
3333
card_modifier: Callable[[AgentCard], Awaitable[AgentCard] | AgentCard]
3434
| None = None,
3535
extended_card_modifier: Callable[

‎src/a2a/server/routes/rest_dispatcher.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
from a2a.server.context import ServerCallContext
1010
from a2a.server.request_handlers.request_handler import RequestHandler
1111
from a2a.server.routes.common import (
12-
ContextBuilder,
13-
DefaultContextBuilder,
12+
ServerCallContextBuilder,
13+
DefaultServerCallContextBuilder,
1414
)
1515
from a2a.types import a2a_pb2
1616
from a2a.types.a2a_pb2 import (
@@ -71,7 +71,7 @@ def __init__( # noqa: PLR0913
7171
agent_card: AgentCard,
7272
request_handler: RequestHandler,
7373
extended_agent_card: AgentCard | None = None,
74-
context_builder: ContextBuilder | None = None,
74+
context_builder: ServerCallContextBuilder | None = None,
7575
card_modifier: Callable[[AgentCard], Awaitable[AgentCard] | AgentCard]
7676
| None = None,
7777
extended_card_modifier: Callable[
@@ -106,7 +106,7 @@ def __init__( # noqa: PLR0913
106106
self.extended_agent_card = extended_agent_card
107107
self.card_modifier = card_modifier
108108
self.extended_card_modifier = extended_card_modifier
109-
self._context_builder = context_builder or DefaultContextBuilder()
109+
self._context_builder = context_builder or DefaultServerCallContextBuilder()
110110
self.request_handler = request_handler
111111

112112
def _build_call_context(self, request: Request) -> ServerCallContext:

0 commit comments

Comments
 (0)