google-genai 0.7.0__py3-none-any.whl → 1.0.0rc0__py3-none-any.whl

google/genai/files.py

@@ -19,7 +19,7 @@ import io
 import mimetypes
 import os
 import pathlib
-from typing import Optional, Union
+from typing import Any, Optional, Union
 from urllib.parse import urlencode
 from . import _api_module
 from . import _common
@@ -351,12 +351,12 @@ def _DeleteFileParameters_to_vertex(
   return to_object
 
 
-def _FileState_to_vertex_enum_validate(enum_value: any):
+def _FileState_to_vertex_enum_validate(enum_value: Any):
   if enum_value in set(['STATE_UNSPECIFIED', 'PROCESSING', 'ACTIVE', 'FAILED']):
     raise ValueError(f'{enum_value} enum value is not supported in Vertex AI.')
 
 
-def _FileSource_to_vertex_enum_validate(enum_value: any):
+def _FileSource_to_vertex_enum_validate(enum_value: Any):
   if enum_value in set(['SOURCE_UNSPECIFIED', 'UPLOADED', 'GENERATED']):
     raise ValueError(f'{enum_value} enum value is not supported in Vertex AI.')
 
@@ -781,16 +781,17 @@ class Files(_api_module.BaseModule):
   def upload(
       self,
       *,
-      path: Union[str, pathlib.Path, os.PathLike, io.IOBase],
+      file: Union[str, pathlib.Path, os.PathLike, io.IOBase],
       config: Optional[types.UploadFileConfigOrDict] = None,
   ) -> types.File:
     """Calls the API to upload a file using a supported file service.
 
     Args:
-      path: The path to the file or an `IOBase` object to be uploaded. If it's
-        an IOBase object, it must be opened in blocking mode and binary mode. In
-        other words, do not use non-blocking mode or text mode. The given stream
-        must be seekable, that is, it must be able to call seek() on 'path'.
+      file: A path to the file or an `IOBase` object to be uploaded. If it's an
+        IOBase object, it must be opened in blocking (the default) mode and
+        binary mode. In other words, do not use non-blocking mode or text mode.
+        The given stream must be seekable, that is, it must be able to call
+        `seek()` on 'path'.
       config: Optional parameters to set `diplay_name`, `mime_type`, and `name`.
     """
     if self._api_client.vertexai:
@@ -804,37 +805,37 @@ class Files(_api_module.BaseModule):
         config_model = types.UploadFileConfig(**config)
       else:
         config_model = config
-      file = types.File(
+      file_obj = types.File(
           mime_type=config_model.mime_type,
           name=config_model.name,
           display_name=config_model.display_name,
       )
     else:  # if not config
-      file = types.File()
-    if file.name is not None and not file.name.startswith('files/'):
-      file.name = f'files/{file.name}'
+      file_obj = types.File()
+    if file_obj.name is not None and not file_obj.name.startswith('files/'):
+      file_obj.name = f'files/{file_obj.name}'
 
-    if isinstance(path, io.IOBase):
-      if file.mime_type is None:
+    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(path, 'mode'):
-        if 'b' not in path.mode:
+      if hasattr(file, 'mode'):
+        if 'b' not in file.mode:
           raise ValueError('The file must be opened in binary mode.')
-      offset = path.tell()
-      path.seek(0, os.SEEK_END)
-      file.size_bytes = path.tell() - offset
-      path.seek(offset, os.SEEK_SET)
+      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(path)
+      fs_path = os.fspath(file)
       if not fs_path or not os.path.isfile(fs_path):
-        raise FileNotFoundError(f'{path} is not a valid file path.')
-      file.size_bytes = os.path.getsize(fs_path)
-      if file.mime_type is None:
-        file.mime_type, _ = mimetypes.guess_type(fs_path)
-      if file.mime_type is None:
+        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'
@@ -849,12 +850,12 @@ class Files(_api_module.BaseModule):
               'Content-Type': 'application/json',
               'X-Goog-Upload-Protocol': 'resumable',
               'X-Goog-Upload-Command': 'start',
-              'X-Goog-Upload-Header-Content-Length': f'{file.size_bytes}',
-              'X-Goog-Upload-Header-Content-Type': f'{file.mime_type}',
+              'X-Goog-Upload-Header-Content-Length': f'{file_obj.size_bytes}',
+              'X-Goog-Upload-Header-Content-Type': f'{file_obj.mime_type}',
           },
           'deprecated_response_payload': response,
       }
