scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-10-06 02:48:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 103

refactor(vertex_ai): stop reassigning optional_params in the Gemini request build

Browse source 
The resolved channel goes into a local instead of the parameter, and the test helper
takes a typed immutable mapping instead of a bare dict and variadic kwargs.
This commit is contained in:
ArthurAAM 2026-08-25 18:15:05 -03:00
parent 7c0219a1c2
commit ef9a6e7141
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
litellm/llms/vertex_ai/gemini/transformation.py
View file

@ -1185,7 +1185,7 @@ def _transform_request_body(
resolved_params: Final = resolve_response_schema_channel(
optional_params=optional_params, litellm_params=litellm_params, model=model
)
optional_params = {
request_params: Final = {
k: v
for k, v in resolved_params.items()
if k not in remove_keys and k != VERTEX_AI_USE_RESPONSE_JSON_SCHEMA_PARAM
@ -1200,18 +1200,18 @@ def _transform_request_body(
content = litellm.VertexGeminiConfig()._transform_messages(
messages=messages, model=model, litellm_params=litellm_params
)
tools: Final[Tools | None] = optional_params.pop("tools", None)
tool_choice: Final[ToolConfig | None] = optional_params.pop("tool_choice", None)
include_server_side_tool_invocations: bool = optional_params.pop("include_server_side_tool_invocations", False)
safety_settings: list[SafetSettingsConfig] | None = optional_params.pop("safety_settings", None)
tools: Final[Tools | None] = request_params.pop("tools", None)
tool_choice: Final[ToolConfig | None] = request_params.pop("tool_choice", None)
include_server_side_tool_invocations: bool = request_params.pop("include_server_side_tool_invocations", False)
safety_settings: list[SafetSettingsConfig] | None = request_params.pop("safety_settings", None)
# Drop output_config as it's not supported by Vertex AI
optional_params.pop("output_config", None)
request_params.pop("output_config", None)
config_fields: Final = GenerationConfig.__annotations__.keys()
# labels: optional explicit param and/or metadata.requester_metadata (OpenAI metadata)
labels: Final = pop_vertex_request_labels(optional_params, litellm_params)
labels: Final = pop_vertex_request_labels(request_params, litellm_params)
filtered_params = {k: v for k, v in optional_params.items() if _get_equivalent_key(k, set(config_fields))}
filtered_params = {k: v for k, v in request_params.items() if _get_equivalent_key(k, set(config_fields))}
generation_config: Final[GenerationConfig | None] = GenerationConfig(**filtered_params)
@ -1247,7 +1247,7 @@ def _transform_request_body(
if cached_content is not None:
data["cachedContent"] = cached_content
if service_tier := optional_params.pop("service_tier", None):
if service_tier := request_params.pop("service_tier", None):
if isinstance(service_tier, str):
if service_tier.lower() == "default":
data["serviceTier"] = "standard"
@ -1259,7 +1259,7 @@ def _transform_request_body(
# Only add labels for Vertex AI endpoints (not Google GenAI/AI Studio) and only if non-empty
if labels and custom_llm_provider != LlmProviders.GEMINI:
data["labels"] = labels
_pop_and_merge_extra_body(data, optional_params)
_pop_and_merge_extra_body(data, request_params)
_rewrite_google_maps_response_format(data)
except Exception as e:
raise e

5
tests/test_litellm/llms/vertex_ai/gemini/test_transformation.py
View file

@ -1,7 +1,8 @@
import json
from collections.abc import Mapping
from typing import Optional
from types import MappingProxyType
from typing import Final, Optional
import pytest
@ -361,7 +362,7 @@ def _gemini_request_body(
litellm_params: Mapping[str, bool],
request_override: Optional[bool] = None,
) -> RequestBody:
override_kwargs: dict[str, bool] = (
override_kwargs: Final[Mapping[str, bool]] = MappingProxyType(
{} if request_override is None else {"vertex_ai_use_response_json_schema": request_override}
)
optional_params = litellm.utils.get_optional_params(