mirror of
https://github.com/encounter/adk-python.git
synced 2026-07-09 18:19:28 -07:00
Merge https://github.com/google/adk-python/pull/1211 ### Description When using the Google.GenAI backend (GEMINI_API), file uploads fail if the `file_data` or `inline_data` parts of the request contain a `display_name`. The Gemini API (non-Vertex) does not support this attribute, causing a `ValueError`. This commit updates the `_preprocess_request` method in the `Gemini` class to sanitize the request. It now iterates through all content parts and sets `display_name` to `None` if the determined backend is `GEMINI_API`. This ensures compatibility, similar to the existing handling of the `labels` attribute. Fixes #1182 ### Testing Plan **1. Unit Tests** - Added a new parameterized test `test_preprocess_request_handles_backend_specific_fields` to `tests/unittests/models/test_google_llm.py`. - This test verifies: - When the backend is `GEMINI_API`, `display_name` in `file_data` and `inline_data` is correctly set to `None`. - When the backend is `VERTEX_AI`, `display_name` remains unchanged. - All unit tests passed successfully. ```shell pytest ./tests/unittests/models/test_google_llm.py ░▒▓ ✔ adk-python base system 21:14:02 ============================================================================================ test session starts ============================================================================================ platform darwin -- Python 3.12.10, pytest-8.3.5, pluggy-1.6.0 rootdir: /Users/leo/PycharmProjects/adk-python configfile: pyproject.toml plugins: anyio-4.9.0, langsmith-0.3.42, asyncio-0.26.0, mock-3.14.0, xdist-3.6.1 asyncio: mode=Mode.AUTO, asyncio_default_fixture_loop_scope=function, asyncio_default_test_loop_scope=function collected 20 items tests/unittests/models/test_google_llm.py .................... [100%] ============================================================================================ 20 passed in 3.19s ============================================================================================= ``` **2. Manual End-to-End (E2E) Test** I manually verified the fix using `adk web`. The test was configured to use a **Google AI Studio API key**, which is the scenario where the bug occurs. - **Before the fix:** When uploading a file, the request failed with the error: `{"error": "display_name parameter is not supported in Gemini API."}`. This confirms the bug. <img width="968" alt="Screenshot 2025-06-06 at 21 22 35" src="https://github.com/user-attachments/assets/f1ab2db2-d5ec-40fc-a182-9932562b21e1" /> - **After the fix:** With the patch applied, the same file upload was processed successfully. The agent correctly analyzed the file and responded without errors. <img width="973" alt="Screenshot 2025-06-06 at 21 23 24" src="https://github.com/user-attachments/assets/e03228f6-0b7d-4bf9-955a-ac24efb4fb72" /> COPYBARA_INTEGRATE_REVIEW=https://github.com/google/adk-python/pull/1211 from ystory:fix/display-name d3efebe74aca635a7a255063e64f07cc44016f05 PiperOrigin-RevId: 769278445
423 lines
13 KiB
Python
423 lines
13 KiB
Python
# 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.
|
|
|
|
import os
|
|
import sys
|
|
from typing import Optional
|
|
from unittest import mock
|
|
|
|
from google.adk import version as adk_version
|
|
from google.adk.models.gemini_llm_connection import GeminiLlmConnection
|
|
from google.adk.models.google_llm import _AGENT_ENGINE_TELEMETRY_ENV_VARIABLE_NAME
|
|
from google.adk.models.google_llm import _AGENT_ENGINE_TELEMETRY_TAG
|
|
from google.adk.models.google_llm import Gemini
|
|
from google.adk.models.llm_request import LlmRequest
|
|
from google.adk.models.llm_response import LlmResponse
|
|
from google.adk.utils.variant_utils import GoogleLLMVariant
|
|
from google.genai import types
|
|
from google.genai import version as genai_version
|
|
from google.genai.types import Content
|
|
from google.genai.types import Part
|
|
import pytest
|
|
|
|
|
|
@pytest.fixture
|
|
def generate_content_response():
|
|
return types.GenerateContentResponse(
|
|
candidates=[
|
|
types.Candidate(
|
|
content=Content(
|
|
role="model",
|
|
parts=[Part.from_text(text="Hello, how can I help you?")],
|
|
),
|
|
finish_reason=types.FinishReason.STOP,
|
|
)
|
|
]
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def gemini_llm():
|
|
return Gemini(model="gemini-1.5-flash")
|
|
|
|
|
|
@pytest.fixture
|
|
def llm_request():
|
|
return LlmRequest(
|
|
model="gemini-1.5-flash",
|
|
contents=[Content(role="user", parts=[Part.from_text(text="Hello")])],
|
|
config=types.GenerateContentConfig(
|
|
temperature=0.1,
|
|
response_modalities=[types.Modality.TEXT],
|
|
system_instruction="You are a helpful assistant",
|
|
),
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def mock_os_environ():
|
|
initial_env = os.environ.copy()
|
|
with mock.patch.dict(os.environ, initial_env, clear=False) as m:
|
|
yield m
|
|
|
|
|
|
def test_supported_models():
|
|
models = Gemini.supported_models()
|
|
assert len(models) == 3
|
|
assert models[0] == r"gemini-.*"
|
|
assert models[1] == r"projects\/.+\/locations\/.+\/endpoints\/.+"
|
|
assert (
|
|
models[2]
|
|
== r"projects\/.+\/locations\/.+\/publishers\/google\/models\/gemini.+"
|
|
)
|
|
|
|
|
|
def test_client_version_header():
|
|
model = Gemini(model="gemini-1.5-flash")
|
|
client = model.api_client
|
|
adk_header = (
|
|
f"google-adk/{adk_version.__version__} gl-python/{sys.version.split()[0]}"
|
|
)
|
|
genai_header = (
|
|
f"google-genai-sdk/{genai_version.__version__} gl-python/{sys.version.split()[0]} "
|
|
)
|
|
expected_header = genai_header + adk_header
|
|
|
|
assert (
|
|
expected_header
|
|
in client._api_client._http_options.headers["x-goog-api-client"]
|
|
)
|
|
assert (
|
|
expected_header in client._api_client._http_options.headers["user-agent"]
|
|
)
|
|
|
|
|
|
def test_client_version_header_with_agent_engine(mock_os_environ):
|
|
os.environ[_AGENT_ENGINE_TELEMETRY_ENV_VARIABLE_NAME] = "my_test_project"
|
|
model = Gemini(model="gemini-1.5-flash")
|
|
client = model.api_client
|
|
adk_header_base = f"google-adk/{adk_version.__version__}"
|
|
adk_header_with_telemetry = (
|
|
f"{adk_header_base}+{_AGENT_ENGINE_TELEMETRY_TAG}"
|
|
f" gl-python/{sys.version.split()[0]}"
|
|
)
|
|
genai_header = (
|
|
f"google-genai-sdk/{genai_version.__version__} "
|
|
f"gl-python/{sys.version.split()[0]} "
|
|
)
|
|
expected_header = genai_header + adk_header_with_telemetry
|
|
|
|
assert (
|
|
expected_header
|
|
in client._api_client._http_options.headers["x-goog-api-client"]
|
|
)
|
|
assert (
|
|
expected_header in client._api_client._http_options.headers["user-agent"]
|
|
)
|
|
|
|
|
|
def test_maybe_append_user_content(gemini_llm, llm_request):
|
|
# Test with user content already present
|
|
gemini_llm._maybe_append_user_content(llm_request)
|
|
assert len(llm_request.contents) == 1
|
|
|
|
# Test with model content as the last message
|
|
llm_request.contents.append(
|
|
Content(role="model", parts=[Part.from_text(text="Response")])
|
|
)
|
|
gemini_llm._maybe_append_user_content(llm_request)
|
|
assert len(llm_request.contents) == 3
|
|
assert llm_request.contents[-1].role == "user"
|
|
assert "Continue processing" in llm_request.contents[-1].parts[0].text
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_generate_content_async(
|
|
gemini_llm, llm_request, generate_content_response
|
|
):
|
|
with mock.patch.object(gemini_llm, "api_client") as mock_client:
|
|
# Create a mock coroutine that returns the generate_content_response
|
|
async def mock_coro():
|
|
return generate_content_response
|
|
|
|
# Assign the coroutine to the mocked method
|
|
mock_client.aio.models.generate_content.return_value = mock_coro()
|
|
|
|
responses = [
|
|
resp
|
|
async for resp in gemini_llm.generate_content_async(
|
|
llm_request, stream=False
|
|
)
|
|
]
|
|
|
|
assert len(responses) == 1
|
|
assert isinstance(responses[0], LlmResponse)
|
|
assert responses[0].content.parts[0].text == "Hello, how can I help you?"
|
|
mock_client.aio.models.generate_content.assert_called_once()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_generate_content_async_stream(gemini_llm, llm_request):
|
|
with mock.patch.object(gemini_llm, "api_client") as mock_client:
|
|
# Create mock stream responses
|
|
class MockAsyncIterator:
|
|
|
|
def __init__(self, seq):
|
|
self.iter = iter(seq)
|
|
|
|
def __aiter__(self):
|
|
return self
|
|
|
|
async def __anext__(self):
|
|
try:
|
|
return next(self.iter)
|
|
except StopIteration:
|
|
raise StopAsyncIteration
|
|
|
|
mock_responses = [
|
|
types.GenerateContentResponse(
|
|
candidates=[
|
|
types.Candidate(
|
|
content=Content(
|
|
role="model", parts=[Part.from_text(text="Hello")]
|
|
),
|
|
finish_reason=None,
|
|
)
|
|
]
|
|
),
|
|
types.GenerateContentResponse(
|
|
candidates=[
|
|
types.Candidate(
|
|
content=Content(
|
|
role="model", parts=[Part.from_text(text=", how")]
|
|
),
|
|
finish_reason=None,
|
|
)
|
|
]
|
|
),
|
|
types.GenerateContentResponse(
|
|
candidates=[
|
|
types.Candidate(
|
|
content=Content(
|
|
role="model",
|
|
parts=[Part.from_text(text=" can I help you?")],
|
|
),
|
|
finish_reason=types.FinishReason.STOP,
|
|
)
|
|
]
|
|
),
|
|
]
|
|
|
|
# Create a mock coroutine that returns the MockAsyncIterator
|
|
async def mock_coro():
|
|
return MockAsyncIterator(mock_responses)
|
|
|
|
# Set the mock to return the coroutine
|
|
mock_client.aio.models.generate_content_stream.return_value = mock_coro()
|
|
|
|
responses = [
|
|
resp
|
|
async for resp in gemini_llm.generate_content_async(
|
|
llm_request, stream=True
|
|
)
|
|
]
|
|
|
|
# Assertions remain the same
|
|
assert len(responses) == 4
|
|
assert responses[0].partial is True
|
|
assert responses[1].partial is True
|
|
assert responses[2].partial is True
|
|
assert responses[3].content.parts[0].text == "Hello, how can I help you?"
|
|
mock_client.aio.models.generate_content_stream.assert_called_once()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_generate_content_async_stream_preserves_thinking_and_text_parts(
|
|
gemini_llm, llm_request
|
|
):
|
|
with mock.patch.object(gemini_llm, "api_client") as mock_client:
|
|
|
|
class MockAsyncIterator:
|
|
|
|
def __init__(self, seq):
|
|
self._iter = iter(seq)
|
|
|
|
def __aiter__(self):
|
|
return self
|
|
|
|
async def __anext__(self):
|
|
try:
|
|
return next(self._iter)
|
|
except StopIteration:
|
|
raise StopAsyncIteration
|
|
|
|
response1 = types.GenerateContentResponse(
|
|
candidates=[
|
|
types.Candidate(
|
|
content=Content(
|
|
role="model",
|
|
parts=[Part(text="Think1", thought=True)],
|
|
),
|
|
finish_reason=None,
|
|
)
|
|
]
|
|
)
|
|
response2 = types.GenerateContentResponse(
|
|
candidates=[
|
|
types.Candidate(
|
|
content=Content(
|
|
role="model",
|
|
parts=[Part(text="Think2", thought=True)],
|
|
),
|
|
finish_reason=None,
|
|
)
|
|
]
|
|
)
|
|
response3 = types.GenerateContentResponse(
|
|
candidates=[
|
|
types.Candidate(
|
|
content=Content(
|
|
role="model",
|
|
parts=[Part.from_text(text="Answer.")],
|
|
),
|
|
finish_reason=types.FinishReason.STOP,
|
|
)
|
|
]
|
|
)
|
|
|
|
async def mock_coro():
|
|
return MockAsyncIterator([response1, response2, response3])
|
|
|
|
mock_client.aio.models.generate_content_stream.return_value = mock_coro()
|
|
|
|
responses = [
|
|
resp
|
|
async for resp in gemini_llm.generate_content_async(
|
|
llm_request, stream=True
|
|
)
|
|
]
|
|
|
|
assert len(responses) == 4
|
|
assert responses[0].partial is True
|
|
assert responses[1].partial is True
|
|
assert responses[2].partial is True
|
|
assert responses[3].content.parts[0].text == "Think1Think2"
|
|
assert responses[3].content.parts[0].thought is True
|
|
assert responses[3].content.parts[1].text == "Answer."
|
|
mock_client.aio.models.generate_content_stream.assert_called_once()
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_connect(gemini_llm, llm_request):
|
|
# Create a mock connection
|
|
mock_connection = mock.MagicMock(spec=GeminiLlmConnection)
|
|
|
|
# Create a mock context manager
|
|
class MockContextManager:
|
|
|
|
async def __aenter__(self):
|
|
return mock_connection
|
|
|
|
async def __aexit__(self, *args):
|
|
pass
|
|
|
|
# Mock the connect method at the class level
|
|
with mock.patch(
|
|
"google.adk.models.google_llm.Gemini.connect",
|
|
return_value=MockContextManager(),
|
|
):
|
|
async with gemini_llm.connect(llm_request) as connection:
|
|
assert connection is mock_connection
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
(
|
|
"api_backend, "
|
|
"expected_file_display_name, "
|
|
"expected_inline_display_name, "
|
|
"expected_labels"
|
|
),
|
|
[
|
|
(
|
|
GoogleLLMVariant.GEMINI_API,
|
|
None,
|
|
None,
|
|
None,
|
|
),
|
|
(
|
|
GoogleLLMVariant.VERTEX_AI,
|
|
"My Test PDF",
|
|
"My Test Image",
|
|
{"key": "value"},
|
|
),
|
|
],
|
|
)
|
|
def test_preprocess_request_handles_backend_specific_fields(
|
|
gemini_llm: Gemini,
|
|
api_backend: GoogleLLMVariant,
|
|
expected_file_display_name: Optional[str],
|
|
expected_inline_display_name: Optional[str],
|
|
expected_labels: Optional[str],
|
|
):
|
|
"""
|
|
Tests that _preprocess_request correctly sanitizes fields based on the API backend.
|
|
|
|
- For GEMINI_API, it should remove 'display_name' from file/inline data
|
|
and remove 'labels' from the config.
|
|
- For VERTEX_AI, it should leave these fields untouched.
|
|
"""
|
|
# Arrange: Create a request with fields that need to be preprocessed.
|
|
llm_request_with_files = LlmRequest(
|
|
model="gemini-1.5-flash",
|
|
contents=[
|
|
Content(
|
|
role="user",
|
|
parts=[
|
|
Part(
|
|
file_data=types.FileData(
|
|
file_uri="gs://bucket/file.pdf",
|
|
mime_type="application/pdf",
|
|
display_name="My Test PDF",
|
|
)
|
|
),
|
|
Part(
|
|
inline_data=types.Blob(
|
|
data=b"some_bytes",
|
|
mime_type="image/png",
|
|
display_name="My Test Image",
|
|
)
|
|
),
|
|
],
|
|
)
|
|
],
|
|
config=types.GenerateContentConfig(labels={"key": "value"}),
|
|
)
|
|
|
|
# Mock the _api_backend property to control the test scenario
|
|
with mock.patch.object(
|
|
Gemini, "_api_backend", new_callable=mock.PropertyMock
|
|
) as mock_backend:
|
|
mock_backend.return_value = api_backend
|
|
|
|
# Act: Run the preprocessing method
|
|
gemini_llm._preprocess_request(llm_request_with_files)
|
|
|
|
# Assert: Check if the fields were correctly processed
|
|
file_part = llm_request_with_files.contents[0].parts[0]
|
|
inline_part = llm_request_with_files.contents[0].parts[1]
|
|
|
|
assert file_part.file_data.display_name == expected_file_display_name
|
|
assert inline_part.inline_data.display_name == expected_inline_display_name
|
|
assert llm_request_with_files.config.labels == expected_labels
|