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

google/genai/chats.py

@@ -63,13 +63,8 @@ def _extract_curated_history(
   """Extracts the curated (valid) history from a comprehensive history.
 
   The comprehensive history contains all turns (user input and model responses),
-  including any invalid or rejected model outputs.  This function filters
-  that history to return only the valid turns.
-
-  A "turn" starts with one user input (a single content) and then follows by
-  corresponding model response (which may consist of multiple contents).
-  Turns are assumed to alternate: user input, model output, user input, model
-  output, etc.
+  including any invalid or rejected model outputs. This function filters that
+  history to return only the valid turns.
 
   Args:
       comprehensive_history: A list representing the complete chat history.
@@ -84,8 +79,6 @@ def _extract_curated_history(
   length = len(comprehensive_history)
   i = 0
   current_input = comprehensive_history[i]
-  if current_input.role != "user":
-    raise ValueError("History must start with a user turn.")
   while i < length:
     if comprehensive_history[i].role not in ["user", "model"]:
       raise ValueError(
@@ -94,6 +87,7 @@ def _extract_curated_history(
 
     if comprehensive_history[i].role == "user":
       current_input = comprehensive_history[i]
+      curated_history.append(current_input)
       i += 1
     else:
       current_output = []
@@ -104,8 +98,9 @@ def _extract_curated_history(
           is_valid = False
         i += 1
       if is_valid:
-        curated_history.append(current_input)
         curated_history.extend(current_output)
+      elif curated_history:
+        curated_history.pop()
   return curated_history
 
 

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],
@@ -1422,11 +1445,18 @@ def _GenerateVideosConfig_to_mldev(
     )
 
   if getv(from_object, ['enhance_prompt']) is not None:
-    raise ValueError('enhance_prompt parameter is not supported in Gemini API.')
+    setv(
+        parent_object,
+        ['parameters', 'enhancePrompt'],
+        getv(from_object, ['enhance_prompt']),
+    )
 
   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
 
 
@@ -1453,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,
@@ -1981,7 +2014,13 @@ def _Tool_to_vertex(
     )
 
   if getv(from_object, ['url_context']) is not None:
-    raise ValueError('url_context parameter is not supported in Vertex AI.')
+    setv(
+        to_object,
+        ['urlContext'],
+        _UrlContext_to_vertex(
+            api_client, getv(from_object, ['url_context']), to_object
+        ),
+    )
 
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
@@ -3223,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],
@@ -3306,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
 
 
@@ -3332,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,
@@ -4294,6 +4371,15 @@ def _Candidate_from_vertex(
   if getv(from_object, ['finishReason']) is not None:
     setv(to_object, ['finish_reason'], getv(from_object, ['finishReason']))
 
+  if getv(from_object, ['urlContextMetadata']) is not None:
+    setv(
+        to_object,
+        ['url_context_metadata'],
+        _UrlContextMetadata_from_vertex(
+            api_client, getv(from_object, ['urlContextMetadata']), to_object
+        ),
+    )
+
   if getv(from_object, ['avgLogprobs']) is not None:
     setv(to_object, ['avg_logprobs'], getv(from_object, ['avgLogprobs']))
 
@@ -5778,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:
@@ -5806,6 +5905,7 @@ class Models(_api_module.BaseModule):
         model=model,
         prompt=prompt,
         image=image,
+        video=video,
         config=config,
     )
 
@@ -7308,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:
@@ -7336,6 +7449,7 @@ class AsyncModels(_api_module.BaseModule):
         model=model,
         prompt=prompt,
         image=image,
+        video=video,
         config=config,
     )
 
@@ -7644,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/tokens.py

@@ -143,6 +143,7 @@ class Tokens(_api_module.BaseModule):
     Usage:
 
     .. code-block:: python
+
       # Case 1: If LiveEphemeralParameters is unset, unlock LiveConnectConfig
       # when using the token in Live API sessions. Each session connection can
       # use a different configuration.
@@ -154,6 +155,7 @@ class Tokens(_api_module.BaseModule):
       auth_token = client.tokens.create(config=config)
 
     .. code-block:: python
+
       # Case 2: If LiveEphemeralParameters is set, lock all fields in
       # LiveConnectConfig when using the token in Live API sessions. For
       # example, changing `output_audio_transcription` in the Live API
@@ -170,7 +172,9 @@ class Tokens(_api_module.BaseModule):
               ),
           )
       )
-      .. code-block:: python
+
+    .. code-block:: python
+
       # Case 3: If LiveEphemeralParameters is set and lockAdditionalFields is
       # empty, lock LiveConnectConfig with set fields (e.g.
       # system_instruction in this example) when using the token in Live API
@@ -187,7 +191,8 @@ class Tokens(_api_module.BaseModule):
           )
       )
 
-      .. code-block:: python
+    .. code-block:: python
+
       # Case 4: If LiveEphemeralParameters is set and lockAdditionalFields is
       # set, lock LiveConnectConfig with set and additional fields (e.g.
       # system_instruction, temperature in this example) when using the token

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