google-genai 1.40.0__py3-none-any.whl → 1.42.0__py3-none-any.whl

google/genai/errors.py

@@ -134,6 +134,13 @@ class APIError(Exception):
             'status': response.reason_phrase,
         }
       status_code = response.status_code
+    elif hasattr(response, 'body_segments') and hasattr(
+        response, 'status_code'
+    ):
+      if response.status_code == 200:
+        return
+      response_json = response.body_segments[0].get('error', {})
+      status_code = response.status_code
     else:
       try:
         import aiohttp  # pylint: disable=g-import-not-at-top
@@ -151,9 +158,9 @@ class APIError(Exception):
             }
           status_code = response.status
         else:
-          response_json = response.body_segments[0].get('error', {})
+          raise ValueError(f'Unsupported response type: {type(response)}')
       except ImportError:
-        response_json = response.body_segments[0].get('error', {})
+        raise ValueError(f'Unsupported response type: {type(response)}')
 
     if 400 <= status_code < 500:
       raise ClientError(status_code, response_json, response)

google/genai/files.py

@@ -18,13 +18,13 @@
 import io
 import json
 import logging
-import mimetypes
 import os
 from typing import Any, Optional, Union
 from urllib.parse import urlencode
 
 from . import _api_module
 from . import _common
+from . import _extra_utils
 from . import _transformers as t
 from . import types
 from ._common import get_value_by_path as getv
