Merge branch 'main' into md-authagentcard

Author: dmandar

.github/workflows/update-a2a-types.yml

@@ -1,12 +1,12 @@
 name: Update A2A Schema from Specification
 
 on:
-  schedule:
-    - cron: "0 0 * * *" # Runs daily at 00:00 UTC
+  repository_dispatch:
+    types: [a2a_json_update]
   workflow_dispatch:
 
 jobs:
-  check_and_update:
+  generate_and_pr:
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.13"
+          python-version: "3.10"
 
       - name: Install uv
         run: curl -LsSf https://astral.sh/uv/install.sh | sh
@@ -61,20 +61,17 @@ jobs:
             --use-standard-collections
           echo "Codegen finished."
 
-      - name: Create Pull Request if generated file changed
+      - name: Create Pull Request with Updates
         uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.A2A_BOT_PAT }}
-          committer: a2a-bot <[email protected]>
-          author: a2a-bot <[email protected]>
-          commit-message: "chore: 🤖 Auto-update A2A schema from specification"
-          title: "chore: 🤖 Auto-update A2A Schema from Specification"
+          committer: "a2a-bot <[email protected]>"
+          author: "a2a-bot <[email protected]>"
+          commit-message: "chore: 🤖Auto-update A2A types from google/A2A@${{ github.event.client_payload.sha }}"
+          title: "chore: 🤖 Auto-update A2A types from google/A2A"
           body: |