-    self._create(file=file, config={'http_options': http_options})
+    self._create(file=file_obj, config={'http_options': http_options})
 
     if (
         'headers' not in response
@@ -866,13 +867,13 @@ class Files(_api_module.BaseModule):
       )
     upload_url = response['headers']['X-Goog-Upload-URL']
 
-    if isinstance(path, io.IOBase):
+    if isinstance(file, io.IOBase):
       return_file = self._api_client.upload_file(
-          path, upload_url, file.size_bytes
+          file, upload_url, file_obj.size_bytes
       )
     else:
       return_file = self._api_client.upload_file(
-          fs_path, upload_url, file.size_bytes
+          fs_path, upload_url, file_obj.size_bytes
       )
 
     return types.File._from_response(
@@ -1211,16 +1212,17 @@ class AsyncFiles(_api_module.BaseModule):
   async def upload(
       self,
       *,
-      path: Union[str, pathlib.Path, os.PathLike, io.IOBase],
+      file: Union[str, pathlib.Path, os.PathLike, io.IOBase],
       config: Optional[types.UploadFileConfigOrDict] = None,
   ) -> types.File:
     """Calls the API to upload a file asynchronously using a supported file service.
 
     Args:
-      path:  The path to the file or an `IOBase` object to be uploaded. If it's
-        an IOBase object, it must be opened in blocking mode and binary mode. In
-        other words, do not use non-blocking mode or text mode. The given stream
-        must be seekable, that is, it must be able to call seek() on 'path'.
+      file: A path to the file or an `IOBase` object to be uploaded. If it's an
+        IOBase object, it must be opened in blocking (the default) mode and
+        binary mode. In other words, do not use non-blocking mode or text mode.
+        The given stream must be seekable, that is, it must be able to call
+        `seek()` on 'path'.
       config: Optional parameters to set `diplay_name`, `mime_type`, and `name`.
     """
     if self._api_client.vertexai:
@@ -1234,37 +1236,37 @@ class AsyncFiles(_api_module.BaseModule):
         config_model = types.UploadFileConfig(**config)
       else:
         config_model = config
-      file = types.File(
+      file_obj = types.File(
           mime_type=config_model.mime_type,
           name=config_model.name,
           display_name=config_model.display_name,
       )
     else:  # if not config
-      file = types.File()
-    if file.name is not None and not file.name.startswith('files/'):
-      file.name = f'files/{file.name}'
+      file_obj = types.File()
+    if file_obj.name is not None and not file_obj.name.startswith('files/'):
+      file_obj.name = f'files/{file_obj.name}'
 
-    if isinstance(path, io.IOBase):
-      if file.mime_type is None:
+    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(path, 'mode'):
-        if 'b' not in path.mode:
+      if hasattr(file, 'mode'):
+        if 'b' not in file.mode:
           raise ValueError('The file must be opened in binary mode.')
-      offset = path.tell()
-      path.seek(0, os.SEEK_END)
-      file.size_bytes = path.tell() - offset
-      path.seek(offset, os.SEEK_SET)
+      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(path)
+      fs_path = os.fspath(file)
       if not fs_path or not os.path.isfile(fs_path):
-        raise FileNotFoundError(f'{path} is not a valid file path.')
-      file.size_bytes = os.path.getsize(fs_path)
-      if file.mime_type is None:
-        file.mime_type, _ = mimetypes.guess_type(fs_path)
-      if file.mime_type is None:
+        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'
@@ -1280,12 +1282,12 @@ class AsyncFiles(_api_module.BaseModule):
               'Content-Type': 'application/json',
               'X-Goog-Upload-Protocol': 'resumable',
               'X-Goog-Upload-Command': 'start',
-              'X-Goog-Upload-Header-Content-Length': f'{file.size_bytes}',
-              'X-Goog-Upload-Header-Content-Type': f'{file.mime_type}',
+              'X-Goog-Upload-Header-Content-Length': f'{file_obj.size_bytes}',
+              'X-Goog-Upload-Header-Content-Type': f'{file_obj.mime_type}',
           },
           'deprecated_response_payload': response,
       }
