Revert a few things

Author: ishymko

src/a2a/server/apps/rest/rest_adapter.py

@@ -159,7 +159,7 @@ async def event_generator(
                 yield json.dumps(item)
 
         return EventSourceResponse(
-            event_generator(await method(request, call_context))
+            event_generator(method(request, call_context))
         )
 
     async def handle_get_agent_card(

src/a2a/server/request_handlers/rest_handler.py

@@ -116,14 +116,11 @@ async def on_message_send_stream(
         body = await request.body()
         params = a2a_pb2.SendMessageRequest()
         Parse(body, params)
-        stream = self.request_handler.on_message_send_stream(params, context)
-
-        async def _generator() -> AsyncIterator[dict[str, Any]]:
-            async for event in stream:
-                response = proto_utils.to_stream_response(event)
-                yield MessageToDict(response)
-
-        return _generator()
+        async for event in self.request_handler.on_message_send_stream(
+            params, context
+        ):
+            response = proto_utils.to_stream_response(event)
+            yield MessageToDict(response)
 
     @validate_version(constants.PROTOCOL_VERSION_1_0)
     async def on_cancel_task(
@@ -170,15 +167,10 @@ async def on_subscribe_to_task(
             JSON serialized objects containing streaming events
         """
         task_id = request.path_params['id']
-        stream = self.request_handler.on_subscribe_to_task(
+        async for event in self.request_handler.on_subscribe_to_task(
             SubscribeToTaskRequest(id=task_id), context
-        )
-
-        async def _generator() -> AsyncIterator[dict[str, Any]]:
-            async for event in stream:
-                yield MessageToDict(proto_utils.to_stream_response(event))
-
-        return _generator()
+        ):
+            yield MessageToDict(proto_utils.to_stream_response(event))
 
     @validate_version(constants.PROTOCOL_VERSION_1_0)
     async def get_push_notification(

src/a2a/utils/helpers.py

@@ -389,27 +389,8 @@ def async_gen_wrapper(
 
             return cast('F', async_gen_wrapper)
 
-        if inspect.iscoroutinefunction(inspect.unwrap(func)):
-
-            @functools.wraps(func)
-            async def async_wrapper(self: Any, *args: Any, **kwargs: Any) -> Any:
-                actual_version = _get_actual_version(args, kwargs)
-                if not _is_version_compatible(actual_version):
-                    logger.warning(
-                        "Version mismatch: actual='%s', expected='%s'",
-                        actual_version,
-                        expected_version,
-                    )
-                    raise VersionNotSupportedError(
-                        message=f"A2A version '{actual_version}' is not supported by this handler. "
-                        f"Expected version '{expected_version}'."
-                    )
-                return await func(self, *args, **kwargs)
-
-            return cast('F', async_wrapper)
-
         @functools.wraps(func)
-        def sync_wrapper(self: Any, *args: Any, **kwargs: Any) -> Any:
+        async def async_wrapper(self: Any, *args: Any, **kwargs: Any) -> Any:
             actual_version = _get_actual_version(args, kwargs)
             if not _is_version_compatible(actual_version):
                 logger.warning(
@@ -421,8 +402,8 @@ def sync_wrapper(self: Any, *args: Any, **kwargs: Any) -> Any:
                     message=f"A2A version '{actual_version}' is not supported by this handler. "
                     f"Expected version '{expected_version}'."
                 )
-            return func(self, *args, **kwargs)
+            return await func(self, *args, **kwargs)
 
-        return cast('F', sync_wrapper)
+        return cast('F', async_wrapper)
 
     return decorator