Merge branch 'main' into kthota/typechanges

Author: holtskinner

.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 = "py310" # Minimum Python version
+target-version = "py313" # Minimum Python version
 
 [lint]
 ignore = [

examples/google_adk/birthday_planner/README.md

@@ -6,7 +6,7 @@ This agent helps plan birthday parties. It has access to a Calendar Agent that i
 
 ## Prerequisites
 
-- Python 3.9 or higher
+- Python 3.13 or higher
 - [UV](https://docs.astral.sh/uv/)
 - A Gemini API Key
 

examples/google_adk/birthday_planner/__main__.py

@@ -6,7 +6,7 @@
 import click
 import uvicorn
 
-from adk_agent_executor import ADKAgentExecutor
+from adk_agent_executor import ADKAgentExecutor # type: ignore[import-untyped]
 from dotenv import load_dotenv
 
 from a2a.server.apps import A2AStarletteApplication

examples/google_adk/calendar_agent/README.md

@@ -4,7 +4,7 @@ This example shows how to create an A2A Server that uses an ADK-based Agent that
 
 ## Prerequisites
 
-- Python 3.9 or higher
+- Python 3.13 or higher
 - [UV](https://docs.astral.sh/uv/)
 - A Gemini API Key
 - A [Google OAuth Client](https://developers.google.com/identity/openid-connect/openid-connect#getcredentials)

examples/google_adk/calendar_agent/__main__.py

@@ -4,13 +4,13 @@
 import click
 import uvicorn
 
-from adk_agent import create_agent
-from adk_agent_executor import ADKAgentExecutor
+from adk_agent import create_agent # type: ignore[import-not-found]
+from adk_agent_executor import ADKAgentExecutor # type: ignore[import-untyped]
 from dotenv import load_dotenv
-from google.adk.artifacts import InMemoryArtifactService
-from google.adk.memory.in_memory_memory_service import InMemoryMemoryService
-from google.adk.runners import Runner
-from google.adk.sessions import InMemorySessionService
+from google.adk.artifacts import InMemoryArtifactService # type: ignore[import-untyped]
+from google.adk.memory.in_memory_memory_service import InMemoryMemoryService # type: ignore[import-untyped]
+from google.adk.runners import Runner # type: ignore[import-untyped]
+from google.adk.sessions import InMemorySessionService # type: ignore[import-untyped]
 from starlette.applications import Starlette
 from starlette.requests import Request
 from starlette.responses import PlainTextResponse
@@ -81,7 +81,7 @@ def main(host: str, port: int):
 
     async def handle_auth(request: Request) -> PlainTextResponse:
         await agent_executor.on_auth_callback(
-            request.query_params.get('state'), str(request.url)
+            str(request.query_params.get('state')), str(request.url)
         )
         return PlainTextResponse('Authentication successful.')
 

examples/google_adk/calendar_agent/adk_agent.py

@@ -1,7 +1,7 @@
 import datetime
 
-from google.adk.agents import LlmAgent
-from google.adk.tools.google_api_tool import calendar_tool_set
+from google.adk.agents import LlmAgent # type: ignore[import-untyped]
+from google.adk.tools.google_api_tool import calendar_tool_set # type: ignore[import-untyped]
 
 
 def create_agent(client_id, client_secret) -> LlmAgent:

examples/helloworld/__main__.py

@@ -1,4 +1,4 @@
-from agent_executor import HelloWorldAgentExecutor
+from agent_executor import HelloWorldAgentExecutor # type: ignore[import-untyped]
 
 from a2a.server.apps import A2AStarletteApplication
 from a2a.server.request_handlers import DefaultRequestHandler

examples/langgraph/__main__.py

@@ -4,8 +4,8 @@
 import click
 import httpx
 
-from agent import CurrencyAgent
-from agent_executor import CurrencyAgentExecutor
+from agent import CurrencyAgent # type: ignore[import-untyped]
+from agent_executor import CurrencyAgentExecutor # type: ignore[import-untyped]
 from dotenv import load_dotenv
 
 from a2a.server.apps import A2AStarletteApplication

examples/langgraph/agent_executor.py

@@ -1,6 +1,5 @@
-from agent import CurrencyAgent
+from agent import CurrencyAgent # type: ignore[import-untyped]
 from typing_extensions import override
-
 from a2a.server.agent_execution import AgentExecutor, RequestContext
 from a2a.server.events.event_queue import EventQueue
 from a2a.types import (

examples/langgraph/test_client.py

@@ -71,8 +71,7 @@ async def run_single_turn_test(client: A2AClient) -> None:
     task_id: str = send_response.root.result.id
     print('---Query Task---')
     # query the task
-    task_id_payload = {'id': task_id}
-    get_request = GetTaskRequest(params=TaskQueryParams(**task_id_payload))
+    get_request = GetTaskRequest(params=TaskQueryParams(id=task_id))
     get_response: GetTaskResponse = await client.get_task(get_request)
     print_json_response(get_response, 'Query Task Response')