Merge branch 'main' into fix/gemma4-tool-role-hf-naming

Author: rohityan

.github/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "2.3.0"
+  ".": "2.4.0"
 }

.github/release-please-config.json

@@ -57,5 +57,5 @@
       ]
     }
   },
-  "last-release-sha": "0cb4c814928f579bfbac9b9e1f95669e4304e089"
+  "last-release-sha": "44d747ed5eaf543b5b8d22e0088f8a7c7eeee846"
 }

CHANGELOG.md

@@ -134,32 +134,3 @@ def validate_artifact_reference_scope(
         "Session-scoped artifact references must stay within the same"
         " session scope."
     )
-
-
-def validate_path_segment(value: str, field_name: str) -> None:
-  """Rejects values that could alter the constructed path.
-
-  Args:
-    value: The caller-supplied identifier (e.g. user_id or session_id).
-    field_name: Human-readable name used in the error message.
-
-  Raises:
-    InputValidationError: If the value contains path separators, traversal
-      segments, or null bytes.
-  """
-  if not value:
-    raise input_validation_error.InputValidationError(
-        f"{field_name} must not be empty."
-    )
-  if "\x00" in value:
-    raise input_validation_error.InputValidationError(
-        f"{field_name} must not contain null bytes."
-    )
-  if "/" in value or "\\" in value:
-    raise input_validation_error.InputValidationError(
-        f"{field_name} {value!r} must not contain path separators."
-    )
-  if value in (".", "..") or ".." in value.split("/"):
-    raise input_validation_error.InputValidationError(
-        f"{field_name} {value!r} must not contain traversal segments."
-    )

src/google/adk/artifacts/artifact_util.py

@@ -34,7 +34,6 @@
 from pydantic import ValidationError
 from typing_extensions import override
 
-from . import artifact_util
 from ..errors.input_validation_error import InputValidationError
 from .base_artifact_service import ArtifactVersion
 from .base_artifact_service import BaseArtifactService
@@ -143,14 +142,39 @@ def _is_user_scoped(session_id: Optional[str], filename: str) -> bool:
   return session_id is None or _file_has_user_namespace(filename)
 
 
+def _validate_path_segment(value: str, field_name: str) -> None:
+  """Rejects values that could alter the constructed filesystem path.
+
+  Args:
+    value: The caller-supplied identifier (e.g. user_id or session_id).
+    field_name: Human-readable name used in the error message.
+
+  Raises:
+    InputValidationError: If the value contains path separators, traversal
+      segments, or null bytes.
+  """
+  if not value:
+    raise InputValidationError(f"{field_name} must not be empty.")
+  if "\x00" in value:
+    raise InputValidationError(f"{field_name} must not contain null bytes.")
+  if "/" in value or "\\" in value:
+    raise InputValidationError(
+        f"{field_name} {value!r} must not contain path separators."
+    )
+  if value in (".", "..") or ".." in value.split("/"):
+    raise InputValidationError(
+        f"{field_name} {value!r} must not contain traversal segments."
+    )
+
+
 def _user_artifacts_dir(base_root: Path) -> Path:
   """Returns the path that stores user-scoped artifacts."""
   return base_root / "artifacts"
 
 
 def _session_artifacts_dir(base_root: Path, session_id: str) -> Path:
   """Returns the path that stores session-scoped artifacts."""
-  artifact_util.validate_path_segment(session_id, "session_id")
+  _validate_path_segment(session_id, "session_id")
   return base_root / "sessions" / session_id / "artifacts"
 
 
@@ -232,7 +256,7 @@ def __init__(self, root_dir: Path | str):
 
   def _base_root(self, user_id: str, /) -> Path:
     """Returns the artifacts root directory for a user."""
