google-genai 0.6.0__py3-none-any.whl → 0.8.0__py3-none-any.whl

google/genai/files.py

@@ -21,6 +21,7 @@ import os
 import pathlib
 from typing import Optional, Union
 from urllib.parse import urlencode
+from . import _api_module
 from . import _common
 from . import _transformers as t
 from . import types
@@ -36,8 +37,6 @@ def _ListFilesConfig_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['page_size']) is not None:
     setv(
@@ -60,8 +59,6 @@ def _ListFilesConfig_to_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['page_size']) is not None:
     setv(
@@ -252,30 +249,6 @@ def _File_to_vertex(
   return to_object
 
 
-def _CreateFileConfig_to_mldev(
-    api_client: ApiClient,
-    from_object: Union[dict, object],
-    parent_object: dict = None,
-) -> dict:
-  to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
-
-  return to_object
-
-
-def _CreateFileConfig_to_vertex(
-    api_client: ApiClient,
-    from_object: Union[dict, object],
-    parent_object: dict = None,
-) -> dict:
-  to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
-
-  return to_object
-
-
 def _CreateFileParameters_to_mldev(
     api_client: ApiClient,
     from_object: Union[dict, object],
@@ -290,13 +263,7 @@ def _CreateFileParameters_to_mldev(
     )
 
   if getv(from_object, ['config']) is not None:
-    setv(
-        to_object,
-        ['config'],
-        _CreateFileConfig_to_mldev(
-            api_client, getv(from_object, ['config']), to_object
-        ),
-    )
+    setv(to_object, ['config'], getv(from_object, ['config']))
 
   return to_object
 
@@ -316,30 +283,6 @@ def _CreateFileParameters_to_vertex(
   return to_object
 
 
-def _GetFileConfig_to_mldev(
-    api_client: ApiClient,
-    from_object: Union[dict, object],
-    parent_object: dict = None,
-) -> dict:
-  to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
-
-  return to_object
-
-
-def _GetFileConfig_to_vertex(
-    api_client: ApiClient,
-    from_object: Union[dict, object],
-    parent_object: dict = None,
-) -> dict:
-  to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
-
-  return to_object
-
-
 def _GetFileParameters_to_mldev(
     api_client: ApiClient,
     from_object: Union[dict, object],
@@ -354,13 +297,7 @@ def _GetFileParameters_to_mldev(
     )
 
   if getv(from_object, ['config']) is not None:
-    setv(
-        to_object,
-        ['config'],
-        _GetFileConfig_to_mldev(
-            api_client, getv(from_object, ['config']), to_object
-        ),
-    )
+    setv(to_object, ['config'], getv(from_object, ['config']))
 
   return to_object
 
@@ -380,30 +317,6 @@ def _GetFileParameters_to_vertex(
   return to_object
 
 
-def _DeleteFileConfig_to_mldev(
-    api_client: ApiClient,
-    from_object: Union[dict, object],
-    parent_object: dict = None,
-) -> dict:
-  to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
-
-  return to_object
-
-
-def _DeleteFileConfig_to_vertex(
-    api_client: ApiClient,
-    from_object: Union[dict, object],
-    parent_object: dict = None,
-) -> dict:
-  to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
-
-  return to_object
-
-
 def _DeleteFileParameters_to_mldev(
     api_client: ApiClient,
     from_object: Union[dict, object],
@@ -418,13 +331,7 @@ def _DeleteFileParameters_to_mldev(
     )
 
   if getv(from_object, ['config']) is not None:
-    setv(
-        to_object,
-        ['config'],
-        _DeleteFileConfig_to_mldev(
-            api_client, getv(from_object, ['config']), to_object
-        ),
-    )
+    setv(to_object, ['config'], getv(from_object, ['config']))
 
   return to_object
 
@@ -444,6 +351,16 @@ def _DeleteFileParameters_to_vertex(
   return to_object
 
 
+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):
+  if enum_value in set(['SOURCE_UNSPECIFIED', 'UPLOADED', 'GENERATED']):
+    raise ValueError(f'{enum_value} enum value is not supported in Vertex AI.')
+
+
 def _FileStatus_from_mldev(
     api_client: ApiClient,
     from_object: Union[dict, object],
@@ -611,7 +528,7 @@ def _DeleteFileResponse_from_vertex(
   return to_object
 
 
-class Files(_common.BaseModule):
+class Files(_api_module.BaseModule):
 
   def _list(
       self, *, config: Optional[types.ListFilesConfigOrDict] = None
@@ -649,8 +566,14 @@ class Files(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -668,7 +591,7 @@ class Files(_common.BaseModule):
       )
 
     return_value = types.ListFilesResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -696,8 +619,14 @@ class Files(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -715,7 +644,7 @@ class Files(_common.BaseModule):
       )
 
     return_value = types.CreateFileResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -757,8 +686,14 @@ class Files(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -771,7 +706,9 @@ class Files(_common.BaseModule):
     else:
       response_dict = _File_from_mldev(self._api_client, response_dict)
 
-    return_value = types.File._from_response(response_dict, parameter_model)
+    return_value = types.File._from_response(
+        response=response_dict, kwargs=parameter_model
+    )
     self._api_client._verify_response(return_value)
     return return_value
 
@@ -811,8 +748,14 @@ class Files(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -830,7 +773,7 @@ class Files(_common.BaseModule):
       )
 
     return_value = types.DeleteFileResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -838,16 +781,17 @@ class Files(_common.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:
@@ -861,37 +805,37 @@ class Files(_common.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'
@@ -906,12 +850,12 @@ class Files(_common.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}',
           },
-          'response_payload': response,
+          '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
@@ -923,13 +867,13 @@ class Files(_common.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(
@@ -1015,7 +959,7 @@ class Files(_common.BaseModule):
     return data
 
 
-class AsyncFiles(_common.BaseModule):
+class AsyncFiles(_api_module.BaseModule):
 
   async def _list(
       self, *, config: Optional[types.ListFilesConfigOrDict] = None
@@ -1053,8 +997,14 @@ class AsyncFiles(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -1072,7 +1022,7 @@ class AsyncFiles(_common.BaseModule):
       )
 
     return_value = types.ListFilesResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -1100,8 +1050,14 @@ class AsyncFiles(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -1119,7 +1075,7 @@ class AsyncFiles(_common.BaseModule):
       )
 
     return_value = types.CreateFileResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -1161,8 +1117,14 @@ class AsyncFiles(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -1175,7 +1137,9 @@ class AsyncFiles(_common.BaseModule):
     else:
       response_dict = _File_from_mldev(self._api_client, response_dict)
 
-    return_value = types.File._from_response(response_dict, parameter_model)
+    return_value = types.File._from_response(
+        response=response_dict, kwargs=parameter_model
+    )
     self._api_client._verify_response(return_value)
     return return_value
 
@@ -1215,8 +1179,14 @@ class AsyncFiles(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -1234,7 +1204,7 @@ class AsyncFiles(_common.BaseModule):
       )
 
     return_value = types.DeleteFileResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -1242,16 +1212,17 @@ class AsyncFiles(_common.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:
@@ -1265,37 +1236,37 @@ class AsyncFiles(_common.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'
@@ -1311,12 +1282,12 @@ class AsyncFiles(_common.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}',
           },
-          'response_payload': response,
+          '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']
@@ -1327,13 +1298,13 @@ class AsyncFiles(_common.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(