Updates

Author: ishymko

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, A2AError, InvalidParamsError
+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
 
 
@@ -66,22 +67,15 @@ def _map_grpc_error(e: grpc.aio.AioRpcError) -> NoReturn:
     if status is not None:
         exception_cls: type[A2AError] | None = None
         for detail in status.details:
-            if detail.Is(error_details_pb2.BadRequest.DESCRIPTOR):
-                bad_request = error_details_pb2.BadRequest()
-                detail.Unpack(bad_request)
-                errors = [
-                    {'field': v.field, 'message': v.description}
-                    for v in bad_request.field_violations
-                ]
-                data = {'errors': errors}
-                exception_cls = InvalidParamsError
-                break
             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)
-                    break
+            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

src/a2a/server/request_handlers/grpc_handler.py

@@ -41,6 +41,7 @@
     TaskNotFoundError,
 )
 from a2a.utils.helpers import maybe_await, validate
+from a2a.utils.proto_utils import validation_errors_to_bad_request
 
 
 logger = logging.getLogger(__name__)
@@ -403,26 +404,23 @@ async def abort_context(
                 error.message if hasattr(error, 'message') else str(error)
             )
 
-            # Create standard Status
+            # Create standard Status with ErrorInfo for all A2A errors
             status = status_pb2.Status(code=status_code, message=error_msg)
+            error_info_detail = any_pb2.Any()
+            error_info_detail.Pack(error_info)
+            status.details.append(error_info_detail)
 
+            # Append structured field violations for validation errors
             if (
                 isinstance(error, types.InvalidParamsError)
                 and error.data
                 and error.data.get('errors')
             ):
-                bad_request = error_details_pb2.BadRequest()
-                for err_dict in error.data['errors']:
-                    violation = bad_request.field_violations.add()
-                    violation.field = err_dict.get('field', '')
-                    violation.description = err_dict.get('message', '')
-                any_bad_request = any_pb2.Any()
-                any_bad_request.Pack(bad_request)
-                status.details.append(any_bad_request)
-            else:
-                detail = any_pb2.Any()
-                detail.Pack(error_info)
-                status.details.append(detail)
+                bad_request_detail = any_pb2.Any()
+                bad_request_detail.Pack(
+                    validation_errors_to_bad_request(error.data['errors'])
+                )
+                status.details.append(bad_request_detail)
 
             # Use grpc_status to safely generate standard trailing metadata
             rich_status = rpc_status.to_status(status)

src/a2a/server/request_handlers/request_handler.py

@@ -246,24 +246,8 @@ async def async_gen_wrapper(
 
         return async_gen_wrapper
 
-    if inspect.iscoroutinefunction(method):
-
-        @functools.wraps(method)
-        async def async_wrapper(
-            self: RequestHandler,
-            params: ProtoMessage,
-            context: ServerCallContext,
-            *args: Any,
-            **kwargs: Any,
-        ) -> Any:
-            if params is not None:
-                validate_proto_required_fields(params)
-            return await method(self, params, context, *args, **kwargs)
-
-        return async_wrapper
-
     @functools.wraps(method)
-    def sync_wrapper(
+    async def async_wrapper(
         self: RequestHandler,
         params: ProtoMessage,
         context: ServerCallContext,
@@ -272,6 +256,6 @@ def sync_wrapper(
     ) -> Any:
         if params is not None:
             validate_proto_required_fields(params)
-        return method(self, params, context, *args, **kwargs)
+        return await method(self, params, context, *args, **kwargs)
 
-    return sync_wrapper
+    return async_wrapper

src/a2a/utils/proto_utils.py

@@ -23,6 +23,7 @@
 from google.protobuf.descriptor import FieldDescriptor
 from google.protobuf.json_format import ParseDict
 from google.protobuf.message import Message as ProtobufMessage
+from google.rpc import error_details_pb2
 
 from a2a.utils.errors import InvalidParamsError
 
@@ -296,3 +297,25 @@ def validate_proto_required_fields(msg: ProtobufMessage) -> None:
         raise InvalidParamsError(
             message='Validation failed', data={'errors': errors}
         )
+
+
+def validation_errors_to_bad_request(
+    errors: list[ValidationDetail],
+) -> error_details_pb2.BadRequest:
+    """Convert validation error details to a gRPC BadRequest proto."""
+    bad_request = error_details_pb2.BadRequest()
+    for err in errors:
+        violation = bad_request.field_violations.add()
+        violation.field = err['field']
+        violation.description = err['message']
+    return bad_request
+
+
+def bad_request_to_validation_errors(
+    bad_request: error_details_pb2.BadRequest,
+) -> list[ValidationDetail]:
+    """Convert a gRPC BadRequest proto to validation error details."""
+    return [
+        ValidationDetail(field=v.field, message=v.description)
+        for v in bad_request.field_violations
+    ]

tests/integration/test_end_to_end.py

@@ -1,5 +1,5 @@
 from collections.abc import AsyncGenerator
-from typing import Any, NamedTuple
+from typing import NamedTuple
 
 import grpc
 import httpx

tests/utils/test_proto_utils.py

@@ -5,12 +5,13 @@
 
 import httpx
 import pytest
+
 from google.protobuf.json_format import MessageToDict, Parse
 from google.protobuf.message import Message as ProtobufMessage
 from google.protobuf.timestamp_pb2 import Timestamp
+from starlette.datastructures import QueryParams
 
 from a2a.types.a2a_pb2 import (
-    AgentCard,
     AgentSkill,
     ListTasksRequest,
     Message,
@@ -23,8 +24,8 @@
     TaskStatus,
     TaskStatusUpdateEvent,
 )
-from starlette.datastructures import QueryParams
 from a2a.utils import proto_utils
+from a2a.utils.errors import InvalidParamsError
 
 
 class TestToStreamResponse:
@@ -255,8 +256,6 @@ def test_valid_required_fields(self):
 
     def test_missing_required_fields(self):
         """Test with empty message raising InvalidParamsError containing all errors."""
-        from a2a.utils.errors import InvalidParamsError
-
         msg = Message()
         with pytest.raises(InvalidParamsError) as exc_info:
             proto_utils.validate_proto_required_fields(msg)
@@ -268,8 +267,6 @@ def test_missing_required_fields(self):
 
     def test_nested_required_fields(self):
         """Test nested required fields inside TaskStatus."""
-        from a2a.utils.errors import InvalidParamsError
-
         # Task Status requires 'state'
         task = Task(id='task-1', status=TaskStatus())
         with pytest.raises(InvalidParamsError) as exc_info: