google-genai 1.39.1__tar.gz → 1.41.0__tar.gz

{google_genai-1.39.1/google_genai.egg-info → google_genai-1.41.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-genai
-Version: 1.39.1
+Version: 1.41.0
 Summary: GenAI Python SDK
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache-2.0

{google_genai-1.39.1 → google_genai-1.41.0}/google/genai/_extra_utils.py

@@ -16,11 +16,13 @@
 """Extra utils depending on types that are shared between sync and async modules."""
 
 import inspect
+import io
 import logging
 import sys
 import typing
 from typing import Any, Callable, Dict, Optional, Union, get_args, get_origin
-
+import mimetypes
+import os
 import pydantic
 
 from . import _common
@@ -541,3 +543,72 @@ def append_chunk_contents(
     contents = t.t_contents(contents)  # type: ignore[assignment]
     if isinstance(contents, list) and chunk_content is not None:
       contents.append(chunk_content)  # type: ignore[arg-type]
+
+
+def prepare_resumable_upload(
+    file: Union[str, os.PathLike[str], io.IOBase],
+    user_http_options: Optional[types.HttpOptionsOrDict] = None,
+    user_mime_type: Optional[str] = None,
+) -> tuple[
+    types.HttpOptions,
+    int,
+    str,
+]:
+  """Prepares the HTTP options, file bytes size and mime type for a resumable upload.
+
+  This function inspects a file (from a path or an in-memory object) to
+  determine its size and MIME type. It then constructs the necessary HTTP
+  headers and options required to initiate a resumable upload session.
+  """
+  size_bytes = None
+  mime_type = user_mime_type
+  if isinstance(file, io.IOBase):
+    if mime_type is None:
+      raise ValueError(
+          'Unknown mime type: Could not determine the mimetype for your'
+          ' file\n please set the `mime_type` argument'
+      )
+    if hasattr(file, 'mode'):
+      if 'b' not in file.mode:
+        raise ValueError('The file must be opened in binary mode.')
+    offset = file.tell()
+    file.seek(0, os.SEEK_END)
+    size_bytes = file.tell() - offset
+    file.seek(offset, os.SEEK_SET)
+  else:
+    fs_path = os.fspath(file)
+    if not fs_path or not os.path.isfile(fs_path):
+      raise FileNotFoundError(f'{file} is not a valid file path.')
+    size_bytes = os.path.getsize(fs_path)
+    if mime_type is None:
+      mime_type, _ = mimetypes.guess_type(fs_path)
+    if mime_type is None:
+      raise ValueError(
+          'Unknown mime type: Could not determine the mimetype for your'
+          ' file\n    please set the `mime_type` argument'
+      )
+  http_options: types.HttpOptions
+  if user_http_options:
+    if isinstance(user_http_options, dict):
+      user_http_options = types.HttpOptions(**user_http_options)
+    http_options = user_http_options
+    http_options.api_version = ''
+    http_options.headers = {
+        'Content-Type': 'application/json',
+        'X-Goog-Upload-Protocol': 'resumable',
+        'X-Goog-Upload-Command': 'start',
+        'X-Goog-Upload-Header-Content-Length': f'{size_bytes}',
+        'X-Goog-Upload-Header-Content-Type': f'{mime_type}',
+    }
+  else:
+    http_options = types.HttpOptions(
+        api_version='',
+        headers={
+            'Content-Type': 'application/json',
+            'X-Goog-Upload-Protocol': 'resumable',
+            'X-Goog-Upload-Command': 'start',
+            'X-Goog-Upload-Header-Content-Length': f'{size_bytes}',
+            'X-Goog-Upload-Header-Content-Type': f'{mime_type}',
+        },
+    )
+  return http_options, size_bytes, mime_type

{google_genai-1.39.1 → google_genai-1.41.0}/google/genai/_live_converters.py

@@ -291,6 +291,42 @@ def _Blob_to_vertex(
   return to_object
 
 
+def _ComputerUse_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, ['environment']) is not None:
+    setv(to_object, ['environment'], getv(from_object, ['environment']))
+
+  if getv(from_object, ['excluded_predefined_functions']) is not None:
+    setv(
+        to_object,
+        ['excludedPredefinedFunctions'],
+        getv(from_object, ['excluded_predefined_functions']),
+    )
+
+  return to_object
+
+
+def _ComputerUse_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, ['environment']) is not None:
+    setv(to_object, ['environment'], getv(from_object, ['environment']))
+
+  if getv(from_object, ['excluded_predefined_functions']) is not None:
+    setv(
+        to_object,
+        ['excludedPredefinedFunctions'],
+        getv(from_object, ['excluded_predefined_functions']),
+    )
+
+  return to_object
+
+
 def _Content_from_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -1448,6 +1484,15 @@ def _LiveConnectConfig_to_mldev(
         ),
     )
 
+  if getv(from_object, ['thinking_config']) is not None:
+    setv(
+        parent_object,
+        ['setup', 'generationConfig', 'thinkingConfig'],
+        _ThinkingConfig_to_mldev(
+            getv(from_object, ['thinking_config']), to_object
+        ),
+    )
+
   if getv(from_object, ['enable_affective_dialog']) is not None:
     setv(
         parent_object,
@@ -1604,6 +1649,15 @@ def _LiveConnectConfig_to_vertex(
         ),
     )
 
+  if getv(from_object, ['thinking_config']) is not None:
+    setv(
+        parent_object,
+        ['setup', 'generationConfig', 'thinkingConfig'],
+        _ThinkingConfig_to_vertex(
+            getv(from_object, ['thinking_config']), to_object
+        ),
+    )
+
   if getv(from_object, ['enable_affective_dialog']) is not None:
     setv(
         parent_object,
@@ -3189,39 +3243,35 @@ def _SpeechConfig_to_vertex(
   return to_object
 
 
-def _ToolComputerUse_to_mldev(
+def _ThinkingConfig_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, ['environment']) is not None:
-    setv(to_object, ['environment'], getv(from_object, ['environment']))
-
-  if getv(from_object, ['excluded_predefined_functions']) is not None:
+  if getv(from_object, ['include_thoughts']) is not None:
     setv(
-        to_object,
-        ['excludedPredefinedFunctions'],
-        getv(from_object, ['excluded_predefined_functions']),
+        to_object, ['includeThoughts'], getv(from_object, ['include_thoughts'])
     )
 
+  if getv(from_object, ['thinking_budget']) is not None:
+    setv(to_object, ['thinkingBudget'], getv(from_object, ['thinking_budget']))
+
   return to_object
 
 
-def _ToolComputerUse_to_vertex(
+def _ThinkingConfig_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, ['environment']) is not None:
-    setv(to_object, ['environment'], getv(from_object, ['environment']))
-
-  if getv(from_object, ['excluded_predefined_functions']) is not None:
+  if getv(from_object, ['include_thoughts']) is not None:
     setv(
-        to_object,
-        ['excludedPredefinedFunctions'],
-        getv(from_object, ['excluded_predefined_functions']),
+        to_object, ['includeThoughts'], getv(from_object, ['include_thoughts'])
     )
 
+  if getv(from_object, ['thinking_budget']) is not None:
+    setv(to_object, ['thinkingBudget'], getv(from_object, ['thinking_budget']))
+
   return to_object
 
 
@@ -3278,9 +3328,7 @@ def _Tool_to_mldev(
     setv(
         to_object,
         ['computerUse'],
-        _ToolComputerUse_to_mldev(
-            getv(from_object, ['computer_use']), to_object
-        ),
+        _ComputerUse_to_mldev(getv(from_object, ['computer_use']), to_object),
     )
 
   if getv(from_object, ['code_execution']) is not None:
@@ -3352,9 +3400,7 @@ def _Tool_to_vertex(
     setv(
         to_object,
         ['computerUse'],
-        _ToolComputerUse_to_vertex(
-            getv(from_object, ['computer_use']), to_object
-        ),
+        _ComputerUse_to_vertex(getv(from_object, ['computer_use']), to_object),
     )
 
   if getv(from_object, ['code_execution']) is not None:

{google_genai-1.39.1 → google_genai-1.41.0}/google/genai/_tokens_converters.py

@@ -106,6 +106,24 @@ def _Blob_to_mldev(
   return to_object
 
 
+def _ComputerUse_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, ['environment']) is not None:
+    setv(to_object, ['environment'], getv(from_object, ['environment']))
+
+  if getv(from_object, ['excluded_predefined_functions']) is not None:
+    setv(
+        to_object,
+        ['excludedPredefinedFunctions'],
+        getv(from_object, ['excluded_predefined_functions']),
+    )
+
+  return to_object
+
+
 def _Content_to_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -430,6 +448,15 @@ def _LiveConnectConfig_to_mldev(
         ),
     )
 
+  if getv(from_object, ['thinking_config']) is not None:
+    setv(
+        parent_object,
+        ['setup', 'generationConfig', 'thinkingConfig'],
+        _ThinkingConfig_to_mldev(
+            getv(from_object, ['thinking_config']), to_object
+        ),
+    )
+
   if getv(from_object, ['enable_affective_dialog']) is not None:
     setv(
         parent_object,
@@ -743,21 +770,19 @@ def _SpeechConfig_to_mldev(
   return to_object
 
 
-def _ToolComputerUse_to_mldev(
+def _ThinkingConfig_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, ['environment']) is not None:
-    setv(to_object, ['environment'], getv(from_object, ['environment']))
-
-  if getv(from_object, ['excluded_predefined_functions']) is not None:
+  if getv(from_object, ['include_thoughts']) is not None:
     setv(
-        to_object,
-        ['excludedPredefinedFunctions'],
-        getv(from_object, ['excluded_predefined_functions']),
+        to_object, ['includeThoughts'], getv(from_object, ['include_thoughts'])
     )
 
+  if getv(from_object, ['thinking_budget']) is not None:
+    setv(to_object, ['thinkingBudget'], getv(from_object, ['thinking_budget']))
+
   return to_object
 
 
@@ -814,9 +839,7 @@ def _Tool_to_mldev(
     setv(
         to_object,
         ['computerUse'],
-        _ToolComputerUse_to_mldev(
-            getv(from_object, ['computer_use']), to_object
-        ),
+        _ComputerUse_to_mldev(getv(from_object, ['computer_use']), to_object),
     )
 
   if getv(from_object, ['code_execution']) is not None:

{google_genai-1.39.1 → google_genai-1.41.0}/google/genai/batches.py

@@ -467,6 +467,24 @@ def _CitationMetadata_from_mldev(
   return to_object
 
 
+def _ComputerUse_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, ['environment']) is not None:
+    setv(to_object, ['environment'], getv(from_object, ['environment']))
+
+  if getv(from_object, ['excluded_predefined_functions']) is not None:
+    setv(
+        to_object,
+        ['excludedPredefinedFunctions'],
+        getv(from_object, ['excluded_predefined_functions']),
+    )
+
+  return to_object
+
+
 def _ContentEmbedding_from_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -1131,6 +1149,13 @@ def _GenerateContentConfig_to_mldev(
         ),
     )
 
+  if getv(from_object, ['image_config']) is not None:
+    setv(
+        to_object,
+        ['imageConfig'],
+        _ImageConfig_to_mldev(getv(from_object, ['image_config']), to_object),
+    )
+
   return to_object
 
 
@@ -1238,6 +1263,17 @@ def _GoogleSearch_to_mldev(
   return to_object
 
 
+def _ImageConfig_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, ['aspect_ratio']) is not None:
+    setv(to_object, ['aspectRatio'], getv(from_object, ['aspect_ratio']))
+
+  return to_object
+
+
 def _InlinedEmbedContentResponse_from_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -1877,24 +1913,6 @@ def _ThinkingConfig_to_mldev(
   return to_object
 
 
-def _ToolComputerUse_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, ['environment']) is not None:
-    setv(to_object, ['environment'], getv(from_object, ['environment']))
-
-  if getv(from_object, ['excluded_predefined_functions']) is not None:
-    setv(
-        to_object,
-        ['excludedPredefinedFunctions'],
-        getv(from_object, ['excluded_predefined_functions']),
-    )
-
-  return to_object
-
-
 def _ToolConfig_to_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -1974,9 +1992,7 @@ def _Tool_to_mldev(
     setv(
         to_object,
         ['computerUse'],
-        _ToolComputerUse_to_mldev(
-            getv(from_object, ['computer_use']), to_object
-        ),
+        _ComputerUse_to_mldev(getv(from_object, ['computer_use']), to_object),
     )
 
   if getv(from_object, ['code_execution']) is not None:

{google_genai-1.39.1 → google_genai-1.41.0}/google/genai/caches.py

@@ -181,6 +181,42 @@ def _CachedContent_from_vertex(
   return to_object
 
 
+def _ComputerUse_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, ['environment']) is not None:
+    setv(to_object, ['environment'], getv(from_object, ['environment']))
+
+  if getv(from_object, ['excluded_predefined_functions']) is not None:
+    setv(
+        to_object,
+        ['excludedPredefinedFunctions'],
+        getv(from_object, ['excluded_predefined_functions']),
+    )
+
+  return to_object
+
+
+def _ComputerUse_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, ['environment']) is not None:
+    setv(to_object, ['environment'], getv(from_object, ['environment']))
+
+  if getv(from_object, ['excluded_predefined_functions']) is not None:
+    setv(
+        to_object,
+        ['excludedPredefinedFunctions'],
+        getv(from_object, ['excluded_predefined_functions']),
+    )
+
+  return to_object
+
+
 def _Content_to_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -1135,42 +1171,6 @@ def _RetrievalConfig_to_vertex(
   return to_object
 
 
-def _ToolComputerUse_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, ['environment']) is not None:
-    setv(to_object, ['environment'], getv(from_object, ['environment']))
-
-  if getv(from_object, ['excluded_predefined_functions']) is not None:
-    setv(
-        to_object,
-        ['excludedPredefinedFunctions'],
-        getv(from_object, ['excluded_predefined_functions']),
-    )
-
-  return to_object
-
-
-def _ToolComputerUse_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, ['environment']) is not None:
-    setv(to_object, ['environment'], getv(from_object, ['environment']))
-
-  if getv(from_object, ['excluded_predefined_functions']) is not None:
-    setv(
-        to_object,
-        ['excludedPredefinedFunctions'],
-        getv(from_object, ['excluded_predefined_functions']),
-    )
-
-  return to_object
-
-
 def _ToolConfig_to_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -1276,9 +1276,7 @@ def _Tool_to_mldev(
     setv(
         to_object,
         ['computerUse'],
-        _ToolComputerUse_to_mldev(
-            getv(from_object, ['computer_use']), to_object
-        ),
+        _ComputerUse_to_mldev(getv(from_object, ['computer_use']), to_object),
     )
 
   if getv(from_object, ['code_execution']) is not None:
@@ -1350,9 +1348,7 @@ def _Tool_to_vertex(
     setv(
         to_object,
         ['computerUse'],
-        _ToolComputerUse_to_vertex(
-            getv(from_object, ['computer_use']), to_object
-        ),
+        _ComputerUse_to_vertex(getv(from_object, ['computer_use']), to_object),
     )
 
   if getv(from_object, ['code_execution']) is not None:

{google_genai-1.39.1 → google_genai-1.41.0}/google/genai/files.py

@@ -18,13 +18,13 @@
 import io
 import json
 import logging
-import mimetypes
 import os
 from typing import Any, Optional, Union
 from urllib.parse import urlencode
 
 from . import _api_module
 from . import _common
+from . import _extra_utils
 from . import _transformers as t
 from . import types
 from ._common import get_value_by_path as getv
@@ -611,54 +611,13 @@ class Files(_api_module.BaseModule):
     if file_obj.name is not None and not file_obj.name.startswith('files/'):
       file_obj.name = f'files/{file_obj.name}'
 
-    if isinstance(file, io.IOBase):
-      if file_obj.mime_type is None:
-        raise ValueError(
-            'Unknown mime type: Could not determine the mimetype for your'
-            ' file\n please set the `mime_type` argument'
-        )
-      if hasattr(file, 'mode'):
-        if 'b' not in file.mode:
-          raise ValueError('The file must be opened in binary mode.')
-      offset = file.tell()
-      file.seek(0, os.SEEK_END)
-      file_obj.size_bytes = file.tell() - offset
-      file.seek(offset, os.SEEK_SET)
-    else:
-      fs_path = os.fspath(file)
-      if not fs_path or not os.path.isfile(fs_path):
-        raise FileNotFoundError(f'{file} is not a valid file path.')
-      file_obj.size_bytes = os.path.getsize(fs_path)
-      if file_obj.mime_type is None:
-        file_obj.mime_type, _ = mimetypes.guess_type(fs_path)
-      if file_obj.mime_type is None:
-        raise ValueError(
-            'Unknown mime type: Could not determine the mimetype for your'
-            ' file\n    please set the `mime_type` argument'
-        )
-
-    http_options: types.HttpOptions
-    if config_model and config_model.http_options:
-      http_options = config_model.http_options
-      http_options.api_version = ''
-      http_options.headers = {
-          'Content-Type': 'application/json',
-          'X-Goog-Upload-Protocol': 'resumable',
-          'X-Goog-Upload-Command': 'start',
-          'X-Goog-Upload-Header-Content-Length': f'{file_obj.size_bytes}',
-          'X-Goog-Upload-Header-Content-Type': f'{file_obj.mime_type}',
-      }
-    else:
-      http_options = types.HttpOptions(
-          api_version='',
-          headers={
-              'Content-Type': 'application/json',
-              'X-Goog-Upload-Protocol': 'resumable',
-              'X-Goog-Upload-Command': 'start',
-              'X-Goog-Upload-Header-Content-Length': f'{file_obj.size_bytes}',
-              'X-Goog-Upload-Header-Content-Type': f'{file_obj.mime_type}',
-          },
-      )
+    http_options, size_bytes, mime_type = _extra_utils.prepare_resumable_upload(
+        file,
+        user_http_options=config_model.http_options,
+        user_mime_type=config_model.mime_type,
+    )
+    file_obj.size_bytes = size_bytes
+    file_obj.mime_type = mime_type
     response = self._create(
         file=file_obj,
         config=types.CreateFileConfig(
@@ -682,6 +641,7 @@ class Files(_api_module.BaseModule):
           file, upload_url, file_obj.size_bytes, http_options=http_options
       )
     else:
+      fs_path = os.fspath(file)
       return_file = self._api_client.upload_file(
           fs_path, upload_url, file_obj.size_bytes, http_options=http_options
       )
@@ -1096,54 +1056,13 @@ class AsyncFiles(_api_module.BaseModule):
     if file_obj.name is not None and not file_obj.name.startswith('files/'):
       file_obj.name = f'files/{file_obj.name}'
 
-    if isinstance(file, io.IOBase):
-      if file_obj.mime_type is None:
-        raise ValueError(
-            'Unknown mime type: Could not determine the mimetype for your'
-            ' file\n    please set the `mime_type` argument'
-        )
-      if hasattr(file, 'mode'):
-        if 'b' not in file.mode:
-          raise ValueError('The file must be opened in binary mode.')
-      offset = file.tell()
-      file.seek(0, os.SEEK_END)
-      file_obj.size_bytes = file.tell() - offset
-      file.seek(offset, os.SEEK_SET)
-    else:
-      fs_path = os.fspath(file)
-      if not fs_path or not os.path.isfile(fs_path):
-        raise FileNotFoundError(f'{file} is not a valid file path.')
-      file_obj.size_bytes = os.path.getsize(fs_path)
-      if file_obj.mime_type is None:
-        file_obj.mime_type, _ = mimetypes.guess_type(fs_path)
-      if file_obj.mime_type is None:
-        raise ValueError(
-            'Unknown mime type: Could not determine the mimetype for your'
-            ' file\n    please set the `mime_type` argument'
-        )
-
-    http_options: types.HttpOptions
-    if config_model and config_model.http_options:
-      http_options = config_model.http_options
-      http_options.api_version = ''
-      http_options.headers = {
-          'Content-Type': 'application/json',
-          'X-Goog-Upload-Protocol': 'resumable',
-          'X-Goog-Upload-Command': 'start',
-          'X-Goog-Upload-Header-Content-Length': f'{file_obj.size_bytes}',
-          'X-Goog-Upload-Header-Content-Type': f'{file_obj.mime_type}',
-      }
-    else:
-      http_options = types.HttpOptions(
-          api_version='',
-          headers={
-              'Content-Type': 'application/json',
-              'X-Goog-Upload-Protocol': 'resumable',
-              'X-Goog-Upload-Command': 'start',
-              'X-Goog-Upload-Header-Content-Length': f'{file_obj.size_bytes}',
-              'X-Goog-Upload-Header-Content-Type': f'{file_obj.mime_type}',
-          },
-      )
+    http_options, size_bytes, mime_type = _extra_utils.prepare_resumable_upload(
+        file,
+        user_http_options=config_model.http_options,
+        user_mime_type=config_model.mime_type,
+    )
+    file_obj.size_bytes = size_bytes
+    file_obj.mime_type = mime_type
     response = await self._create(
         file=file_obj,
         config=types.CreateFileConfig(
@@ -1172,6 +1091,7 @@ class AsyncFiles(_api_module.BaseModule):
           file, upload_url, file_obj.size_bytes, http_options=http_options
       )
     else:
+      fs_path = os.fspath(file)
       return_file = await self._api_client.async_upload_file(
           fs_path, upload_url, file_obj.size_bytes, http_options=http_options
       )

{google_genai-1.39.1 → google_genai-1.41.0}/google/genai/live.py

@@ -82,9 +82,15 @@ _FUNCTION_RESPONSE_REQUIRES_ID = (
 class AsyncSession:
   """[Preview] AsyncSession."""
 
-  def __init__(self, api_client: BaseApiClient, websocket: ClientConnection):
+  def __init__(
+      self,
+      api_client: BaseApiClient,
+      websocket: ClientConnection,
+      session_id: Optional[str] = None,
+  ):
     self._api_client = api_client
     self._ws = websocket
+    self.session_id = session_id
 
   async def send(
       self,
@@ -1054,11 +1060,34 @@ class AsyncLive(_api_module.BaseModule):
       await ws.send(request)
       try:
         # websockets 14.0+
-        logger.info(await ws.recv(decode=False))
+        raw_response = await ws.recv(decode=False)
       except TypeError:
-        logger.info(await ws.recv())
+        raw_response = await ws.recv()  # type: ignore[assignment]
+      if raw_response:
+        try:
+          response = json.loads(raw_response)
+        except json.decoder.JSONDecodeError:
+          raise ValueError(f'Failed to parse response: {raw_response!r}')
+      else:
+        response = {}
 
-      yield AsyncSession(api_client=self._api_client, websocket=ws)
+      if self._api_client.vertexai:
+        response_dict = live_converters._LiveServerMessage_from_vertex(response)
+      else:
+        response_dict = live_converters._LiveServerMessage_from_mldev(response)
+
+      setup_response = types.LiveServerMessage._from_response(
+          response=response_dict, kwargs=parameter_model.model_dump()
+      )
+      if setup_response.setup_complete:
+        session_id = setup_response.setup_complete.session_id
+      else:
+        session_id = None
+      yield AsyncSession(
+          api_client=self._api_client,
+          websocket=ws,
+          session_id=session_id,
+      )
 
 
 async def _t_live_connect_config(

{google_genai-1.39.1 → google_genai-1.41.0}/google/genai/models.py

@@ -366,6 +366,42 @@ def _ComputeTokensResponse_from_vertex(
   return to_object
 
 
+def _ComputerUse_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, ['environment']) is not None:
+    setv(to_object, ['environment'], getv(from_object, ['environment']))
+
+  if getv(from_object, ['excluded_predefined_functions']) is not None:
+    setv(
+        to_object,
+        ['excludedPredefinedFunctions'],
+        getv(from_object, ['excluded_predefined_functions']),
+    )
+
+  return to_object
+
+
+def _ComputerUse_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, ['environment']) is not None:
+    setv(to_object, ['environment'], getv(from_object, ['environment']))
+
+  if getv(from_object, ['excluded_predefined_functions']) is not None:
+    setv(
+        to_object,
+        ['excludedPredefinedFunctions'],
+        getv(from_object, ['excluded_predefined_functions']),
+    )
+
+  return to_object
+
+
 def _ContentEmbeddingStatistics_from_vertex(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -1602,6 +1638,13 @@ def _GenerateContentConfig_to_mldev(
         ),
     )
 
+  if getv(from_object, ['image_config']) is not None:
+    setv(
+        to_object,
+        ['imageConfig'],
+        _ImageConfig_to_mldev(getv(from_object, ['image_config']), to_object),
+    )
+
   return to_object
 
 
@@ -1774,6 +1817,13 @@ def _GenerateContentConfig_to_vertex(
         ),
     )
 
+  if getv(from_object, ['image_config']) is not None:
+    setv(
+        to_object,
+        ['imageConfig'],
+        _ImageConfig_to_vertex(getv(from_object, ['image_config']), to_object),
+    )
+
   return to_object
 
 
@@ -2960,6 +3010,28 @@ def _GoogleSearch_to_vertex(
   return to_object
 
 
+def _ImageConfig_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, ['aspect_ratio']) is not None:
+    setv(to_object, ['aspectRatio'], getv(from_object, ['aspect_ratio']))
+
+  return to_object
+
+
+def _ImageConfig_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, ['aspect_ratio']) is not None:
+    setv(to_object, ['aspectRatio'], getv(from_object, ['aspect_ratio']))
+
+  return to_object
+
+
 def _Image_from_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -4467,42 +4539,6 @@ def _ThinkingConfig_to_vertex(
   return to_object
 
 
-def _ToolComputerUse_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, ['environment']) is not None:
-    setv(to_object, ['environment'], getv(from_object, ['environment']))
-
-  if getv(from_object, ['excluded_predefined_functions']) is not None:
-    setv(
-        to_object,
-        ['excludedPredefinedFunctions'],
-        getv(from_object, ['excluded_predefined_functions']),
-    )
-
-  return to_object
-
-
-def _ToolComputerUse_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, ['environment']) is not None:
-    setv(to_object, ['environment'], getv(from_object, ['environment']))
-
-  if getv(from_object, ['excluded_predefined_functions']) is not None:
-    setv(
-        to_object,
-        ['excludedPredefinedFunctions'],
-        getv(from_object, ['excluded_predefined_functions']),
-    )
-
-  return to_object
-
-
 def _ToolConfig_to_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -4608,9 +4644,7 @@ def _Tool_to_mldev(
     setv(
         to_object,
         ['computerUse'],
-        _ToolComputerUse_to_mldev(
-            getv(from_object, ['computer_use']), to_object
-        ),
+        _ComputerUse_to_mldev(getv(from_object, ['computer_use']), to_object),
     )
 
   if getv(from_object, ['code_execution']) is not None:
@@ -4682,9 +4716,7 @@ def _Tool_to_vertex(
     setv(
         to_object,
         ['computerUse'],
-        _ToolComputerUse_to_vertex(
-            getv(from_object, ['computer_use']), to_object
-        ),
+        _ComputerUse_to_vertex(getv(from_object, ['computer_use']), to_object),
     )
 
   if getv(from_object, ['code_execution']) is not None:

{google_genai-1.39.1 → google_genai-1.41.0}/google/genai/tunings.py

@@ -753,6 +753,9 @@ def _TuningJob_from_mldev(
         getv(from_object, ['tunedModelDisplayName']),
     )
 
+  if getv(from_object, ['veoTuningSpec']) is not None:
+    setv(to_object, ['veo_tuning_spec'], getv(from_object, ['veoTuningSpec']))
+
   return to_object
 
 
@@ -865,6 +868,9 @@ def _TuningJob_from_vertex(
         getv(from_object, ['tunedModelDisplayName']),
     )
 
+  if getv(from_object, ['veoTuningSpec']) is not None:
+    setv(to_object, ['veo_tuning_spec'], getv(from_object, ['veoTuningSpec']))
+
   return to_object
 
 

{google_genai-1.39.1 → google_genai-1.41.0}/google/genai/types.py

@@ -285,6 +285,10 @@ class FinishReason(_common.CaseInSensitiveEnum):
   """Token generation stopped because generated images have safety violations."""
   UNEXPECTED_TOOL_CALL = 'UNEXPECTED_TOOL_CALL'
   """The tool call generated by the model is invalid."""
+  IMAGE_PROHIBITED_CONTENT = 'IMAGE_PROHIBITED_CONTENT'
+  """Image generation stopped because the generated images have prohibited content."""
+  NO_IMAGE = 'NO_IMAGE'
+  """The model was expected to generate an image, but none was generated."""
 
 
 class HarmProbability(_common.CaseInSensitiveEnum):
@@ -434,6 +438,17 @@ class AdapterSize(_common.CaseInSensitiveEnum):
   """Adapter size 32."""
 
 
+class TuningTask(_common.CaseInSensitiveEnum):
+  """Optional. The tuning task. Either I2V or T2V."""
+
+  TUNING_TASK_UNSPECIFIED = 'TUNING_TASK_UNSPECIFIED'
+  """Default value. This value is unused."""
+  TUNING_TASK_I2V = 'TUNING_TASK_I2V'
+  """Tuning task for image to video."""
+  TUNING_TASK_T2V = 'TUNING_TASK_T2V'
+  """Tuning task for text to video."""
+
+
 class JSONSchemaType(Enum):
   """The type of the data supported by JSON Schema.
 
@@ -2795,7 +2810,7 @@ class UrlContextDict(TypedDict, total=False):
 UrlContextOrDict = Union[UrlContext, UrlContextDict]
 
 
-class ToolComputerUse(_common.BaseModel):
+class ComputerUse(_common.BaseModel):
   """Tool to support computer use."""
 
   environment: Optional[Environment] = Field(
@@ -2811,7 +2826,7 @@ class ToolComputerUse(_common.BaseModel):
   )
 
 
-class ToolComputerUseDict(TypedDict, total=False):
+class ComputerUseDict(TypedDict, total=False):
   """Tool to support computer use."""
 
   environment: Optional[Environment]
@@ -2825,7 +2840,7 @@ class ToolComputerUseDict(TypedDict, total=False):
       2. Improving the definitions / instructions of predefined functions."""
 
 
-ToolComputerUseOrDict = Union[ToolComputerUse, ToolComputerUseDict]
+ComputerUseOrDict = Union[ComputerUse, ComputerUseDict]
 
 
 class ApiAuthApiKeyConfig(_common.BaseModel):
@@ -3422,7 +3437,7 @@ class Tool(_common.BaseModel):
       default=None,
       description="""Optional. Tool to support URL context retrieval.""",
   )
-  computer_use: Optional[ToolComputerUse] = Field(
+  computer_use: Optional[ComputerUse] = Field(
       default=None,
       description="""Optional. Tool to support the model interacting directly with the
       computer. If enabled, it automatically populates computer-use specific
@@ -3461,7 +3476,7 @@ class ToolDict(TypedDict, total=False):
   url_context: Optional[UrlContextDict]
   """Optional. Tool to support URL context retrieval."""
 
-  computer_use: Optional[ToolComputerUseDict]
+  computer_use: Optional[ComputerUseDict]
   """Optional. Tool to support the model interacting directly with the
       computer. If enabled, it automatically populates computer-use specific
       Function Declarations."""
@@ -3826,6 +3841,27 @@ class ThinkingConfigDict(TypedDict, total=False):
 ThinkingConfigOrDict = Union[ThinkingConfig, ThinkingConfigDict]
 
 
+class ImageConfig(_common.BaseModel):
+  """The image generation configuration to be used in GenerateContentConfig."""
+
+  aspect_ratio: Optional[str] = Field(
+      default=None,
+      description="""Aspect ratio of the generated images. Supported values are
+      "1:1", "2:3", "3:2", "3:4", "4:3", "9:16", "16:9", and "21:9".""",
+  )
+
+
+class ImageConfigDict(TypedDict, total=False):
+  """The image generation configuration to be used in GenerateContentConfig."""
+
+  aspect_ratio: Optional[str]
+  """Aspect ratio of the generated images. Supported values are
+      "1:1", "2:3", "3:2", "3:4", "4:3", "9:16", "16:9", and "21:9"."""
+
+
+ImageConfigOrDict = Union[ImageConfig, ImageConfigDict]
+
+
 class FileStatus(_common.BaseModel):
   """Status of a File that uses a common error model."""
 
@@ -4263,6 +4299,11 @@ class GenerateContentConfig(_common.BaseModel):
       description="""The thinking features configuration.
       """,
   )
+  image_config: Optional[ImageConfig] = Field(
+      default=None,
+      description="""The image generation configuration.
+      """,
+  )
 
   @pydantic.field_validator('response_schema', mode='before')
   @classmethod
@@ -4278,6 +4319,15 @@ class GenerateContentConfig(_common.BaseModel):
       return Enum('PlaceholderLiteralEnum', {s: s for s in enum_vals})
     return value
 
+  @pydantic.field_validator('image_config', mode='before')
+  @classmethod
+  def _check_image_config_type(cls, value: Any) -> Any:
+    if isinstance(value, GenerateImagesConfig):
+      raise ValueError(
+          'image_config must be an instance of ImageConfig or compatible dict.'
+      )
+    return value
+
 
 class GenerateContentConfigDict(TypedDict, total=False):
   """Optional model configuration parameters.
@@ -4452,6 +4502,10 @@ class GenerateContentConfigDict(TypedDict, total=False):
   """The thinking features configuration.
       """
 
+  image_config: Optional[ImageConfigDict]
+  """The image generation configuration.
+      """
+
 
 GenerateContentConfigOrDict = Union[
     GenerateContentConfig, GenerateContentConfigDict
@@ -10134,6 +10188,71 @@ PartnerModelTuningSpecOrDict = Union[
 ]
 
 
+class VeoHyperParameters(_common.BaseModel):
+  """Hyperparameters for Veo."""
+
+  epoch_count: Optional[int] = Field(
+      default=None,
+      description="""Optional. Number of complete passes the model makes over the entire training dataset during training.""",
+  )
+  learning_rate_multiplier: Optional[float] = Field(
+      default=None,
+      description="""Optional. Multiplier for adjusting the default learning rate.""",
+  )
+  tuning_task: Optional[TuningTask] = Field(
+      default=None,
+      description="""Optional. The tuning task. Either I2V or T2V.""",
+  )
+
+
+class VeoHyperParametersDict(TypedDict, total=False):
+  """Hyperparameters for Veo."""
+
+  epoch_count: Optional[int]
+  """Optional. Number of complete passes the model makes over the entire training dataset during training."""
+
+  learning_rate_multiplier: Optional[float]
+  """Optional. Multiplier for adjusting the default learning rate."""
+
+  tuning_task: Optional[TuningTask]
+  """Optional. The tuning task. Either I2V or T2V."""
+
+
+VeoHyperParametersOrDict = Union[VeoHyperParameters, VeoHyperParametersDict]
+
+
+class VeoTuningSpec(_common.BaseModel):
+  """Tuning Spec for Veo Model Tuning."""
+
+  hyper_parameters: Optional[VeoHyperParameters] = Field(
+      default=None, description="""Optional. Hyperparameters for Veo."""
+  )
+  training_dataset_uri: Optional[str] = Field(
+      default=None,
+      description="""Required. Training dataset used for tuning. The dataset can be specified as either a Cloud Storage path to a JSONL file or as the resource name of a Vertex Multimodal Dataset.""",
+  )
+  validation_dataset_uri: Optional[str] = Field(
+      default=None,
+      description="""Optional. Validation dataset used for tuning. The dataset can be specified as either a Cloud Storage path to a JSONL file or as the resource name of a Vertex Multimodal Dataset.""",
+  )
+
+
+class VeoTuningSpecDict(TypedDict, total=False):
+  """Tuning Spec for Veo Model Tuning."""
+
+  hyper_parameters: Optional[VeoHyperParametersDict]
+  """Optional. Hyperparameters for Veo."""
+
+  training_dataset_uri: Optional[str]
+  """Required. Training dataset used for tuning. The dataset can be specified as either a Cloud Storage path to a JSONL file or as the resource name of a Vertex Multimodal Dataset."""
+
+  validation_dataset_uri: Optional[str]
+  """Optional. Validation dataset used for tuning. The dataset can be specified as either a Cloud Storage path to a JSONL file or as the resource name of a Vertex Multimodal Dataset."""
+
+
+VeoTuningSpecOrDict = Union[VeoTuningSpec, VeoTuningSpecDict]
+
+
 class TuningJob(_common.BaseModel):
   """A tuning job."""
 
@@ -10229,6 +10348,9 @@ class TuningJob(_common.BaseModel):
       default=None,
       description="""Optional. The display name of the TunedModel. The name can be up to 128 characters long and can consist of any UTF-8 characters.""",
   )
+  veo_tuning_spec: Optional[VeoTuningSpec] = Field(
+      default=None, description="""Tuning Spec for Veo Tuning."""
+  )
 
   @property
   def has_ended(self) -> bool:
@@ -10316,6 +10438,9 @@ class TuningJobDict(TypedDict, total=False):
   tuned_model_display_name: Optional[str]
   """Optional. The display name of the TunedModel. The name can be up to 128 characters long and can consist of any UTF-8 characters."""
 
+  veo_tuning_spec: Optional[VeoTuningSpecDict]
+  """Tuning Spec for Veo Tuning."""
+
 
 TuningJobOrDict = Union[TuningJob, TuningJobDict]
 
@@ -14594,6 +14719,13 @@ class LiveConnectConfig(_common.BaseModel):
       description="""The speech generation configuration.
       """,
   )
+  thinking_config: Optional[ThinkingConfig] = Field(
+      default=None,
+      description="""Config for thinking features.
+      An error will be returned if this field is set for models that don't
+      support thinking.
+      """,
+  )
   enable_affective_dialog: Optional[bool] = Field(
       default=None,
       description="""If enabled, the model will detect emotions and adapt its responses accordingly.""",
@@ -14699,6 +14831,12 @@ class LiveConnectConfigDict(TypedDict, total=False):
   """The speech generation configuration.
       """
 
+  thinking_config: Optional[ThinkingConfigDict]
+  """Config for thinking features.
+      An error will be returned if this field is set for models that don't
+      support thinking.
+      """
+
   enable_affective_dialog: Optional[bool]
   """If enabled, the model will detect emotions and adapt its responses accordingly."""
 

{google_genai-1.39.1 → google_genai-1.41.0}/google/genai/version.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 #
 
-__version__ = '1.39.1' # x-release-please-version
+__version__ = '1.41.0' # x-release-please-version

{google_genai-1.39.1 → google_genai-1.41.0/google_genai.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-genai
-Version: 1.39.1
+Version: 1.41.0
 Summary: GenAI Python SDK
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache-2.0

{google_genai-1.39.1 → google_genai-1.41.0}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel", "twine>=6.1.0", "packaging>=24.2", "pkginfo>=
 
 [project]
 name = "google-genai"
-version = "1.39.1"
+version = "1.41.0"
 description = "GenAI Python SDK"
 readme = "README.md"
 license = {text = "Apache-2.0"}