-            This PR automatically updates the A2A schema types based on the latest specification.
-
-            This update was triggered by the scheduled workflow run.
-            See the workflow run details: [${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
-          branch: "a2a-schema-update"
+            This PR updates `src/a2a/types.py` based on the latest `specification/json/a2a.json` from [google/A2A](https://github.com/google/A2A/commit/${{ github.event.client_payload.sha }}).
+          branch: "auto-update-a2a-types-${{ github.event.client_payload.sha }}"
           base: main
           labels: |
             automated

examples/google_adk/birthday_planner/adk_agent_executor.py

@@ -156,9 +156,10 @@ async def _process_request(
         session_id: str,
         task_updater: TaskUpdater,
     ) -> AsyncIterable[TaskStatus | Artifact]:
-        session_id = self._upsert_session(
+        session = await self._upsert_session(
             session_id,
-        ).id
+        )
+        session_id = session.id
         async for event in self._run_agent(
             session_id, new_message, task_updater
         ):
@@ -243,10 +244,10 @@ async def cancel(self, context: RequestContext, event_queue: EventQueue):
         # Ideally: kill any ongoing tasks.
         raise ServerError(error=UnsupportedOperationError())
 
-    def _upsert_session(self, session_id: str):
-        return self.runner.session_service.get_session(
+    async def _upsert_session(self, session_id: str):
+        return await self.runner.session_service.get_session(
             app_name=self.runner.app_name, user_id='self', session_id=session_id
-        ) or self.runner.session_service.create_session(
+        ) or await self.runner.session_service.create_session(
             app_name=self.runner.app_name, user_id='self', session_id=session_id
         )
 

examples/google_adk/birthday_planner/pyproject.toml

@@ -3,14 +3,14 @@ name = "adk-a2a-client-example"
 version = "0.1.0"
 description = "Birthday planner agent example"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.12"
 dependencies = [
     "a2a-sdk",
     "click>=8.1.8",
     "dotenv>=0.9.9",
     "httpx>=0.28.1",
     "google-genai>=1.9.0",
-    "google-adk>=0.0.3",
+    "google-adk>=1.0.0",
     "pydantic>=2.11.4",
     "python-dotenv>=1.1.0",
 ]

examples/google_adk/calendar_agent/__main__.py

@@ -1,3 +1,4 @@
+import asyncio
 import logging
 import os
 
@@ -66,10 +67,10 @@ def main(host: str, port: int):
         skills=[skill],
     )
 
-    adk_agent = create_agent(
+    adk_agent = asyncio.run(create_agent(
         client_id=os.getenv('GOOGLE_CLIENT_ID'),
         client_secret=os.getenv('GOOGLE_CLIENT_SECRET'),
-    )
+    ))
     runner = Runner(
         app_name=agent_card.name,
         agent=adk_agent,

examples/google_adk/calendar_agent/adk_agent.py

@@ -1,12 +1,12 @@
 import datetime
 
 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]
+from google.adk.tools.google_api_tool import CalendarToolset # type: ignore[import-untyped]
 
 
-def create_agent(client_id, client_secret) -> LlmAgent:
+async def create_agent(client_id, client_secret) -> LlmAgent:
     """Constructs the ADK agent."""
-    calendar_tool_set.configure_auth(client_id, client_secret)
+    toolset = CalendarToolset(client_id=client_id, client_secret=client_secret)
     return LlmAgent(
         model='gemini-2.0-flash-001',
         name='calendar_agent',
@@ -23,5 +23,5 @@ def create_agent(client_id, client_secret) -> LlmAgent:
 
 Today is {datetime.datetime.now()}.
 """,
-        tools=calendar_tool_set.get_tools(),
+        tools=await toolset.get_tools(),
     )

examples/google_adk/calendar_agent/adk_agent_executor.py

@@ -65,9 +65,10 @@ async def _process_request(
         session_id: str,
         task_updater: TaskUpdater,
     ) -> None:
-        session_id = self._upsert_session(
+        session = await self._upsert_session(
             session_id,
-        ).id
+        )
+        session_id = session.id
         auth_details = None
         async for event in self._run_agent(session_id, new_message):
             # This agent is expected to do one of two things:
@@ -229,10 +230,10 @@ async def cancel(self, context: RequestContext, event_queue: EventQueue):
     async def on_auth_callback(self, state: str, uri: str):
         self._awaiting_auth[state].set_result(uri)
 
-    def _upsert_session(self, session_id: str):
-        return self.runner.session_service.get_session(
+    async def _upsert_session(self, session_id: str):
+        return await self.runner.session_service.get_session(
             app_name=self.runner.app_name, user_id='self', session_id=session_id
-        ) or self.runner.session_service.create_session(
+        ) or await self.runner.session_service.create_session(
             app_name=self.runner.app_name, user_id='self', session_id=session_id
         )
 
@@ -317,7 +318,7 @@ def get_auth_config(
 ) -> AuthConfig:
     """Extracts the AuthConfig object from the arguments of the auth request function call."""
     if not auth_request_function_call.args or not (
-        auth_config := auth_request_function_call.args.get('auth_config')
+        auth_config := auth_request_function_call.args.get('authConfig')
     ):
         raise ValueError(
             f'Cannot get auth config from function call: {auth_request_function_call}'

examples/google_adk/calendar_agent/pyproject.toml

@@ -3,14 +3,14 @@ name = "adk-auth-example"
 version = "0.1.0"
 description = "Calendar agent example"
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">=3.12"
 dependencies = [
     "a2a-sdk",
     "click>=8.1.8",
     "dotenv>=0.9.9",
     "httpx>=0.28.1",
     "google-genai>=1.9.0",
-    "google-adk>=0.0.3",
+    "google-adk>=1.0.0",
     "pydantic>=2.11.4",
     "python-dotenv>=1.1.0",
     "uvicorn>=0.34.2",

src/a2a/server/agent_execution/context.py

@@ -1,5 +1,6 @@
 import uuid
 
+from a2a.server.context import ServerCallContext
 from a2a.types import (
     InvalidParamsError,
     Message,
@@ -26,6 +27,7 @@ def __init__(
         context_id: str | None = None,
         task: Task | None = None,
         related_tasks: list[Task] | None = None,
+        call_context: ServerCallContext | None = None,
     ):
         """Initializes the RequestContext.
 
@@ -43,6 +45,7 @@ def __init__(
         self._context_id = context_id
         self._current_task = task
         self._related_tasks = related_tasks
+        self._call_context = call_context
         # If the task id and context id were provided, make sure they
         # match the request. Otherwise, create them
         if self._params:
@@ -125,6 +128,11 @@ def configuration(self) -> MessageSendConfiguration | None:
             return None
         return self._params.configuration
 
+    @property
+    def call_context(self) -> ServerCallContext | None:
+        """The server call context associated with this request."""
+        return self._call_context
+
     def _check_or_generate_task_id(self) -> None:
         """Ensures a task ID is present, generating one if necessary."""
         if not self._params:

src/a2a/server/agent_execution/request_context_builder.py

@@ -1,6 +1,7 @@
 from abc import ABC, abstractmethod
 
 from a2a.server.agent_execution import RequestContext
+from a2a.server.context import ServerCallContext
 from a2a.types import MessageSendParams, Task
 
 
@@ -14,5 +15,6 @@ async def build(
         task_id: str | None = None,
         context_id: str | None = None,
         task: Task | None = None,
+        context: ServerCallContext | None = None,
     ) -> RequestContext:
         pass

src/a2a/server/agent_execution/simple_request_context_builder.py

@@ -1,6 +1,7 @@
 import asyncio
 
 from a2a.server.agent_execution import RequestContext, RequestContextBuilder
+from a2a.server.context import ServerCallContext
 from a2a.server.tasks import TaskStore
 from a2a.types import MessageSendParams, Task
 
@@ -22,6 +23,7 @@ async def build(
         task_id: str | None = None,
         context_id: str | None = None,
         task: Task | None = None,
+        context: ServerCallContext | None = None,
     ) -> RequestContext:
         related_tasks: list[Task] | None = None
 
@@ -45,4 +47,5 @@ async def build(
             context_id=context_id,
             task=task,
             related_tasks=related_tasks,
+            call_context=context,
         )