Merge branch 'main' into feat-tp

Linux2010 · web-flow · commit db57a8fb39bb · 2025-05-23T00:27:10.000+08:00
diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
@@ -32,6 +32,7 @@ lifecycles
 linting
 oauthoidc
 opensource
+pyversions
 socio
 sse
 tagwords
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -18,7 +18,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.13"]
+        python-version: ["3.10", "3.13"]
 
     steps:
       - name: Checkout code
diff --git a/.github/workflows/update-a2a-types.yml b/.github/workflows/update-a2a-types.yml
@@ -1,12 +1,12 @@
 name: Update A2A Schema from Specification
 
 on:
-  schedule:
-    - cron: "0 0 * * *" # Runs daily at 00:00 UTC
+  repository_dispatch:
+    types: [a2a_json_update]
   workflow_dispatch:
 
 jobs:
-  check_and_update:
+  generate_and_pr:
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.13"
+          python-version: "3.10"
 
       - name: Install uv
         run: curl -LsSf https://astral.sh/uv/install.sh | sh
@@ -61,20 +61,17 @@ jobs:
             --use-standard-collections
           echo "Codegen finished."
 
-      - name: Create Pull Request if generated file changed
+      - name: Create Pull Request with Updates
         uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.A2A_BOT_PAT }}
-          committer: a2a-bot <a2a-bot@google.com>
-          author: a2a-bot <a2a-bot@google.com>
-          commit-message: "chore: 🤖 Auto-update A2A schema from specification"
-          title: "chore: 🤖 Auto-update A2A Schema from Specification"
+          committer: "a2a-bot <a2a-bot@google.com>"
+          author: "a2a-bot <a2a-bot@google.com>"
+          commit-message: "chore: 🤖Auto-update A2A types from google/A2A@${{ github.event.client_payload.sha }}"
+          title: "chore: 🤖 Auto-update A2A types from google/A2A"
           body: |
