google-genai 1.19.0__py3-none-any.whl → 1.20.0__py3-none-any.whl

google/genai/errors.py

@@ -22,6 +22,7 @@ import json
 
 if TYPE_CHECKING:
   from .replay_api_client import ReplayResponse
+  import aiohttp
 
 
 class APIError(Exception):
@@ -36,7 +37,9 @@ class APIError(Exception):
       self,
       code: int,
       response_json: Any,
-      response: Optional[Union['ReplayResponse', httpx.Response]] = None,
+      response: Optional[
+          Union['ReplayResponse', httpx.Response, 'aiohttp.ClientResponse']
+      ] = None,
   ):
     self.response = response
     self.details = response_json
@@ -106,12 +109,17 @@ class APIError(Exception):
 
   @classmethod
   async def raise_for_async_response(
-      cls, response: Union['ReplayResponse', httpx.Response]
+      cls,
+      response: Union[
+          'ReplayResponse', httpx.Response, 'aiohttp.ClientResponse'
+      ],
   ) -> None:
     """Raises an error with detailed error message if the response has an error status."""
-    if response.status_code == 200:
-      return
+    status_code = 0
+    response_json = None
     if isinstance(response, httpx.Response):
+      if response.status_code == 200:
+        return
       try:
         await response.aread()
         response_json = response.json()
@@ -121,10 +129,28 @@ class APIError(Exception):
             'message': message,
             'status': response.reason_phrase,
         }
+      status_code = response.status_code
     else:
-      response_json = response.body_segments[0].get('error', {})
+      try:
+        import aiohttp  # pylint: disable=g-import-not-at-top
+
+        if isinstance(response, aiohttp.ClientResponse):
+          if response.status == 200:
+            return
+          try:
+            response_json = await response.json()
+          except aiohttp.client_exceptions.ContentTypeError:
+            message = await response.text()
+            response_json = {
+                'message': message,
+                'status': response.reason,
+            }
+          status_code = response.status
+        else:
+          response_json = response.body_segments[0].get('error', {})
+      except ImportError:
+        response_json = response.body_segments[0].get('error', {})
 
-    status_code = response.status_code
     if 400 <= status_code < 500:
       raise ClientError(status_code, response_json, response)
     elif 500 <= status_code < 600:

google/genai/files.py

@@ -22,6 +22,7 @@ import os
 import pathlib
 from typing import Any, Optional, Union
 from urllib.parse import urlencode
+
 from . import _api_module
 from . import _common
 from . import _transformers as t
@@ -1152,15 +1153,18 @@ class AsyncFiles(_api_module.BaseModule):
     response = await self._create(
         file=file_obj, config=types.CreateFileConfig(http_options=http_options)
     )
