Merge branch 'main' into feat/bigquery-default-attributes

Author: andrewrfitz

src/google/adk/cli/cli_deploy.py

@@ -689,6 +689,7 @@ def to_agent_engine(
     adk_app: str,
     staging_bucket: Optional[str] = None,
     trace_to_cloud: Optional[bool] = None,
+    otel_to_cloud: Optional[bool] = None,
     api_key: Optional[str] = None,
     adk_app_object: Optional[str] = None,
     agent_engine_id: Optional[str] = None,
@@ -733,6 +734,8 @@ def to_agent_engine(
     staging_bucket (str): Deprecated. This argument is no longer required or
       used.
     trace_to_cloud (bool): Whether to enable Cloud Trace.
+    otel_to_cloud (bool): Whether to enable exporting OpenTelemetry signals
+      to Google Cloud.
     api_key (str): Optional. The API key to use for Express Mode.
       If not provided, the API key from the GOOGLE_API_KEY environment variable
       will be used. It will only be used if GOOGLE_GENAI_USE_VERTEXAI is true.
@@ -910,6 +913,14 @@ def to_agent_engine(
       if 'GOOGLE_API_KEY' in env_vars:
         api_key = env_vars['GOOGLE_API_KEY']
         click.echo(f'api_key set by GOOGLE_API_KEY in {env_file}')
+    if otel_to_cloud:
+      if 'GOOGLE_CLOUD_AGENT_ENGINE_ENABLE_TELEMETRY' in env_vars:
+        click.secho(
+            'Ignoring GOOGLE_CLOUD_AGENT_ENGINE_ENABLE_TELEMETRY in .env'
+            ' as `--otel_to_cloud` was explicitly passed and takes precedence',
+            fg='yellow',
+        )
+      env_vars['GOOGLE_CLOUD_AGENT_ENGINE_ENABLE_TELEMETRY'] = 'true'
     if env_vars:
       if 'env_vars' in agent_config:
         click.echo(

src/google/adk/cli/cli_tools_click.py

@@ -1751,6 +1751,14 @@ def cli_migrate_session(
     default=None,
     help="Optional. Whether to enable Cloud Trace for Agent Engine.",
 )
+@click.option(
+    "--otel_to_cloud",
+    type=bool,
+    is_flag=True,
+    show_default=True,
+    default=None,
+    help="Optional. Whether to enable OpenTelemetry for Agent Engine.",
+)
 @click.option(
     "--display_name",
     type=str,
@@ -1842,6 +1850,7 @@ def cli_deploy_agent_engine(
     staging_bucket: Optional[str],
     agent_engine_id: Optional[str],
     trace_to_cloud: Optional[bool],
+    otel_to_cloud: Optional[bool],
     api_key: Optional[str],
     display_name: str,
     description: str,
@@ -1872,6 +1881,7 @@ def cli_deploy_agent_engine(
         region=region,
         agent_engine_id=agent_engine_id,
         trace_to_cloud=trace_to_cloud,
+        otel_to_cloud=otel_to_cloud,
         api_key=api_key,
         adk_app_object=adk_app_object,
         display_name=display_name,

src/google/adk/tools/load_artifacts_tool.py

@@ -24,6 +24,8 @@
 from google.genai import types
 from typing_extensions import override
 
+from ..features import FeatureName
+from ..features import is_feature_enabled
 from .base_tool import BaseTool
 
 # MIME types Gemini accepts for inline data in requests.
@@ -132,6 +134,20 @@ def __init__(self):
     )
 
   def _get_declaration(self) -> types.FunctionDeclaration | None:
+    if is_feature_enabled(FeatureName.JSON_SCHEMA_FOR_FUNC_DECL):
+      return types.FunctionDeclaration(
+          name=self.name,
+          description=self.description,
+          parameters_json_schema={
+              'type': 'object',
+              'properties': {
+                  'artifact_names': {
+                      'type': 'array',
+                      'items': {'type': 'string'},
+                  },
+              },
+          },
+      )
     return types.FunctionDeclaration(
         name=self.name,
         description=self.description,

src/google/adk/tools/load_memory_tool.py

@@ -21,6 +21,8 @@
 from pydantic import Field
 from typing_extensions import override
 
+from ..features import FeatureName
+from ..features import is_feature_enabled
 from ..memory.memory_entry import MemoryEntry
 from .function_tool import FunctionTool
 from .tool_context import ToolContext
@@ -59,6 +61,18 @@ def __init__(self):
 
   @override
   def _get_declaration(self) -> types.FunctionDeclaration | None:
+    if is_feature_enabled(FeatureName.JSON_SCHEMA_FOR_FUNC_DECL):
+      return types.FunctionDeclaration(
+          name=self.name,
+          description=self.description,
+          parameters_json_schema={
+              'type': 'object',
+              'properties': {
+                  'query': {'type': 'string'},
+              },
+              'required': ['query'],
+          },
+      )
     return types.FunctionDeclaration(
         name=self.name,
         description=self.description,

src/google/adk/tools/retrieval/base_retrieval_tool.py

@@ -12,16 +12,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import annotations
+
 from google.genai import types
 from typing_extensions import override
 
+from ...features import FeatureName
+from ...features import is_feature_enabled
 from ..base_tool import BaseTool
 
 
 class BaseRetrievalTool(BaseTool):
 
   @override
   def _get_declaration(self) -> types.FunctionDeclaration:
+    if is_feature_enabled(FeatureName.JSON_SCHEMA_FOR_FUNC_DECL):
+      return types.FunctionDeclaration(
+          name=self.name,
+          description=self.description,
+          parameters_json_schema={
+              'type': 'object',
+              'properties': {
+                  'query': {
+                      'type': 'string',
+                      'description': 'The query to retrieve.',
+                  },
+              },
+          },
+      )
     return types.FunctionDeclaration(
         name=self.name,
         description=self.description,

tests/unittests/cli/utils/test_cli_tools_click.py

@@ -410,6 +410,38 @@ def test_cli_deploy_agent_engine_success(
   assert called_kwargs.get("region") == "us-central1"
 
 
+# cli deploy agent_engine with --otel_to_cloud
+def test_cli_deploy_agent_engine_otel_to_cloud_success(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+  """Successful path should call cli_deploy.to_agent_engine with --otel_to_cloud."""
+  rec = _Recorder()
+  monkeypatch.setattr(cli_tools_click.cli_deploy, "to_agent_engine", rec)
+
+  agent_dir = tmp_path / "agent_ae"
+  agent_dir.mkdir()
+  runner = CliRunner()
+  result = runner.invoke(
+      cli_tools_click.main,
+      [
+          "deploy",
+          "agent_engine",
+          "--project",
+          "test-proj",
+          "--region",
+          "us-central1",
+          "--otel_to_cloud",
+          str(agent_dir),
+      ],
+  )
+  assert result.exit_code == 0
+  assert rec.calls, "cli_deploy.to_agent_engine must be invoked"
+  called_kwargs = rec.calls[0][1]
+  assert called_kwargs.get("project") == "test-proj"
+  assert called_kwargs.get("region") == "us-central1"
+  assert called_kwargs.get("otel_to_cloud")
+
+
 # cli deploy gke
 def test_cli_deploy_gke_success(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch

tests/unittests/tools/retrieval/test_base_retrieval_tool.py

@@ -0,0 +1,67 @@
+# Copyright 2025 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.
+
+from google.adk.features import FeatureName
+from google.adk.features._feature_registry import temporary_feature_override
+from google.adk.tools.retrieval.base_retrieval_tool import BaseRetrievalTool
+from google.genai import types
+
+
+class _TestRetrievalTool(BaseRetrievalTool):
+  """Concrete implementation of BaseRetrievalTool for testing."""
+
+  def __init__(self):
+    super().__init__(
+        name='test_retrieval',
+        description='A test retrieval tool.',
+    )
+
+  async def run_async(self, *, args, tool_context):
+    return {'result': 'test'}
+
+
+def test_get_declaration_with_json_schema_feature_disabled():
+  """Test that _get_declaration uses parameters when feature is disabled."""
+  tool = _TestRetrievalTool()
+
+  with temporary_feature_override(FeatureName.JSON_SCHEMA_FOR_FUNC_DECL, False):
+    declaration = tool._get_declaration()
+
+  assert declaration.name == 'test_retrieval'
+  assert declaration.description == 'A test retrieval tool.'
+  assert declaration.parameters_json_schema is None
+  assert isinstance(declaration.parameters, types.Schema)
+  assert declaration.parameters.type == types.Type.OBJECT
+  assert 'query' in declaration.parameters.properties
+
+
+def test_get_declaration_with_json_schema_feature_enabled():
+  """Test that _get_declaration uses parameters_json_schema when feature is enabled."""
+  tool = _TestRetrievalTool()
+
+  with temporary_feature_override(FeatureName.JSON_SCHEMA_FOR_FUNC_DECL, True):
+    declaration = tool._get_declaration()
+
+  assert declaration.name == 'test_retrieval'
+  assert declaration.description == 'A test retrieval tool.'
+  assert declaration.parameters is None
+  assert declaration.parameters_json_schema == {
+      'type': 'object',
+      'properties': {
+          'query': {
+              'type': 'string',
+              'description': 'The query to retrieve.',
+          },
+      },
+  }

tests/unittests/tools/test_load_artifacts_tool.py

@@ -14,6 +14,8 @@
 
 import base64
 
+from google.adk.features import FeatureName
+from google.adk.features._feature_registry import temporary_feature_override
 from google.adk.models.llm_request import LlmRequest
 from google.adk.tools.load_artifacts_tool import _maybe_base64_to_bytes
 from google.adk.tools.load_artifacts_tool import load_artifacts_tool
@@ -160,3 +162,21 @@ def test_maybe_base64_to_bytes_returns_none_for_invalid():
   """Invalid base64 strings return None."""
   # Single character is invalid (base64 requires length % 4 == 0 after padding)
   assert _maybe_base64_to_bytes('x') is None
+
+
+def test_get_declaration_with_json_schema_feature_enabled():
+  """Test that _get_declaration uses parameters_json_schema when feature is enabled."""
+  with temporary_feature_override(FeatureName.JSON_SCHEMA_FOR_FUNC_DECL, True):
+    declaration = load_artifacts_tool._get_declaration()
+
+  assert declaration.name == 'load_artifacts'
+  assert declaration.parameters is None
+  assert declaration.parameters_json_schema == {
+      'type': 'object',
+      'properties': {
+          'artifact_names': {
+              'type': 'array',
+              'items': {'type': 'string'},
+          },
+      },
+  }

tests/unittests/tools/test_load_memory_tool.py

@@ -0,0 +1,46 @@
+# Copyright 2025 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.
+
+from google.adk.features import FeatureName
+from google.adk.features._feature_registry import temporary_feature_override
+from google.adk.tools.load_memory_tool import load_memory_tool
+from google.genai import types
+
+
+def test_get_declaration_with_json_schema_feature_disabled():
+  """Test that _get_declaration uses parameters when feature is disabled."""
+  with temporary_feature_override(FeatureName.JSON_SCHEMA_FOR_FUNC_DECL, False):
+    declaration = load_memory_tool._get_declaration()
+
+  assert declaration.name == 'load_memory'
+  assert declaration.parameters_json_schema is None
+  assert isinstance(declaration.parameters, types.Schema)
+  assert declaration.parameters.type == types.Type.OBJECT
+  assert 'query' in declaration.parameters.properties
+
+
+def test_get_declaration_with_json_schema_feature_enabled():
+  """Test that _get_declaration uses parameters_json_schema when feature is enabled."""
+  with temporary_feature_override(FeatureName.JSON_SCHEMA_FOR_FUNC_DECL, True):
+    declaration = load_memory_tool._get_declaration()
+
+  assert declaration.name == 'load_memory'
+  assert declaration.parameters is None
+  assert declaration.parameters_json_schema == {
+      'type': 'object',
+      'properties': {
+          'query': {'type': 'string'},
+      },
+      'required': ['query'],
+  }