Merge branch 'main' into feat/database-memory-service

Author: rohityan

.github/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.30.0"
+  ".": "1.31.0"
 }

.github/release-please-config.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json",
-  "last-release-sha": "80a7ecf4b31e4c6de4a1425b03422f384c1a032d",
+  "last-release-sha": "d69477f6ff348311e1d53e3f2c389dcf037fb049",
   "packages": {
     ".": {
       "release-type": "python",

CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## [1.31.0](https://github.com/google/adk-python/compare/v1.30.0...v1.31.0) (2026-04-16)
+
+
+### Features
+
+* Add "google-adk" user agent to Parameter Manager and Secret Manager clients ([b8e8f6b](https://github.com/google/adk-python/commit/b8e8f6b90290e48e134f48bbe7e2b800276e7269))
+* Add support for memories.ingest_events in VertexAiMemoryBankService ([d69477f](https://github.com/google/adk-python/commit/d69477f6ff348311e1d53e3f2c389dcf037fb049))
+* Add Vertex AI Agent Engine Sandbox integration for computer use ([7686848](https://github.com/google/adk-python/commit/76868485519090c5fa2a0287bccca040e438d94e))
+* Firestore support ([1a9df8f](https://github.com/google/adk-python/commit/1a9df8f77410a08a85d04744f199d25f20d55ebd))
+* **live:** Add live_session_id to LlmResponse ([bf84e2c](https://github.com/google/adk-python/commit/bf84e2cee84f04c886914eb72318875f3c29ea13))
+
+
+### Bug Fixes
+
+* Bump minimum mcp version from 1.23.0 to 1.24.0 ([494c360](https://github.com/google/adk-python/commit/494c360b2a82af5130f153ff615f84e4c2604a73))
+* **cli:** correct console URL path after adk deploy agent_engine ([64ed1a6](https://github.com/google/adk-python/commit/64ed1a68c98e32d61aff43857fa4e756b129b13f)), closes [#5336](https://github.com/google/adk-python/issues/5336)
+* execute on_event_callback before append_event to persist plugin modifications ([454188d](https://github.com/google/adk-python/commit/454188de5de0ef44adb7716230eacddcb060dab2)), closes [#3990](https://github.com/google/adk-python/issues/3990)
+* make `_EvalMetricResultWithInvocation.expected_invocation` `Optional` for conversation_scenario support ([#5215](https://github.com/google/adk-python/issues/5215)) ([a4c9387](https://github.com/google/adk-python/commit/a4c938775764794f42e00a89e3cb33da5119c38b))
+* Pass in auth headers with header provider instead of connection params ([e12b0af](https://github.com/google/adk-python/commit/e12b0af20d9a025e3d75f309de836b139b6d3e88))
+* populate required fields in FunctionDeclaration json_schema fallback ([9b9faa4](https://github.com/google/adk-python/commit/9b9faa4ba21d566252e4c25bd55ab9db2658051e))
+* Resolve BigQuery plugin issues with A2A transfers, spans, and metadata ([9ca8c38](https://github.com/google/adk-python/commit/9ca8c384324e07e945146359f21010b438eb1bc6))
+* upgrade google-genai lower bound ([8bc5728](https://github.com/google/adk-python/commit/8bc57283f3c584a5a6d6d774a316fe63342ed481))
+
+
+### Code Refactoring
+
+* **live:** Use `send_client_content` to send conversation history ([67dc2eb](https://github.com/google/adk-python/commit/67dc2ebfd42f175f2dd6ea58df51a03c575062c6))
+* **live:** Use `send_tool_response` for function responses ([70c5fc8](https://github.com/google/adk-python/commit/70c5fc83a62d1e81d20986223f5c275b086f9822))
+
+
+### Documentation
+
+* update MCP Toolbox branding, binary version, and asset references ([47fa7b7](https://github.com/google/adk-python/commit/47fa7b743c37e3aa8302e78be552876c2784e6ff))
+
 ## [1.30.0](https://github.com/google/adk-python/compare/v1.29.0...v1.30.0) (2026-04-13)
 
 

README.md

@@ -69,6 +69,11 @@ You can install the latest stable version of ADK using `pip`:
 pip install google-adk
 ```
 
+To install optional integrations, you can use the following command:
+```bash
+pip install "google-adk[extensions]"
+```
+
 The release cadence is roughly bi-weekly.
 
 This version is recommended for most users as it represents the most recent official release.

contributing/samples/adk_triaging_agent/agent.py

@@ -37,7 +37,7 @@
     "models": "xuanyang15",
     "services": "DeanChensj",
     "tools": "xuanyang15",
-    "tracing": "jawoszek",
+    "tracing": "mhenc",
     "web": "wyf7107",
     "workflow": "DeanChensj",
 }

contributing/samples/local_environment_skill/agent.py

@@ -15,38 +15,7 @@
 
 from google.adk import Agent
 from google.adk.environment import LocalEnvironment
-from google.adk.tools.base_tool import BaseTool
 from google.adk.tools.environment import EnvironmentToolset
-from google.genai import types
-
-
-class GetTimezoneTool(BaseTool):
-  """A tool to get the timezone for a given location."""
-
-  def __init__(self):
-    super().__init__(
-        name="get_timezone",
-        description="Returns the timezone for a given location.",
-    )
-
-  def _get_declaration(self) -> types.FunctionDeclaration | None:
-    return types.FunctionDeclaration(
-        name=self.name,
-        description=self.description,
-        parameters_json_schema={
-            "type": "object",
-            "properties": {
-                "location": {
-                    "type": "string",
-                    "description": "The location to get the timezone for.",
-                },
-            },
-            "required": ["location"],
-        },
-    )
-
-  async def run_async(self, *, args: dict, tool_context) -> str:
-    return f"The timezone for {args['location']} is UTC+00:00."
 
 
 def get_wind_speed(location: str) -> str:
@@ -89,7 +58,6 @@ def get_wind_speed(location: str) -> str:
                 working_dir=pathlib.Path(__file__).parent
             ),
         ),
-        GetTimezoneTool(),
         get_wind_speed,
     ],
 )

contributing/samples/local_environment_skill/skills/weather-skill/SKILL.md

@@ -1,9 +1,6 @@
 ---
 name: weather-skill
 description: A skill that provides weather information based on reference data.
-metadata:
-  adk_additional_tools:
-    - get_wind_speed
 ---
 
 Step 1: Check 'references/weather_info.md' for the current weather.

pyproject.toml

@@ -33,7 +33,7 @@ dependencies = [
   "fastapi>=0.124.1, <1.0.0",                                # FastAPI framework
   "google-api-python-client>=2.157.0, <3.0.0",               # Google API client discovery
   "google-auth[pyopenssl]>=2.47.0",                          # Google Auth library
-  "google-cloud-aiplatform[agent_engines]>=1.132.0, <2.0.0", # For VertexAI integrations, e.g. example store.
+  "google-cloud-aiplatform[agent_engines]>=1.148.0, <2.0.0", # For VertexAI integrations, e.g. example store.
   "google-cloud-bigquery-storage>=2.0.0",
   "google-cloud-bigquery>=2.2.0",
   "google-cloud-bigtable>=2.32.0",                           # For Bigtable database
@@ -111,7 +111,7 @@ eval = [
   # go/keep-sorted start
   "Jinja2>=3.1.4,<4.0.0",                         # For eval template rendering
   "gepa>=0.1.0",
-  "google-cloud-aiplatform[evaluation]>=1.143.0",
+  "google-cloud-aiplatform[evaluation]>=1.148.0",
   "pandas>=2.2.3",
   "rouge-score>=0.1.2",
   "tabulate>=0.9.0",

src/google/adk/agents/base_agent.py

@@ -16,6 +16,7 @@
 
 import inspect
 import logging
+import sys
 from typing import Any
 from typing import AsyncGenerator
 from typing import Awaitable
@@ -285,7 +286,9 @@ async def run_async(
       Event: the events generated by the agent.
     """
 
-    with tracer.start_as_current_span(f'invoke_agent {self.name}') as span:
+    cm = tracer.start_as_current_span(f'invoke_agent {self.name}')
+    span = cm.__enter__()
+    try:
       ctx = self._create_invocation_context(parent_context)
       tracing.trace_agent_invocation(span, self, ctx)
       if event := await self._handle_before_agent_callback(ctx):
@@ -302,6 +305,23 @@ async def run_async(
 
       if event := await self._handle_after_agent_callback(ctx):
         yield event
+    except BaseException:
+      try:
+        cm.__exit__(*sys.exc_info())
+      except ValueError:
+        logger.warning(
+            'Failed to detach context during generator cleanup, likely due to'
+            ' cancellation.'
+        )
+      raise
+    else:
+      try:
+        cm.__exit__(None, None, None)
+      except ValueError:
+        logger.warning(
+            'Failed to detach context during generator cleanup, likely due to'
+            ' cancellation.'
+        )
 
   @final
   async def run_live(

src/google/adk/agents/common_configs.py

@@ -118,7 +118,7 @@ class AgentRefConfig(BaseModel):
     my_custom_agent = LlmAgent(
         name="my_custom_agent",
         instruction="You are a helpful custom agent.",
-        model="gemini-2.0-flash",
+        model="gemini-2.5-flash",
     )
     ```