google-genai 1.16.1__py3-none-any.whl → 1.17.0__py3-none-any.whl

google/genai/_automatic_function_calling_util.py

@@ -37,6 +37,7 @@ _py_builtin_type_to_schema_type = {
     bool: types.Type.BOOLEAN,
     list: types.Type.ARRAY,
     dict: types.Type.OBJECT,
+    None: types.Type.NULL,
 }
 
 

google/genai/_live_converters.py

@@ -281,6 +281,42 @@ def _Blob_to_vertex(
   return to_object
 
 
+def _FileData_to_mldev(
+    api_client: BaseApiClient,
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
+  to_object: dict[str, Any] = {}
+  if getv(from_object, ['display_name']) is not None:
+    raise ValueError('display_name parameter is not supported in Gemini API.')
+
+  if getv(from_object, ['file_uri']) is not None:
+    setv(to_object, ['fileUri'], getv(from_object, ['file_uri']))
+
+  if getv(from_object, ['mime_type']) is not None:
+    setv(to_object, ['mimeType'], getv(from_object, ['mime_type']))
+
+  return to_object
+
+
+def _FileData_to_vertex(
+    api_client: BaseApiClient,
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
+  to_object: dict[str, Any] = {}
+  if getv(from_object, ['display_name']) is not None:
+    setv(to_object, ['displayName'], getv(from_object, ['display_name']))
+
+  if getv(from_object, ['file_uri']) is not None:
+    setv(to_object, ['fileUri'], getv(from_object, ['file_uri']))
+
+  if getv(from_object, ['mime_type']) is not None:
+    setv(to_object, ['mimeType'], getv(from_object, ['mime_type']))
+
+  return to_object
+
+
 def _Part_to_mldev(
     api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
@@ -308,6 +344,15 @@ def _Part_to_mldev(
         ),
     )
 
+  if getv(from_object, ['file_data']) is not None:
+    setv(
+        to_object,
+        ['fileData'],
+        _FileData_to_mldev(
+            api_client, getv(from_object, ['file_data']), to_object
+        ),
+    )
+
   if getv(from_object, ['code_execution_result']) is not None:
     setv(
         to_object,
@@ -318,9 +363,6 @@ def _Part_to_mldev(
   if getv(from_object, ['executable_code']) is not None:
     setv(to_object, ['executableCode'], getv(from_object, ['executable_code']))
 
-  if getv(from_object, ['file_data']) is not None:
-    setv(to_object, ['fileData'], getv(from_object, ['file_data']))
-
   if getv(from_object, ['function_call']) is not None:
     setv(to_object, ['functionCall'], getv(from_object, ['function_call']))
 
@@ -364,6 +406,15 @@ def _Part_to_vertex(
         ),
     )
 
+  if getv(from_object, ['file_data']) is not None:
+    setv(
+        to_object,
+        ['fileData'],
+        _FileData_to_vertex(
+            api_client, getv(from_object, ['file_data']), to_object
+        ),
+    )
+
   if getv(from_object, ['code_execution_result']) is not None:
     setv(
         to_object,
@@ -374,9 +425,6 @@ def _Part_to_vertex(
   if getv(from_object, ['executable_code']) is not None:
     setv(to_object, ['executableCode'], getv(from_object, ['executable_code']))
 
-  if getv(from_object, ['file_data']) is not None:
-    setv(to_object, ['fileData'], getv(from_object, ['file_data']))
-
   if getv(from_object, ['function_call']) is not None:
     setv(to_object, ['functionCall'], getv(from_object, ['function_call']))
 
@@ -2345,13 +2393,6 @@ def _LiveMusicGenerationConfig_to_mldev(
         getv(from_object, ['only_bass_and_drums']),
     )
 
-  if getv(from_object, ['music_generation_mode']) is not None:
-    setv(
-        to_object,
-        ['musicGenerationMode'],
-        getv(from_object, ['music_generation_mode']),
-    )
-
   return to_object
 
 
@@ -2396,11 +2437,6 @@ def _LiveMusicGenerationConfig_to_vertex(
         'only_bass_and_drums parameter is not supported in Vertex AI.'
     )
 
-  if getv(from_object, ['music_generation_mode']) is not None:
-    raise ValueError(
-        'music_generation_mode parameter is not supported in Vertex AI.'
-    )
-
   return to_object
 
 
@@ -2653,6 +2689,40 @@ def _Blob_from_vertex(
   return to_object
 
 
+def _FileData_from_mldev(
+    api_client: BaseApiClient,
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
+  to_object: dict[str, Any] = {}
+
+  if getv(from_object, ['fileUri']) is not None:
+    setv(to_object, ['file_uri'], getv(from_object, ['fileUri']))
+
+  if getv(from_object, ['mimeType']) is not None:
+    setv(to_object, ['mime_type'], getv(from_object, ['mimeType']))
+
+  return to_object
+
+
+def _FileData_from_vertex(
+    api_client: BaseApiClient,
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
+  to_object: dict[str, Any] = {}
+  if getv(from_object, ['displayName']) is not None:
+    setv(to_object, ['display_name'], getv(from_object, ['displayName']))
+
+  if getv(from_object, ['fileUri']) is not None:
+    setv(to_object, ['file_uri'], getv(from_object, ['fileUri']))
+
+  if getv(from_object, ['mimeType']) is not None:
+    setv(to_object, ['mime_type'], getv(from_object, ['mimeType']))
+
+  return to_object
+
+
 def _Part_from_mldev(
     api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
@@ -2680,6 +2750,15 @@ def _Part_from_mldev(
         ),
     )
 
+  if getv(from_object, ['fileData']) is not None:
+    setv(
+        to_object,
+        ['file_data'],
+        _FileData_from_mldev(
+            api_client, getv(from_object, ['fileData']), to_object
+        ),
+    )
+
   if getv(from_object, ['codeExecutionResult']) is not None:
     setv(
         to_object,
@@ -2690,9 +2769,6 @@ def _Part_from_mldev(
   if getv(from_object, ['executableCode']) is not None:
     setv(to_object, ['executable_code'], getv(from_object, ['executableCode']))
 
-  if getv(from_object, ['fileData']) is not None:
-    setv(to_object, ['file_data'], getv(from_object, ['fileData']))
-
   if getv(from_object, ['functionCall']) is not None:
     setv(to_object, ['function_call'], getv(from_object, ['functionCall']))
 
@@ -2736,6 +2812,15 @@ def _Part_from_vertex(
         ),
     )
 
+  if getv(from_object, ['fileData']) is not None:
+    setv(
+        to_object,
+        ['file_data'],
+        _FileData_from_vertex(
+            api_client, getv(from_object, ['fileData']), to_object
+        ),
+    )
+
   if getv(from_object, ['codeExecutionResult']) is not None:
     setv(
         to_object,
@@ -2746,9 +2831,6 @@ def _Part_from_vertex(
   if getv(from_object, ['executableCode']) is not None:
     setv(to_object, ['executable_code'], getv(from_object, ['executableCode']))
 
-  if getv(from_object, ['fileData']) is not None:
-    setv(to_object, ['file_data'], getv(from_object, ['fileData']))
-
   if getv(from_object, ['functionCall']) is not None:
     setv(to_object, ['function_call'], getv(from_object, ['functionCall']))
 
@@ -3676,13 +3758,6 @@ def _LiveMusicGenerationConfig_from_mldev(
         getv(from_object, ['onlyBassAndDrums']),
     )
 
-  if getv(from_object, ['musicGenerationMode']) is not None:
-    setv(
-        to_object,
-        ['music_generation_mode'],
-        getv(from_object, ['musicGenerationMode']),
-    )
-
   return to_object
 
 

google/genai/_mcp_utils.py

@@ -83,13 +83,10 @@ def set_mcp_usage_header(headers: dict[str, str]) -> None:
     version_label = version("mcp")
   except PackageNotFoundError:
     version_label = "0.0.0"
-  # TODO: b/418827318 - Investigate weather the duplicate mcp label check is
-  # necessary.
-  mcp_label = f"mcp_used/{version_label}"
   existing_header = headers.get("x-goog-api-client", "")
-  if mcp_label in existing_header:
-    return
-  headers["x-goog-api-client"] = (existing_header + f" {mcp_label}").lstrip()
+  headers["x-goog-api-client"] = (
+      existing_header + f" mcp_used/{version_label}"
+  ).lstrip()
 
 
 def _filter_to_supported_schema(schema: dict[str, Any]) -> dict[str, Any]:

google/genai/_replay_api_client.py

@@ -18,6 +18,7 @@
 import base64
 import copy
 import datetime
+import enum
 import inspect
 import io
 import json
@@ -37,6 +38,55 @@ from .types import HttpOptions, HttpOptionsOrDict
 from .types import GenerateVideosOperation
 
 
+def to_snake_case(name: str) -> str:
+  """Converts a string from camelCase or PascalCase to snake_case."""
+
+  if not isinstance(name, str):
+    name = str(name)
+  s1 = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', name)
+  return re.sub('([a-z0-9])([A-Z])', r'\1_\2', s1).lower()
+
+
+def _normalize_json_case(obj: Any) -> Any:
+  if isinstance(obj, dict):
+    return {
+        to_snake_case(k): _normalize_json_case(v)
+        for k, v in obj.items()
+    }
+  elif isinstance(obj, list):
+    return [_normalize_json_case(item) for item in obj]
+  elif isinstance(obj, enum.Enum):
+    return obj.value
+  else:
+    return obj
+
+
+def _equals_ignore_key_case(obj1: Any, obj2: Any) -> bool:
+  """Compares two Python objects for equality ignoring key casing.
+
+  Returns:
+      bool: True if the two objects are equal regardless of key casing
+  (camelCase vs. snake_case). For example, the following are considered equal:
+
+  {'my_key': 'my_value'}
+  {'myKey': 'my_value'}
+
+  This also considers enums and strings with the same value as equal.
+  For example, the following are considered equal:
+
+  {'type': <Type.STRING: 'STRING'>}}
+  {'type': 'STRING'}
+  """
+
+  normalized_obj_1 = _normalize_json_case(obj1)
+  normalized_obj_2 = _normalize_json_case(obj2)
+
+  if normalized_obj_1 == normalized_obj_2:
+    return True
+  else:
+    return False
+
+
 def _redact_version_numbers(version_string: str) -> str:
   """Redacts version numbers in the form x.y.z from a string."""
   return re.sub(r'\d+\.\d+\.\d+', '{VERSION_NUMBER}', version_string)
@@ -358,7 +408,7 @@ class ReplayApiClient(BaseApiClient):
 
     actual_request_body = [request_data_copy]
     expected_request_body = interaction.request.body_segments
-    assert actual_request_body == expected_request_body, (
+    assert _equals_ignore_key_case(actual_request_body, expected_request_body), (
         'Request body mismatch:\n'
         f'Actual: {actual_request_body}\n'
         f'Expected: {expected_request_body}'

google/genai/_tokens_converters.py

@@ -281,6 +281,42 @@ def _Blob_to_vertex(
   return to_object
 
 
+def _FileData_to_mldev(
+    api_client: BaseApiClient,
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
+  to_object: dict[str, Any] = {}
+  if getv(from_object, ['display_name']) is not None:
+    raise ValueError('display_name parameter is not supported in Gemini API.')
+
+  if getv(from_object, ['file_uri']) is not None:
+    setv(to_object, ['fileUri'], getv(from_object, ['file_uri']))
+
+  if getv(from_object, ['mime_type']) is not None:
+    setv(to_object, ['mimeType'], getv(from_object, ['mime_type']))
+
+  return to_object
+
+
+def _FileData_to_vertex(
+    api_client: BaseApiClient,
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
+  to_object: dict[str, Any] = {}
+  if getv(from_object, ['display_name']) is not None:
+    setv(to_object, ['displayName'], getv(from_object, ['display_name']))
+
+  if getv(from_object, ['file_uri']) is not None:
+    setv(to_object, ['fileUri'], getv(from_object, ['file_uri']))
+
+  if getv(from_object, ['mime_type']) is not None:
+    setv(to_object, ['mimeType'], getv(from_object, ['mime_type']))
+
+  return to_object
+
+
 def _Part_to_mldev(
     api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
@@ -308,6 +344,15 @@ def _Part_to_mldev(
         ),
     )
 
+  if getv(from_object, ['file_data']) is not None:
+    setv(
+        to_object,
+        ['fileData'],
+        _FileData_to_mldev(
+            api_client, getv(from_object, ['file_data']), to_object
+        ),
+    )
+
   if getv(from_object, ['code_execution_result']) is not None:
     setv(
         to_object,
@@ -318,9 +363,6 @@ def _Part_to_mldev(
   if getv(from_object, ['executable_code']) is not None:
     setv(to_object, ['executableCode'], getv(from_object, ['executable_code']))
 
-  if getv(from_object, ['file_data']) is not None:
-    setv(to_object, ['fileData'], getv(from_object, ['file_data']))
-
   if getv(from_object, ['function_call']) is not None:
     setv(to_object, ['functionCall'], getv(from_object, ['function_call']))
 
@@ -364,6 +406,15 @@ def _Part_to_vertex(
         ),
     )
 
+  if getv(from_object, ['file_data']) is not None:
+    setv(
+        to_object,
+        ['fileData'],
+        _FileData_to_vertex(
+            api_client, getv(from_object, ['file_data']), to_object
+        ),
+    )
+
   if getv(from_object, ['code_execution_result']) is not None:
     setv(
         to_object,
@@ -374,9 +425,6 @@ def _Part_to_vertex(
   if getv(from_object, ['executable_code']) is not None:
     setv(to_object, ['executableCode'], getv(from_object, ['executable_code']))
 
-  if getv(from_object, ['file_data']) is not None:
-    setv(to_object, ['fileData'], getv(from_object, ['file_data']))
-
   if getv(from_object, ['function_call']) is not None:
     setv(to_object, ['functionCall'], getv(from_object, ['function_call']))
 

google/genai/_transformers.py

@@ -630,6 +630,21 @@ def handle_null_fields(schema: dict[str, Any]) -> None:
           del schema['anyOf']
 
 
+def _raise_for_unsupported_schema_type(origin: Any) -> None:
+  """Raises an error if the schema type is unsupported."""
+  raise ValueError(f'Unsupported schema type: {origin}')
+
+
+def _raise_for_unsupported_mldev_properties(schema: Any, client: _api_client.BaseApiClient) -> None:
+  if not client.vertexai and (
+      schema.get('additionalProperties')
+      or schema.get('additional_properties')
+  ):
+    raise ValueError(
+        'additionalProperties is not supported in the Gemini API.'
+    )
+
+
 def process_schema(
     schema: dict[str, Any],
     client: _api_client.BaseApiClient,
@@ -700,6 +715,8 @@ def process_schema(
   if schema.get('title') == 'PlaceholderLiteralEnum':
     del schema['title']
 
+  _raise_for_unsupported_mldev_properties(schema, client)
+
   # Standardize spelling for relevant schema fields.  For example, if a dict is
   # provided directly to response_schema, it may use `any_of` instead of `anyOf.
   # Otherwise, model_json_schema() uses `anyOf`.
@@ -818,8 +835,9 @@ def t_schema(
     return _process_enum(origin, client)
   if isinstance(origin, types.Schema):
     if dict(origin) == dict(types.Schema()):
-      # response_schema value was coerced to an empty Schema instance because it did not adhere to the Schema field annotation
-      raise ValueError(f'Unsupported schema type.')
+      # response_schema value was coerced to an empty Schema instance because
+      # it did not adhere to the Schema field annotation
+      _raise_for_unsupported_schema_type(origin)
     schema = origin.model_dump(exclude_unset=True)
     process_schema(schema, client)
     return types.Schema.model_validate(schema)

google/genai/caches.py

@@ -66,6 +66,24 @@ def _Blob_to_mldev(
   return to_object
 
 
+def _FileData_to_mldev(
+    api_client: BaseApiClient,
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
+  to_object: dict[str, Any] = {}
+  if getv(from_object, ['display_name']) is not None:
+    raise ValueError('display_name parameter is not supported in Gemini API.')
+
+  if getv(from_object, ['file_uri']) is not None:
+    setv(to_object, ['fileUri'], getv(from_object, ['file_uri']))
+
+  if getv(from_object, ['mime_type']) is not None:
+    setv(to_object, ['mimeType'], getv(from_object, ['mime_type']))
+
+  return to_object
+
+
 def _Part_to_mldev(
     api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
@@ -93,6 +111,15 @@ def _Part_to_mldev(
         ),
     )
 
+  if getv(from_object, ['file_data']) is not None:
+    setv(
+        to_object,
+        ['fileData'],
+        _FileData_to_mldev(
+            api_client, getv(from_object, ['file_data']), to_object
+        ),
+    )
+
   if getv(from_object, ['code_execution_result']) is not None:
     setv(
         to_object,
@@ -103,9 +130,6 @@ def _Part_to_mldev(
   if getv(from_object, ['executable_code']) is not None:
     setv(to_object, ['executableCode'], getv(from_object, ['executable_code']))
 
-  if getv(from_object, ['file_data']) is not None:
-    setv(to_object, ['fileData'], getv(from_object, ['file_data']))
-
   if getv(from_object, ['function_call']) is not None:
     setv(to_object, ['functionCall'], getv(from_object, ['function_call']))
 
@@ -428,6 +452,9 @@ def _RetrievalConfig_to_mldev(
         _LatLng_to_mldev(api_client, getv(from_object, ['lat_lng']), to_object),
     )
 
+  if getv(from_object, ['language_code']) is not None:
+    setv(to_object, ['languageCode'], getv(from_object, ['language_code']))
+
   return to_object
 
 
@@ -704,6 +731,24 @@ def _Blob_to_vertex(
   return to_object
 
 
+def _FileData_to_vertex(
+    api_client: BaseApiClient,
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
+  to_object: dict[str, Any] = {}
+  if getv(from_object, ['display_name']) is not None:
+    setv(to_object, ['displayName'], getv(from_object, ['display_name']))
+
+  if getv(from_object, ['file_uri']) is not None:
+    setv(to_object, ['fileUri'], getv(from_object, ['file_uri']))
+
+  if getv(from_object, ['mime_type']) is not None:
+    setv(to_object, ['mimeType'], getv(from_object, ['mime_type']))
+
+  return to_object
+
+
 def _Part_to_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
@@ -731,6 +776,15 @@ def _Part_to_vertex(
         ),
     )
 
+  if getv(from_object, ['file_data']) is not None:
+    setv(
+        to_object,
+        ['fileData'],
+        _FileData_to_vertex(
+            api_client, getv(from_object, ['file_data']), to_object
+        ),
+    )
+
   if getv(from_object, ['code_execution_result']) is not None:
     setv(
         to_object,
@@ -741,9 +795,6 @@ def _Part_to_vertex(
   if getv(from_object, ['executable_code']) is not None:
     setv(to_object, ['executableCode'], getv(from_object, ['executable_code']))
 
-  if getv(from_object, ['file_data']) is not None:
-    setv(to_object, ['fileData'], getv(from_object, ['file_data']))
-
   if getv(from_object, ['function_call']) is not None:
     setv(to_object, ['functionCall'], getv(from_object, ['function_call']))
 
@@ -1084,6 +1135,9 @@ def _RetrievalConfig_to_vertex(
         ),
     )
 
+  if getv(from_object, ['language_code']) is not None:
+    setv(to_object, ['languageCode'], getv(from_object, ['language_code']))
+
   return to_object
 
 

google/genai/live.py

@@ -944,7 +944,7 @@ class AsyncLive(_api_module.BaseModule):
 
     parameter_model = await _t_live_connect_config(self._api_client, config)
 
-    if self._api_client.api_key:
+    if self._api_client.api_key and not self._api_client.vertexai:
       api_key = self._api_client.api_key
       version = self._api_client._http_options.api_version
       if uri is None:
@@ -964,6 +964,28 @@ class AsyncLive(_api_module.BaseModule):
 
       setv(request_dict, ['setup', 'model'], transformed_model)
 
+      request = json.dumps(request_dict)
+    elif self._api_client.api_key and self._api_client.vertexai:
+      # Headers already contains api key for express mode.
+      api_key = self._api_client.api_key
+      version = self._api_client._http_options.api_version
+      if uri is None:
+        uri = f'{base_url}/ws/google.cloud.aiplatform.{version}.LlmBidiService/BidiGenerateContent'
+      headers = self._api_client._http_options.headers
+
+      request_dict = _common.convert_to_dict(
+          live_converters._LiveConnectParameters_to_vertex(
+              api_client=self._api_client,
+              from_object=types.LiveConnectParameters(
+                  model=transformed_model,
+                  config=parameter_model,
+              ).model_dump(exclude_none=True),
+          )
+      )
+      del request_dict['config']
+
+      setv(request_dict, ['setup', 'model'], transformed_model)
+
       request = json.dumps(request_dict)
     else:
       if not self._api_client._credentials: