Fix basedpyright warnings (deprecated Optional/Mapping aliases, unused bindings)

basedpyright fails CI on warnings: replace typing.Optional/typing.Mapping
with PEP 604/collections.abc forms, drop two unused query-result bindings,
and mark the intentionally-unused node_input parameters (the name is
load-bearing for ADK FunctionNode binding) with targeted ignores.

Author: DABH

temporalio/contrib/google_adk_agents/_hitl.py

@@ -15,8 +15,9 @@
 
 from __future__ import annotations
 
+from collections.abc import Mapping
 from dataclasses import dataclass
-from typing import Any, Literal, Mapping, Optional
+from typing import Any, Literal
 
 from google.adk.events import Event
 from google.adk.tools.tool_confirmation import ToolConfirmation
@@ -64,12 +65,12 @@ class HitlRequest:
 
     kind: Literal["input", "tool_confirmation", "credential"]
     interrupt_id: str
-    invocation_id: Optional[str] = None
-    author: Optional[str] = None
-    message: Optional[str] = None
-    payload: Optional[Any] = None
-    response_schema: Optional[dict[str, Any]] = None
-    original_function_call: Optional[dict[str, Any]] = None
+    invocation_id: str | None = None
+    author: str | None = None
+    message: str | None = None
+    payload: Any | None = None
+    response_schema: dict[str, Any] | None = None
+    original_function_call: dict[str, Any] | None = None
 
 
 def pending_hitl_requests(event: Event) -> list[HitlRequest]:
@@ -104,10 +105,10 @@ def pending_hitl_requests(event: Event) -> list[HitlRequest]:
         if kind is None:
             continue
         args = function_call.args or {}
-        message: Optional[str] = None
-        payload: Optional[Any] = None
-        response_schema: Optional[dict[str, Any]] = None
-        original_function_call: Optional[dict[str, Any]] = None
+        message: str | None = None
+        payload: Any | None = None
+        response_schema: dict[str, Any] | None = None
+        original_function_call: dict[str, Any] | None = None
         if kind == "input":
             message = args.get("message")
             payload = args.get("payload")
@@ -164,7 +165,7 @@ def hitl_input_response(interrupt_id: str, response: Any) -> types.Part:
 
 
 def hitl_confirmation_response(
-    interrupt_id: str, *, confirmed: bool, payload: Optional[Any] = None
+    interrupt_id: str, *, confirmed: bool, payload: Any | None = None
 ) -> types.Part:
     """Builds the message part answering a tool-confirmation request.
 

temporalio/contrib/google_adk_agents/workflow.py

@@ -3,7 +3,7 @@
 import functools
 import inspect
 import typing
-from typing import TYPE_CHECKING, Any, Callable, Optional
+from typing import TYPE_CHECKING, Any, Callable
 
 import temporalio.workflow
 from temporalio import workflow
@@ -64,7 +64,7 @@ async def wrapper(*args: Any, **kw: Any):
 def activity_node(
     activity_def: Callable,
     *,
-    name: Optional[str] = None,
+    name: str | None = None,
     rerun_on_resume: bool = False,
     **kwargs: Any,
 ) -> "FunctionNode":

tests/contrib/google_adk_agents/test_adk_dynamic_workflows.py

@@ -18,7 +18,7 @@
 import uuid
 from collections.abc import AsyncGenerator
 from datetime import timedelta
-from typing import Any, Optional
+from typing import Any
 
 import pytest
 from google.adk.agents import LlmAgent
@@ -158,7 +158,7 @@ class WorkflowToolModel(BaseLlm):
     async def generate_content_async(
         self, llm_request: LlmRequest, stream: bool = False
     ) -> AsyncGenerator[LlmResponse, None]:
-        tool_response: Optional[types.FunctionResponse] = None
+        tool_response: types.FunctionResponse | None = None
         for content in llm_request.contents:
             for part in content.parts or []:
                 if part.function_response is not None:

tests/contrib/google_adk_agents/test_adk_graph_workflows.py

@@ -123,10 +123,10 @@ def route_ticket(node_input: Any) -> Event:
             text = str(node_input)
             return Event(route="bug" if "bug" in text else "other", output=text)  # type: ignore
 
-        def handle_bug(node_input: str) -> str:
+        def handle_bug(node_input: str) -> str:  # pyright: ignore[reportUnusedParameter]
             return "routed-to-bug"
 
-        def handle_other(node_input: str) -> str:
+        def handle_other(node_input: str) -> str:  # pyright: ignore[reportUnusedParameter]
             return "routed-to-other"
 
         graph = Workflow(
@@ -145,10 +145,10 @@ class ParallelJoinGraphWorkflow:
 
     @workflow.run
     async def run(self, prompt: str) -> dict[str, Any]:
-        def make_a(node_input: Any) -> str:
+        def make_a(node_input: Any) -> str:  # pyright: ignore[reportUnusedParameter]
             return "alpha"
 
-        def make_b(node_input: Any) -> str:
+        def make_b(node_input: Any) -> str:  # pyright: ignore[reportUnusedParameter]
             return "beta"
 
         enrich_a = activity_node(
@@ -177,7 +177,7 @@ class MultiParamActivityNodeWorkflow:
 
     @workflow.run
     async def run(self, prompt: str) -> str:
-        def prepare(node_input: Any) -> dict[str, str]:
+        def prepare(node_input: Any) -> dict[str, str]:  # pyright: ignore[reportUnusedParameter]
             return {"left": "L", "right": "R"}
 
         combine = activity_node(
@@ -216,7 +216,7 @@ class TimeoutGraphWorkflow:
 
     @workflow.run
     async def run(self, prompt: str) -> str:
-        async def slow(node_input: Any) -> str:
+        async def slow(node_input: Any) -> str:  # pyright: ignore[reportUnusedParameter]
             await asyncio.sleep(5)
             return "never"
 
@@ -237,7 +237,7 @@ class RetryGraphWorkflow:
     async def run(self, prompt: str) -> str:
         attempts: list[int] = []
 
-        def flaky(node_input: Any) -> str:
+        def flaky(node_input: Any) -> str:  # pyright: ignore[reportUnusedParameter]
             attempts.append(1)
             if len(attempts) < 2:
                 raise RuntimeError("transient failure")
@@ -264,7 +264,7 @@ class JitteredRetryGraphWorkflow:
     async def run(self, prompt: str) -> str:
         attempts: list[int] = []
 
-        def flaky(node_input: Any) -> str:
+        def flaky(node_input: Any) -> str:  # pyright: ignore[reportUnusedParameter]
             attempts.append(1)
             if len(attempts) < 2:
                 raise RuntimeError("transient failure")

tests/contrib/google_adk_agents/test_adk_hitl.py

@@ -18,7 +18,7 @@
 import uuid
 from collections.abc import AsyncGenerator
 from datetime import timedelta
-from typing import Any, Optional
+from typing import Any
 
 import pytest
 from google.adk.agents import LlmAgent
@@ -327,7 +327,7 @@ async def _wait_for_pending(
     handle: WorkflowHandle,
     query: Any,
     count: int = 1,
-    expected_ids: Optional[set[str]] = None,
+    expected_ids: set[str] | None = None,
 ) -> list[HitlRequest]:
     async def _poll() -> list[HitlRequest]:
         while True:
@@ -422,15 +422,15 @@ async def test_hitl_multiple_pending_partial_response(client: Client):
             task_queue=TASK_QUEUE,
             execution_timeout=timedelta(seconds=60),
         )
-        pending = await _wait_for_pending(
+        await _wait_for_pending(
             handle, MultiPendingGraphWorkflow.pending_requests, expected_ids={"a", "b"}
         )
 
         # Answer only one; the other must stay pending.
         await handle.execute_update(
             MultiPendingGraphWorkflow.respond, args=["a", "yes-a"]
         )
-        pending = await _wait_for_pending(
+        await _wait_for_pending(
             handle, MultiPendingGraphWorkflow.pending_requests, expected_ids={"b"}
         )