@@ -41,11 +41,7 @@ def _CreateFileParameters_to_mldev(
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
   if getv(from_object, ['file']) is not None:
-    setv(
-        to_object,
-        ['file'],
-        _File_to_mldev(getv(from_object, ['file']), to_object),
-    )
+    setv(to_object, ['file'], getv(from_object, ['file']))
 
   return to_object
 
@@ -89,148 +85,6 @@ def _DeleteFileResponse_from_mldev(
   return to_object
 
 
-def _FileStatus_from_mldev(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['details']) is not None:
-    setv(to_object, ['details'], getv(from_object, ['details']))
-
-  if getv(from_object, ['message']) is not None:
-    setv(to_object, ['message'], getv(from_object, ['message']))
-
-  if getv(from_object, ['code']) is not None:
-    setv(to_object, ['code'], getv(from_object, ['code']))
-
-  return to_object
-
-
-def _FileStatus_to_mldev(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['details']) is not None:
-    setv(to_object, ['details'], getv(from_object, ['details']))
-
-  if getv(from_object, ['message']) is not None:
-    setv(to_object, ['message'], getv(from_object, ['message']))
-
-  if getv(from_object, ['code']) is not None:
-    setv(to_object, ['code'], getv(from_object, ['code']))
-
-  return to_object
-
-
-def _File_from_mldev(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['name']) is not None:
-    setv(to_object, ['name'], getv(from_object, ['name']))
-
-  if getv(from_object, ['displayName']) is not None:
-    setv(to_object, ['display_name'], getv(from_object, ['displayName']))
-
-  if getv(from_object, ['mimeType']) is not None:
-    setv(to_object, ['mime_type'], getv(from_object, ['mimeType']))
-
-  if getv(from_object, ['sizeBytes']) is not None:
-    setv(to_object, ['size_bytes'], getv(from_object, ['sizeBytes']))
-
-  if getv(from_object, ['createTime']) is not None:
-    setv(to_object, ['create_time'], getv(from_object, ['createTime']))
-
-  if getv(from_object, ['expirationTime']) is not None:
-    setv(to_object, ['expiration_time'], getv(from_object, ['expirationTime']))
-
-  if getv(from_object, ['updateTime']) is not None:
-    setv(to_object, ['update_time'], getv(from_object, ['updateTime']))
-
-  if getv(from_object, ['sha256Hash']) is not None:
-    setv(to_object, ['sha256_hash'], getv(from_object, ['sha256Hash']))
-
-  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']))
-
-  if getv(from_object, ['error']) is not None:
-    setv(
-        to_object,
-        ['error'],
-        _FileStatus_from_mldev(getv(from_object, ['error']), to_object),
-    )
-
-  return to_object
-
-
-def _File_to_mldev(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['name']) is not None:
-    setv(to_object, ['name'], getv(from_object, ['name']))
-
-  if getv(from_object, ['display_name']) is not None:
-    setv(to_object, ['displayName'], getv(from_object, ['display_name']))
-
-  if getv(from_object, ['mime_type']) is not None:
-    setv(to_object, ['mimeType'], getv(from_object, ['mime_type']))
-
-  if getv(from_object, ['size_bytes']) is not None:
-    setv(to_object, ['sizeBytes'], getv(from_object, ['size_bytes']))
-
-  if getv(from_object, ['create_time']) is not None:
-    setv(to_object, ['createTime'], getv(from_object, ['create_time']))
-
-  if getv(from_object, ['expiration_time']) is not None:
-    setv(to_object, ['expirationTime'], getv(from_object, ['expiration_time']))
-
-  if getv(from_object, ['update_time']) is not None:
-    setv(to_object, ['updateTime'], getv(from_object, ['update_time']))
-
-  if getv(from_object, ['sha256_hash']) is not None:
-    setv(to_object, ['sha256Hash'], getv(from_object, ['sha256_hash']))
-
-  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']))
-
-  if getv(from_object, ['error']) is not None:
-    setv(
-        to_object,
-        ['error'],
-        _FileStatus_to_mldev(getv(from_object, ['error']), to_object),
-    )
-
-  return to_object
-
-
 def _GetFileParameters_to_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -290,14 +144,7 @@ def _ListFilesResponse_from_mldev(
     setv(to_object, ['next_page_token'], getv(from_object, ['nextPageToken']))
 
   if getv(from_object, ['files']) is not None:
-    setv(
-        to_object,
-        ['files'],
-        [
-            _File_from_mldev(item, to_object)
-            for item in getv(from_object, ['files'])
-        ],
-    )
+    setv(to_object, ['files'], [item for item in getv(from_object, ['files'])])
 
   return to_object
 
@@ -359,7 +206,7 @@ class Files(_api_module.BaseModule):
 
     response = self._api_client.request('get', path, request_dict, http_options)
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if not self._api_client.vertexai:
       response_dict = _ListFilesResponse_from_mldev(response_dict)
@@ -424,7 +271,7 @@ class Files(_api_module.BaseModule):
       self._api_client._verify_response(return_value)
       return return_value
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if not self._api_client.vertexai:
       response_dict = _CreateFileResponse_from_mldev(response_dict)
@@ -492,10 +339,7 @@ class Files(_api_module.BaseModule):
 
     response = self._api_client.request('get', path, request_dict, http_options)
 
-    response_dict = '' if not response.body else json.loads(response.body)
-
-    if not self._api_client.vertexai:
-      response_dict = _File_from_mldev(response_dict)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     return_value = types.File._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -561,7 +405,7 @@ class Files(_api_module.BaseModule):
         'delete', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if not self._api_client.vertexai:
       response_dict = _DeleteFileResponse_from_mldev(response_dict)
@@ -611,54 +455,13 @@ class Files(_api_module.BaseModule):
     if file_obj.name is not None and not file_obj.name.startswith('files/'):
       file_obj.name = f'files/{file_obj.name}'
 
-    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(file, 'mode'):
-        if 'b' not in file.mode:
-          raise ValueError('The file must be opened in binary mode.')
-      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(file)
-      if not fs_path or not os.path.isfile(fs_path):
-        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'
-        )
-
-    http_options: types.HttpOptions
-    if config_model and config_model.http_options:
-      http_options = config_model.http_options
-      http_options.api_version = ''
-      http_options.headers = {
-          'Content-Type': 'application/json',
-          'X-Goog-Upload-Protocol': 'resumable',
-          'X-Goog-Upload-Command': 'start',
-          'X-Goog-Upload-Header-Content-Length': f'{file_obj.size_bytes}',
-          'X-Goog-Upload-Header-Content-Type': f'{file_obj.mime_type}',
-      }
-    else:
-      http_options = types.HttpOptions(
-          api_version='',
-          headers={
-              'Content-Type': 'application/json',
-              'X-Goog-Upload-Protocol': 'resumable',
-              'X-Goog-Upload-Command': 'start',
-              'X-Goog-Upload-Header-Content-Length': f'{file_obj.size_bytes}',
-              'X-Goog-Upload-Header-Content-Type': f'{file_obj.mime_type}',
-          },
-      )
+    http_options, size_bytes, mime_type = _extra_utils.prepare_resumable_upload(
+        file,
+        user_http_options=config_model.http_options,
+        user_mime_type=config_model.mime_type,
+    )
+    file_obj.size_bytes = size_bytes
+    file_obj.mime_type = mime_type
     response = self._create(
         file=file_obj,
         config=types.CreateFileConfig(
@@ -682,12 +485,13 @@ class Files(_api_module.BaseModule):
           file, upload_url, file_obj.size_bytes, http_options=http_options
       )
     else:
+      fs_path = os.fspath(file)
       return_file = self._api_client.upload_file(
           fs_path, upload_url, file_obj.size_bytes, http_options=http_options
       )
 
     return types.File._from_response(
-        response=_File_from_mldev(return_file.json['file']),
+        response=return_file.json['file'],
         kwargs=config_model.model_dump() if config else {},
     )
 
@@ -842,7 +646,7 @@ class AsyncFiles(_api_module.BaseModule):
         'get', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if not self._api_client.vertexai:
       response_dict = _ListFilesResponse_from_mldev(response_dict)
@@ -907,7 +711,7 @@ class AsyncFiles(_api_module.BaseModule):
       self._api_client._verify_response(return_value)
       return return_value
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if not self._api_client.vertexai:
       response_dict = _CreateFileResponse_from_mldev(response_dict)
@@ -977,10 +781,7 @@ class AsyncFiles(_api_module.BaseModule):
         'get', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
-
-    if not self._api_client.vertexai:
-      response_dict = _File_from_mldev(response_dict)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     return_value = types.File._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -1046,7 +847,7 @@ class AsyncFiles(_api_module.BaseModule):
         'delete', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if not self._api_client.vertexai:
       response_dict = _DeleteFileResponse_from_mldev(response_dict)
@@ -1096,54 +897,13 @@ class AsyncFiles(_api_module.BaseModule):
     if file_obj.name is not None and not file_obj.name.startswith('files/'):
       file_obj.name = f'files/{file_obj.name}'
 
-    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(file, 'mode'):
-        if 'b' not in file.mode:
-          raise ValueError('The file must be opened in binary mode.')
-      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(file)
-      if not fs_path or not os.path.isfile(fs_path):
-        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'
-        )
-
-    http_options: types.HttpOptions
-    if config_model and config_model.http_options:
-      http_options = config_model.http_options
-      http_options.api_version = ''
-      http_options.headers = {
-          'Content-Type': 'application/json',
-          'X-Goog-Upload-Protocol': 'resumable',
-          'X-Goog-Upload-Command': 'start',
-          'X-Goog-Upload-Header-Content-Length': f'{file_obj.size_bytes}',
-          'X-Goog-Upload-Header-Content-Type': f'{file_obj.mime_type}',
-      }
-    else:
-      http_options = types.HttpOptions(
-          api_version='',
-          headers={
-              'Content-Type': 'application/json',
-              'X-Goog-Upload-Protocol': 'resumable',
-              'X-Goog-Upload-Command': 'start',
-              'X-Goog-Upload-Header-Content-Length': f'{file_obj.size_bytes}',
-              'X-Goog-Upload-Header-Content-Type': f'{file_obj.mime_type}',
-          },
-      )
+    http_options, size_bytes, mime_type = _extra_utils.prepare_resumable_upload(
+        file,
+        user_http_options=config_model.http_options,
+        user_mime_type=config_model.mime_type,
+    )
+    file_obj.size_bytes = size_bytes
+    file_obj.mime_type = mime_type
     response = await self._create(
         file=file_obj,
         config=types.CreateFileConfig(
@@ -1172,12 +932,13 @@ class AsyncFiles(_api_module.BaseModule):
           file, upload_url, file_obj.size_bytes, http_options=http_options
       )
     else:
+      fs_path = os.fspath(file)
       return_file = await self._api_client.async_upload_file(
           fs_path, upload_url, file_obj.size_bytes, http_options=http_options
       )
 
     return types.File._from_response(
-        response=_File_from_mldev(return_file.json['file']),
+        response=return_file.json['file'],
         kwargs=config_model.model_dump() if config else {},
     )
 

google/genai/live.py

@@ -21,7 +21,7 @@ import contextlib
 import json
 import logging
 import typing
-from typing import Any, AsyncIterator, Dict, Optional, Sequence, Union, get_args
+from typing import Any, AsyncIterator, Optional, Sequence, Union, get_args
 import warnings
 
 import google.auth
@@ -40,7 +40,6 @@ from ._common import get_value_by_path as getv
 from ._common import set_value_by_path as setv
 from .live_music import AsyncLiveMusic
 from .models import _Content_to_mldev
-from .models import _Content_to_vertex
 
 
 try:
@@ -223,8 +222,8 @@ class AsyncSession:
     )
 
     if self._api_client.vertexai:
-      client_content_dict = live_converters._LiveClientContent_to_vertex(
-          from_object=client_content
+      client_content_dict = _common.convert_to_dict(
+          client_content, convert_keys=True
       )
     else:
       client_content_dict = live_converters._LiveClientContent_to_mldev(
@@ -410,12 +409,12 @@ class AsyncSession:
     """
     tool_response = t.t_tool_response(function_responses)
     if self._api_client.vertexai:
-      tool_response_dict = live_converters._LiveClientToolResponse_to_vertex(
-          from_object=tool_response
+      tool_response_dict = _common.convert_to_dict(
+          tool_response, convert_keys=True
       )
     else:
-      tool_response_dict = live_converters._LiveClientToolResponse_to_mldev(
-          from_object=tool_response
+      tool_response_dict = _common.convert_to_dict(
+          tool_response, convert_keys=True
       )
       for response in tool_response_dict.get('functionResponses', []):
         if response.get('id') is None:
@@ -541,7 +540,7 @@ class AsyncSession:
     if self._api_client.vertexai:
       response_dict = live_converters._LiveServerMessage_from_vertex(response)
     else:
-      response_dict = live_converters._LiveServerMessage_from_mldev(response)
+      response_dict = response
 
     return types.LiveServerMessage._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -655,7 +654,7 @@ class AsyncSession:
           content_input_parts.append(item)
       if self._api_client.vertexai:
         contents = [
-            _Content_to_vertex(item, to_object)
+            _common.convert_to_dict(item, convert_keys=True)
             for item in t.t_contents(content_input_parts)
         ]
       else:
@@ -1074,7 +1073,7 @@ class AsyncLive(_api_module.BaseModule):
       if self._api_client.vertexai:
         response_dict = live_converters._LiveServerMessage_from_vertex(response)
       else:
-        response_dict = live_converters._LiveServerMessage_from_mldev(response)
+        response_dict = response
 
       setup_response = types.LiveServerMessage._from_response(
           response=response_dict, kwargs=parameter_model.model_dump()

google/genai/live_music.py

@@ -22,13 +22,11 @@ from typing import AsyncIterator
 
 from . import _api_module
 from . import _common
+from . import _live_converters as live_converters
 from . import _transformers as t
 from . import types
 from ._api_client import BaseApiClient
 from ._common import set_value_by_path as setv
-from . import _live_converters as live_converters
-from .models import _Content_to_mldev
-from .models import _Content_to_vertex
 
 
 try:
@@ -44,46 +42,47 @@ logger = logging.getLogger('google_genai.live_music')
 class AsyncMusicSession:
   """[Experimental] AsyncMusicSession."""
 
-  def __init__(
-      self, api_client: BaseApiClient, websocket: ClientConnection
-  ):
+  def __init__(self, api_client: BaseApiClient, websocket: ClientConnection):
     self._api_client = api_client
     self._ws = websocket
 
   async def set_weighted_prompts(
-      self,
-  	  prompts: list[types.WeightedPrompt]
+      self, prompts: list[types.WeightedPrompt]
   ) -> None:
     if self._api_client.vertexai:
-      raise NotImplementedError('Live music generation is not supported in Vertex AI.')
-    else:
-      client_content_dict = live_converters._LiveMusicClientContent_to_mldev(
-          from_object={'weighted_prompts': prompts}
+      raise NotImplementedError(
+          'Live music generation is not supported in Vertex AI.'
       )
+    else:
+      client_content_dict = {
+          'weightedPrompts': [
+              _common.convert_to_dict(prompt, convert_keys=True)
+              for prompt in prompts
+          ]
+      }
+
     await self._ws.send(json.dumps({'clientContent': client_content_dict}))
 
   async def set_music_generation_config(
-      self,
-  	  config: types.LiveMusicGenerationConfig
+      self, config: types.LiveMusicGenerationConfig
   ) -> None:
     if self._api_client.vertexai:
-      raise NotImplementedError('Live music generation is not supported in Vertex AI.')
-    else:
-      config_dict = live_converters._LiveMusicGenerationConfig_to_mldev(
-          from_object=config
+      raise NotImplementedError(
+          'Live music generation is not supported in Vertex AI.'
       )
+    else:
+      config_dict = _common.convert_to_dict(config, convert_keys=True)
     await self._ws.send(json.dumps({'musicGenerationConfig': config_dict}))
 
   async def _send_control_signal(
-      self,
-      playback_control: types.LiveMusicPlaybackControl
+      self, playback_control: types.LiveMusicPlaybackControl
   ) -> None:
     if self._api_client.vertexai:
-      raise NotImplementedError('Live music generation is not supported in Vertex AI.')
-    else:
-      playback_control_dict = live_converters._LiveMusicClientMessage_to_mldev(
-          from_object={'playback_control': playback_control}
+      raise NotImplementedError(
+          'Live music generation is not supported in Vertex AI.'
       )
+    else:
+      playback_control_dict = {'playbackControl': playback_control.value}
       await self._ws.send(json.dumps(playback_control_dict))
 
   async def play(self) -> None:
@@ -134,9 +133,7 @@ class AsyncMusicSession:
     if self._api_client.vertexai:
       raise NotImplementedError('Live music generation is not supported in Vertex AI.')
     else:
-      response_dict = live_converters._LiveMusicServerMessage_from_mldev(
-          response
-      )
+      response_dict = response
 
     return types.LiveMusicServerMessage._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()