Merge branch 'main' into feature/ollama-llm

Author: ayman3000

.github/workflows/pre-commit.yml

@@ -0,0 +1,39 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+name: pre-commit
+
+on:
+  push:
+    branches: [main, v2]
+    paths:
+      - '**.py'
+      - '.pre-commit-config.yaml'
+      - 'pyproject.toml'
+  pull_request:
+    branches: [main, v2]
+    paths:
+      - '**.py'
+      - '.pre-commit-config.yaml'
+      - 'pyproject.toml'
+
+jobs:
+  pre-commit:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v6
+
+      - name: Run pre-commit checks
+        uses: pre-commit/action@v3.0.1

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.

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.148.0, <2.0.0", # For VertexAI integrations, e.g. example store.
+  "google-cloud-aiplatform[agent_engines]>=1.148.1, <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
@@ -90,6 +90,7 @@ dev = [
   "flit>=3.10.0",
   "isort>=6.0.0",
   "mypy>=1.15.0",
+  "pre-commit>=4.0.0",
   "pyink>=25.12.0",
   "pylint>=2.6.0",
   # go/keep-sorted end

src/google/adk/a2a/converters/from_adk_event.py

@@ -257,7 +257,6 @@ def _serialize_value(value: Any) -> Optional[Any]:
     try:
       dumped = value.model_dump(
           exclude_none=True,
-          exclude_unset=True,
           exclude_defaults=True,
           by_alias=True,
       )

src/google/adk/agents/base_agent.py

@@ -16,7 +16,6 @@
 
 import inspect
 import logging
-import sys
 from typing import Any
 from typing import AsyncGenerator
 from typing import Awaitable
@@ -43,8 +42,7 @@
 from ..events.event_actions import EventActions
 from ..features import experimental
 from ..features import FeatureName
-from ..telemetry import tracing
-from ..telemetry.tracing import tracer
+from ..telemetry import _instrumentation
 from ..utils.context_utils import Aclosing
 from .base_agent_config import BaseAgentConfig
 from .callback_context import CallbackContext
@@ -286,11 +284,8 @@ async def run_async(
       Event: the events generated by the agent.
     """
 
-    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)
+    ctx = self._create_invocation_context(parent_context)
+    async with _instrumentation.record_agent_invocation(ctx, self):
       if event := await self._handle_before_agent_callback(ctx):
         yield event
       if ctx.end_invocation:
@@ -305,23 +300,6 @@ 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(
@@ -338,9 +316,8 @@ async def run_live(
       Event: the events generated by the agent.
     """
 
-    with tracer.start_as_current_span(f'invoke_agent {self.name}') as span:
-      ctx = self._create_invocation_context(parent_context)
-      tracing.trace_agent_invocation(span, self, ctx)
+    ctx = self._create_invocation_context(parent_context)
+    async with _instrumentation.record_agent_invocation(ctx, self):
       if event := await self._handle_before_agent_callback(ctx):
         yield event
       if ctx.end_invocation:

src/google/adk/agents/config_agent_utils.py

@@ -80,6 +80,31 @@ def _resolve_agent_class(agent_class: str) -> type[BaseAgent]:
   )
 
 
+_BLOCKED_YAML_KEYS = frozenset({"args"})
+_ENFORCE_DENYLIST = False
+
+
+def _set_enforce_denylist(value: bool) -> None:
+  global _ENFORCE_DENYLIST
+  _ENFORCE_DENYLIST = value
+
+
+def _check_config_for_blocked_keys(node: Any, filename: str) -> None:
+  """Recursively check if the configuration contains any blocked keys."""
+  if isinstance(node, dict):
+    for key, value in node.items():
+      if key in _BLOCKED_YAML_KEYS:
+        raise ValueError(
+            f"Blocked key {key!r} found in {filename!r}. "
+            f"The '{key}' field is not allowed in agent configurations "
+            "because it can execute arbitrary code."
+        )
+      _check_config_for_blocked_keys(value, filename)
+  elif isinstance(node, list):
+    for item in node:
+      _check_config_for_blocked_keys(item, filename)
+
+
 def _load_config_from_path(config_path: str) -> AgentConfig:
   """Load an agent's configuration from a YAML file.
 
@@ -100,6 +125,9 @@ def _load_config_from_path(config_path: str) -> AgentConfig:
   with open(config_path, "r", encoding="utf-8") as f:
     config_data = yaml.safe_load(f)
 
+  if _ENFORCE_DENYLIST:
+    _check_config_for_blocked_keys(config_data, config_path)
+
   return AgentConfig.model_validate(config_data)
 
 

src/google/adk/cli/browser/index.html

@@ -148,6 +148,12 @@ def get_fast_api_app(
     The configured FastAPI application instance.
   """
 
+  # Enable denylist enforcement for config loads if web UI is enabled.
+  if web:
+    from ..agents import config_agent_utils
+
+    config_agent_utils._set_enforce_denylist(True)
+
   # Set up eval managers.
   if eval_storage_uri:
     gcs_eval_managers = evals.create_gcs_eval_managers_from_uri(

…/google/adk/cli/browser/main-3OBAHHYV.js …/google/adk/cli/browser/main-TCIQIOZ3.jssrc/google/adk/cli/browser/main-3OBAHHYV.js renamed to src/google/adk/cli/browser/main-TCIQIOZ3.js src/google/adk/cli/browser/main-3OBAHHYV.js renamed to src/google/adk/cli/browser/main-TCIQIOZ3.js

@@ -41,6 +41,12 @@ class FeatureName(str, Enum):
   GOOGLE_CREDENTIALS_CONFIG = "GOOGLE_CREDENTIALS_CONFIG"
   GOOGLE_TOOL = "GOOGLE_TOOL"
   JSON_SCHEMA_FOR_FUNC_DECL = "JSON_SCHEMA_FOR_FUNC_DECL"
+  # Private (leading underscore): not part of the public API surface.
+  # GE flips this on by setting the env var
+  # `ADK_ENABLE_MCP_GRACEFUL_ERROR_HANDLING=1`; nothing should import this
+  # enum member by name. Keeping it private avoids a backward-compat
+  # obligation for what is intended as a temporary, internal kill-switch.
+  _MCP_GRACEFUL_ERROR_HANDLING = "MCP_GRACEFUL_ERROR_HANDLING"
   PROGRESSIVE_SSE_STREAMING = "PROGRESSIVE_SSE_STREAMING"
   PUBSUB_TOOL_CONFIG = "PUBSUB_TOOL_CONFIG"
   PUBSUB_TOOLSET = "PUBSUB_TOOLSET"
@@ -131,6 +137,9 @@ class FeatureConfig:
     FeatureName.JSON_SCHEMA_FOR_FUNC_DECL: FeatureConfig(
         FeatureStage.WIP, default_on=False
     ),
+    FeatureName._MCP_GRACEFUL_ERROR_HANDLING: FeatureConfig(
+        FeatureStage.EXPERIMENTAL, default_on=False
+    ),
     FeatureName.PROGRESSIVE_SSE_STREAMING: FeatureConfig(
         FeatureStage.EXPERIMENTAL, default_on=True
     ),