google-genai 1.12.1__py3-none-any.whl → 1.14.0__py3-none-any.whl

google/genai/_live_converters.py

@@ -154,213 +154,115 @@ def _Content_to_vertex(
   return to_object
 
 
-def _Schema_to_mldev(
+def _GoogleSearch_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, ['example']) is not None:
-    raise ValueError('example parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['pattern']) is not None:
-    raise ValueError('pattern parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['default']) is not None:
-    raise ValueError('default parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['max_length']) is not None:
-    raise ValueError('max_length parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['min_length']) is not None:
-    raise ValueError('min_length parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['min_properties']) is not None:
-    raise ValueError('min_properties parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['max_properties']) is not None:
-    raise ValueError('max_properties parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['any_of']) is not None:
-    setv(to_object, ['anyOf'], getv(from_object, ['any_of']))
 
-  if getv(from_object, ['description']) is not None:
-    setv(to_object, ['description'], getv(from_object, ['description']))
-
-  if getv(from_object, ['enum']) is not None:
-    setv(to_object, ['enum'], getv(from_object, ['enum']))
-
-  if getv(from_object, ['format']) is not None:
-    setv(to_object, ['format'], getv(from_object, ['format']))
-
-  if getv(from_object, ['items']) is not None:
-    setv(to_object, ['items'], getv(from_object, ['items']))
-
-  if getv(from_object, ['max_items']) is not None:
-    setv(to_object, ['maxItems'], getv(from_object, ['max_items']))
+  return to_object
 
-  if getv(from_object, ['maximum']) is not None:
-    setv(to_object, ['maximum'], getv(from_object, ['maximum']))
 
-  if getv(from_object, ['min_items']) is not None:
-    setv(to_object, ['minItems'], getv(from_object, ['min_items']))
+def _GoogleSearch_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, ['minimum']) is not None:
-    setv(to_object, ['minimum'], getv(from_object, ['minimum']))
+  return to_object
 
-  if getv(from_object, ['nullable']) is not None:
-    setv(to_object, ['nullable'], getv(from_object, ['nullable']))
 
-  if getv(from_object, ['properties']) is not None:
-    setv(to_object, ['properties'], getv(from_object, ['properties']))
+def _DynamicRetrievalConfig_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, ['mode']) is not None:
+    setv(to_object, ['mode'], getv(from_object, ['mode']))
 
-  if getv(from_object, ['property_ordering']) is not None:
+  if getv(from_object, ['dynamic_threshold']) is not None:
     setv(
         to_object,
-        ['propertyOrdering'],
-        getv(from_object, ['property_ordering']),
+        ['dynamicThreshold'],
+        getv(from_object, ['dynamic_threshold']),
     )
 
-  if getv(from_object, ['required']) is not None:
-    setv(to_object, ['required'], getv(from_object, ['required']))
-
-  if getv(from_object, ['title']) is not None:
-    setv(to_object, ['title'], getv(from_object, ['title']))
-
-  if getv(from_object, ['type']) is not None:
-    setv(to_object, ['type'], getv(from_object, ['type']))
-
   return to_object
 
 
-def _Schema_to_vertex(
+def _DynamicRetrievalConfig_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, ['example']) is not None:
-    setv(to_object, ['example'], getv(from_object, ['example']))
-
-  if getv(from_object, ['pattern']) is not None:
-    setv(to_object, ['pattern'], getv(from_object, ['pattern']))
-
-  if getv(from_object, ['default']) is not None:
-    setv(to_object, ['default'], getv(from_object, ['default']))
-
-  if getv(from_object, ['max_length']) is not None:
-    setv(to_object, ['maxLength'], getv(from_object, ['max_length']))
-
-  if getv(from_object, ['min_length']) is not None:
-    setv(to_object, ['minLength'], getv(from_object, ['min_length']))
-
-  if getv(from_object, ['min_properties']) is not None:
-    setv(to_object, ['minProperties'], getv(from_object, ['min_properties']))
-
-  if getv(from_object, ['max_properties']) is not None:
-    setv(to_object, ['maxProperties'], getv(from_object, ['max_properties']))
-
-  if getv(from_object, ['any_of']) is not None:
-    setv(to_object, ['anyOf'], getv(from_object, ['any_of']))
-
-  if getv(from_object, ['description']) is not None:
-    setv(to_object, ['description'], getv(from_object, ['description']))
-
-  if getv(from_object, ['enum']) is not None:
-    setv(to_object, ['enum'], getv(from_object, ['enum']))
-
-  if getv(from_object, ['format']) is not None:
-    setv(to_object, ['format'], getv(from_object, ['format']))
-
-  if getv(from_object, ['items']) is not None:
-    setv(to_object, ['items'], getv(from_object, ['items']))
-
-  if getv(from_object, ['max_items']) is not None:
-    setv(to_object, ['maxItems'], getv(from_object, ['max_items']))
-
-  if getv(from_object, ['maximum']) is not None:
-    setv(to_object, ['maximum'], getv(from_object, ['maximum']))
-
-  if getv(from_object, ['min_items']) is not None:
-    setv(to_object, ['minItems'], getv(from_object, ['min_items']))
-
-  if getv(from_object, ['minimum']) is not None:
-    setv(to_object, ['minimum'], getv(from_object, ['minimum']))
-
-  if getv(from_object, ['nullable']) is not None:
-    setv(to_object, ['nullable'], getv(from_object, ['nullable']))
-
-  if getv(from_object, ['properties']) is not None:
-    setv(to_object, ['properties'], getv(from_object, ['properties']))
+  if getv(from_object, ['mode']) is not None:
+    setv(to_object, ['mode'], getv(from_object, ['mode']))
 
-  if getv(from_object, ['property_ordering']) is not None:
+  if getv(from_object, ['dynamic_threshold']) is not None:
     setv(
         to_object,
-        ['propertyOrdering'],
-        getv(from_object, ['property_ordering']),
+        ['dynamicThreshold'],
+        getv(from_object, ['dynamic_threshold']),
     )
 
-  if getv(from_object, ['required']) is not None:
-    setv(to_object, ['required'], getv(from_object, ['required']))
-
-  if getv(from_object, ['title']) is not None:
-    setv(to_object, ['title'], getv(from_object, ['title']))
-
-  if getv(from_object, ['type']) is not None:
-    setv(to_object, ['type'], getv(from_object, ['type']))
-
   return to_object
 
 
-def _FunctionDeclaration_to_mldev(
+def _GoogleSearchRetrieval_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, ['response']) is not None:
-    raise ValueError('response parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['description']) is not None:
-    setv(to_object, ['description'], getv(from_object, ['description']))
-
-  if getv(from_object, ['name']) is not None:
-    setv(to_object, ['name'], getv(from_object, ['name']))
-
-  if getv(from_object, ['parameters']) is not None:
-    setv(to_object, ['parameters'], getv(from_object, ['parameters']))
+  if getv(from_object, ['dynamic_retrieval_config']) is not None:
+    setv(
+        to_object,
+        ['dynamicRetrievalConfig'],
+        _DynamicRetrievalConfig_to_mldev(
+            api_client,
+            getv(from_object, ['dynamic_retrieval_config']),
+            to_object,
+        ),
+    )
 
   return to_object
 
 
-def _FunctionDeclaration_to_vertex(
+def _GoogleSearchRetrieval_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, ['response']) is not None:
+  if getv(from_object, ['dynamic_retrieval_config']) is not None:
     setv(
         to_object,
-        ['response'],
-        _Schema_to_vertex(
-            api_client, getv(from_object, ['response']), to_object
+        ['dynamicRetrievalConfig'],
+        _DynamicRetrievalConfig_to_vertex(
+            api_client,
+            getv(from_object, ['dynamic_retrieval_config']),
+            to_object,
         ),
     )
 
-  if getv(from_object, ['description']) is not None:
-    setv(to_object, ['description'], getv(from_object, ['description']))
+  return to_object
 
-  if getv(from_object, ['name']) is not None:
-    setv(to_object, ['name'], getv(from_object, ['name']))
 
-  if getv(from_object, ['parameters']) is not None:
-    setv(to_object, ['parameters'], getv(from_object, ['parameters']))
+def _EnterpriseWebSearch_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] = {}
 
   return to_object
 
 
-def _GoogleSearch_to_mldev(
+def _EnterpriseWebSearch_to_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -370,88 +272,130 @@ def _GoogleSearch_to_mldev(
   return to_object
 
 
-def _GoogleSearch_to_vertex(
+def _ApiKeyConfig_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, ['api_key_string']) is not None:
+    raise ValueError('api_key_string parameter is not supported in Gemini API.')
 
   return to_object
 
 
-def _DynamicRetrievalConfig_to_mldev(
+def _ApiKeyConfig_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, ['mode']) is not None:
-    setv(to_object, ['mode'], getv(from_object, ['mode']))
-
-  if getv(from_object, ['dynamic_threshold']) is not None:
-    setv(
-        to_object,
-        ['dynamicThreshold'],
-        getv(from_object, ['dynamic_threshold']),
-    )
+  if getv(from_object, ['api_key_string']) is not None:
+    setv(to_object, ['apiKeyString'], getv(from_object, ['api_key_string']))
 
   return to_object
 
 
-def _DynamicRetrievalConfig_to_vertex(
+def _AuthConfig_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, ['mode']) is not None:
-    setv(to_object, ['mode'], getv(from_object, ['mode']))
+  if getv(from_object, ['api_key_config']) is not None:
+    raise ValueError('api_key_config parameter is not supported in Gemini API.')
 
-  if getv(from_object, ['dynamic_threshold']) is not None:
+  if getv(from_object, ['auth_type']) is not None:
+    setv(to_object, ['authType'], getv(from_object, ['auth_type']))
+
+  if getv(from_object, ['google_service_account_config']) is not None:
     setv(
         to_object,
-        ['dynamicThreshold'],
-        getv(from_object, ['dynamic_threshold']),
+        ['googleServiceAccountConfig'],
+        getv(from_object, ['google_service_account_config']),
+    )
+
+  if getv(from_object, ['http_basic_auth_config']) is not None:
+    setv(
+        to_object,
+        ['httpBasicAuthConfig'],
+        getv(from_object, ['http_basic_auth_config']),
     )
 
+  if getv(from_object, ['oauth_config']) is not None:
+    setv(to_object, ['oauthConfig'], getv(from_object, ['oauth_config']))
+
+  if getv(from_object, ['oidc_config']) is not None:
+    setv(to_object, ['oidcConfig'], getv(from_object, ['oidc_config']))
+
   return to_object
 
 
-def _GoogleSearchRetrieval_to_mldev(
+def _AuthConfig_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, ['dynamic_retrieval_config']) is not None:
+  if getv(from_object, ['api_key_config']) is not None:
     setv(
         to_object,
-        ['dynamicRetrievalConfig'],
-        _DynamicRetrievalConfig_to_mldev(
-            api_client,
-            getv(from_object, ['dynamic_retrieval_config']),
-            to_object,
+        ['apiKeyConfig'],
+        _ApiKeyConfig_to_vertex(
+            api_client, getv(from_object, ['api_key_config']), to_object
         ),
     )
 
+  if getv(from_object, ['auth_type']) is not None:
+    setv(to_object, ['authType'], getv(from_object, ['auth_type']))
+
+  if getv(from_object, ['google_service_account_config']) is not None:
+    setv(
+        to_object,
+        ['googleServiceAccountConfig'],
+        getv(from_object, ['google_service_account_config']),
+    )
+
+  if getv(from_object, ['http_basic_auth_config']) is not None:
+    setv(
+        to_object,
+        ['httpBasicAuthConfig'],
+        getv(from_object, ['http_basic_auth_config']),
+    )
+
+  if getv(from_object, ['oauth_config']) is not None:
+    setv(to_object, ['oauthConfig'], getv(from_object, ['oauth_config']))
+
+  if getv(from_object, ['oidc_config']) is not None:
+    setv(to_object, ['oidcConfig'], getv(from_object, ['oidc_config']))
+
   return to_object
 
 
-def _GoogleSearchRetrieval_to_vertex(
+def _GoogleMaps_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, ['dynamic_retrieval_config']) is not None:
+  if getv(from_object, ['auth_config']) is not None:
+    raise ValueError('auth_config parameter is not supported in Gemini API.')
+
+  return to_object
+
+
+def _GoogleMaps_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, ['auth_config']) is not None:
     setv(
         to_object,
-        ['dynamicRetrievalConfig'],
-        _DynamicRetrievalConfig_to_vertex(
-            api_client,
-            getv(from_object, ['dynamic_retrieval_config']),
-            to_object,
+        ['authConfig'],
+        _AuthConfig_to_vertex(
+            api_client, getv(from_object, ['auth_config']), to_object
         ),
     )
 
@@ -464,16 +408,6 @@ def _Tool_to_mldev(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['function_declarations']) is not None:
-    setv(
-        to_object,
-        ['functionDeclarations'],
-        [
-            _FunctionDeclaration_to_mldev(api_client, item, to_object)
-            for item in getv(from_object, ['function_declarations'])
-        ],
-    )
-
   if getv(from_object, ['retrieval']) is not None:
     raise ValueError('retrieval parameter is not supported in Gemini API.')
 
@@ -497,9 +431,24 @@ def _Tool_to_mldev(
         ),
     )
 
+  if getv(from_object, ['enterprise_web_search']) is not None:
+    raise ValueError(
+        'enterprise_web_search parameter is not supported in Gemini API.'
+    )
+
+  if getv(from_object, ['google_maps']) is not None:
+    raise ValueError('google_maps parameter is not supported in Gemini API.')
+
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
 
+  if getv(from_object, ['function_declarations']) is not None:
+    setv(
+        to_object,
+        ['functionDeclarations'],
+        getv(from_object, ['function_declarations']),
+    )
+
   return to_object
 
 
@@ -509,16 +458,6 @@ def _Tool_to_vertex(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['function_declarations']) is not None:
-    setv(
-        to_object,
-        ['functionDeclarations'],
-        [
-            _FunctionDeclaration_to_vertex(api_client, item, to_object)
-            for item in getv(from_object, ['function_declarations'])
-        ],
-    )
-
   if getv(from_object, ['retrieval']) is not None:
     setv(to_object, ['retrieval'], getv(from_object, ['retrieval']))
 
@@ -542,9 +481,34 @@ def _Tool_to_vertex(
         ),
     )
 
+  if getv(from_object, ['enterprise_web_search']) is not None:
+    setv(
+        to_object,
+        ['enterpriseWebSearch'],
+        _EnterpriseWebSearch_to_vertex(
+            api_client, getv(from_object, ['enterprise_web_search']), to_object
+        ),
+    )
+
+  if getv(from_object, ['google_maps']) is not None:
+    setv(
+        to_object,
+        ['googleMaps'],
+        _GoogleMaps_to_vertex(
+            api_client, getv(from_object, ['google_maps']), to_object
+        ),
+    )
+
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
 
+  if getv(from_object, ['function_declarations']) is not None:
+    setv(
+        to_object,
+        ['functionDeclarations'],
+        getv(from_object, ['function_declarations']),
+    )
+
   return to_object
 
 
@@ -900,8 +864,14 @@ def _LiveConnectConfig_to_mldev(
     )
 
   if getv(from_object, ['input_audio_transcription']) is not None:
-    raise ValueError(
-        'input_audio_transcription parameter is not supported in Gemini API.'
+    setv(
+        parent_object,
+        ['setup', 'inputAudioTranscription'],
+        _AudioTranscriptionConfig_to_mldev(
+            api_client,
+            getv(from_object, ['input_audio_transcription']),
+            to_object,
+        ),
     )
 
   if getv(from_object, ['output_audio_transcription']) is not None:
@@ -1329,6 +1299,28 @@ def _LiveClientSetup_to_mldev(
         ),
     )
 
+  if getv(from_object, ['input_audio_transcription']) is not None:
+    setv(
+        to_object,
+        ['inputAudioTranscription'],
+        _AudioTranscriptionConfig_to_mldev(
+            api_client,
+            getv(from_object, ['input_audio_transcription']),
+            to_object,
+        ),
+    )
+
+  if getv(from_object, ['output_audio_transcription']) is not None:
+    setv(
+        to_object,
+        ['outputAudioTranscription'],
+        _AudioTranscriptionConfig_to_mldev(
+            api_client,
+            getv(from_object, ['output_audio_transcription']),
+            to_object,
+        ),
+    )
+
   return to_object
 
 
@@ -1389,6 +1381,28 @@ def _LiveClientSetup_to_vertex(
         ),
     )
 
+  if getv(from_object, ['input_audio_transcription']) is not None:
+    setv(
+        to_object,
+        ['inputAudioTranscription'],
+        _AudioTranscriptionConfig_to_vertex(
+            api_client,
+            getv(from_object, ['input_audio_transcription']),
+            to_object,
+        ),
+    )
+
+  if getv(from_object, ['output_audio_transcription']) is not None:
+    setv(
+        to_object,
+        ['outputAudioTranscription'],
+        _AudioTranscriptionConfig_to_vertex(
+            api_client,
+            getv(from_object, ['output_audio_transcription']),
+            to_object,
+        ),
+    )
+
   return to_object
 
 
@@ -1887,6 +1901,13 @@ def _LiveServerContent_from_mldev(
   if getv(from_object, ['interrupted']) is not None:
     setv(to_object, ['interrupted'], getv(from_object, ['interrupted']))
 
+  if getv(from_object, ['groundingMetadata']) is not None:
+    setv(
+        to_object,
+        ['grounding_metadata'],
+        getv(from_object, ['groundingMetadata']),
+    )
+
   if getv(from_object, ['generationComplete']) is not None:
     setv(
         to_object,
@@ -1936,6 +1957,13 @@ def _LiveServerContent_from_vertex(
   if getv(from_object, ['interrupted']) is not None:
     setv(to_object, ['interrupted'], getv(from_object, ['interrupted']))
 
+  if getv(from_object, ['groundingMetadata']) is not None:
+    setv(
+        to_object,
+        ['grounding_metadata'],
+        getv(from_object, ['groundingMetadata']),
+    )
+
   if getv(from_object, ['generationComplete']) is not None:
     setv(
         to_object,

google/genai/_transformers.py

@@ -790,7 +790,7 @@ def t_schema(
   if not origin:
     return None
   if isinstance(origin, dict) and _is_type_dict_str_any(origin):
-    process_schema(origin, client, order_properties=False)
+    process_schema(origin, client)
     return types.Schema.model_validate(origin)
   if isinstance(origin, EnumMeta):
     return _process_enum(origin, client)
@@ -799,7 +799,7 @@ def t_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.')
     schema = origin.model_dump(exclude_unset=True)
-    process_schema(schema, client, order_properties=False)
+    process_schema(schema, client)
     return types.Schema.model_validate(schema)
 
   if (

google/genai/batches.py

@@ -743,7 +743,7 @@ class Batches(_api_module.BaseModule):
     .. code-block:: python
 
       batch_job = client.batches.create(
-          model="gemini-1.5-flash",
+          model="gemini-2.0-flash-001",
           src="gs://path/to/input/data",
       )
       print(batch_job.state)
@@ -1113,7 +1113,7 @@ class AsyncBatches(_api_module.BaseModule):
     .. code-block:: python
 
       batch_job = await client.aio.batches.create(
-          model="gemini-1.5-flash",
+          model="gemini-2.0-flash-001",
           src="gs://path/to/input/data",
       )
     """