google-genai 1.4.0__py3-none-any.whl → 1.6.0__py3-none-any.whl

google/genai/batches.py

@@ -668,7 +668,7 @@ class Batches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -737,7 +737,7 @@ class Batches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -807,7 +807,7 @@ class Batches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -846,7 +846,7 @@ class Batches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -921,7 +921,7 @@ class Batches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -998,6 +998,8 @@ class Batches(_api_module.BaseModule):
       for batch_job in batch_jobs:
         print(f"Batch job: {batch_job.name}, state {batch_job.state}")
     """
+    if config is None:
+      config = types.ListBatchJobsConfig()
     return Pager(
         'batch_jobs',
         self._list,
@@ -1043,7 +1045,7 @@ class AsyncBatches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1112,7 +1114,7 @@ class AsyncBatches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1182,7 +1184,7 @@ class AsyncBatches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1221,7 +1223,7 @@ class AsyncBatches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1296,7 +1298,7 @@ class AsyncBatches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1373,6 +1375,8 @@ class AsyncBatches(_api_module.BaseModule):
       await batch_jobs_pager.next_page()
       print(f"next page: {batch_jobs_pager.page}")
     """
+    if config is None:
+      config = types.ListBatchJobsConfig()
     return AsyncPager(
         'batch_jobs',
         self._list,

google/genai/caches.py

@@ -174,15 +174,9 @@ def _Schema_to_mldev(
   if getv(from_object, ['pattern']) is not None:
     raise ValueError('pattern parameter is not supported in Gemini API.')
 
-  if getv(from_object, ['minimum']) is not None:
-    raise ValueError('minimum parameter is not supported in Gemini API.')
-
   if getv(from_object, ['default']) is not None:
     raise ValueError('default parameter is not supported in Gemini API.')
 
-  if getv(from_object, ['any_of']) is not None:
-    raise ValueError('any_of parameter is not supported in Gemini API.')
-
   if getv(from_object, ['max_length']) is not None:
     raise ValueError('max_length parameter is not supported in Gemini API.')
 
@@ -195,12 +189,12 @@ def _Schema_to_mldev(
   if getv(from_object, ['min_properties']) is not None:
     raise ValueError('min_properties parameter is not supported in Gemini API.')
 
-  if getv(from_object, ['maximum']) is not None:
-    raise ValueError('maximum parameter is not supported in Gemini API.')
-
   if getv(from_object, ['max_properties']) is not None:
     raise ValueError('max_properties parameter is not supported in Gemini API.')
 
+  if getv(from_object, ['any_of']) is not None:
+    setv(to_object, ['anyOf'], getv(from_object, ['any_of']))
+
   if getv(from_object, ['description']) is not None:
     setv(to_object, ['description'], getv(from_object, ['description']))
 
@@ -216,9 +210,15 @@ def _Schema_to_mldev(
   if getv(from_object, ['max_items']) is not None:
     setv(to_object, ['maxItems'], getv(from_object, ['max_items']))
 
+  if getv(from_object, ['maximum']) is not None:
+    setv(to_object, ['maximum'], getv(from_object, ['maximum']))
+
   if getv(from_object, ['min_items']) is not None:
     setv(to_object, ['minItems'], getv(from_object, ['min_items']))
 
+  if getv(from_object, ['minimum']) is not None:
+    setv(to_object, ['minimum'], getv(from_object, ['minimum']))
+
   if getv(from_object, ['nullable']) is not None:
     setv(to_object, ['nullable'], getv(from_object, ['nullable']))
 
@@ -253,15 +253,9 @@ def _Schema_to_vertex(
   if getv(from_object, ['pattern']) is not None:
     setv(to_object, ['pattern'], getv(from_object, ['pattern']))
 
-  if getv(from_object, ['minimum']) is not None:
-    setv(to_object, ['minimum'], getv(from_object, ['minimum']))
-
   if getv(from_object, ['default']) is not None:
     setv(to_object, ['default'], getv(from_object, ['default']))
 
-  if getv(from_object, ['any_of']) is not None:
-    setv(to_object, ['anyOf'], getv(from_object, ['any_of']))
-
   if getv(from_object, ['max_length']) is not None:
     setv(to_object, ['maxLength'], getv(from_object, ['max_length']))
 
@@ -274,12 +268,12 @@ def _Schema_to_vertex(
   if getv(from_object, ['min_properties']) is not None:
     setv(to_object, ['minProperties'], getv(from_object, ['min_properties']))
 
-  if getv(from_object, ['maximum']) is not None:
-    setv(to_object, ['maximum'], getv(from_object, ['maximum']))
-
   if getv(from_object, ['max_properties']) is not None:
     setv(to_object, ['maxProperties'], getv(from_object, ['max_properties']))
 
+  if getv(from_object, ['any_of']) is not None:
+    setv(to_object, ['anyOf'], getv(from_object, ['any_of']))
+
   if getv(from_object, ['description']) is not None:
     setv(to_object, ['description'], getv(from_object, ['description']))
 
@@ -295,9 +289,15 @@ def _Schema_to_vertex(
   if getv(from_object, ['max_items']) is not None:
     setv(to_object, ['maxItems'], getv(from_object, ['max_items']))
 
+  if getv(from_object, ['maximum']) is not None:
+    setv(to_object, ['maximum'], getv(from_object, ['maximum']))
+
   if getv(from_object, ['min_items']) is not None:
     setv(to_object, ['minItems'], getv(from_object, ['min_items']))
 
+  if getv(from_object, ['minimum']) is not None:
+    setv(to_object, ['minimum'], getv(from_object, ['minimum']))
+
   if getv(from_object, ['nullable']) is not None:
     setv(to_object, ['nullable'], getv(from_object, ['nullable']))
 
@@ -1176,10 +1176,7 @@ class Caches(_api_module.BaseModule):
       model: str,
       config: Optional[types.CreateCachedContentConfigOrDict] = None,
   ) -> types.CachedContent:
-    """Creates cached content, this call will initialize the cached
-
-    content in the data storage, and users need to pay for the cache data
-    storage.
+    """Creates a cached contents resource.
 
     Usage:
 
@@ -1231,7 +1228,7 @@ class Caches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1301,7 +1298,7 @@ class Caches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1373,7 +1370,7 @@ class Caches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1450,7 +1447,7 @@ class Caches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1518,7 +1515,7 @@ class Caches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1562,10 +1559,7 @@ class AsyncCaches(_api_module.BaseModule):
       model: str,
       config: Optional[types.CreateCachedContentConfigOrDict] = None,
   ) -> types.CachedContent:
-    """Creates cached content, this call will initialize the cached
-
-    content in the data storage, and users need to pay for the cache data
-    storage.
+    """Creates a cached contents resource.
 
     Usage:
 
@@ -1617,7 +1611,7 @@ class AsyncCaches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1688,7 +1682,7 @@ class AsyncCaches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1761,7 +1755,7 @@ class AsyncCaches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1838,7 +1832,7 @@ class AsyncCaches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1906,7 +1900,7 @@ class AsyncCaches(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)

google/genai/client.py

@@ -130,8 +130,9 @@ class Client:
       from environment variables. Applies to the Vertex AI API only.
     debug_config: Config settings that control network behavior of the client.
       This is typically used when running test code.
-    http_options: Http options to use for the client. Response_payload can't be
-      set when passing to the client constructor.
+    http_options: Http options to use for the client. These options will be
+      applied to all requests made by the client. Example usage:
+      `client = genai.Client(http_options=types.HttpOptions(api_version='v1'))`.
 
   Usage for the Gemini Developer API:
 

google/genai/errors.py

@@ -18,7 +18,6 @@
 from typing import Any, Optional, TYPE_CHECKING, Union
 import httpx
 import json
-import requests
 
 
 if TYPE_CHECKING:
@@ -28,7 +27,7 @@ if TYPE_CHECKING:
 class APIError(Exception):
   """General errors raised by the GenAI API."""
   code: int
-  response: Union[requests.Response, 'ReplayResponse', httpx.Response]
+  response: Union['ReplayResponse', httpx.Response]
 
   status: Optional[str] = None
   message: Optional[str] = None
@@ -36,28 +35,21 @@ class APIError(Exception):
   def __init__(
       self,
       code: int,
-      response: Union[requests.Response, 'ReplayResponse', httpx.Response],
+      response: Union['ReplayResponse', httpx.Response],
   ):
     self.response = response
-
-    if isinstance(response, requests.Response):
+    message = None
+    if isinstance(response, httpx.Response):
       try:
-        # do not do any extra muanipulation on the response.
-        # return the raw response json as is.
         response_json = response.json()
-      except requests.exceptions.JSONDecodeError:
+      except (json.decoder.JSONDecodeError):
+        message = response.text
         response_json = {
-            'message': response.text,
-            'status': response.reason,
+            'message': message,
+            'status': response.reason_phrase,
         }
-    elif isinstance(response, httpx.Response):
-      try:
-        response_json = response.json()
-      except (json.decoder.JSONDecodeError, httpx.ResponseNotRead):
-        try:
-          message = response.text
-        except httpx.ResponseNotRead:
-          message = None
+      except httpx.ResponseNotRead:
+        message = 'Response not read'
         response_json = {
             'message': message,
             'status': response.reason_phrase,
@@ -103,7 +95,7 @@ class APIError(Exception):
 
   @classmethod
   def raise_for_response(
-      cls, response: Union[requests.Response, 'ReplayResponse', httpx.Response]
+      cls, response: Union['ReplayResponse', httpx.Response]
   ):
     """Raises an error with detailed error message if the response has an error status."""
     if response.status_code == 200:

google/genai/files.py

@@ -583,7 +583,7 @@ class Files(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -641,7 +641,7 @@ class Files(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -713,7 +713,7 @@ class Files(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -780,7 +780,7 @@ class Files(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -826,7 +826,7 @@ class Files(_api_module.BaseModule):
           'Vertex AI does not support creating files. You can upload files to'
           ' GCS files instead.'
       )
-    config_model = None
+    config_model = types.UploadFileConfig()
     if config:
       if isinstance(config, dict):
         config_model = types.UploadFileConfig(**config)
@@ -907,7 +907,7 @@ class Files(_api_module.BaseModule):
 
     return types.File._from_response(
         response=_File_from_mldev(self._api_client, return_file['file']),
-        kwargs=None,
+        kwargs=config_model.model_dump() if config else {},
     )
 
   def list(
@@ -923,7 +923,7 @@ class Files(_api_module.BaseModule):
   def download(
       self,
       *,
-      file: Union[str, types.File],
+      file: Union[str, types.File, types.Video, types.GeneratedVideo],
       config: Optional[types.DownloadFileConfigOrDict] = None,
   ) -> bytes:
     """Downloads a file's data from storage.
@@ -931,6 +931,10 @@ class Files(_api_module.BaseModule):
     Files created by `upload` can't be downloaded. You can tell which files are
     downloadable by checking the `source` or `download_uri` property.
 
+    Note: This method returns the data as bytes. For `Video` and
+    `GeneratedVideo` objects there is an additional side effect, that it also
+    sets the `video_bytes` property on the `Video` object.
+
     Args:
       file (str): A file name, uri, or file object. Identifying which file to
         download.
@@ -952,6 +956,10 @@ class Files(_api_module.BaseModule):
       data = client.files.download(file=file)
       # data = client.files.download(file=file.name)
       # data = client.files.download(file=file.download_uri)
+
+      video = types.Video(uri=file.uri)
+      video_bytes = client.files.download(file=video)
+      video.video_bytes
     """
     if self._api_client.vertexai:
       raise ValueError(
@@ -971,7 +979,7 @@ class Files(_api_module.BaseModule):
           'downloaded. You can tell which files are downloadable by checking '
           'the `source` or `download_uri` property.'
       )
-    name = t.t_file_name(self, file)
+    name = t.t_file_name(self._api_client, file)
 
     path = f'files/{name}:download'
 
@@ -986,6 +994,11 @@ class Files(_api_module.BaseModule):
         http_options,
     )
 
+    if isinstance(file, types.Video):
+      file.video_bytes = data
+    elif isinstance(file, types.GeneratedVideo) and file.video is not None:
+      file.video.video_bytes = data
+
     return data
 
 
@@ -1037,7 +1050,7 @@ class AsyncFiles(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1095,7 +1108,7 @@ class AsyncFiles(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1167,7 +1180,7 @@ class AsyncFiles(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1234,7 +1247,7 @@ class AsyncFiles(_api_module.BaseModule):
     http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options'):
+    elif hasattr(config, 'http_options') and config is not None:
       http_options = config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
@@ -1280,7 +1293,7 @@ class AsyncFiles(_api_module.BaseModule):
           'Vertex AI does not support creating files. You can upload files to'
           ' GCS files instead.'
       )
-    config_model = None
+    config_model = types.UploadFileConfig()
     if config:
       if isinstance(config, dict):
         config_model = types.UploadFileConfig(**config)
@@ -1360,7 +1373,7 @@ class AsyncFiles(_api_module.BaseModule):
 
     return types.File._from_response(
         response=_File_from_mldev(self._api_client, return_file['file']),
-        kwargs=None,
+        kwargs=config_model.model_dump() if config else {},
     )
 
   async def list(
@@ -1420,7 +1433,7 @@ class AsyncFiles(_api_module.BaseModule):
       else:
         config_model = config
 
-    name = t.t_file_name(self, file)
+    name = t.t_file_name(self._api_client, file)
 
     path = f'files/{name}:download'