Fix lint errors

holtskinner · holtskinner · commit 698f3674ada2 · 2025-06-04T12:27:51.000-05:00
diff --git a/src/a2a/auth/user.py b/src/a2a/auth/user.py
@@ -21,7 +21,7 @@ class UnauthenticatedUser(User):
     """A representation that no user has been authenticated in the request."""
 
     @property
-    def is_authenticated(self):
+    def is_authenticated(self) -> bool:
         return False
 
     @property
diff --git a/src/a2a/server/agent_execution/context.py b/src/a2a/server/agent_execution/context.py
@@ -80,7 +80,7 @@ def get_user_input(self, delimiter='\n') -> str:
 
         return get_message_text(self._params.message, delimiter)
 
-    def attach_related_task(self, task: Task):
+    def attach_related_task(self, task: Task) -> None:
         """Attaches a related task to the context.
 
         This is useful for scenarios like tool execution where a new task
diff --git a/src/a2a/server/agent_execution/request_context_builder.py b/src/a2a/server/agent_execution/request_context_builder.py
@@ -6,7 +6,7 @@
 
 
 class RequestContextBuilder(ABC):
-    """Builds request context to be supplied to agent executor"""
+    """Builds request context to be supplied to agent executor."""
 
     @abstractmethod
     async def build(
diff --git a/src/a2a/server/agent_execution/simple_request_context_builder.py b/src/a2a/server/agent_execution/simple_request_context_builder.py
@@ -7,7 +7,7 @@
 
 
 class SimpleRequestContextBuilder(RequestContextBuilder):
-    """Builds request context and populates referred tasks"""
+    """Builds request context and populates referred tasks."""
 
     def __init__(
         self,
diff --git a/src/a2a/server/apps/__init__.py b/src/a2a/server/apps/__init__.py
@@ -1,6 +1,6 @@
 """HTTP application components for the A2A server."""
 
-from .jsonrpc import (
+from a2a.server.apps.jsonrpc import (
     A2AFastAPIApplication,
     A2AStarletteApplication,
     CallContextBuilder,
diff --git a/src/a2a/server/apps/jsonrpc/__init__.py b/src/a2a/server/apps/jsonrpc/__init__.py
@@ -1,8 +1,11 @@
 """A2A JSON-RPC Applications."""
 
-from .fastapi_app import A2AFastAPIApplication
-from .jsonrpc_app import CallContextBuilder, JSONRPCApplication
-from .starlette_app import A2AStarletteApplication
+from a2a.server.apps.jsonrpc.fastapi_app import A2AFastAPIApplication
+from a2a.server.apps.jsonrpc.jsonrpc_app import (
+    CallContextBuilder,
+    JSONRPCApplication,
+)
+from a2a.server.apps.jsonrpc.starlette_app import A2AStarletteApplication
 
 
 __all__ = [
diff --git a/src/a2a/server/apps/jsonrpc/fastapi_app.py b/src/a2a/server/apps/jsonrpc/fastapi_app.py
@@ -4,11 +4,13 @@
 
 from fastapi import FastAPI, Request
 
+from a2a.server.apps.jsonrpc.jsonrpc_app import (
+    CallContextBuilder,
+    JSONRPCApplication,
+)
 from a2a.server.request_handlers.jsonrpc_handler import RequestHandler
 from a2a.types import AgentCard
 
-from .jsonrpc_app import CallContextBuilder, JSONRPCApplication
-
 
 logger = logging.getLogger(__name__)
 
@@ -50,8 +52,8 @@ def __init__(
     def build(
         self,
         agent_card_url: str = '/.well-known/agent.json',
-        extended_agent_card_url: str = '/agent/authenticatedExtendedCard',
         rpc_url: str = '/',
+        extended_agent_card_url: str = '/agent/authenticatedExtendedCard',
         **kwargs: Any,
     ) -> FastAPI:
         """Builds and returns the FastAPI application instance.
diff --git a/src/a2a/server/apps/jsonrpc/starlette_app.py b/src/a2a/server/apps/jsonrpc/starlette_app.py
@@ -5,11 +5,13 @@
 from starlette.applications import Starlette
 from starlette.routing import Route
 
