Merge branch '1.0-dev' into ishymko/845-validation

Author: ishymko

.github/actions/spelling/allow.txt

@@ -35,6 +35,7 @@ cls
 coc
 codegen
 coro
+culsans
 datamodel
 deepwiki
 drivername
@@ -127,7 +128,7 @@ taskupdate
 testuuid
 Tful
 tiangolo
+TResponse
 typ
 typeerror
 vulnz
-TResponse

.github/workflows/unit-tests.yml

@@ -38,7 +38,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ['3.10', '3.13']
+        python-version: ['3.10', '3.11', '3.12', '3.13', '3.14']
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
@@ -56,9 +56,9 @@ jobs:
           echo "$HOME/.cargo/bin" >> $GITHUB_PATH
 
 
-      # Coverage comparison for PRs (only on Python 3.13 to avoid duplicate work)
+      # Coverage comparison for PRs (only on Python 3.14 to avoid duplicate work)
       - name: Checkout Base Branch
-        if: github.event_name == 'pull_request' && matrix.python-version == '3.13'
+        if: github.event_name == 'pull_request' && matrix.python-version == '3.14'
         uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.base.ref || 'main' }}
@@ -68,33 +68,33 @@ jobs:
         run: uv sync --locked
 
       - name: Run coverage (Base)
-        if: github.event_name == 'pull_request' && matrix.python-version == '3.13'
+        if: github.event_name == 'pull_request' && matrix.python-version == '3.14'
         run: |
           uv run pytest --cov=a2a --cov-report=json --cov-report=html:coverage
           mv coverage.json /tmp/coverage-base.json
 
       - name: Checkout PR Branch (Restore)
-        if: github.event_name == 'pull_request' && matrix.python-version == '3.13'
+        if: github.event_name == 'pull_request' && matrix.python-version == '3.14'
         uses: actions/checkout@v4
         with:
           clean: true
 
       - name: Run coverage (PR)
-        if: github.event_name == 'pull_request' && matrix.python-version == '3.13'
+        if: github.event_name == 'pull_request' && matrix.python-version == '3.14'
         run: |
           uv run pytest --cov=a2a --cov-report=json --cov-report=html:coverage --cov-report=term --cov-fail-under=88
           mv coverage.json coverage-pr.json
           cp /tmp/coverage-base.json coverage-base.json
 
       - name: Save Metadata
-        if: github.event_name == 'pull_request' && matrix.python-version == '3.13'
+        if: github.event_name == 'pull_request' && matrix.python-version == '3.14'
         run: |
           echo ${{ github.event.number }} > ./PR_NUMBER
           echo ${{ github.event.pull_request.base.ref || 'main' }} > ./BASE_BRANCH
 
       - name: Upload Coverage Artifacts
         uses: actions/upload-artifact@v4
-        if: github.event_name == 'pull_request' && matrix.python-version == '3.13'
+        if: github.event_name == 'pull_request' && matrix.python-version == '3.14'
         with:
           name: coverage-data
           path: |
@@ -107,12 +107,12 @@ jobs:
 
       # Run standard tests (for matrix items that didn't run coverage PR)
       - name: Run tests (Standard)
-        if: matrix.python-version != '3.13' || github.event_name != 'pull_request'
+        if: matrix.python-version != '3.14' || github.event_name != 'pull_request'
         run: uv run pytest --cov=a2a --cov-report term --cov-fail-under=88
 
       - name: Upload Artifact (base)
         uses: actions/upload-artifact@v4
-        if: github.event_name != 'pull_request' && matrix.python-version == '3.13'
+        if: github.event_name != 'pull_request' && matrix.python-version == '3.14'
         with:
           name: coverage-report
           path: coverage

pyproject.toml

@@ -15,6 +15,7 @@ dependencies = [
   "google-api-core>=1.26.0",
   "json-rpc>=1.15.0",
   "googleapis-common-protos>=1.70.0",
+  "culsans>=0.11.0 ; python_full_version < '3.13'",
 ]
 
 classifiers = [
@@ -25,6 +26,7 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Operating System :: OS Independent",
   "Topic :: Software Development :: Libraries :: Python Modules",
   "License :: OSI Approved :: Apache Software License",

src/a2a/client/transports/http_helpers.py

@@ -78,7 +78,22 @@ async def send_http_stream_request(
         async with aconnect_sse(
             httpx_client, method, url, **kwargs
         ) as event_source:
-            event_source.response.raise_for_status()
+            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
+
+            # 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

src/a2a/compat/v0_3/grpc_handler.py

@@ -29,7 +29,7 @@
 from a2a.server.request_handlers.request_handler import RequestHandler
 from a2a.types.a2a_pb2 import AgentCard
 from a2a.utils.errors import A2AError, InvalidParamsError
-from a2a.utils.helpers import maybe_await, validate, validate_async_generator
+from a2a.utils.helpers import maybe_await, validate
 
 
 logger = logging.getLogger(__name__)
@@ -170,17 +170,17 @@ async def _handler(
             context, _handler, a2a_v0_3_pb2.SendMessageResponse()
         )
 
-    @validate_async_generator(
-        lambda self: self.agent_card.capabilities.streaming,
-        'Streaming is not supported by the agent',
-    )
     async def SendStreamingMessage(
         self,
         request: a2a_v0_3_pb2.SendMessageRequest,
         context: grpc.aio.ServicerContext,
     ) -> AsyncIterable[a2a_v0_3_pb2.StreamResponse]:
         """Handles the 'SendStreamingMessage' gRPC method (v0.3)."""
 
+        @validate(
+            lambda _: self.agent_card.capabilities.streaming,
+            'Streaming is not supported by the agent',
+        )
         async def _handler(
             server_context: ServerCallContext,
         ) -> AsyncIterable[a2a_v0_3_pb2.StreamResponse]:
@@ -233,17 +233,17 @@ async def _handler(
 
         return await self._handle_unary(context, _handler, a2a_v0_3_pb2.Task())
 
-    @validate_async_generator(
-        lambda self: self.agent_card.capabilities.streaming,
-        'Streaming is not supported by the agent',
-    )
     async def TaskSubscription(
         self,
         request: a2a_v0_3_pb2.TaskSubscriptionRequest,
         context: grpc.aio.ServicerContext,
     ) -> AsyncIterable[a2a_v0_3_pb2.StreamResponse]:
         """Handles the 'TaskSubscription' gRPC method (v0.3)."""
 
+        @validate(
+            lambda _: self.agent_card.capabilities.streaming,
+            'Streaming is not supported by the agent',
+        )
         async def _handler(
             server_context: ServerCallContext,
         ) -> AsyncIterable[a2a_v0_3_pb2.StreamResponse]:
@@ -260,17 +260,17 @@ async def _handler(
         async for item in self._handle_stream(context, _handler):
             yield item
 
-    @validate(
-        lambda self: self.agent_card.capabilities.push_notifications,
-        'Push notifications are not supported by the agent',
-    )
     async def CreateTaskPushNotificationConfig(
         self,
         request: a2a_v0_3_pb2.CreateTaskPushNotificationConfigRequest,
         context: grpc.aio.ServicerContext,
     ) -> a2a_v0_3_pb2.TaskPushNotificationConfig:
         """Handles the 'CreateTaskPushNotificationConfig' gRPC method (v0.3)."""
 
+        @validate(
+            lambda _: self.agent_card.capabilities.push_notifications,
+            'Push notifications are not supported by the agent',
+        )
         async def _handler(
             server_context: ServerCallContext,
         ) -> a2a_v0_3_pb2.TaskPushNotificationConfig:

src/a2a/compat/v0_3/rest_handler.py

@@ -31,7 +31,6 @@
 from a2a.utils import constants
 from a2a.utils.helpers import (
     validate,
-    validate_async_generator,
     validate_version,
 )
 from a2a.utils.telemetry import SpanKind, trace_class
@@ -85,7 +84,7 @@ async def on_message_send(
         return MessageToDict(pb2_v03_resp)
 
     @validate_version(constants.PROTOCOL_VERSION_0_3)
-    @validate_async_generator(
+    @validate(
         lambda self: self.agent_card.capabilities.streaming,
         'Streaming is not supported by the agent',
     )
@@ -143,7 +142,7 @@ async def on_cancel_task(
         return MessageToDict(pb2_v03_task)
 
     @validate_version(constants.PROTOCOL_VERSION_0_3)
-    @validate_async_generator(
+    @validate(
         lambda self: self.agent_card.capabilities.streaming,
         'Streaming is not supported by the agent',
     )

src/a2a/server/events/event_consumer.py

@@ -1,12 +1,11 @@
 import asyncio
 import logging
-import sys
 
 from collections.abc import AsyncGenerator
 
 from pydantic import ValidationError
 
-from a2a.server.events.event_queue import Event, EventQueue
+from a2a.server.events.event_queue import Event, EventQueue, QueueShutDown
 from a2a.types.a2a_pb2 import (
     Message,
     Task,
@@ -17,13 +16,6 @@
 from a2a.utils.telemetry import SpanKind, trace_class
 
 
-# This is an alias to the exception for closed queue
-QueueClosed: type[Exception] = asyncio.QueueEmpty
-
-# When using python 3.13 or higher, the closed queue signal is QueueShutdown
-if sys.version_info >= (3, 13):
-    QueueClosed = asyncio.QueueShutDown
-
 logger = logging.getLogger(__name__)
 
 
@@ -130,7 +122,7 @@ async def consume_all(self) -> AsyncGenerator[Event]:
             except asyncio.TimeoutError:  # pyright: ignore [reportUnusedExcept]
                 # This class was made an alias of built-in TimeoutError after 3.11
                 continue
-            except (QueueClosed, asyncio.QueueEmpty):
+            except (QueueShutDown, asyncio.QueueEmpty):
                 # Confirm that the queue is closed, e.g. we aren't on
                 # python 3.12 and get a queue empty error on an open queue
                 if self.queue.is_closed():