-    if (
-        response.http_headers is None
-        or 'x-goog-upload-url' not in response.http_headers
+    if response.http_headers is None or (
+        'x-goog-upload-url' not in response.http_headers
+        and 'X-Goog-Upload-URL' not in response.http_headers
     ):
       raise KeyError(
           'Failed to create file. Upload URL did not returned from the create'
           ' file request.'
       )
-    upload_url = response.http_headers['x-goog-upload-url']
+    elif 'x-goog-upload-url' in response.http_headers:
+      upload_url = response.http_headers['x-goog-upload-url']
+    else:
+      upload_url = response.http_headers['X-Goog-Upload-URL']
 
     if isinstance(file, io.IOBase):
       return_file = await self._api_client.async_upload_file(

google/genai/models.py

@@ -18,6 +18,7 @@
 import logging
 from typing import Any, AsyncIterator, Awaitable, Iterator, Optional, Union
 from urllib.parse import urlencode
+
 from . import _api_module
 from . import _common
 from . import _extra_utils
@@ -1364,6 +1365,28 @@ def _Image_to_mldev(
   return to_object
 
 
+def _Video_to_mldev(
+    api_client: BaseApiClient,
+    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, ['uri']) is not None:
+    setv(to_object, ['video', 'uri'], getv(from_object, ['uri']))
+
+  if getv(from_object, ['video_bytes']) is not None:
+    setv(
+        to_object,
+        ['video', 'encodedVideo'],
+        t.t_bytes(api_client, getv(from_object, ['video_bytes'])),
+    )
+
+  if getv(from_object, ['mime_type']) is not None:
+    setv(to_object, ['encoding'], getv(from_object, ['mime_type']))
+
+  return to_object
+
+
 def _GenerateVideosConfig_to_mldev(
     api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
@@ -1431,6 +1454,9 @@ def _GenerateVideosConfig_to_mldev(
   if getv(from_object, ['generate_audio']) is not None:
     raise ValueError('generate_audio parameter is not supported in Gemini API.')
 
+  if getv(from_object, ['last_frame']) is not None:
+    raise ValueError('last_frame parameter is not supported in Gemini API.')
+
   return to_object
 
 
@@ -1457,6 +1483,9 @@ def _GenerateVideosParameters_to_mldev(
         _Image_to_mldev(api_client, getv(from_object, ['image']), to_object),
     )
 
+  if getv(from_object, ['video']) is not None:
+    raise ValueError('video parameter is not supported in Gemini API.')
+
   if getv(from_object, ['config']) is not None:
     setv(
         to_object,
@@ -3233,6 +3262,28 @@ def _ComputeTokensParameters_to_vertex(
   return to_object
 
 
+def _Video_to_vertex(
+    api_client: BaseApiClient,
+    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, ['uri']) is not None:
+    setv(to_object, ['gcsUri'], getv(from_object, ['uri']))
+
+  if getv(from_object, ['video_bytes']) is not None:
+    setv(
+        to_object,
+        ['bytesBase64Encoded'],
+        t.t_bytes(api_client, getv(from_object, ['video_bytes'])),
+    )
+
+  if getv(from_object, ['mime_type']) is not None:
+    setv(to_object, ['mimeType'], getv(from_object, ['mime_type']))
+
+  return to_object
+
+
 def _GenerateVideosConfig_to_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
@@ -3316,6 +3367,15 @@ def _GenerateVideosConfig_to_vertex(
         getv(from_object, ['generate_audio']),
     )
 
+  if getv(from_object, ['last_frame']) is not None:
+    setv(
+        parent_object,
+        ['instances[0]', 'lastFrame'],
+        _Image_to_vertex(
+            api_client, getv(from_object, ['last_frame']), to_object
+        ),
+    )
+
   return to_object
 
 
@@ -3342,6 +3402,13 @@ def _GenerateVideosParameters_to_vertex(
         _Image_to_vertex(api_client, getv(from_object, ['image']), to_object),
     )
 
+  if getv(from_object, ['video']) is not None:
+    setv(
+        to_object,
+        ['instances[0]', 'video'],
+        _Video_to_vertex(api_client, getv(from_object, ['video']), to_object),
+    )
+
   if getv(from_object, ['config']) is not None:
     setv(
         to_object,
@@ -5797,13 +5864,26 @@ class Models(_api_module.BaseModule):
       model: str,
       prompt: Optional[str] = None,
       image: Optional[types.ImageOrDict] = None,
+      video: Optional[types.VideoOrDict] = None,
       config: Optional[types.GenerateVideosConfigOrDict] = None,
   ) -> types.GenerateVideosOperation:
-    """Generates videos based on a text description and configuration.
+    """Generates videos based on an input (text, image, or video) and configuration.
+
+    The following use cases are supported:
+    1. Text to video generation.
+    2a. Image to video generation (additional text prompt is optional).
+    2b. Image to video generation with frame interpolation (specify last_frame
+    in config).
+    3. Video extension (additional text prompt is optional)
 
     Args:
       model: The model to use.
-      instances: A list of prompts, images and videos to generate videos from.
+      prompt: The text prompt for generating the videos. Optional for image to
+        video use cases.
+      image: The input image for generating the videos. Optional if prompt is
+        provided.
+      video: The input video for video extension use cases. Optional if prompt
+        or image is provided.
       config: Configuration for generation.
 
     Usage:
@@ -5825,6 +5905,7 @@ class Models(_api_module.BaseModule):
         model=model,
         prompt=prompt,
         image=image,
+        video=video,
         config=config,
     )
 
@@ -7327,13 +7408,26 @@ class AsyncModels(_api_module.BaseModule):
       model: str,
       prompt: Optional[str] = None,
       image: Optional[types.ImageOrDict] = None,
+      video: Optional[types.VideoOrDict] = None,
       config: Optional[types.GenerateVideosConfigOrDict] = None,
   ) -> types.GenerateVideosOperation:
-    """Generates videos based on a text description and configuration.
+    """Generates videos based on an input (text, image, or video) and configuration.
+
+    The following use cases are supported:
+    1. Text to video generation.
+    2a. Image to video generation (additional text prompt is optional).
+    2b. Image to video generation with frame interpolation (specify last_frame
+    in config).
+    3. Video extension (additional text prompt is optional)
 
     Args:
       model: The model to use.
-      instances: A list of prompts, images and videos to generate videos from.
+      prompt: The text prompt for generating the videos. Optional for image to
+        video use cases.
+      image: The input image for generating the videos. Optional if prompt is
+        provided.
+      video: The input video for video extension use cases. Optional if prompt
+        or image is provided.
       config: Configuration for generation.
 
     Usage:
@@ -7355,6 +7449,7 @@ class AsyncModels(_api_module.BaseModule):
         model=model,
         prompt=prompt,
         image=image,
+        video=video,
         config=config,
     )
 
@@ -7663,8 +7758,10 @@ class AsyncModels(_api_module.BaseModule):
               or not chunk.candidates[0].content.parts
           ):
             break
-          func_response_parts = _extra_utils.get_function_response_parts(
-              chunk, function_map
+          func_response_parts = (
+              await _extra_utils.get_function_response_parts_async(
+                  chunk, function_map
+              )
           )
         if not function_map:
           break

google/genai/operations.py

@@ -18,6 +18,7 @@
 import logging
 from typing import Any, Optional, Union
 from urllib.parse import urlencode
+
 from . import _api_module
 from . import _common
 from . import _transformers as t

google/genai/tunings.py

@@ -18,6 +18,7 @@
 import logging
 from typing import Any, Optional, Union
 from urllib.parse import urlencode
+
 from . import _api_module
 from . import _common
 from . import _transformers as t

google/genai/types.py

@@ -2375,6 +2375,42 @@ class UrlContextDict(TypedDict, total=False):
 UrlContextOrDict = Union[UrlContext, UrlContextDict]
 
 
+class VertexAISearchDataStoreSpec(_common.BaseModel):
+  """Define data stores within engine to filter on in a search call and configurations for those data stores.
+
+  For more information, see
+  https://cloud.google.com/generative-ai-app-builder/docs/reference/rpc/google.cloud.discoveryengine.v1#datastorespec
+  """
+
+  data_store: Optional[str] = Field(
+      default=None,
+      description="""Full resource name of DataStore, such as Format: `projects/{project}/locations/{location}/collections/{collection}/dataStores/{dataStore}`""",
+  )
+  filter: Optional[str] = Field(
+      default=None,
+      description="""Optional. Filter specification to filter documents in the data store specified by data_store field. For more information on filtering, see [Filtering](https://cloud.google.com/generative-ai-app-builder/docs/filter-search-metadata)""",
+  )
+
+
+class VertexAISearchDataStoreSpecDict(TypedDict, total=False):
+  """Define data stores within engine to filter on in a search call and configurations for those data stores.
+
+  For more information, see
+  https://cloud.google.com/generative-ai-app-builder/docs/reference/rpc/google.cloud.discoveryengine.v1#datastorespec
+  """
+
+  data_store: Optional[str]
+  """Full resource name of DataStore, such as Format: `projects/{project}/locations/{location}/collections/{collection}/dataStores/{dataStore}`"""
+
+  filter: Optional[str]
+  """Optional. Filter specification to filter documents in the data store specified by data_store field. For more information on filtering, see [Filtering](https://cloud.google.com/generative-ai-app-builder/docs/filter-search-metadata)"""
+
+
+VertexAISearchDataStoreSpecOrDict = Union[
+    VertexAISearchDataStoreSpec, VertexAISearchDataStoreSpecDict
+]
+
+
 class VertexAISearch(_common.BaseModel):
   """Retrieve from Vertex AI Search datastore or engine for grounding.
 
@@ -2382,6 +2418,10 @@ class VertexAISearch(_common.BaseModel):
   https://cloud.google.com/products/agent-builder
   """
 
+  data_store_specs: Optional[list[VertexAISearchDataStoreSpec]] = Field(
+      default=None,
+      description="""Specifications that define the specific DataStores to be searched, along with configurations for those data stores. This is only considered for Engines with multiple data stores. It should only be set if engine is used.""",
+  )
   datastore: Optional[str] = Field(
       default=None,
       description="""Optional. Fully-qualified Vertex AI Search data store resource ID. Format: `projects/{project}/locations/{location}/collections/{collection}/dataStores/{dataStore}`""",
@@ -2407,6 +2447,9 @@ class VertexAISearchDict(TypedDict, total=False):
   https://cloud.google.com/products/agent-builder
   """
 
+  data_store_specs: Optional[list[VertexAISearchDataStoreSpecDict]]
+  """Specifications that define the specific DataStores to be searched, along with configurations for those data stores. This is only considered for Engines with multiple data stores. It should only be set if engine is used."""
+
   datastore: Optional[str]
   """Optional. Fully-qualified Vertex AI Search data store resource ID. Format: `projects/{project}/locations/{location}/collections/{collection}/dataStores/{dataStore}`"""
 
@@ -2632,6 +2675,10 @@ class VertexRagStore(_common.BaseModel):
       default=None,
       description="""Optional. Number of top k results to return from the selected corpora.""",
   )
+  store_context: Optional[bool] = Field(
+      default=None,
+      description="""Optional. Currently only supported for Gemini Multimodal Live API. In Gemini Multimodal Live API, if `store_context` bool is specified, Gemini will leverage it to automatically memorize the interactions between the client and Gemini, and retrieve context when needed to augment the response generation for users' ongoing and future interactions.""",
+  )
   vector_distance_threshold: Optional[float] = Field(
       default=None,
       description="""Optional. Only return results with vector distance smaller than the threshold.""",
@@ -2653,6 +2700,9 @@ class VertexRagStoreDict(TypedDict, total=False):
   similarity_top_k: Optional[int]
   """Optional. Number of top k results to return from the selected corpora."""
 
+  store_context: Optional[bool]
+  """Optional. Currently only supported for Gemini Multimodal Live API. In Gemini Multimodal Live API, if `store_context` bool is specified, Gemini will leverage it to automatically memorize the interactions between the client and Gemini, and retrieve context when needed to augment the response generation for users' ongoing and future interactions."""
+
   vector_distance_threshold: Optional[float]
   """Optional. Only return results with vector distance smaller than the threshold."""
 
@@ -6967,6 +7017,109 @@ ComputeTokensResponseOrDict = Union[
 ]
 
 
+class Video(_common.BaseModel):
+  """A generated video."""
+
+  uri: Optional[str] = Field(
+      default=None, description="""Path to another storage."""
+  )
+  video_bytes: Optional[bytes] = Field(
+      default=None, description="""Video bytes."""
+  )
+  mime_type: Optional[str] = Field(
+      default=None, description="""Video encoding, for example "video/mp4"."""
+  )
+
+  @classmethod
+  def from_file(
+      cls, *, location: str, mime_type: Optional[str] = None
+  ) -> 'Video':
+    """Loads a video from a local file.
+
+    Args:
+        location: The local path to load the video from.
+        mime_type: The MIME type of the video. If not provided, the MIME type
+          will be automatically determined.
+
+    Returns:
+        A loaded video as an `Video` object.
+    """
+    import mimetypes  # pylint: disable=g-import-not-at-top
+    import pathlib  # pylint: disable=g-import-not-at-top
+
+    video_bytes = pathlib.Path(location).read_bytes()
+
+    if not mime_type:
+      mime_type, _ = mimetypes.guess_type(location)
+    video = cls(video_bytes=video_bytes, mime_type=mime_type)
+    return video
+
+  def save(
+      self,
+      path: str,
+  ) -> None:
+    """Saves the video to a file.
+
+    Args:
+        path: Local path where to save the video.
+    """
+    import pathlib  # pylint: disable=g-import-not-at-top
+
+    if not self.video_bytes:
+      raise NotImplementedError('Saving remote videos is not supported.')
+
+    pathlib.Path(path).write_bytes(self.video_bytes)
+
+  def show(self) -> None:
+    """Shows the video.
+
+    If the video has no mime_type, it is assumed to be video/mp4.
+
+    This method only works in a notebook environment.
+    """
+    if self.uri and not self.video_bytes:
+      raise ValueError('Showing remote videos is not supported.')
+    if not self.video_bytes:
+      raise ValueError('Video has no bytes.')
+
+    mime_type = self.mime_type or 'video/mp4'
+
+    try:
+      from IPython import display as IPython_display
+    except ImportError:
+      IPython_display = None
+
+    if IPython_display:
+      IPython_display.display(
+          IPython_display.Video(
+              data=self.video_bytes, mimetype=mime_type, embed=True
+          )
+      )
+
+  def __repr__(self) -> str:
+    video_bytes = '<video_bytes>' if self.video_bytes else 'None'
+    return (
+        f'Video(uri={self.uri}, video_bytes={video_bytes},'
+        f' mime_type={self.mime_type})'
+    )
+
+
+class VideoDict(TypedDict, total=False):
+  """A generated video."""
+
+  uri: Optional[str]
+  """Path to another storage."""
+
+  video_bytes: Optional[bytes]
+  """Video bytes."""
+
+  mime_type: Optional[str]
+  """Video encoding, for example "video/mp4"."""
+
+
+VideoOrDict = Union[Video, VideoDict]
+
+
 class GenerateVideosConfig(_common.BaseModel):
   """Configuration for generating videos."""
 
@@ -7018,6 +7171,10 @@ class GenerateVideosConfig(_common.BaseModel):
       default=None,
       description="""Whether to generate audio along with the video.""",
   )
+  last_frame: Optional[Image] = Field(
+      default=None,
+      description="""Image to use as the last frame of generated videos. Only supported for image to video use cases.""",
+  )
 
 
 class GenerateVideosConfigDict(TypedDict, total=False):
@@ -7062,6 +7219,9 @@ class GenerateVideosConfigDict(TypedDict, total=False):
   generate_audio: Optional[bool]
   """Whether to generate audio along with the video."""
 
+  last_frame: Optional[ImageDict]
+  """Image to use as the last frame of generated videos. Only supported for image to video use cases."""
+
 
 GenerateVideosConfigOrDict = Union[
     GenerateVideosConfig, GenerateVideosConfigDict
@@ -7069,7 +7229,7 @@ GenerateVideosConfigOrDict = Union[
 
 
 class _GenerateVideosParameters(_common.BaseModel):
-  """Class that represents the parameters for generating an image."""
+  """Class that represents the parameters for generating videos."""
 
   model: Optional[str] = Field(
       default=None,
@@ -7083,7 +7243,12 @@ class _GenerateVideosParameters(_common.BaseModel):
   image: Optional[Image] = Field(
       default=None,
       description="""The input image for generating the videos.
-      Optional if prompt is provided.""",
+      Optional if prompt or video is provided.""",
+  )
+  video: Optional[Video] = Field(
+      default=None,
+      description="""The input video for video extension use cases.
+      Optional if prompt or image is provided.""",
   )
   config: Optional[GenerateVideosConfig] = Field(
       default=None, description="""Configuration for generating videos."""
@@ -7091,7 +7256,7 @@ class _GenerateVideosParameters(_common.BaseModel):
 
 
 class _GenerateVideosParametersDict(TypedDict, total=False):
-  """Class that represents the parameters for generating an image."""
+  """Class that represents the parameters for generating videos."""
 
   model: Optional[str]
   """ID of the model to use. For a list of models, see `Google models
@@ -7102,7 +7267,11 @@ class _GenerateVideosParametersDict(TypedDict, total=False):
 
   image: Optional[ImageDict]
   """The input image for generating the videos.
-      Optional if prompt is provided."""
+      Optional if prompt or video is provided."""
+
+  video: Optional[VideoDict]
+  """The input video for video extension use cases.
+      Optional if prompt or image is provided."""
 
   config: Optional[GenerateVideosConfigDict]
   """Configuration for generating videos."""
@@ -7113,85 +7282,6 @@ _GenerateVideosParametersOrDict = Union[
 ]
 
 
-class Video(_common.BaseModel):
-  """A generated video."""
-
-  uri: Optional[str] = Field(
-      default=None, description="""Path to another storage."""
-  )
-  video_bytes: Optional[bytes] = Field(
-      default=None, description="""Video bytes."""
-  )
-  mime_type: Optional[str] = Field(
-      default=None, description="""Video encoding, for example "video/mp4"."""
-  )
-
-  def save(
-      self,
-      path: str,
-  ) -> None:
-    """Saves the video to a file.
-
-    Args:
-        path: Local path where to save the video.
-    """
-    import pathlib  # pylint: disable=g-import-not-at-top
-
-    if not self.video_bytes:
-      raise NotImplementedError('Saving remote videos is not supported.')
-
-    pathlib.Path(path).write_bytes(self.video_bytes)
-
-  def show(self) -> None:
-    """Shows the video.
-
-    If the video has no mime_type, it is assumed to be video/mp4.
-
-    This method only works in a notebook environment.
-    """
-    if self.uri and not self.video_bytes:
-      raise ValueError('Showing remote videos is not supported.')
-    if not self.video_bytes:
-      raise ValueError('Video has no bytes.')
-
-    mime_type = self.mime_type or 'video/mp4'
-
-    try:
-      from IPython import display as IPython_display
-    except ImportError:
-      IPython_display = None
-
-    if IPython_display:
-      IPython_display.display(
-          IPython_display.Video(
-              data=self.video_bytes, mimetype=mime_type, embed=True
-          )
-      )
-
-  def __repr__(self) -> str:
-    video_bytes = '<video_bytes>' if self.video_bytes else 'None'
-    return (
-        f'Video(uri={self.uri}, video_bytes={video_bytes},'
-        f' mime_type={self.mime_type})'
-    )
-
-
-class VideoDict(TypedDict, total=False):
-  """A generated video."""
-
-  uri: Optional[str]
-  """Path to another storage."""
-
-  video_bytes: Optional[bytes]
-  """Video bytes."""
-
-  mime_type: Optional[str]
-  """Video encoding, for example "video/mp4"."""
-
-
-VideoOrDict = Union[Video, VideoDict]
-
-
 class GeneratedVideo(_common.BaseModel):
   """A generated video."""
 

google/genai/version.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 #
 
-__version__ = '1.19.0' # x-release-please-version
+__version__ = '1.20.0' # x-release-please-version

{google_genai-1.19.0.dist-info → google_genai-1.20.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-genai
-Version: 1.19.0
+Version: 1.20.0
 Summary: GenAI Python SDK
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache-2.0
@@ -27,6 +27,8 @@ Requires-Dist: pydantic<3.0.0,>=2.0.0
 Requires-Dist: requests<3.0.0,>=2.28.1
 Requires-Dist: websockets<15.1.0,>=13.0.0
 Requires-Dist: typing-extensions<5.0.0,>=4.11.0
+Provides-Extra: aiohttp
+Requires-Dist: aiohttp<4.0.0; extra == "aiohttp"
 Dynamic: license-file
 
 # Google Gen AI SDK