+from a2a.server.apps.jsonrpc.jsonrpc_app import (
+    CallContextBuilder,
+    JSONRPCApplication,
+)
 from a2a.server.request_handlers.jsonrpc_handler import RequestHandler
 from a2a.types import AgentCard
 
-from .jsonrpc_app import CallContextBuilder, JSONRPCApplication
-
 
 logger = logging.getLogger(__name__)
 
@@ -93,8 +95,8 @@ def routes(
     def build(
         self,
         agent_card_url: str = '/.well-known/agent.json',
-        extended_agent_card_url: str = '/agent/authenticatedExtendedCard',
         rpc_url: str = '/',
+        extended_agent_card_url: str = '/agent/authenticatedExtendedCard',
         **kwargs: Any,
     ) -> Starlette:
         """Builds and returns the Starlette application instance.
@@ -103,8 +105,7 @@ def build(
             agent_card_url: The URL path for the agent card endpoint.
             rpc_url: The URL path for the A2A JSON-RPC endpoint (POST requests).
             extended_agent_card_url: The URL for the authenticated extended agent card endpoint.
-            **kwargs: Additional keyword arguments to pass to the Starlette
-              constructor.
+            **kwargs: Additional keyword arguments to pass to the Starlette constructor.
 
         Returns:
             A configured Starlette application instance.
diff --git a/src/a2a/server/events/event_consumer.py b/src/a2a/server/events/event_consumer.py
@@ -135,7 +135,7 @@ async def consume_all(self) -> AsyncGenerator[Event]:
                 if self.queue.is_closed():
                     break
 
-    def agent_task_callback(self, agent_task: asyncio.Task[None]):
+    def agent_task_callback(self, agent_task: asyncio.Task[None]) -> None:
         """Callback to handle exceptions from the agent's execution task.
 
         If the agent's asyncio task raises an exception, this callback is
diff --git a/src/a2a/server/events/event_queue.py b/src/a2a/server/events/event_queue.py
@@ -43,7 +43,7 @@ def __init__(self, max_queue_size: int = DEFAULT_MAX_QUEUE_SIZE) -> None:
         self._lock = asyncio.Lock()
         logger.debug('EventQueue initialized.')
 
-    async def enqueue_event(self, event: Event):
+    async def enqueue_event(self, event: Event) -> None:
         """Enqueues an event to this queue and all its children.
 
         Args:
@@ -127,7 +127,7 @@ def tap(self) -> 'EventQueue':
         self._children.append(queue)
         return queue
 
-    async def close(self):
+    async def close(self) -> None:
         """Closes the queue for future push events.
 
         Once closed, `dequeue_event` will eventually raise `asyncio.QueueShutDown`
diff --git a/src/a2a/server/events/in_memory_queue_manager.py b/src/a2a/server/events/in_memory_queue_manager.py
@@ -26,7 +26,7 @@ def __init__(self) -> None:
         self._task_queue: dict[str, EventQueue] = {}
         self._lock = asyncio.Lock()
 
-    async def add(self, task_id: str, queue: EventQueue):
+    async def add(self, task_id: str, queue: EventQueue) -> None:
         """Adds a new event queue for a task ID.
 
         Raises:
@@ -59,7 +59,7 @@ async def tap(self, task_id: str) -> EventQueue | None:
                 return None
             return self._task_queue[task_id].tap()
 
-    async def close(self, task_id: str):
+    async def close(self, task_id: str) -> None:
         """Closes and removes the event queue for a task ID.
 
         Raises:
diff --git a/src/a2a/server/request_handlers/default_request_handler.py b/src/a2a/server/request_handlers/default_request_handler.py
@@ -197,7 +197,7 @@ async def on_message_send(
             context=context,
         )
 
-        task_id = cast(str, request_context.task_id)
+        task_id = cast('str', request_context.task_id)
         # Always assign a task ID. We may not actually upgrade to a task, but
         # dictating the task ID at this layer is useful for tracking running
         # agents.
@@ -287,7 +287,7 @@ async def on_message_send_stream(
             context=context,
         )
 
-        task_id = cast(str, request_context.task_id)
+        task_id = cast('str', request_context.task_id)
         queue = await self._queue_manager.create_or_tap(task_id)
         producer_task = asyncio.create_task(
             self._run_event_stream(
diff --git a/src/a2a/server/tasks/inmemory_push_notifier.py b/src/a2a/server/tasks/inmemory_push_notifier.py
@@ -29,7 +29,7 @@ def __init__(self, httpx_client: httpx.AsyncClient) -> None:
 
     async def set_info(
         self, task_id: str, notification_config: PushNotificationConfig
-    ):
+    ) -> None:
         """Sets or updates the push notification configuration for a task in memory."""
         async with self.lock:
             self._push_notification_infos[task_id] = notification_config
@@ -39,13 +39,13 @@ async def get_info(self, task_id: str) -> PushNotificationConfig | None:
         async with self.lock:
             return self._push_notification_infos.get(task_id)
 
-    async def delete_info(self, task_id: str):
+    async def delete_info(self, task_id: str) -> None:
         """Deletes the push notification configuration for a task from memory."""
         async with self.lock:
             if task_id in self._push_notification_infos:
                 del self._push_notification_infos[task_id]
 
-    async def send_notification(self, task: Task):
+    async def send_notification(self, task: Task) -> None:
         """Sends a push notification for a task if configuration exists."""
         push_info = await self.get_info(task.id)
         if not push_info:
diff --git a/src/a2a/server/tasks/result_aggregator.py b/src/a2a/server/tasks/result_aggregator.py
@@ -105,8 +105,7 @@ async def consume_and_break_on_interrupt(
         Returns:
             A tuple containing:
             - The current aggregated result (`Task` or `Message`) at the point of completion or interruption.
-            - A boolean indicating whether the consumption was interrupted (`True`)
-              or completed naturally (`False`).
+            - A boolean indicating whether the consumption was interrupted (`True`) or completed naturally (`False`).
 
         Raises:
             BaseException: If the `EventConsumer` raises an exception during consumption.
diff --git a/src/a2a/server/tasks/task_updater.py b/src/a2a/server/tasks/task_updater.py
@@ -38,9 +38,9 @@ async def update_status(
         self,
         state: TaskState,
         message: Message | None = None,
-        final=False,
+        final: bool = False,
         timestamp: str | None = None,
-    ):
+    ) -> None:
         """Updates the status of the task and publishes a `TaskStatusUpdateEvent`.
 
         Args:
@@ -71,16 +71,14 @@ async def add_artifact(
         artifact_id: str | None = None,
         name: str | None = None,
         metadata: dict[str, Any] | None = None,
-    ):
+    ) -> None:
         """Adds an artifact chunk to the task and publishes a `TaskArtifactUpdateEvent`.
 
         Args:
             parts: A list of `Part` objects forming the artifact chunk.
             artifact_id: The ID of the artifact. A new UUID is generated if not provided.
             name: Optional name for the artifact.
             metadata: Optional metadata for the artifact.
-            append: Optional boolean indicating if this chunk appends to a previous one.
-            last_chunk: Optional boolean indicating if this is the last chunk.
         """
         if not artifact_id:
             artifact_id = str(uuid.uuid4())
@@ -98,32 +96,32 @@ async def add_artifact(
             )
         )
 
-    async def complete(self, message: Message | None = None):
+    async def complete(self, message: Message | None = None) -> None:
         """Marks the task as completed and publishes a final status update."""
         await self.update_status(
             TaskState.completed,
             message=message,
             final=True,
         )
 
-    async def failed(self, message: Message | None = None):
+    async def failed(self, message: Message | None = None) -> None:
         """Marks the task as failed and publishes a final status update."""
         await self.update_status(TaskState.failed, message=message, final=True)
 
-    async def reject(self, message: Message | None = None):
+    async def reject(self, message: Message | None = None) -> None:
         """Marks the task as rejected and publishes a final status update."""
         await self.update_status(
             TaskState.rejected, message=message, final=True
         )
 
-    async def submit(self, message: Message | None = None):
+    async def submit(self, message: Message | None = None) -> None:
         """Marks the task as submitted and publishes a status update."""
         await self.update_status(
             TaskState.submitted,
             message=message,
         )
 
-    async def start_work(self, message: Message | None = None):
+    async def start_work(self, message: Message | None = None) -> None:
         """Marks the task as working and publishes a status update."""
         await self.update_status(
             TaskState.working,
@@ -142,7 +140,6 @@ def new_agent_message(
 
         Args:
             parts: A list of `Part` objects for the message content.
-            final: Optional boolean indicating if this is the final message in a stream.
             metadata: Optional metadata for the message.
 
         Returns:
diff --git a/src/a2a/utils/message.py b/src/a2a/utils/message.py
@@ -38,7 +38,7 @@ def new_agent_parts_message(
     parts: list[Part],
     context_id: str | None = None,
     task_id: str | None = None,
-):
+) -> Message:
     """Creates a new agent message containing a list of Parts.
 
     Args:
@@ -70,7 +70,7 @@ def get_text_parts(parts: list[Part]) -> list[str]:
     return [part.root.text for part in parts if isinstance(part.root, TextPart)]
 
 
-def get_message_text(message: Message, delimiter='\n') -> str:
+def get_message_text(message: Message, delimiter: str = '\n') -> str:
     """Extracts and joins all text content from a Message's parts.
 
     Args:
diff --git a/src/a2a/utils/telemetry.py b/src/a2a/utils/telemetry.py
@@ -57,6 +57,8 @@ def internal_method(self):
 import inspect
 import logging
 
+from collections.abc import Callable
+
 from opentelemetry import trace
 from opentelemetry.trace import SpanKind as _SpanKind
 from opentelemetry.trace import StatusCode
@@ -77,7 +79,7 @@ def trace_function(
     kind=SpanKind.INTERNAL,
     attributes=None,
     attribute_extractor=None,
-):
+) -> Callable:
     """A decorator to automatically trace a function call with OpenTelemetry.
 
     This decorator can be used to wrap both sync and async functions.
@@ -216,7 +218,7 @@ def trace_class(
     include_list: list[str] | None = None,
     exclude_list: list[str] | None = None,
     kind=SpanKind.INTERNAL,
-):
+) -> Callable:
     """A class decorator to automatically trace specified methods of a class.
 
     This decorator iterates over the methods of a class and applies the
diff --git a/tests/client/test_client.py b/tests/client/test_client.py
@@ -63,15 +63,15 @@
 AGENT_CARD_EXTENDED = AGENT_CARD.model_copy(
     update={
         'name': 'Hello World Agent - Extended Edition',
-        'skills': AGENT_CARD.skills
-        + [
+        'skills': [
+            *AGENT_CARD.skills,
             AgentSkill(
                 id='extended_skill',
                 name='Super Greet',
                 description='A more enthusiastic greeting.',
                 tags=['extended'],
                 examples=['super hi'],
-            )
+            ),
         ],
         'version': '1.0.1',
     }
diff --git a/tests/server/events/test_event_consumer.py b/tests/server/events/test_event_consumer.py
@@ -139,6 +139,7 @@ async def mock_dequeue() -> Any:
             event = events[cursor]
             cursor += 1
             return event
+        return None
 
     mock_event_queue.dequeue_event = mock_dequeue
     consumed_events: list[Any] = []
@@ -181,6 +182,7 @@ async def mock_dequeue() -> Any:
             event = events[cursor]
             cursor += 1
             return event
+        return None
 
     mock_event_queue.dequeue_event = mock_dequeue
     consumed_events: list[Any] = []
@@ -210,6 +212,7 @@ async def mock_dequeue() -> Any:
             event = events[cursor]
             cursor += 1
             return event
+        return None
 
     mock_event_queue.dequeue_event = mock_dequeue
     consumed_events: list[Any] = []
diff --git a/tests/server/events/test_event_queue.py b/tests/server/events/test_event_queue.py
diff --git a/tests/server/events/test_inmemory_queue_manager.py b/tests/server/events/test_inmemory_queue_manager.py
diff --git a/tests/server/request_handlers/test_jsonrpc_handler.py b/tests/server/request_handlers/test_jsonrpc_handler.py
diff --git a/tests/utils/test_helpers.py b/tests/utils/test_helpers.py
diff --git a/tests/utils/test_telemetry.py b/tests/utils/test_telemetry.py
