encounter/adk-python
0
0
Fork 0
mirror of https://github.com/encounter/adk-python.git synced 2026-07-09 18:19:28 -07:00
Code Issues Packages Projects Releases Wiki Activity

chore: Disable SetModelResponseTool workaround for Vertex AI Gemini 2+ models

Browse Source 
Gemini models now [support Function calling being used together with structured output on Vertex AI](https://cloud.google.com/vertex-ai/generative-ai/docs/multimodal/function-calling#structured-output-bp).

Co-authored-by: Xuan Yang <xygoogle@google.com>
PiperOrigin-RevId: 827709903
This commit is contained in:
Xuan Yang
2025-11-03 17:12:01 -08:00
committed by Copybara-Service
parent 8b6ee576d5
commit 6a94af24bf
6 changed files with 170 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unittests/utils/test_output_schema_utils.py
+50
View File
@@ -0,0 +1,50 @@
# 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.models.anthropic_llm import Claude
from google.adk.models.google_llm import Gemini
from google.adk.utils.output_schema_utils import can_use_output_schema_with_tools
import pytest
@pytest.mark.parametrize(
"model, env_value, expected",
[
("gemini-2.5-pro", "1", True),
("gemini-2.5-pro", "0", False),
("gemini-2.5-pro", None, False),
(Gemini(model="gemini-2.5-pro"), "1", True),
(Gemini(model="gemini-2.5-pro"), "0", False),
(Gemini(model="gemini-2.5-pro"), None, False),
("gemini-2.0-flash", "1", True),
("gemini-2.0-flash", "0", False),
("gemini-2.0-flash", None, False),
("gemini-1.5-pro", "1", False),
("gemini-1.5-pro", "0", False),
("gemini-1.5-pro", None, False),
(Claude(model="claude-3.7-sonnet"), "1", False),
(Claude(model="claude-3.7-sonnet"), "0", False),
(Claude(model="claude-3.7-sonnet"), None, False),
],
)
def test_can_use_output_schema_with_tools(
monkeypatch, model, env_value, expected
):
"""Test can_use_output_schema_with_tools."""
if env_value is not None:
monkeypatch.setenv("GOOGLE_GENAI_USE_VERTEXAI", env_value)
else:
monkeypatch.delenv("GOOGLE_GENAI_USE_VERTEXAI", raising=False)
assert can_use_output_schema_with_tools(model) == expected