-    artifact_util.validate_path_segment(user_id, "user_id")
+    _validate_path_segment(user_id, "user_id")
     return self.root_dir / "users" / user_id
 
   def _scope_root(
@@ -245,7 +269,7 @@ def _scope_root(
     base = self._base_root(user_id)
     if _is_user_scoped(session_id, filename):
       return _user_artifacts_dir(base)
-    if session_id is None:
+    if not session_id:
       raise InputValidationError(
           "Session ID must be provided for session-scoped artifacts."
       )
@@ -519,7 +543,7 @@ def _list_artifact_keys_sync(
 
     base_root = self._base_root(user_id)
 
-    if session_id is not None:
+    if session_id:
       session_root = _session_artifacts_dir(base_root, session_id)
       for artifact_dir in _iter_artifact_dirs(session_root):
         metadata = self._latest_metadata(artifact_dir)

src/google/adk/artifacts/file_artifact_service.py

@@ -167,16 +167,13 @@ def _get_blob_prefix(
       session_id: Optional[str] = None,
   ) -> str:
     """Constructs the blob name prefix in GCS for a given artifact."""
-    artifact_util.validate_path_segment(app_name, "app_name")
-    artifact_util.validate_path_segment(user_id, "user_id")
     if self._file_has_user_namespace(filename):
       return f"{app_name}/{user_id}/user/{filename}"
 
     if session_id is None:
       raise InputValidationError(
           "Session ID must be provided for session-scoped artifacts."
       )
-    artifact_util.validate_path_segment(session_id, "session_id")
     return f"{app_name}/{user_id}/{session_id}/{filename}"
 
   def _get_blob_name(
@@ -371,10 +368,6 @@ def _load_artifact(
   def _list_artifact_keys(
       self, app_name: str, user_id: str, session_id: Optional[str]
   ) -> list[str]:
-    artifact_util.validate_path_segment(app_name, "app_name")
-    artifact_util.validate_path_segment(user_id, "user_id")
-    if session_id is not None:
-      artifact_util.validate_path_segment(session_id, "session_id")
     filenames = set()
 
     if session_id:

src/google/adk/artifacts/gcs_artifact_service.py

@@ -85,16 +85,13 @@ def _artifact_path(
     Returns:
         The constructed artifact path.
     """
-    artifact_util.validate_path_segment(app_name, "app_name")
-    artifact_util.validate_path_segment(user_id, "user_id")
     if self._file_has_user_namespace(filename):
       return f"{app_name}/{user_id}/user/{filename}"
 
     if session_id is None:
       raise InputValidationError(
           "Session ID must be provided for session-scoped artifacts."
       )
-    artifact_util.validate_path_segment(session_id, "session_id")
     return f"{app_name}/{user_id}/{session_id}/{filename}"
 
   @override
@@ -218,10 +215,6 @@ async def load_artifact(
   async def list_artifact_keys(
       self, *, app_name: str, user_id: str, session_id: Optional[str] = None
   ) -> list[str]:
-    artifact_util.validate_path_segment(app_name, "app_name")
-    artifact_util.validate_path_segment(user_id, "user_id")
-    if session_id is not None:
-      artifact_util.validate_path_segment(session_id, "session_id")
     usernamespace_prefix = f"{app_name}/{user_id}/user/"
     session_prefix = (
         f"{app_name}/{user_id}/{session_id}/" if session_id else None

src/google/adk/artifacts/in_memory_artifact_service.py

@@ -23,13 +23,17 @@
 from typing import Optional
 from typing import Tuple
 
+from google.adk.utils import _mtls_utils
 import google.auth
 import google.auth.exceptions
 from google.auth.transport.requests import AuthorizedSession
 from google.auth.transport.requests import Request
 import requests
 
 _VERTEX_AI_ENDPOINT = "https://{location}-aiplatform.googleapis.com/v1beta1"
+_VERTEX_AI_MTLS_ENDPOINT = (
+    "https://{location}-aiplatform.mtls.googleapis.com/v1beta1"
+)
 
 
 def check_adc() -> bool:
@@ -75,7 +79,18 @@ def _call_vertex_express_api(
   """Calls a Vertex AI Express API."""
   credentials, _ = google.auth.default()
   session = AuthorizedSession(credentials)
-  url = f"{_VERTEX_AI_ENDPOINT.format(location=location)}/vertexExpress{action}"
+
+  if _mtls_utils.use_client_cert_effective():
+    session.configure_mtls_channel()
+    endpoint = _mtls_utils.get_api_endpoint(
+        location=location,
+        default_template=_VERTEX_AI_ENDPOINT,
+        mtls_template=_VERTEX_AI_MTLS_ENDPOINT,
+    )
+  else:
+    endpoint = _VERTEX_AI_ENDPOINT.format(location=location)
+
+  url = f"{endpoint}/vertexExpress{action}"
   headers = {
       "Content-Type": "application/json",
   }

src/google/adk/cli/utils/gcp_utils.py

@@ -14,7 +14,9 @@
 
 from __future__ import annotations
 
+import logging
 from typing import Any
+from typing import cast
 from typing import Optional
 from typing import Union
 
@@ -23,13 +25,31 @@
 from pydantic import BaseModel
 from pydantic import ConfigDict
 from pydantic import Field
+from pydantic import field_serializer
+from pydantic import SerializerFunctionWrapHandler
+from pydantic_core import to_jsonable_python
 
 from ..auth.auth_tool import AuthConfig
 from ..tools.tool_confirmation import ToolConfirmation
 from .ui_widget import UiWidget
 
+logger = logging.getLogger('google_adk.' + __name__)
 
-class EventCompaction(BaseModel):
+
+def _make_json_serializable(obj: Any) -> Any:
+  """Converts an object into a JSON-serializable form.
+
+  Used as a fallback when the default Pydantic serialization fails. Delegates to
+  `pydantic_core.to_jsonable_python` so rich types (e.g. datetimes, Pydantic
+  models) are serialized faithfully instead of being discarded. Values that
+  pydantic-core cannot serialize (e.g. Python callables stored in session state)
+  are replaced with their `repr` via `serialize_unknown=True` so the overall
+  structure can still be persisted without crashing.
+  """
+  return to_jsonable_python(obj, serialize_unknown=True)
+
+
+class EventCompaction(BaseModel):  # type: ignore[misc]
   """The compaction of the events."""
 
   model_config = ConfigDict(
@@ -49,7 +69,7 @@ class EventCompaction(BaseModel):
   """The compacted content of the events."""
 
 
-class EventActions(BaseModel):
+class EventActions(BaseModel):  # type: ignore[misc]
   """Represents the actions attached to an event."""
 
   model_config = ConfigDict(
@@ -68,6 +88,27 @@ class EventActions(BaseModel):
   state_delta: dict[str, Any] = Field(default_factory=dict)
   """Indicates that the event is updating the state with the given delta."""
 
+  @field_serializer('state_delta', mode='wrap')  # type: ignore[misc, untyped-decorator]
+  def _serialize_state_delta(
+      self, value: dict[str, object], handler: SerializerFunctionWrapHandler
+  ) -> dict[str, Any]:
+    # Use a wrap serializer so the default serialization (which honors callers'
+    # `exclude`/`include` directives, e.g. the conformance harness excluding
+    # internal `_adk_*` keys) is preserved. Only fall back to sanitization when
+    # the value contains objects Pydantic cannot serialize (e.g. callables).
+    try:
+      return cast(dict[str, Any], handler(value))
+    except Exception:  # pylint: disable=broad-except
+      logger.warning(
+          'Failed to serialize `state_delta`; some values are not'
+          ' JSON-serializable (e.g. callables) and will be replaced with a'
+          ' string representation in the persisted event.',
+          exc_info=True,
+      )
+      # Re-run the handler on the sanitized value so that caller `exclude` /
+      # `include` directives are still applied to the fallback output.
+      return cast(dict[str, Any], handler(_make_json_serializable(value)))
+
   artifact_delta: dict[str, int] = Field(default_factory=dict)
   """Indicates that the event is updating an artifact. key is the filename,
   value is the version."""
@@ -108,6 +149,28 @@ class EventActions(BaseModel):
   """The agent state at the current event, used for checkpoint and resume. This
   should only be set by ADK workflow."""
 
+  @field_serializer('agent_state', mode='wrap')  # type: ignore[misc, untyped-decorator]
+  def _serialize_agent_state(
+      self,
+      value: Optional[dict[str, Any]],
+      handler: SerializerFunctionWrapHandler,
+  ) -> Optional[dict[str, Any]]:
+    if value is None:
+      return None
+    # See `_serialize_state_delta` for why a wrap serializer is used.
+    try:
+      return cast(Optional[dict[str, Any]], handler(value))
+    except Exception:  # pylint: disable=broad-except
+      logger.warning(
+          'Failed to serialize `agent_state`; some values are not'
+          ' JSON-serializable (e.g. callables) and will be replaced with a'
+          ' string representation in the persisted event.',
+          exc_info=True,
+      )
+      # Re-run the handler on the sanitized value so that caller `exclude` /
+      # `include` directives are still applied to the fallback output.
+      return cast(dict[str, Any], handler(_make_json_serializable(value)))
+
   rewind_before_invocation_id: Optional[str] = None
   """The invocation id to rewind to. This is only set for rewind event."""
 

src/google/adk/events/event_actions.py

@@ -46,6 +46,7 @@ class FeatureName(str, Enum):
   GOOGLE_CREDENTIALS_CONFIG = "GOOGLE_CREDENTIALS_CONFIG"
   GOOGLE_TOOL = "GOOGLE_TOOL"
   JSON_SCHEMA_FOR_FUNC_DECL = "JSON_SCHEMA_FOR_FUNC_DECL"
+  MCP_AGENT_SERVER = "MCP_AGENT_SERVER"
   # 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
@@ -157,6 +158,9 @@ class FeatureConfig:
     FeatureName.JSON_SCHEMA_FOR_FUNC_DECL: FeatureConfig(
         FeatureStage.EXPERIMENTAL, default_on=True
     ),
+    FeatureName.MCP_AGENT_SERVER: FeatureConfig(
+        FeatureStage.EXPERIMENTAL, default_on=True
+    ),
     FeatureName._MCP_GRACEFUL_ERROR_HANDLING: FeatureConfig(
         FeatureStage.EXPERIMENTAL, default_on=True
     ),