Merge branch '1.0-dev' into guglielmoc/remove_helpers

Author: guglielmo-san

src/a2a/compat/v0_3/context_builders.py

@@ -0,0 +1,80 @@
+"""Context builders that add v0.3 backwards-compatibility for extensions.
+
+The current spec uses ``A2A-Extensions`` (RFC 6648, no ``X-`` prefix). v0.3
+clients still send the old ``X-A2A-Extensions`` name, so the v0.3 compat
+adapters wrap the default builders with these classes to recognize both names.
+"""
+
+from typing import TYPE_CHECKING, Any
+
+import grpc
+
+from a2a.compat.v0_3.extension_headers import LEGACY_HTTP_EXTENSION_HEADER
+from a2a.extensions.common import get_requested_extensions
+from a2a.server.context import ServerCallContext
+
+
+if TYPE_CHECKING:
+    from starlette.requests import Request
+
+    from a2a.server.request_handlers.grpc_handler import (
+        GrpcServerCallContextBuilder,
+    )
+    from a2a.server.routes.common import ServerCallContextBuilder
+else:
+    try:
+        from starlette.requests import Request
+    except ImportError:
+        Request = Any
+
+
+def _get_legacy_grpc_extensions(
+    context: grpc.aio.ServicerContext,
+) -> list[str]:
+    md = context.invocation_metadata()
+    if md is None:
+        return []
+    lower_key = LEGACY_HTTP_EXTENSION_HEADER.lower()
+    return [
+        e if isinstance(e, str) else e.decode('utf-8')
+        for k, e in md
+        if k.lower() == lower_key
+    ]
+
+
+class V03ServerCallContextBuilder:
+    """Wraps a ServerCallContextBuilder to also accept the legacy header.
+
+    Recognizes the v0.3 ``X-A2A-Extensions`` HTTP header in addition to the
+    spec ``A2A-Extensions``.
+    """
+
+    def __init__(self, inner: 'ServerCallContextBuilder') -> None:
+        self._inner = inner
+
+    def build(self, request: 'Request') -> ServerCallContext:
+        """Builds a ServerCallContext, merging legacy extension headers."""
+        context = self._inner.build(request)
+        context.requested_extensions |= get_requested_extensions(
+            request.headers.getlist(LEGACY_HTTP_EXTENSION_HEADER)
+        )
+        return context
+
+
+class V03GrpcServerCallContextBuilder:
+    """Wraps a GrpcServerCallContextBuilder to also accept the legacy metadata.
+
+    Recognizes the v0.3 ``X-A2A-Extensions`` gRPC metadata key in addition to
+    the spec ``A2A-Extensions``.
+    """
+
+    def __init__(self, inner: 'GrpcServerCallContextBuilder') -> None:
+        self._inner = inner
+
+    def build(self, context: grpc.aio.ServicerContext) -> ServerCallContext:
+        """Builds a ServerCallContext, merging legacy extension metadata."""
+        server_context = self._inner.build(context)
+        server_context.requested_extensions |= get_requested_extensions(
+            _get_legacy_grpc_extensions(context)
+        )
+        return server_context

src/a2a/compat/v0_3/extension_headers.py

@@ -0,0 +1,27 @@
+"""Shared header name constants for v0.3 extension compatibility.
+
+The current spec uses ``A2A-Extensions``. v0.3 used the ``X-`` prefixed
+``X-A2A-Extensions`` form. v0.3 compat servers and clients accept/emit both
+names so they can interoperate with peers that only know the legacy one.
+"""
+
+from a2a.client.service_parameters import ServiceParameters
+from a2a.extensions.common import HTTP_EXTENSION_HEADER
+
+
+LEGACY_HTTP_EXTENSION_HEADER = f'X-{HTTP_EXTENSION_HEADER}'
+
+
+def add_legacy_extension_header(parameters: ServiceParameters) -> None:
+    """Mirrors the ``A2A-Extensions`` parameter under its legacy name in-place.
+
+    Used by v0.3 compat client transports so that requests can be understood
+    by older v0.3 servers that only recognize ``X-A2A-Extensions``.
+    """
+    if (
+        HTTP_EXTENSION_HEADER in parameters
+        and LEGACY_HTTP_EXTENSION_HEADER not in parameters
+    ):
+        parameters[LEGACY_HTTP_EXTENSION_HEADER] = parameters[
+            HTTP_EXTENSION_HEADER
+        ]

