WIP

Author: ishymko

src/a2a/client/transports/http_helpers.py

@@ -81,19 +81,20 @@ async def send_http_stream_request(
             try:
                 event_source.response.raise_for_status()
             except httpx.HTTPStatusError as e:
+                # Read upfront streaming error content immediately, otherwise lower-level handlers 
+                # (e.g. response.json()) crash with 'ResponseNotRead' Access errors.
                 await event_source.response.aread()
                 raise e
 
-            try:
-                async for sse in event_source.aiter_sse():
-                    if not sse.data:
-                        continue
-                    yield sse.data
-            except SSEError as e:
-                if 'application/json' in event_source.response.headers.get(
-                    'content-type', ''
-                ):
-                    content = await event_source.response.aread()
-                    yield content.decode('utf-8')
-                else:
-                    raise e
+            # If the response is not a stream, read it standardly (e.g., upfront JSON-RPC error payload)
+            if 'text/event-stream' not in event_source.response.headers.get(
+                'content-type', ''
+            ):
+                content = await event_source.response.aread()
+                yield content.decode('utf-8')
+                return
+
+            async for sse in event_source.aiter_sse():
+                if not sse.data:
+                    continue
+                yield sse.data

tests/client/transports/test_jsonrpc_client.py

@@ -464,6 +464,7 @@ async def test_send_message_streaming_request_error(
         request = create_send_message_request()
         mock_event_source = AsyncMock()
         mock_event_source.response.raise_for_status = MagicMock()
+        mock_event_source.response.headers = {}
         mock_event_source.aiter_sse = MagicMock(
             side_effect=httpx.RequestError(
                 'Simulated request error', request=MagicMock()
@@ -487,6 +488,7 @@ async def test_send_message_streaming_timeout(
         request = create_send_message_request()
         mock_event_source = AsyncMock()
         mock_event_source.response.raise_for_status = MagicMock()
+        mock_event_source.response.headers = {}
         mock_event_source.aiter_sse = MagicMock(
             side_effect=httpx.TimeoutException('Timeout')
         )