Merge branch 'main' into jscpd-fixes

Author: holtskinner

.github/actions/spelling/excludes.txt

@@ -81,8 +81,7 @@
 \.xz$
 \.zip$
 ^\.github/actions/spelling/
-^\Q.github/workflows/spelling.yaml\E$
-^\Q.github/workflows/linter.yaml\E$
+^\.github/workflows/
 \.gitignore\E$
 \.vscode/
 noxfile.py

.github/linters/.mypy.ini

@@ -0,0 +1,6 @@
+[mypy]
+exclude = examples/
+disable_error_code = import-not-found
+
+[mypy-examples.*]
+follow_imports = skip

.github/workflows/linter.yaml

@@ -13,10 +13,9 @@ name: Lint Code Base
 #############################
 # Start the job on all push #
 #############################
-# on:
-#   pull_request:
-#     branches: [main]
-on: workflow_dispatch
+on:
+  pull_request:
+    branches: [main]
 
 ###############
 # Set the Job #
@@ -64,3 +63,5 @@ jobs:
           VALIDATE_TYPESCRIPT_STANDARD: false
           VALIDATE_GIT_COMMITLINT: false
           MARKDOWN_CONFIG_FILE: .markdownlint.json
+          PYTHON_MYPY_CONFIG_FILE: .mypy.ini
+          FILTER_REGEX_EXCLUDE: "^examples/.*"

.github/workflows/python-publish.yml

@@ -24,7 +24,7 @@ jobs:
 
       - name: Build
         run: uv build
-      
+
       - name: Upload distributions
         uses: actions/upload-artifact@v4
         with:
@@ -49,6 +49,3 @@ jobs:
         uses: pypa/gh-action-pypi-publish@release/v1
         with:
           packages-dir: dist/
-  
-        
-      

examples/google_adk/birthday_planner/adk_agent_executor.py

@@ -1,3 +1,4 @@
+# mypy: ignore-errors
 import asyncio
 import logging
 

examples/google_adk/calendar_agent/adk_agent_executor.py

@@ -1,3 +1,4 @@
+# mypy: ignore-errors
 import asyncio
 import logging
 
@@ -53,7 +54,7 @@ def __init__(self, runner: Runner, card: AgentCard):
 
     def _run_agent(
         self, session_id, new_message: types.Content
-    ) -> AsyncGenerator[Event, None]:
+    ) -> AsyncGenerator[Event]:
         return self.runner.run_async(
             session_id=session_id, user_id='self', new_message=new_message
         )

noxfile.py

@@ -114,9 +114,15 @@ def format(session):
         'pyupgrade',
         'autoflake',
         'ruff',
+        'no_implicit_optional',
     )
 
     if lint_paths_py:
+        session.run(
+            'no_implicit_optional',
+            '--use-union-or',
+            *lint_paths_py,
+        )
         if not format_all:
             session.run(
                 'pyupgrade',

src/a2a/server/agent_execution/context.py

@@ -3,8 +3,8 @@
 from a2a.types import (
     InvalidParamsError,
     Message,
-    MessageSendParams,
     MessageSendConfiguration,
+    MessageSendParams,
     Task,
 )
 from a2a.utils import get_message_text
@@ -82,6 +82,8 @@ def context_id(self) -> str | None:
 
     @property
     def configuration(self) -> MessageSendConfiguration | None:
+        if not self._params:
+            return None
         return self._params.configuration
 
     def _check_or_generate_task_id(self) -> None:

src/a2a/server/request_handlers/default_request_handler.py

@@ -128,9 +128,14 @@ async def on_message_send(
         if task:
             task = task_manager.update_with_message(params.message, task)
             if self.should_add_push_info(params):
-                assert isinstance(self._push_notifier, PushNotifier) # For typechecker
-                assert isinstance(params.configuration, MessageSendConfiguration) # For typechecker
-                assert isinstance(params.configuration.pushNotificationConfig, PushNotificationConfig) # For typechecker
+                assert isinstance(self._push_notifier, PushNotifier)
+                assert isinstance(
+                    params.configuration, MessageSendConfiguration
+                )
+                assert isinstance(
+                    params.configuration.pushNotificationConfig,
+                    PushNotificationConfig,
+                )
                 await self._push_notifier.set_info(
                     task.id, params.configuration.pushNotificationConfig
                 )
@@ -193,9 +198,14 @@ async def on_message_send_stream(
             task = task_manager.update_with_message(params.message, task)
 
             if self.should_add_push_info(params):
-                assert isinstance(self._push_notifier, PushNotifier) # For typechecker
-                assert isinstance(params.configuration, MessageSendConfiguration) # For typechecker
-                assert isinstance(params.configuration.pushNotificationConfig, PushNotificationConfig) # For typechecker
+                assert isinstance(self._push_notifier, PushNotifier)
+                assert isinstance(
+                    params.configuration, MessageSendConfiguration
+                )
+                assert isinstance(
+                    params.configuration.pushNotificationConfig,
+                    PushNotificationConfig,
+                )
                 await self._push_notifier.set_info(
                     task.id, params.configuration.pushNotificationConfig
                 )
@@ -324,11 +334,8 @@ async def on_resubscribe_to_task(
             yield event
 
     def should_add_push_info(self, params: MessageSendParams) -> bool:
-        if (
+        return bool(
             self._push_notifier
             and params.configuration
             and params.configuration.pushNotificationConfig
-        ):
-            return True
-        else:
-            return False
+        )

src/a2a/server/tasks/task_updater.py

@@ -1,5 +1,7 @@
 import uuid
 
+from typing import Any
+
 from a2a.server.events import EventQueue
 from a2a.types import (
     Artifact,
@@ -42,7 +44,7 @@ def add_artifact(
         parts: list[Part],
         artifact_id=str(uuid.uuid4()),
         name: str | None = None,
-        metadata: dict[str, any] | None = None,
+        metadata: dict[str, Any] | None = None,
     ):
         """Add an artifact to the task."""
         self.event_queue.enqueue_event(
@@ -68,11 +70,7 @@ def complete(self, message: Message | None = None):
 
     def failed(self, message: Message | None = None):
         """Mark the task as failed."""
-        self.update_status(
-            TaskState.failed,
-            message=message,
-            final=True
-        )
+        self.update_status(TaskState.failed, message=message, final=True)
 
     def submit(self, message: Message | None = None):
         """Mark the task as submitted."""