google-genai 1.24.0__py3-none-any.whl → 1.26.0__py3-none-any.whl

google/genai/caches.py

@@ -269,71 +269,6 @@ def _GoogleSearchRetrieval_to_mldev(
   return to_object
 
 
-def _EnterpriseWebSearch_to_mldev(
-    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 _ApiKeyConfig_to_mldev(
-    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 _AuthConfig_to_mldev(
-    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_config']) is not None:
-    raise ValueError('api_key_config parameter is not supported in Gemini API.')
-
-  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 _GoogleMaps_to_mldev(
-    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:
-    raise ValueError('auth_config parameter is not supported in Gemini API.')
-
-  return to_object
-
-
 def _UrlContext_to_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,

google/genai/errors.py

@@ -18,6 +18,7 @@
 from typing import Any, Optional, TYPE_CHECKING, Union
 import httpx
 import json
+from . import _common
 
 
 if TYPE_CHECKING:
@@ -185,5 +186,4 @@ class FunctionInvocationError(ValueError):
   pass
 
 
-class ExperimentalWarning(Warning):
-  """Warning for experimental features."""
+ExperimentalWarning = _common.ExperimentalWarning

google/genai/files.py

@@ -288,6 +288,10 @@ def _CreateFileResponse_from_mldev(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
+  if getv(from_object, ['sdkHttpResponse']) is not None:
+    setv(
+        to_object, ['sdk_http_response'], getv(from_object, ['sdkHttpResponse'])
+    )
 
   return to_object
 

google/genai/live.py

@@ -196,7 +196,7 @@ class AsyncSession:
     if os.environ.get('GOOGLE_GENAI_USE_VERTEXAI'):
       MODEL_NAME = 'gemini-2.0-flash-live-preview-04-09'
     else:
-      MODEL_NAME = 'gemini-2.0-flash-live-001';
+      MODEL_NAME = 'gemini-live-2.5-flash-preview';
 
     client = genai.Client()
     async with client.aio.live.connect(
@@ -267,7 +267,7 @@ class AsyncSession:
     if os.environ.get('GOOGLE_GENAI_USE_VERTEXAI'):
       MODEL_NAME = 'gemini-2.0-flash-live-preview-04-09'
     else:
-      MODEL_NAME = 'gemini-2.0-flash-live-001';
+      MODEL_NAME = 'gemini-live-2.5-flash-preview';
 
 
     client = genai.Client()
@@ -361,7 +361,7 @@ class AsyncSession:
     if os.environ.get('GOOGLE_GENAI_USE_VERTEXAI'):
       MODEL_NAME = 'gemini-2.0-flash-live-preview-04-09'
     else:
-      MODEL_NAME = 'gemini-2.0-flash-live-001';
+      MODEL_NAME = 'gemini-live-2.5-flash-preview';
 
     client = genai.Client()
 
@@ -372,7 +372,7 @@ class AsyncSession:
     }
 
     async with client.aio.live.connect(
-        model='models/gemini-2.0-flash-live-001',
+        model='models/gemini-live-2.5-flash-preview',
         config=config
     ) as session:
       prompt = "Turn on the lights please"
@@ -929,7 +929,8 @@ class AsyncLive(_api_module.BaseModule):
       version = self._api_client._http_options.api_version
       api_key = self._api_client.api_key
       method = 'BidiGenerateContent'
-      key_name = 'key'
+      original_headers = self._api_client._http_options.headers
+      headers = original_headers.copy() if original_headers is not None else {}
       if api_key.startswith('auth_tokens/'):
         warnings.warn(
             message=(
@@ -939,10 +940,18 @@ class AsyncLive(_api_module.BaseModule):
             category=errors.ExperimentalWarning,
         )
         method = 'BidiGenerateContentConstrained'
-        key_name = 'access_token'
-
-      uri = f'{base_url}/ws/google.ai.generativelanguage.{version}.GenerativeService.{method}?{key_name}={api_key}'
-      headers = self._api_client._http_options.headers
+        headers['Authorization'] = f'Token {api_key}'
+        if version != 'v1alpha':
+          warnings.warn(
+              message=(
+                  "The SDK's ephemeral token support is in v1alpha only."
+                  'Please use client = genai.Client(api_key=token.name, '
+                  'http_options=types.HttpOptions(api_version="v1alpha"))'
+                  ' before session connection.'
+              ),
+              category=errors.ExperimentalWarning,
+          )
+      uri = f'{base_url}/ws/google.ai.generativelanguage.{version}.GenerativeService.{method}'
 
       request_dict = _common.convert_to_dict(
           live_converters._LiveConnectParameters_to_mldev(
@@ -963,7 +972,7 @@ class AsyncLive(_api_module.BaseModule):
       api_key = self._api_client.api_key
       version = self._api_client._http_options.api_version
       uri = f'{base_url}/ws/google.cloud.aiplatform.{version}.LlmBidiService/BidiGenerateContent'
-      headers = self._api_client._http_options.headers
+      headers = self._api_client._http_options.headers or {}
 
       request_dict = _common.convert_to_dict(
           live_converters._LiveConnectParameters_to_vertex(
@@ -993,11 +1002,9 @@ class AsyncLive(_api_module.BaseModule):
         auth_req = google.auth.transport.requests.Request()  # type: ignore
         creds.refresh(auth_req)
       bearer_token = creds.token
-      headers = self._api_client._http_options.headers
-      if headers is not None:
-        headers.update({
-            'Authorization': 'Bearer {}'.format(bearer_token),
-        })
+      original_headers = self._api_client._http_options.headers
+      headers = original_headers.copy() if original_headers is not None else {}
+      headers['Authorization'] = f'Bearer {bearer_token}'
       version = self._api_client._http_options.api_version
       uri = f'{base_url}/ws/google.cloud.aiplatform.{version}.LlmBidiService/BidiGenerateContent'
       location = self._api_client.location

google/genai/models.py

@@ -260,19 +260,6 @@ def _Schema_to_mldev(
   return to_object
 
 
-def _ModelSelectionConfig_to_mldev(
-    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, ['feature_selection_preference']) is not None:
-    raise ValueError(
-        'feature_selection_preference parameter is not supported in Gemini API.'
-    )
-
-  return to_object
-
-
 def _SafetySetting_to_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -391,71 +378,6 @@ def _GoogleSearchRetrieval_to_mldev(
   return to_object
 
 
-def _EnterpriseWebSearch_to_mldev(
-    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 _ApiKeyConfig_to_mldev(
-    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 _AuthConfig_to_mldev(
-    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_config']) is not None:
-    raise ValueError('api_key_config parameter is not supported in Gemini API.')
-
-  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 _GoogleMaps_to_mldev(
-    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:
-    raise ValueError('auth_config parameter is not supported in Gemini API.')
-
-  return to_object
-
-
 def _UrlContext_to_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -1317,27 +1239,6 @@ def _Image_to_mldev(
   return to_object
 
 
-def _Video_to_mldev(
-    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, ['uri']) is not None:
-    setv(to_object, ['video', 'uri'], getv(from_object, ['uri']))
-
-  if getv(from_object, ['video_bytes']) is not None:
-    setv(
-        to_object,
-        ['video', 'encodedVideo'],
-        t.t_bytes(getv(from_object, ['video_bytes'])),
-    )
-
-  if getv(from_object, ['mime_type']) is not None:
-    setv(to_object, ['encoding'], getv(from_object, ['mime_type']))
-
-  return to_object
-
-
 def _GenerateVideosConfig_to_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -2071,33 +1972,6 @@ def _VoiceConfig_to_vertex(
   return to_object
 
 
-def _SpeakerVoiceConfig_to_vertex(
-    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, ['speaker']) is not None:
-    raise ValueError('speaker parameter is not supported in Vertex AI.')
-
-  if getv(from_object, ['voice_config']) is not None:
-    raise ValueError('voice_config parameter is not supported in Vertex AI.')
-
-  return to_object
-
-
-def _MultiSpeakerVoiceConfig_to_vertex(
-    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, ['speaker_voice_configs']) is not None:
-    raise ValueError(
-        'speaker_voice_configs parameter is not supported in Vertex AI.'
-    )
-
-  return to_object
-
-
 def _SpeechConfig_to_vertex(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -2793,6 +2667,13 @@ def _EditImageConfig_to_vertex(
         getv(from_object, ['output_compression_quality']),
     )
 
+  if getv(from_object, ['add_watermark']) is not None:
+    setv(
+        parent_object,
+        ['parameters', 'addWatermark'],
+        getv(from_object, ['add_watermark']),
+    )
+
   if getv(from_object, ['edit_mode']) is not None:
     setv(
         parent_object,
@@ -3331,18 +3212,6 @@ def _GenerateVideosParameters_to_vertex(
   return to_object
 
 
-def _FeatureSelectionPreference_to_mldev_enum_validate(enum_value: Any) -> None:
-  if enum_value in set(
-      [
-          'FEATURE_SELECTION_PREFERENCE_UNSPECIFIED',
-          'PRIORITIZE_QUALITY',
-          'BALANCED',
-          'PRIORITIZE_COST',
-      ]
-  ):
-    raise ValueError(f'{enum_value} enum value is not supported in Gemini API.')
-
-
 def _SafetyFilterLevel_to_mldev_enum_validate(enum_value: Any) -> None:
   if enum_value in set(['BLOCK_NONE']):
     raise ValueError(f'{enum_value} enum value is not supported in Gemini API.')
@@ -3600,7 +3469,6 @@ def _GenerateContentResponse_from_mldev(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-
   if getv(from_object, ['sdkHttpResponse']) is not None:
     setv(
         to_object, ['sdk_http_response'], getv(from_object, ['sdkHttpResponse'])
@@ -3628,15 +3496,6 @@ def _GenerateContentResponse_from_mldev(
   return to_object
 
 
-def _ContentEmbeddingStatistics_from_mldev(
-    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 _ContentEmbedding_from_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -3782,15 +3641,6 @@ def _GenerateImagesResponse_from_mldev(
   return to_object
 
 
-def _Endpoint_from_mldev(
-    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 _TunedModelInfo_from_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -3808,15 +3658,6 @@ def _TunedModelInfo_from_mldev(
   return to_object
 
 
-def _Checkpoint_from_mldev(
-    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 _Model_from_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -4263,7 +4104,6 @@ def _GenerateContentResponse_from_vertex(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-
   if getv(from_object, ['sdkHttpResponse']) is not None:
     setv(
         to_object, ['sdk_http_response'], getv(from_object, ['sdkHttpResponse'])
@@ -5861,9 +5701,9 @@ class Models(_api_module.BaseModule):
       response = client.models.generate_content(
         model='gemini-2.0-flash',
         contents=[
-          types.Part.from_text('What is shown in this image?'),
-          types.Part.from_uri('gs://generativeai-downloads/images/scones.jpg',
-          'image/jpeg')
+          types.Part.from_text(text='What is shown in this image?'),
+          types.Part.from_uri(file_uri='gs://generativeai-downloads/images/scones.jpg',
+          mime_type='image/jpeg')
         ]
       )
       print(response.text)