-            This PR automatically updates the A2A schema types based on the latest specification.
-
-            This update was triggered by the scheduled workflow run.
-            See the workflow run details: [${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
-          branch: "a2a-schema-update"
+            This PR updates `src/a2a/types.py` based on the latest `specification/json/a2a.json` from [google/A2A](https://github.com/google/A2A/commit/${{ github.event.client_payload.sha }}).
+          branch: "auto-update-a2a-types-${{ github.event.client_payload.sha }}"
           base: main
           labels: |
             automated
diff --git a/.ruff.toml b/.ruff.toml
@@ -9,7 +9,7 @@
 line-length = 80 # Google Style Guide §3.2: 80 columns
 indent-width = 4 # Google Style Guide §3.4: 4 spaces
 
-target-version = "py313" # Minimum Python version
+target-version = "py310" # Minimum Python version
 
 [lint]
 ignore = [
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [0.2.4](https://github.com/google/a2a-python/compare/v0.2.3...v0.2.4) (2025-05-22)
+
+
+### Features
+
+* Update to support python 3.10 ([#85](https://github.com/google/a2a-python/issues/85)) ([fd9c3b5](https://github.com/google/a2a-python/commit/fd9c3b5b0bbef509789a701171d95f690c84750b))
+
+
+### Bug Fixes
+
+* Throw exception for task_id mismatches ([#70](https://github.com/google/a2a-python/issues/70)) ([a9781b5](https://github.com/google/a2a-python/commit/a9781b589075280bfaaab5742d8b950916c9de74))
+
 ## [0.2.3](https://github.com/google/a2a-python/compare/v0.2.2...v0.2.3) (2025-05-20)
 
 
diff --git a/README.md b/README.md
@@ -1,14 +1,27 @@
 # A2A Python SDK
 
-A Python library that helps run agentic applications as A2AServers following the [Agent2Agent (A2A) Protocol](https://google.github.io/A2A/).
+[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](LICENSE)
+![PyPI - Version](https://img.shields.io/pypi/v/a2a-sdk)
+![PyPI - Python Version](https://img.shields.io/pypi/pyversions/a2a-sdk)
+
+<!-- markdownlint-disable no-inline-html -->
+
+<html>
+   <h2 align="center">
+   <img src="https://raw.githubusercontent.com/google/A2A/refs/heads/main/docs/assets/a2a-logo-black.svg" width="256" alt="A2A Logo"/>
+   </h2>
+   <h3 align="center">A Python library that helps run agentic applications as A2AServers following the <a href="https://google.github.io/A2A">Agent2Agent (A2A) Protocol</a>.</h3>
+</html>
+
+<!-- markdownlint-enable no-inline-html -->
 
 ## Installation
 
 You can install the A2A SDK using either `uv` or `pip`.
 
 ## Prerequisites
 
-- Python 3.13+
+- Python 3.10+
 - `uv` (optional, but recommended) or `pip`
 
 ### Using `uv`
diff --git a/noxfile.py b/noxfile.py
@@ -23,7 +23,7 @@
 import nox
 
 
-DEFAULT_PYTHON_VERSION = '3.13'
+DEFAULT_PYTHON_VERSION = '3.10'
 
 CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()
 
@@ -127,7 +127,7 @@ def format(session):
             session.run(
                 'pyupgrade',
                 '--exit-zero-even-if-changed',
-                '--py313-plus',
+                '--py310-plus',
                 *lint_paths_py,
             )
         session.run(
diff --git a/pyproject.toml b/pyproject.toml
@@ -5,7 +5,7 @@ description = "A2A Python SDK"
 readme = "README.md"
 license = { file = "LICENSE" }
 authors = [{ name = "Google LLC", email = "googleapis-packages@google.com" }]
-requires-python = ">=3.13"
+requires-python = ">=3.10"
 keywords = ["A2A", "A2A SDK", "A2A Protocol", "Agent2Agent"]
 dependencies = [
     "httpx>=0.28.1",
@@ -22,6 +22,9 @@ classifiers = [
   "Intended Audience :: Developers",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
   "Operating System :: OS Independent",
   "Topic :: Software Development :: Libraries :: Python Modules",
diff --git a/src/a2a/server/events/event_consumer.py b/src/a2a/server/events/event_consumer.py
@@ -1,5 +1,6 @@
 import asyncio
 import logging
+import sys
 
 from collections.abc import AsyncGenerator
 
@@ -15,6 +16,13 @@
 from a2a.utils.telemetry import SpanKind, trace_class
 
 
+# This is an alias to the exception for closed queue
+QueueClosed = 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__)
 
 
@@ -111,13 +119,16 @@ async def consume_all(self) -> AsyncGenerator[Event]:
 
                 if is_final_event:
                     logger.debug('Stopping event consumption in consume_all.')
-                    self.queue.close()
+                    await self.queue.close()
                     break
             except TimeoutError:
                 # continue polling until there is a final event
                 continue
-            except asyncio.QueueShutDown:
-                break
+            except QueueClosed:
+                # 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():
+                    break
 
     def agent_task_callback(self, agent_task: asyncio.Task[None]):
         """Callback to handle exceptions from the agent's execution task.
diff --git a/src/a2a/server/events/event_queue.py b/src/a2a/server/events/event_queue.py
@@ -1,5 +1,6 @@
 import asyncio
 import logging
+import sys
 
 from a2a.types import (
     A2AError,
@@ -39,6 +40,8 @@ def __init__(self) -> None:
         """Initializes the EventQueue."""
         self.queue: asyncio.Queue[Event] = asyncio.Queue()
         self._children: list[EventQueue] = []
+        self._is_closed = False
+        self._lock = asyncio.Lock()
         logger.debug('EventQueue initialized.')
 
     def enqueue_event(self, event: Event):
@@ -47,6 +50,9 @@ def enqueue_event(self, event: Event):
         Args:
             event: The event object to enqueue.
         """
+        if self._is_closed:
+            logger.warning('Queue is closed. Event will not be enqueued.')
+            return
         logger.debug(f'Enqueuing event of type: {type(event)}')
         self.queue.put_nowait(event)
         for child in self._children:
@@ -55,6 +61,20 @@ def enqueue_event(self, event: Event):
     async def dequeue_event(self, no_wait: bool = False) -> Event:
         """Dequeues an event from the queue.
 
+        This implementation expects that dequeue to raise an exception when
+        the queue has been closed. In python 3.13+ this is naturally provided
+        by the QueueShutDown exception generated when the queue has closed and
+        the user is awaiting the queue.get method. Python<=3.12 this needs to
+        manage this lifecycle itself. The current implementation can lead to
+        blocking if the dequeue_event is called before the EventQueue has been
+        closed but when there are no events on the queue. Two ways to avoid this
+        are to call this with no_wait = True which won't block, but is the
+        callers responsibility to retry as appropriate. Alternatively, one can
+        use a async Task management solution to cancel the get task if the queue
+        has closed or some other condition is met. The implementation of the
+        EventConsumer uses an async.wait with a timeout to abort the
+        dequeue_event call and retry, when it will return with a closed error.
+
         Args:
             no_wait: If True, retrieve an event immediately or raise `asyncio.QueueEmpty`.
                      If False (default), wait until an event is available.
@@ -66,6 +86,11 @@ async def dequeue_event(self, no_wait: bool = False) -> Event:
             asyncio.QueueEmpty: If `no_wait` is True and the queue is empty.
             asyncio.QueueShutDown: If the queue has been closed and is empty.
         """
+        async with self._lock:
+            if self._is_closed and self.queue.empty():
+                logger.warning('Queue is closed. Event will not be dequeued.')
+                raise asyncio.QueueEmpty('Queue is closed.')
+
         if no_wait:
             logger.debug('Attempting to dequeue event (no_wait=True).')
             event = self.queue.get_nowait()
@@ -99,13 +124,30 @@ def tap(self) -> 'EventQueue':
         self._children.append(queue)
         return queue
 
-    def close(self):
+    async def close(self):
         """Closes the queue for future push events.
 
         Once closed, `dequeue_event` will eventually raise `asyncio.QueueShutDown`
         when the queue is empty. Also closes all child queues.
         """
         logger.debug('Closing EventQueue.')
-        self.queue.shutdown()
-        for child in self._children:
-            child.close()
+        async with self._lock:
+            # If already closed, just return.
+            if self._is_closed:
+                return
+            self._is_closed = True
+        # If using python 3.13 or higher, use the shutdown method
+        if sys.version_info >= (3, 13):
+            self.queue.shutdown()
+            for child in self._children:
+                child.close()
+        # Otherwise, join the queue
+        else:
+            tasks = [asyncio.create_task(self.queue.join())]
+            for child in self._children:
+                tasks.append(asyncio.create_task(child.close()))
+            await asyncio.wait(tasks, return_when=asyncio.ALL_COMPLETED)
+
+    def is_closed(self) -> bool:
+        """Checks if the queue is closed."""
+        return self._is_closed
diff --git a/src/a2a/server/events/in_memory_queue_manager.py b/src/a2a/server/events/in_memory_queue_manager.py
@@ -69,7 +69,7 @@ async def close(self, task_id: str):
             if task_id not in self._task_queue:
                 raise NoTaskQueue()
             queue = self._task_queue.pop(task_id)
-            queue.close()
+            await queue.close()
 
     async def create_or_tap(self, task_id: str) -> EventQueue:
         """Creates a new event queue for a task ID if one doesn't exist, otherwise taps the existing one.
diff --git a/src/a2a/server/request_handlers/default_request_handler.py b/src/a2a/server/request_handlers/default_request_handler.py
@@ -147,7 +147,7 @@ async def _run_event_stream(
             queue: The event queue for the agent to publish to.
         """
         await self.agent_executor.execute(request, queue)
-        queue.close()
+        await queue.close()
 
     async def on_message_send(
         self, params: MessageSendParams