src/a2a/compat/v0_3/grpc_handler.py

@@ -17,8 +17,8 @@
 from a2a.compat.v0_3 import (
     types as types_v03,
 )
+from a2a.compat.v0_3.context_builders import V03GrpcServerCallContextBuilder
 from a2a.compat.v0_3.request_handler import RequestHandler03
-from a2a.extensions.common import HTTP_EXTENSION_HEADER
 from a2a.server.context import ServerCallContext
 from a2a.server.request_handlers.grpc_handler import (
     _ERROR_CODE_MAP,
@@ -51,7 +51,7 @@ def __init__(
                              DefaultCallContextBuilder is used.
         """
         self.handler03 = RequestHandler03(request_handler=request_handler)
-        self._context_builder = (
+        self._context_builder = V03GrpcServerCallContextBuilder(
             context_builder or DefaultGrpcServerCallContextBuilder()
         )
 
@@ -65,7 +65,6 @@ async def _handle_unary(
         try:
             server_context = self._context_builder.build(context)
             result = await handler_func(server_context)
-            self._set_extension_metadata(context, server_context)
         except A2AError as e:
             await self.abort_context(e, context)
         else:
@@ -82,7 +81,6 @@ async def _handle_stream(
             server_context = self._context_builder.build(context)
             async for item in handler_func(server_context):
                 yield item
-            self._set_extension_metadata(context, server_context)
         except A2AError as e:
             await self.abort_context(e, context)
 
@@ -120,19 +118,6 @@ async def abort_context(
                 f'Unknown error type: {error}',
             )
 
-    def _set_extension_metadata(
-        self,
-        context: grpc.aio.ServicerContext,
-        server_context: ServerCallContext,
-    ) -> None:
-        if server_context.activated_extensions:
-            context.set_trailing_metadata(
-                [
-                    (HTTP_EXTENSION_HEADER.lower(), e)
-                    for e in sorted(server_context.activated_extensions)
-                ]
-            )
-
     async def SendMessage(
         self,
         request: a2a_v0_3_pb2.SendMessageRequest,

src/a2a/compat/v0_3/grpc_transport.py

@@ -30,6 +30,7 @@
 from a2a.compat.v0_3 import (
     types as types_v03,
 )
+from a2a.compat.v0_3.extension_headers import add_legacy_extension_header
 from a2a.types import a2a_pb2
 from a2a.utils.constants import PROTOCOL_VERSION_0_3, VERSION_HEADER
 from a2a.utils.telemetry import SpanKind, trace_class
@@ -361,7 +362,9 @@ def _get_grpc_metadata(
         metadata = [(VERSION_HEADER.lower(), PROTOCOL_VERSION_0_3)]
 
         if context and context.service_parameters:
-            for key, value in context.service_parameters.items():
+            params = dict(context.service_parameters)
+            add_legacy_extension_header(params)
+            for key, value in params.items():
                 metadata.append((key.lower(), value))
 
         return metadata

src/a2a/compat/v0_3/jsonrpc_adapter.py

@@ -24,6 +24,7 @@
         _package_starlette_installed = False
 
 from a2a.compat.v0_3 import types as types_v03
+from a2a.compat.v0_3.context_builders import V03ServerCallContextBuilder
 from a2a.compat.v0_3.request_handler import RequestHandler03
 from a2a.server.context import ServerCallContext
 from a2a.server.jsonrpc_models import (
@@ -70,7 +71,7 @@ def __init__(
         self.handler = RequestHandler03(
             request_handler=http_handler,
         )
-        self._context_builder = (
+        self._context_builder = V03ServerCallContextBuilder(
             context_builder or DefaultServerCallContextBuilder()
         )
 

src/a2a/compat/v0_3/jsonrpc_transport.py

@@ -19,6 +19,7 @@
 )
 from a2a.compat.v0_3 import conversions
 from a2a.compat.v0_3 import types as types_v03
+from a2a.compat.v0_3.extension_headers import add_legacy_extension_header
 from a2a.types.a2a_pb2 import (
     AgentCard,
     CancelTaskRequest,
@@ -424,6 +425,7 @@ async def _send_stream_request(
         http_kwargs = get_http_args(context)
         http_kwargs.setdefault('headers', {})
         http_kwargs['headers'][VERSION_HEADER.lower()] = PROTOCOL_VERSION_0_3
+        add_legacy_extension_header(http_kwargs['headers'])
 
         async for sse_data in send_http_stream_request(
             self.httpx_client,
@@ -485,6 +487,7 @@ async def _send_request(
         http_kwargs = get_http_args(context)
         http_kwargs.setdefault('headers', {})
         http_kwargs['headers'][VERSION_HEADER.lower()] = PROTOCOL_VERSION_0_3
+        add_legacy_extension_header(http_kwargs['headers'])
 
         request = self.httpx_client.build_request(
             'POST',

src/a2a/compat/v0_3/rest_adapter.py

@@ -31,6 +31,7 @@
         _package_starlette_installed = False
 
 
+from a2a.compat.v0_3.context_builders import V03ServerCallContextBuilder
 from a2a.compat.v0_3.rest_handler import REST03Handler
 from a2a.server.routes.common import (
     DefaultServerCallContextBuilder,
@@ -60,7 +61,7 @@ def __init__(
         context_builder: 'ServerCallContextBuilder | None' = None,
     ):
         self.handler = REST03Handler(request_handler=http_handler)
-        self._context_builder = (
+        self._context_builder = V03ServerCallContextBuilder(
             context_builder or DefaultServerCallContextBuilder()
         )
 

src/a2a/compat/v0_3/rest_transport.py

@@ -25,6 +25,7 @@
 from a2a.compat.v0_3 import (
     types as types_v03,
 )
+from a2a.compat.v0_3.extension_headers import add_legacy_extension_header
 from a2a.types.a2a_pb2 import (
     AgentCard,
     CancelTaskRequest,
@@ -380,6 +381,7 @@ async def _send_stream_request(
         http_kwargs = get_http_args(context)
         http_kwargs.setdefault('headers', {})
         http_kwargs['headers'][VERSION_HEADER.lower()] = PROTOCOL_VERSION_0_3
+        add_legacy_extension_header(http_kwargs['headers'])
 
         async for sse_data in send_http_stream_request(
             self.httpx_client,
@@ -414,6 +416,7 @@ async def _execute_request(
         http_kwargs = get_http_args(context)
         http_kwargs.setdefault('headers', {})
         http_kwargs['headers'][VERSION_HEADER.lower()] = PROTOCOL_VERSION_0_3
+        add_legacy_extension_header(http_kwargs['headers'])
 
         request = self.httpx_client.build_request(
             method,

src/a2a/extensions/common.py

@@ -1,7 +1,7 @@
 from a2a.types.a2a_pb2 import AgentCard, AgentExtension
 
 
-HTTP_EXTENSION_HEADER = 'X-A2A-Extensions'
+HTTP_EXTENSION_HEADER = 'A2A-Extensions'
 
 
 def get_requested_extensions(values: list[str]) -> set[str]:

src/a2a/server/agent_execution/context.py

@@ -151,22 +151,14 @@ def metadata(self) -> dict[str, Any]:
             return dict(self._params.metadata)
         return {}
 
-    def add_activated_extension(self, uri: str) -> None:
-        """Add an extension to the set of activated extensions for this request.
-
-        This causes the extension to be indicated back to the client in the
-        response.
-        """
-        self._call_context.activated_extensions.add(uri)
-
     @property
     def tenant(self) -> str:
         """The tenant associated with this request."""
         return self._call_context.tenant
 
     @property
     def requested_extensions(self) -> set[str]:
-        """Extensions that the client requested to activate."""
+        """Extensions that the client requested for this interaction."""
         return self._call_context.requested_extensions
 
     def _check_or_generate_task_id(self) -> None: