Fixes after merge

Author: ishymko

.github/workflows/linter.yaml

@@ -63,8 +63,6 @@ jobs:
                 "${{ steps.ruff-format.outcome }}" == "failure" || \
                 "${{ steps.mypy.outcome }}" == "failure" || \
                 "${{ steps.pyright.outcome }}" == "failure"]]; then
-# Disable due to not to block on "PR too large error"
-#               "${{ steps.jscpd.outcome }}" == "failure" ]]; then
             echo "One or more linting/checking steps failed."
             exit 1
           fi

.github/workflows/unit-tests.yml

@@ -36,7 +36,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.10", "3.13"]
+        python-version: ['3.10', '3.13']
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
@@ -57,6 +57,6 @@ jobs:
       - name: Install dependencies
         run: uv sync --locked
       - name: Run tests and check coverage
-        run: uv run pytest --cov=a2a --cov-report term --cov-fail-under=85
+        run: uv run pytest --cov=a2a --cov-report term --cov-fail-under=88
       - name: Show coverage summary in log
         run: uv run coverage report

.github/workflows/update-a2a-types.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
-          python-version: "3.10"
+          python-version: '3.10'
       - name: Install uv
         uses: astral-sh/setup-uv@v7
       - name: Configure uv shell
@@ -41,8 +41,8 @@ jobs:
           token: ${{ secrets.A2A_BOT_PAT }}
           committer: a2a-bot <a2a-bot@google.com>
           author: a2a-bot <a2a-bot@google.com>
-          commit-message: "${{ github.event.client_payload.message }}"
-          title: "${{ github.event.client_payload.message }}"
+          commit-message: '${{ github.event.client_payload.message }}'
+          title: '${{ github.event.client_payload.message }}'
           body: |
             Commit: https://github.com/a2aproject/A2A/commit/${{ github.event.client_payload.sha }}
           branch: auto-update-a2a-types-${{ github.event.client_payload.sha }}

src/a2a/client/transports/jsonrpc.py