-    await self._create(file=file, config={'http_options': http_options})
+    await self._create(file=file_obj, config={'http_options': http_options})
     if (
         'headers' not in response
         or 'X-Goog-Upload-URL' not in response['headers']
@@ -1296,13 +1298,13 @@ class AsyncFiles(_api_module.BaseModule):
       )
     upload_url = response['headers']['X-Goog-Upload-URL']
 
-    if isinstance(path, io.IOBase):
+    if isinstance(file, io.IOBase):
       return_file = await self._api_client.async_upload_file(
-          path, upload_url, file.size_bytes
+          file, upload_url, file_obj.size_bytes
       )
     else:
       return_file = await self._api_client.async_upload_file(
-          fs_path, upload_url, file.size_bytes
+          fs_path, upload_url, file_obj.size_bytes
       )
 
     return types.File._from_response(

google/genai/models.py

@@ -16,7 +16,7 @@
 # Code generated by the Google Gen AI SDK generator DO NOT EDIT.
 
 import logging
-from typing import AsyncIterator, Awaitable, Iterator, Optional, Union
+from typing import Any, AsyncIterator, Awaitable, Iterator, Optional, Union
 from urllib.parse import urlencode
 from . import _api_module
 from . import _common
@@ -904,6 +904,9 @@ def _GenerateContentConfig_to_mldev(
         ),
     )
 
+  if getv(from_object, ['labels']) is not None:
+    raise ValueError('labels parameter is not supported in Gemini API.')
+
   if getv(from_object, ['cached_content']) is not None:
     setv(
         parent_object,
@@ -1066,6 +1069,9 @@ def _GenerateContentConfig_to_vertex(
         ),
     )
 
