Merge branch 'main' into snake-case-field

Author: holtskinner

.coveragerc

@@ -4,7 +4,6 @@ omit =
     */tests/*
     */site-packages/*
     */__init__.py
-    */noxfile.py*
     src/a2a/grpc/*
 
 [report]

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,7 +9,7 @@ Before submitting your PR, there are a few things you can do to make sure it goe
     - `fix:` which represents bug fixes, and correlates to a [SemVer](https://semver.org/) patch.
     - `feat:` represents a new feature, and correlates to a SemVer minor.
     - `feat!:`, or `fix!:`, `refactor!:`, etc., which represent a breaking change (indicated by the `!`) and will result in a SemVer major.
-- [ ] Ensure the tests and linter pass (Run `nox -s format` from the repository root to format)
+- [ ] Ensure the tests and linter pass (Run `bash scripts/format.sh` from the repository root to format)
 - [ ] Appropriate docs were updated (if necessary)
 
 Fixes #<issue_number_goes_here> 🦕

.github/actions/spelling/allow.txt

@@ -1,8 +1,15 @@
 ACard
 AClient
+ACMRTUXB
+aconnect
+adk
 AError
 AFast
+agentic
 AGrpc
+aio
+aiomysql
+aproject
 ARequest
 ARun
 AServer
@@ -36,22 +43,30 @@ codegen
 coro
 datamodel
 drivername
+DSNs
 dunders
 euo
+EUR
 excinfo
 fernet
 fetchrow
 fetchval
+GBP
 genai
 getkwargs
 gle
+GVsb
 initdb
 inmemory
+INR
 isready
+JPY
+JSONRPCt
 kwarg
 langgraph
 lifecycles
 linting
+Llm
 lstrips
 mockurl
 notif
@@ -60,13 +75,16 @@ oidc
 opensource
 otherurl
 postgres
+POSTGRES
 postgresql
 protoc
 pyi
 pypistats
+pyupgrade
 pyversions
 respx
 resub
+RUF
 socio
 sse
 tagwords

.github/actions/spelling/excludes.txt

@@ -86,7 +86,6 @@
 ^\.github/actions/spelling/
 ^\.github/workflows/
 CHANGELOG.md
-noxfile.py
 ^src/a2a/grpc/
 ^tests/
 .pre-commit-config.yaml

.ruff.toml

@@ -81,7 +81,6 @@ exclude = [
     "node_modules",
     "venv",
     "*/migrations/*",
-    "noxfile.py",
     "src/a2a/grpc/**",
     "tests/**",
 ]

noxfile.py

@@ -88,6 +88,9 @@ dev = [
   "types-protobuf",
   "types-requests",
   "pre-commit",
+  "pyupgrade",
+  "autoflake",
+  "no_implicit_optional",
 ]
 
 [[tool.uv.index]]

pyproject.toml

@@ -0,0 +1,39 @@
+#!/bin/bash
+set -e
+set -o pipefail
+
+# Sort Spelling Allowlist
+# The user did not provide this file, so we check for its existence.
+SPELLING_ALLOW_FILE=".github/actions/spelling/allow.txt"
+if [ -f "$SPELLING_ALLOW_FILE" ]; then
+    sort -u "$SPELLING_ALLOW_FILE" -o "$SPELLING_ALLOW_FILE"
+fi
+
+TARGET_BRANCH="origin/${GITHUB_BASE_REF:-main}"
+git fetch origin "${GITHUB_BASE_REF:-main}" --depth=1
+
+# Find merge base between HEAD and target branch
+MERGE_BASE=$(git merge-base HEAD "$TARGET_BRANCH")
+
+# Get python files changed in this PR, excluding grpc generated files
+CHANGED_FILES=$(git diff --name-only --diff-filter=ACMRTUXB "$MERGE_BASE" HEAD -- '*.py' ':!src/a2a/grpc/*')
+
+if [ -z "$CHANGED_FILES" ]; then
+    echo "No changed Python files to format."
+    exit 0
+fi
+
+echo "Formatting changed files:"
+echo "$CHANGED_FILES"
+
+# Formatters are already installed in the activated venv from the GHA step.
+# Use xargs to pass the file list to the formatters.
+run_formatter() {
+    echo "$CHANGED_FILES" | xargs -r "$@"
+}
+
+run_formatter no_implicit_optional --use-union-or
+run_formatter pyupgrade --exit-zero-even-if-changed --py310-plus
+run_formatter autoflake -i -r --remove-all-unused-imports
+run_formatter ruff check --fix-only
+run_formatter ruff format

scripts/format.sh

@@ -200,6 +200,12 @@ async def _setup_message_execution(
                 )
 
             task = task_manager.update_with_message(params.message, task)
+        elif params.message.taskId:
+            raise ServerError(
+                error=TaskNotFoundError(
+                    message=f'Task {params.message.taskId} was specified but does not exist'
+                )
+            )
 
         # Build request context
         request_context = await self._request_context_builder.build(

src/a2a/server/request_handlers/default_request_handler.py

@@ -1783,3 +1783,85 @@ async def test_on_resubscribe_to_task_in_terminal_state(terminal_state):
         in exc_info.value.error.message
     )
     mock_task_store.get.assert_awaited_once_with(task_id)
+
+
+@pytest.mark.asyncio
+async def test_on_message_send_task_id_provided_but_task_not_found():
+    """Test on_message_send when taskId is provided but task doesn't exist."""
+    task_id = 'nonexistent_task'
+    mock_task_store = AsyncMock(spec=TaskStore)
+
+    request_handler = DefaultRequestHandler(
+        agent_executor=DummyAgentExecutor(), task_store=mock_task_store
+    )
+
+    params = MessageSendParams(
+        message=Message(
+            role=Role.user,
+            messageId='msg_nonexistent',
+            parts=[Part(root=TextPart(text='Hello'))],
+            taskId=task_id,
+            contextId='ctx1',
+        )
+    )
+
+    from a2a.utils.errors import ServerError
+
+    # Mock TaskManager.get_task to return None (task not found)
+    with patch(
+        'a2a.server.request_handlers.default_request_handler.TaskManager.get_task',
+        return_value=None,
+    ):
+        with pytest.raises(ServerError) as exc_info:
+            await request_handler.on_message_send(
+                params, create_server_call_context()
+            )
+
+    assert isinstance(exc_info.value.error, TaskNotFoundError)
+    assert exc_info.value.error.message
+    assert (
+        f'Task {task_id} was specified but does not exist'
+        in exc_info.value.error.message
+    )
+
+
+@pytest.mark.asyncio
+async def test_on_message_send_stream_task_id_provided_but_task_not_found():
+    """Test on_message_send_stream when taskId is provided but task doesn't exist."""
+    task_id = 'nonexistent_stream_task'
+    mock_task_store = AsyncMock(spec=TaskStore)
+
+    request_handler = DefaultRequestHandler(
+        agent_executor=DummyAgentExecutor(), task_store=mock_task_store
+    )
+
+    params = MessageSendParams(
+        message=Message(
+            role=Role.user,
+            messageId='msg_nonexistent_stream',
+            parts=[Part(root=TextPart(text='Hello'))],
+            taskId=task_id,
+            contextId='ctx1',
+        )
+    )
+
+    from a2a.utils.errors import ServerError
+
+    # Mock TaskManager.get_task to return None (task not found)
+    with patch(
+        'a2a.server.request_handlers.default_request_handler.TaskManager.get_task',
+        return_value=None,
+    ):
+        with pytest.raises(ServerError) as exc_info:
+            # Need to consume the async generator to trigger the error
+            async for _ in request_handler.on_message_send_stream(
+                params, create_server_call_context()
+            ):
+                pass
+
+    assert isinstance(exc_info.value.error, TaskNotFoundError)
+    assert exc_info.value.error.message
+    assert (
+        f'Task {task_id} was specified but does not exist'
+        in exc_info.value.error.message
+    )