@@ -176,13 +176,17 @@ async def send_message_streaming(
             try:
                 event_source.response.raise_for_status()
                 async for sse in event_source.aiter_sse():
+                    if not sse.data:
+                        continue
                     json_rpc_response = JSONRPC20Response.from_json(sse.data)
                     if json_rpc_response.error:
                         raise A2AClientJSONRPCError(json_rpc_response.error)
                     response: StreamResponse = json_format.ParseDict(
                         json_rpc_response.result, StreamResponse()
                     )
                     yield response
+            except httpx.TimeoutException as e:
+                raise A2AClientTimeoutError('Client Request timed out') from e
             except httpx.HTTPStatusError as e:
                 raise A2AClientHTTPError(e.response.status_code, str(e)) from e
             except SSEError as e:
@@ -415,6 +419,8 @@ async def subscribe(
                         json_rpc_response.result, StreamResponse()
                     )
                     yield response
+            except httpx.TimeoutException as e:
+                raise A2AClientTimeoutError('Client Request timed out') from e
             except SSEError as e:
                 raise A2AClientHTTPError(
                     400, f'Invalid SSE response or protocol error: {e}'

src/a2a/client/transports/rest.py

@@ -163,6 +163,8 @@ async def send_message_streaming(
                 async for sse in event_source.aiter_sse():
                     event: StreamResponse = Parse(sse.data, StreamResponse())
                     yield event
+            except httpx.TimeoutException as e:
+                raise A2AClientTimeoutError('Client Request timed out') from e
             except httpx.HTTPStatusError as e:
                 raise A2AClientHTTPError(e.response.status_code, str(e)) from e
             except SSEError as e:
@@ -383,8 +385,12 @@ async def subscribe(
         ) as event_source:
             try:
                 async for sse in event_source.aiter_sse():
+                    if not sse.data:
+                        continue
                     event: StreamResponse = Parse(sse.data, StreamResponse())
                     yield event
+            except httpx.TimeoutException as e:
+                raise A2AClientTimeoutError('Client Request timed out') from e
             except SSEError as e:
                 raise A2AClientHTTPError(
                     400, f'Invalid SSE response or protocol error: {e}'

tests/client/test_errors.py

@@ -170,11 +170,9 @@ class TestA2AClientJSONRPCErrorRepr:
 
     def test_repr(self) -> None:
         """Test that __repr__ shows the JSON-RPC error object."""
-        response = JSONRPC20Response(
-            _id='test-1',
-            error={'code': -32601, 'message': 'Method not found', 'data': None},
+        error = A2AClientJSONRPCError(
+            {'code': -32601, 'message': 'Method not found', 'data': None}
         )
-        error = A2AClientJSONRPCError(response.error)
         assert (
             repr(error)
             == "A2AClientJSONRPCError(\"JSON-RPC Error {'code': -32601, 'message': 'Method not found', 'data': None}\")"

tests/client/transports/test_jsonrpc_client.py

@@ -430,6 +430,27 @@ async def test_send_message_streaming_request_error(
             async for _ in transport.send_message_streaming(request):
                 pass
 
+    @pytest.mark.asyncio
+    @patch('a2a.client.transports.jsonrpc.aconnect_sse')
+    async def test_send_message_streaming_timeout(
+        self,
+        mock_aconnect_sse: AsyncMock,
+        transport: JsonRpcTransport,
+    ):
+        request = create_send_message_request()
+        mock_event_source = AsyncMock()
+        mock_event_source.response.raise_for_status = MagicMock()
+        mock_event_source.aiter_sse = MagicMock(
+            side_effect=httpx.TimeoutException('Timeout')
+        )
+        mock_aconnect_sse.return_value.__aenter__.return_value = (
+            mock_event_source
+        )
+
+        with pytest.raises(A2AClientTimeoutError, match='timed out'):
+            async for _ in transport.send_message_streaming(request):
+                pass
+
 
 class TestInterceptors:
     """Tests for interceptor functionality."""

tests/client/transports/test_rest_client.py

@@ -8,7 +8,7 @@
 from httpx_sse import EventSource, ServerSentEvent
 
 from a2a.client import create_text_message_object
-from a2a.client.errors import A2AClientHTTPError
+from a2a.client.errors import A2AClientHTTPError, A2AClientTimeoutError
 from a2a.client.transports.rest import RestTransport
 from a2a.extensions.common import HTTP_EXTENSION_HEADER
 from a2a.types.a2a_pb2 import (
@@ -56,6 +56,40 @@ def _assert_extensions_header(mock_kwargs: dict, expected_extensions: set[str]):
     assert actual_extensions == expected_extensions
 
 
+class TestRestTransport:
+    @pytest.mark.asyncio
+    @patch('a2a.client.transports.rest.aconnect_sse')
+    async def test_send_message_streaming_timeout(
+        self,
+        mock_aconnect_sse: AsyncMock,
+        mock_httpx_client: AsyncMock,
+        mock_agent_card: MagicMock,
+    ):
+        client = RestTransport(
+            httpx_client=mock_httpx_client, agent_card=mock_agent_card
+        )
+        params = SendMessageRequest(
+            message=create_text_message_object(content='Hello stream')
+        )
+        mock_event_source = AsyncMock(spec=EventSource)
+        mock_event_source.response = MagicMock(spec=httpx.Response)
+        mock_event_source.response.raise_for_status.return_value = None
+        mock_event_source.aiter_sse.side_effect = httpx.TimeoutException(
+            'Read timed out'
+        )
+        mock_aconnect_sse.return_value.__aenter__.return_value = (
+            mock_event_source
+        )
+
+        with pytest.raises(A2AClientTimeoutError) as exc_info:
+            _ = [
+                item
+                async for item in client.send_message_streaming(request=params)
+            ]
+
+        assert 'Client Request timed out' in str(exc_info.value)
+
+
 class TestRestTransportExtensions:
     @pytest.mark.asyncio
     async def test_send_message_with_default_extensions(