+  if getv(from_object, ['labels']) is not None:
+    setv(parent_object, ['labels'], getv(from_object, ['labels']))
+
   if getv(from_object, ['cached_content']) is not None:
     setv(
         parent_object,
@@ -2785,7 +2791,7 @@ def _ComputeTokensParameters_to_vertex(
   return to_object
 
 
-def _MediaResolution_to_mldev_enum_validate(enum_value: any):
+def _MediaResolution_to_mldev_enum_validate(enum_value: Any):
   if enum_value in set([
       'MEDIA_RESOLUTION_UNSPECIFIED',
       'MEDIA_RESOLUTION_LOW',
@@ -2795,17 +2801,17 @@ def _MediaResolution_to_mldev_enum_validate(enum_value: any):
     raise ValueError(f'{enum_value} enum value is not supported in Gemini API.')
 
 
-def _SafetyFilterLevel_to_mldev_enum_validate(enum_value: any):
+def _SafetyFilterLevel_to_mldev_enum_validate(enum_value: Any):
   if enum_value in set(['BLOCK_NONE']):
     raise ValueError(f'{enum_value} enum value is not supported in Gemini API.')
 
 
-def _PersonGeneration_to_mldev_enum_validate(enum_value: any):
+def _PersonGeneration_to_mldev_enum_validate(enum_value: Any):
   if enum_value in set(['ALLOW_ALL']):
     raise ValueError(f'{enum_value} enum value is not supported in Gemini API.')
 
 
-def _MaskReferenceMode_to_mldev_enum_validate(enum_value: any):
+def _MaskReferenceMode_to_mldev_enum_validate(enum_value: Any):
   if enum_value in set([
       'MASK_MODE_DEFAULT',
       'MASK_MODE_USER_PROVIDED',
@@ -2816,7 +2822,7 @@ def _MaskReferenceMode_to_mldev_enum_validate(enum_value: any):
     raise ValueError(f'{enum_value} enum value is not supported in Gemini API.')
 
 
-def _ControlReferenceType_to_mldev_enum_validate(enum_value: any):
+def _ControlReferenceType_to_mldev_enum_validate(enum_value: Any):
   if enum_value in set([
       'CONTROL_TYPE_DEFAULT',
       'CONTROL_TYPE_CANNY',
@@ -2826,7 +2832,7 @@ def _ControlReferenceType_to_mldev_enum_validate(enum_value: any):
     raise ValueError(f'{enum_value} enum value is not supported in Gemini API.')
 
 
-def _SubjectReferenceType_to_mldev_enum_validate(enum_value: any):
+def _SubjectReferenceType_to_mldev_enum_validate(enum_value: Any):
   if enum_value in set([
       'SUBJECT_TYPE_DEFAULT',
       'SUBJECT_TYPE_PERSON',
@@ -2836,7 +2842,7 @@ def _SubjectReferenceType_to_mldev_enum_validate(enum_value: any):
     raise ValueError(f'{enum_value} enum value is not supported in Gemini API.')
 
 
-def _EditMode_to_mldev_enum_validate(enum_value: any):
+def _EditMode_to_mldev_enum_validate(enum_value: Any):
   if enum_value in set([
       'EDIT_MODE_DEFAULT',
       'EDIT_MODE_INPAINT_REMOVAL',
@@ -3366,6 +3372,9 @@ def _GeneratedImage_from_mldev(
         getv(from_object, ['raiFilteredReason']),
     )
 
+  if getv(from_object, ['prompt']) is not None:
+    setv(to_object, ['enhanced_prompt'], getv(from_object, ['prompt']))
+
   return to_object
 
 
@@ -3389,6 +3398,9 @@ def _GeneratedImage_from_vertex(
         getv(from_object, ['raiFilteredReason']),
     )
 
+  if getv(from_object, ['prompt']) is not None:
+    setv(to_object, ['enhanced_prompt'], getv(from_object, ['prompt']))
+
   return to_object
 
 
@@ -4690,15 +4702,18 @@ class Models(_api_module.BaseModule):
       )
       if not func_response_parts:
         break
-      contents = t.t_contents(self._api_client, contents)
-      contents.append(response.candidates[0].content)
-      contents.append(
-          types.Content(
-              role='user',
-              parts=func_response_parts,
-          )
+      func_call_content = response.candidates[0].content
+      func_response_content = types.Content(
+          role='user',
+          parts=func_response_parts,
       )
-      automatic_function_calling_history.extend(contents)
+      contents = t.t_contents(self._api_client, contents)
+      if not automatic_function_calling_history:
+        automatic_function_calling_history.extend(contents)
+      contents.append(func_call_content)
+      contents.append(func_response_content)
+      automatic_function_calling_history.append(func_call_content)
+      automatic_function_calling_history.append(func_response_content)
     if _extra_utils.should_append_afc_history(config):
       response.automatic_function_calling_history = (
           automatic_function_calling_history
@@ -4768,8 +4783,8 @@ class Models(_api_module.BaseModule):
   ) -> Pager[types.Model]:
     """Makes an API request to list the available models.
 
-    If `query_base` is set to True in the config, the API will return all
-    available base models. If set to False or not set (default), it will return
+    If `query_base` is set to True in the config or not set (default), the
+    API will return all available base models. If set to False, it will return
     all tuned models.
 
     Args:
@@ -4792,6 +4807,8 @@ class Models(_api_module.BaseModule):
         types._ListModelsParameters(config=config).config
         or types.ListModelsConfig()
     )
+    if config.query_base is None:
+      config.query_base = True
     if self._api_client.vertexai:
       config = config.copy()
       if not config.query_base:
@@ -4802,8 +4819,6 @@ class Models(_api_module.BaseModule):
             if filter_value
             else 'labels.tune-type:*'
         )
-    if not config.query_base:
-      config.query_base = False
     return Pager(
         'models',
         self._list,
@@ -5688,15 +5703,18 @@ class AsyncModels(_api_module.BaseModule):
       )
       if not func_response_parts:
         break
-      contents = t.t_contents(self._api_client, contents)
-      contents.append(response.candidates[0].content)
-      contents.append(
-          types.Content(
-              role='user',
-              parts=func_response_parts,
-          )
+      func_call_content = response.candidates[0].content
+      func_response_content = types.Content(
+          role='user',
+          parts=func_response_parts,
       )
-      automatic_function_calling_history.extend(contents)
+      contents = t.t_contents(self._api_client, contents)
+      if not automatic_function_calling_history:
+        automatic_function_calling_history.extend(contents)
+      contents.append(func_call_content)
+      contents.append(func_response_content)
+      automatic_function_calling_history.append(func_call_content)
+      automatic_function_calling_history.append(func_response_content)
 
     if _extra_utils.should_append_afc_history(config):
       response.automatic_function_calling_history = (