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

google/genai/files.py

@@ -15,6 +15,7 @@
 
 # Code generated by the Google Gen AI SDK generator DO NOT EDIT.
 
+import io
 import mimetypes
 import os
 import pathlib
@@ -176,9 +177,15 @@ def _File_to_mldev(
   if getv(from_object, ['uri']) is not None:
     setv(to_object, ['uri'], getv(from_object, ['uri']))
 
+  if getv(from_object, ['download_uri']) is not None:
+    setv(to_object, ['downloadUri'], getv(from_object, ['download_uri']))
+
   if getv(from_object, ['state']) is not None:
     setv(to_object, ['state'], getv(from_object, ['state']))
 
+  if getv(from_object, ['source']) is not None:
+    setv(to_object, ['source'], getv(from_object, ['source']))
+
   if getv(from_object, ['video_metadata']) is not None:
     setv(to_object, ['videoMetadata'], getv(from_object, ['video_metadata']))
 
@@ -227,9 +234,15 @@ def _File_to_vertex(
   if getv(from_object, ['uri']) is not None:
     raise ValueError('uri parameter is not supported in Vertex AI.')
 
+  if getv(from_object, ['download_uri']) is not None:
+    raise ValueError('download_uri parameter is not supported in Vertex AI.')
+
   if getv(from_object, ['state']) is not None:
     raise ValueError('state parameter is not supported in Vertex AI.')
 
+  if getv(from_object, ['source']) is not None:
+    raise ValueError('source parameter is not supported in Vertex AI.')
+
   if getv(from_object, ['video_metadata']) is not None:
     raise ValueError('video_metadata parameter is not supported in Vertex AI.')
 
@@ -492,9 +505,15 @@ def _File_from_mldev(
   if getv(from_object, ['uri']) is not None:
     setv(to_object, ['uri'], getv(from_object, ['uri']))
 
+  if getv(from_object, ['downloadUri']) is not None:
+    setv(to_object, ['download_uri'], getv(from_object, ['downloadUri']))
+
   if getv(from_object, ['state']) is not None:
     setv(to_object, ['state'], getv(from_object, ['state']))
 
+  if getv(from_object, ['source']) is not None:
+    setv(to_object, ['source'], getv(from_object, ['source']))
+
   if getv(from_object, ['videoMetadata']) is not None:
     setv(to_object, ['video_metadata'], getv(from_object, ['videoMetadata']))
 
@@ -633,7 +652,7 @@ class Files(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = self._api_client.request(
         'get', path, request_dict, http_options
@@ -680,7 +699,7 @@ class Files(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = self._api_client.request(
         'post', path, request_dict, http_options
@@ -741,7 +760,7 @@ class Files(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = self._api_client.request(
         'get', path, request_dict, http_options
@@ -795,7 +814,7 @@ class Files(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = self._api_client.request(
         'delete', path, request_dict, http_options
@@ -819,13 +838,16 @@ class Files(_common.BaseModule):
   def upload(
       self,
       *,
-      path: str | pathlib.Path | os.PathLike,
+      path: 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 or a path-like object points to the file to to be uploaded.
+      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'.
       config: Optional parameters to set `diplay_name`, `mime_type`, and `name`.
     """
     if self._api_client.vertexai:
@@ -849,17 +871,31 @@ class Files(_common.BaseModule):
     if file.name is not None and not file.name.startswith('files/'):
       file.name = f'files/{file.name}'
 
-    fs_path = os.fspath(path)
-    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 ValueError(
-          'Unknown mime type: Could not determine the mimetype for your file\n'
-          '    please set the `mime_type` argument'
-      )
+    if isinstance(path, io.IOBase):
+      if file.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:
+          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)
+    else:
+      fs_path = os.fspath(path)
+      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 ValueError(
+            'Unknown mime type: Could not determine the mimetype for your'
+            ' file\n    please set the `mime_type` argument'
+        )
     response = {}
     if config_model and config_model.http_options:
       http_options = config_model.http_options
@@ -876,6 +912,7 @@ class Files(_common.BaseModule):
           'response_payload': response,
       }
     self._create(file=file, config={'http_options': http_options})
+
     if (
         'headers' not in response
         or 'X-Goog-Upload-URL' not in response['headers']
@@ -886,9 +923,14 @@ class Files(_common.BaseModule):
       )
     upload_url = response['headers']['X-Goog-Upload-URL']
 
-    return_file = self._api_client.upload_file(
-        fs_path, upload_url, file.size_bytes
-    )
+    if isinstance(path, io.IOBase):
+      return_file = self._api_client.upload_file(
+          path, upload_url, file.size_bytes
+      )
+    else:
+      return_file = self._api_client.upload_file(
+          fs_path, upload_url, file.size_bytes
+      )
 
     return types.File._from_response(
         _File_from_mldev(self._api_client, return_file['file']), None
@@ -904,6 +946,74 @@ class Files(_common.BaseModule):
         config,
     )
 
+  def download(
+      self,
+      *,
+      file: Union[str, types.File],
+      config: Optional[types.DownloadFileConfigOrDict] = None,
+  ) -> bytes:
+    """Downloads a file's data from storage.
+
+    Files created by `upload` can't be downloaded. You can tell which files are
+    downloadable by checking the `source` or `download_uri` property.
+
+    Args:
+      file (str): A file name, uri, or file object. Identifying which file to
+        download.
+      config (DownloadFileConfigOrDict): Optional, configuration for the get
+        method.
+
+    Returns:
+      File: The file data as bytes.
+
+    Usage:
+
+    .. code-block:: python
+
+      for file client.files.list():
+        if file.download_uri is not None:
+          break
+      else:
+        raise ValueError('No files found with a `download_uri`.')
+      data = client.files.download(file=file)
+      # data = client.files.download(file=file.name)
+      # data = client.files.download(file=file.download_uri)
+    """
+    if self._api_client.vertexai:
+      raise ValueError(
+          'Vertex AI does not support the Files API. Use GCS files instead.'
+      )
+
+    config_model = None
+    if config:
+      if isinstance(config, dict):
+        config_model = types.DownloadFileConfig(**config)
+      else:
+        config_model = config
+
+    if isinstance(file, types.File) and file.download_uri is None:
+      raise ValueError(
+          "Only generated files can be downloaded, uploaded files can't be "
+          'downloaded. You can tell which files are downloadable by checking '
+          'the `source` or `download_uri` property.'
+      )
+    name = t.t_file_name(self, file)
+
+    path = f'files/{name}:download'
+
+    query_params = {'alt': 'media'}
+    path = f'{path}?{urlencode(query_params)}'
+    http_options = None
+    if getv(config_model, ['http_options']) is not None:
+      http_options = getv(config_model, ['http_options'])
+
+    data = self._api_client.download_file(
+        path,
+        http_options,
+    )
+
+    return data
+
 
 class AsyncFiles(_common.BaseModule):
 
@@ -946,7 +1056,7 @@ class AsyncFiles(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = await self._api_client.async_request(
         'get', path, request_dict, http_options
@@ -993,7 +1103,7 @@ class AsyncFiles(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = await self._api_client.async_request(
         'post', path, request_dict, http_options
@@ -1054,7 +1164,7 @@ class AsyncFiles(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = await self._api_client.async_request(
         'get', path, request_dict, http_options
@@ -1108,7 +1218,7 @@ class AsyncFiles(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = await self._api_client.async_request(
         'delete', path, request_dict, http_options
@@ -1132,13 +1242,16 @@ class AsyncFiles(_common.BaseModule):
   async def upload(
       self,
       *,
-      path: str | pathlib.Path | os.PathLike,
+      path: 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 or a path-like object points to the file to be uploaded.
+      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'.
       config: Optional parameters to set `diplay_name`, `mime_type`, and `name`.
     """
     if self._api_client.vertexai:
@@ -1162,17 +1275,32 @@ class AsyncFiles(_common.BaseModule):
     if file.name is not None and not file.name.startswith('files/'):
       file.name = f'files/{file.name}'
 
-    fs_path = os.fspath(path)
-    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 ValueError(
-          'Unknown mime type: Could not determine the mimetype for your file\n'
-          '    please set the `mime_type` argument'
-      )
+    if isinstance(path, io.IOBase):
+      if file.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:
+          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)
+    else:
+      fs_path = os.fspath(path)
+      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 ValueError(
+            'Unknown mime type: Could not determine the mimetype for your'
+            ' file\n    please set the `mime_type` argument'
+        )
+
     response = {}
     if config_model and config_model.http_options:
       http_options = config_model.http_options
@@ -1199,9 +1327,14 @@ class AsyncFiles(_common.BaseModule):
       )
     upload_url = response['headers']['X-Goog-Upload-URL']
 
-    return_file = await self._api_client.async_upload_file(
-        fs_path, upload_url, file.size_bytes
-    )
+    if isinstance(path, io.IOBase):
+      return_file = await self._api_client.async_upload_file(
+          path, upload_url, file.size_bytes
+      )
+    else:
+      return_file = await self._api_client.async_upload_file(
+          fs_path, upload_url, file.size_bytes
+      )
 
     return types.File._from_response(
         _File_from_mldev(self._api_client, return_file['file']), None
@@ -1216,3 +1349,69 @@ class AsyncFiles(_common.BaseModule):
         await self._list(config=config),
         config,
     )
+
+  async def download(
+      self,
+      *,
+      file: Union[str, types.File],
+      config: Optional[types.DownloadFileConfigOrDict] = None,
+  ) -> bytes:
+    """Downloads a file's data from the file service.
+
+    The Vertex-AI implementation of the API foes not include the file service.
+
+    Files created by `upload` can't be downloaded. You can tell which files are
+    downloadable by checking the `download_uri` property.
+
+    Args:
+      File (str): A file name, uri, or file object. Identifying which file to
+        download.
+      config (DownloadFileConfigOrDict): Optional, configuration for the get
+        method.
+
+    Returns:
+      File: The file data as bytes.
+
+    Usage:
+
+    .. code-block:: python
+
+      for file client.files.list():
+        if file.download_uri is not None:
+          break
+      else:
+        raise ValueError('No files found with a `download_uri`.')
+      data = client.files.download(file=file)
+      # data = client.files.download(file=file.name)
+      # data = client.files.download(file=file.uri)
+    """
+    if self._api_client.vertexai:
+      raise ValueError(
+          'Vertex AI does not support the Files API. Use GCS files instead.'
+      )
+
+    config_model = None
+    if config:
+      if isinstance(config, dict):
+        config_model = types.DownloadFileConfig(**config)
+      else:
+        config_model = config
+
+    name = t.t_file_name(self, file)
+
+    path = f'files/{name}:download'
+
+    http_options = None
+    if getv(config_model, ['http_options']) is not None:
+      http_options = getv(config_model, ['http_options'])
+
+    query_params = {'alt': 'media'}
+    if query_params:
+      path = f'{path}?{urlencode(query_params)}'
+
+    data = await self._api_client.async_download_file(
+        path,
+        http_options,
+    )
+
+    return data

google/genai/live.py

@@ -108,7 +108,7 @@ class AsyncSession:
 
     The method will yield the model responses from the server. The returned
     responses will represent a complete model turn. When the returned message
-    is fuction call, user must call `send` with the function response to
+    is function call, user must call `send` with the function response to
     continue the turn.
 
     Yields:
@@ -380,6 +380,10 @@ class AsyncSession:
         isinstance(c, dict) and 'name' in c and 'response' in c for c in input
     ):
       # ToolResponse.FunctionResponse
+      if not (self._api_client.vertexai):
+        for item in input:
+          if 'id' not in item:
+            raise ValueError(_FUNCTION_RESPONSE_REQUIRES_ID)
       client_message = {'tool_response': {'function_responses': input}}
     elif isinstance(input, Sequence) and any(isinstance(c, str) for c in input):
       to_object = {}