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

google/genai/_transformers.py

@@ -179,8 +179,8 @@ def t_models_url(api_client: _api_client.BaseApiClient, base_models: bool) -> st
 
 
 def t_extract_models(
-    api_client: _api_client.BaseApiClient, response: dict
-) -> list[types.Model]:
+    api_client: _api_client.BaseApiClient, response: dict[str, list[types.ModelDict]]
+) -> Optional[list[types.ModelDict]]:
   if not response:
     return []
   elif response.get('models') is not None:
@@ -241,7 +241,7 @@ def pil_to_blob(img) -> types.Blob:
 
 
 def t_part(
-    client: _api_client.BaseApiClient, part: Optional[types.PartUnionDict]
+    part: Optional[types.PartUnionDict]
 ) -> types.Part:
   try:
     import PIL.Image
@@ -268,22 +268,21 @@ def t_part(
 
 
 def t_parts(
-    client: _api_client.BaseApiClient,
     parts: Optional[Union[list[types.PartUnionDict], types.PartUnionDict]],
 ) -> list[types.Part]:
   #
   if parts is None or (isinstance(parts, list) and not parts):
     raise ValueError('content parts are required.')
   if isinstance(parts, list):
-    return [t_part(client, part) for part in parts]
+    return [t_part(part) for part in parts]
   else:
-    return [t_part(client, parts)]
+    return [t_part(parts)]
 
 
 def t_image_predictions(
     client: _api_client.BaseApiClient,
     predictions: Optional[Iterable[Mapping[str, Any]]],
-) -> list[types.GeneratedImage]:
+) -> Optional[list[types.GeneratedImage]]:
   if not predictions:
     return None
   images = []
@@ -408,7 +407,7 @@ def t_contents(
       accumulated_parts: list[types.Part],
       current_part: types.PartUnionDict,
   ):
-    current_part = t_part(client, current_part)
+    current_part = t_part(current_part)
     if _is_user_part(current_part) == _are_user_parts(accumulated_parts):
       accumulated_parts.append(current_part)
     else:
@@ -507,7 +506,7 @@ def handle_null_fields(schema: dict[str, Any]):
 
 def process_schema(
     schema: dict[str, Any],
-    client: Optional[_api_client.BaseApiClient] = None,
+    client: _api_client.BaseApiClient,
     defs: Optional[dict[str, Any]] = None,
     *,
     order_properties: bool = True,
@@ -570,7 +569,7 @@ def process_schema(
         'type': 'array'
     }
   """
-  if client and not client.vertexai:
+  if not client.vertexai:
     schema.pop('title', None)
 
     if schema.get('default') is not None:
@@ -596,15 +595,16 @@ def process_schema(
   # After removing null fields, Optional fields with only one possible type
   # will have a $ref key that needs to be flattened
   # For example: {'default': None, 'description': 'Name of the person', 'nullable': True, '$ref': '#/$defs/TestPerson'}
-  if schema.get('$ref', None):
-    ref = defs[schema.get('$ref').split('defs/')[-1]]
+  schema_ref = schema.get('$ref', None)
+  if schema_ref is not None:
+    ref = defs[schema_ref.split('defs/')[-1]]
     for schema_key in list(ref.keys()):
       schema[schema_key] = ref[schema_key]
     del schema['$ref']
 
   any_of = schema.get('anyOf', None)
   if any_of is not None:
-    if not client.vertexai:
+    if client and not client.vertexai:
       raise ValueError(
           'AnyOf is not supported in the response schema for the Gemini API.'
       )
@@ -750,7 +750,10 @@ def t_speech_config(
   if (
       isinstance(origin, dict)
       and 'voice_config' in origin
+      and origin['voice_config'] is not None
       and 'prebuilt_voice_config' in origin['voice_config']
+      and origin['voice_config']['prebuilt_voice_config'] is not None
+      and 'voice_name' in origin['voice_config']['prebuilt_voice_config']
   ):
     return types.SpeechConfig(
         voice_config=types.VoiceConfig(
@@ -764,7 +767,7 @@ def t_speech_config(
   raise ValueError(f'Unsupported speechConfig type: {type(origin)}')
 
 
-def t_tool(client: _api_client.BaseApiClient, origin) -> types.Tool:
+def t_tool(client: _api_client.BaseApiClient, origin) -> Optional[types.Tool]:
   if not origin:
     return None
   if inspect.isfunction(origin) or inspect.ismethod(origin):
@@ -790,12 +793,13 @@ def t_tools(
   for tool in origin:
     transformed_tool = t_tool(client, tool)
     # All functions should be merged into one tool.
-    if transformed_tool.function_declarations:
-      function_tool.function_declarations += (
-          transformed_tool.function_declarations
-      )
-    else:
-      tools.append(transformed_tool)
+    if transformed_tool is not None:
+      if transformed_tool.function_declarations:
+        function_tool.function_declarations += (
+            transformed_tool.function_declarations
+        )
+      else:
+        tools.append(transformed_tool)
   if function_tool.function_declarations:
     tools.append(function_tool)
   return tools
@@ -883,15 +887,25 @@ def t_resolve_operation(api_client: _api_client.BaseApiClient, struct: dict):
 
 
 def t_file_name(
-    api_client: _api_client.BaseApiClient, name: Optional[Union[str, types.File]]
+    api_client: _api_client.BaseApiClient,
+    name: Optional[Union[str, types.File, types.Video, types.GeneratedVideo]],
 ):
   # Remove the files/ prefix since it's added to the url path.
   if isinstance(name, types.File):
     name = name.name
+  elif isinstance(name, types.Video):
+    name = name.uri
+  elif isinstance(name, types.GeneratedVideo):
+    name = name.video.uri
 
   if name is None:
     raise ValueError('File name is required.')
 
+  if not isinstance(name, str):
+    raise ValueError(
+        f'Could not convert object of type `{type(name)}` to a file name.'
+    )
+
   if name.startswith('https://'):
     suffix = name.split('files/')[1]
     match = re.match('[a-z0-9]+', suffix)
@@ -906,16 +920,19 @@ def t_file_name(
 
 def t_tuning_job_status(
     api_client: _api_client.BaseApiClient, status: str
-) -> types.JobState:
+) -> Union[types.JobState, str]:
   if status == 'STATE_UNSPECIFIED':
-    return 'JOB_STATE_UNSPECIFIED'
+    return types.JobState.JOB_STATE_UNSPECIFIED
   elif status == 'CREATING':
-    return 'JOB_STATE_RUNNING'
+    return types.JobState.JOB_STATE_RUNNING
   elif status == 'ACTIVE':
-    return 'JOB_STATE_SUCCEEDED'
+    return types.JobState.JOB_STATE_SUCCEEDED
   elif status == 'FAILED':
-    return 'JOB_STATE_FAILED'
+    return types.JobState.JOB_STATE_FAILED
   else:
+    for state in types.JobState:
+      if str(state.value) == status:
+        return state
     return status
 
 

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)
@@ -1043,7 +1043,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 +1112,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 +1182,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 +1221,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 +1296,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)

google/genai/caches.py

@@ -1231,7 +1231,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 +1301,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 +1373,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 +1450,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 +1518,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)
@@ -1617,7 +1617,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 +1688,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 +1761,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 +1838,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 +1906,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/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)
@@ -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(
@@ -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):
+      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)