Merge

Author: ishymko

pyproject.toml

@@ -16,6 +16,7 @@ dependencies = [
   "json-rpc>=1.15.0",
   "googleapis-common-protos>=1.70.0",
   "culsans>=0.11.0 ; python_full_version < '3.13'",
+  "packaging>=24.0",
 ]
 
 classifiers = [

samples/hello_world_agent.py

@@ -11,13 +11,16 @@
 from a2a.compat.v0_3.grpc_handler import CompatGrpcHandler
 from a2a.server.agent_execution.agent_executor import AgentExecutor
 from a2a.server.agent_execution.context import RequestContext
-from a2a.server.apps import A2ARESTFastAPIApplication
 from a2a.server.events.event_queue import EventQueue
 from a2a.server.request_handlers import GrpcHandler
 from a2a.server.request_handlers.default_request_handler import (
     DefaultRequestHandler,
 )
-from a2a.server.routes import create_agent_card_routes, create_jsonrpc_routes
+from a2a.server.routes import (
+    create_agent_card_routes,
+    create_jsonrpc_routes,
+    create_rest_routes,
+)
 from a2a.server.tasks.inmemory_task_store import InMemoryTaskStore
 from a2a.server.tasks.task_updater import TaskUpdater
 from a2a.types import (
@@ -166,22 +169,22 @@ async def serve(
             AgentInterface(
                 protocol_binding='JSONRPC',
                 protocol_version='1.0',
-                url=f'http://{host}:{port}/a2a/jsonrpc/',
+                url=f'http://{host}:{port}/a2a/jsonrpc',
             ),
             AgentInterface(
                 protocol_binding='JSONRPC',
                 protocol_version='0.3',
-                url=f'http://{host}:{port}/a2a/jsonrpc/',
+                url=f'http://{host}:{port}/a2a/jsonrpc',
             ),
             AgentInterface(
                 protocol_binding='HTTP+JSON',
                 protocol_version='1.0',
-                url=f'http://{host}:{port}/a2a/rest/',
+                url=f'http://{host}:{port}/a2a/rest',
             ),
             AgentInterface(
                 protocol_binding='HTTP+JSON',
                 protocol_version='0.3',
-                url=f'http://{host}:{port}/a2a/rest/',
+                url=f'http://{host}:{port}/a2a/rest',
             ),
         ],
     )
@@ -191,25 +194,25 @@ async def serve(
         agent_executor=SampleAgentExecutor(), task_store=task_store
     )
 
-    rest_app_builder = A2ARESTFastAPIApplication(
+    rest_routes = create_rest_routes(
         agent_card=agent_card,
-        http_handler=request_handler,
+        request_handler=request_handler,
+        path_prefix='/a2a/rest',
         enable_v0_3_compat=True,
     )
-    rest_app = rest_app_builder.build()
-
     jsonrpc_routes = create_jsonrpc_routes(
         agent_card=agent_card,
         request_handler=request_handler,
-        rpc_url='/a2a/jsonrpc/',
+        rpc_url='/a2a/jsonrpc',
+        enable_v0_3_compat=True,
     )
     agent_card_routes = create_agent_card_routes(
         agent_card=agent_card,
     )
     app = FastAPI()
     app.routes.extend(jsonrpc_routes)
     app.routes.extend(agent_card_routes)
-    app.mount('/a2a/rest', rest_app)
+    app.routes.extend(rest_routes)
 
     grpc_server = grpc.aio.server()
     grpc_server.add_insecure_port(f'{host}:{grpc_port}')

src/a2a/client/transports/grpc.py

@@ -47,7 +47,8 @@
     TaskPushNotificationConfig,
 )
 from a2a.utils.constants import PROTOCOL_VERSION_CURRENT, VERSION_HEADER
-from a2a.utils.errors import A2A_REASON_TO_ERROR
+from a2a.utils.errors import A2A_REASON_TO_ERROR, A2AError
+from a2a.utils.proto_utils import bad_request_to_validation_errors
 from a2a.utils.telemetry import SpanKind, trace_class
 
 
@@ -61,17 +62,23 @@ def _map_grpc_error(e: grpc.aio.AioRpcError) -> NoReturn:
 
     # Use grpc_status to cleanly extract the rich Status from the call
     status = rpc_status.from_call(cast('grpc.Call', e))
+    data = None
 
     if status is not None:
+        exception_cls: type[A2AError] | None = None
         for detail in status.details:
             if detail.Is(error_details_pb2.ErrorInfo.DESCRIPTOR):
                 error_info = error_details_pb2.ErrorInfo()
                 detail.Unpack(error_info)
-
                 if error_info.domain == 'a2a-protocol.org':
                     exception_cls = A2A_REASON_TO_ERROR.get(error_info.reason)
-                    if exception_cls:
-                        raise exception_cls(status.message) from e
+            elif detail.Is(error_details_pb2.BadRequest.DESCRIPTOR):
+                bad_request = error_details_pb2.BadRequest()
+                detail.Unpack(bad_request)
+                data = {'errors': bad_request_to_validation_errors(bad_request)}
+
+        if exception_cls:
+            raise exception_cls(status.message, data=data) from e
 
     raise A2AClientError(f'gRPC Error {e.code().name}: {e.details()}') from e
 

src/a2a/client/transports/jsonrpc.py

@@ -318,9 +318,10 @@ def _create_jsonrpc_error(self, error_dict: dict[str, Any]) -> Exception:
         """Creates the appropriate A2AError from a JSON-RPC error dictionary."""
         code = error_dict.get('code')
         message = error_dict.get('message', str(error_dict))
+        data = error_dict.get('data')
 
         if isinstance(code, int) and code in _JSON_RPC_ERROR_CODE_TO_A2A_ERROR:
-            return _JSON_RPC_ERROR_CODE_TO_A2A_ERROR[code](message)
+            return _JSON_RPC_ERROR_CODE_TO_A2A_ERROR[code](message, data=data)
 
         # Fallback to general A2AClientError
         return A2AClientError(f'JSON-RPC Error {code}: {message}')

src/a2a/compat/v0_3/rest_adapter.py

@@ -33,7 +33,6 @@
 
 from a2a.compat.v0_3 import conversions
 from a2a.compat.v0_3.rest_handler import REST03Handler
-from a2a.server.apps.rest.rest_adapter import RESTAdapterInterface
 from a2a.server.context import ServerCallContext
 from a2a.server.routes import CallContextBuilder, DefaultCallContextBuilder
 from a2a.utils.error_handlers import (
@@ -50,7 +49,7 @@
 logger = logging.getLogger(__name__)
 
 
-class REST03Adapter(RESTAdapterInterface):
+class REST03Adapter:
     """Adapter to make RequestHandler work with v0.3 RESTful API.
 
     Defines v0.3 REST request processors and their routes, as well as managing response generation including Server-Sent Events (SSE).