google-genai 1.23.0__tar.gz → 1.25.0__tar.gz

{google_genai-1.23.0/google_genai.egg-info → google_genai-1.25.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-genai
-Version: 1.23.0
+Version: 1.25.0
 Summary: GenAI Python SDK
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache-2.0
@@ -89,10 +89,13 @@ You can create a client by configuring the necessary environment variables.
 Configuration setup instructions depends on whether you're using the Gemini
 Developer API or the Gemini API in Vertex AI.
 
-**Gemini Developer API:** Set `GOOGLE_API_KEY` as shown below:
+**Gemini Developer API:** Set the `GEMINI_API_KEY` or `GOOGLE_API_KEY`.
+It will automatically be picked up by the client. It's recommended that you
+set only one of those variables, but if both are set, `GOOGLE_API_KEY` takes
+precedence.
 
 ```bash
-export GOOGLE_API_KEY='your-api-key'
+export GEMINI_API_KEY='your-api-key'
 ```
 
 **Gemini API on Vertex AI:** Set `GOOGLE_GENAI_USE_VERTEXAI`,
@@ -1132,9 +1135,9 @@ response3.generated_images[0].image.show()
 
 ### Veo
 
-#### Generate Videos
+Support for generating videos is considered public preview
 
-Support for generate videos in Vertex and Gemini Developer API is behind an allowlist
+#### Generate Videos (Text to Video)
 
 ```python
 from google.genai import types
@@ -1145,7 +1148,6 @@ operation = client.models.generate_videos(
     prompt='A neon hologram of a cat driving at top speed',
     config=types.GenerateVideosConfig(
         number_of_videos=1,
-        fps=24,
         duration_seconds=5,
         enhance_prompt=True,
     ),
@@ -1156,7 +1158,73 @@ while not operation.done:
     time.sleep(20)
     operation = client.operations.get(operation)
 
-video = operation.result.generated_videos[0].video
+video = operation.response.generated_videos[0].video
+video.show()
+```
+
+#### Generate Videos (Image to Video)
+
+```python
+from google.genai import types
+
+# Read local image (uses mimetypes.guess_type to infer mime type)
+image = types.Image.from_file("local/path/file.png")
+
+# Create operation
+operation = client.models.generate_videos(
+    model='veo-2.0-generate-001',
+    # Prompt is optional if image is provided
+    prompt='Night sky',
+    image=image,
+    config=types.GenerateVideosConfig(
+        number_of_videos=1,
+        duration_seconds=5,
+        enhance_prompt=True,
+        # Can also pass an Image into last_frame for frame interpolation
+    ),
+)
+
+# Poll operation
+while not operation.done:
+    time.sleep(20)
+    operation = client.operations.get(operation)
+
+video = operation.response.generated_videos[0].video
+video.show()
+```
+
+#### Generate Videos (Video to Video)
+
+Currently, only Vertex supports Video to Video generation (Video extension).
+
+```python
+from google.genai import types
+
+# Read local video (uses mimetypes.guess_type to infer mime type)
+video = types.Video.from_file("local/path/video.mp4")
+
+# Create operation
+operation = client.models.generate_videos(
+    model='veo-2.0-generate-001',
+    # Prompt is optional if Video is provided
+    prompt='Night sky',
+    # Input video must be in GCS
+    video=types.Video(
+        uri="gs://bucket-name/inputs/videos/cat_driving.mp4",
+    ),
+    config=types.GenerateVideosConfig(
+        number_of_videos=1,
+        duration_seconds=5,
+        enhance_prompt=True,
+    ),
+)
+
+# Poll operation
+while not operation.done:
+    time.sleep(20)
+    operation = client.operations.get(operation)
+
+video = operation.response.generated_videos[0].video
 video.show()
 ```
 
@@ -1568,3 +1636,24 @@ except errors.APIError as e:
   print(e.code) # 404
   print(e.message)
 ```
+
+## Extra Request Body
+
+The `extra_body` field in `HttpOptions` accepts a dictionary of additional JSON
+properties to include in the request body. This can be used to access new or
+experimental backend features that are not yet formally supported in the SDK.
+The structure of the dictionary must match the backend API's request structure.
+
+- VertexAI backend API docs: https://cloud.google.com/vertex-ai/docs/reference/rest
+- GeminiAPI backend API docs: https://ai.google.dev/api/rest
+
+```python
+response = client.models.generate_content(
+    model="gemini-2.5-pro",
+    contents="What is the weather in Boston? and how about Sunnyvale?",
+    config=types.GenerateContentConfig(
+        tools=[get_current_weather],
+        http_options=types.HttpOptions(extra_body={'tool_config': {'function_calling_config': {'mode': 'COMPOSITIONAL'}}}),
+    ),
+)
+```

{google_genai-1.23.0 → google_genai-1.25.0}/README.md

@@ -55,10 +55,13 @@ You can create a client by configuring the necessary environment variables.
 Configuration setup instructions depends on whether you're using the Gemini
 Developer API or the Gemini API in Vertex AI.
 
-**Gemini Developer API:** Set `GOOGLE_API_KEY` as shown below:
+**Gemini Developer API:** Set the `GEMINI_API_KEY` or `GOOGLE_API_KEY`.
+It will automatically be picked up by the client. It's recommended that you
+set only one of those variables, but if both are set, `GOOGLE_API_KEY` takes
+precedence.
 
 ```bash
-export GOOGLE_API_KEY='your-api-key'
+export GEMINI_API_KEY='your-api-key'
 ```
 
 **Gemini API on Vertex AI:** Set `GOOGLE_GENAI_USE_VERTEXAI`,
@@ -1098,9 +1101,9 @@ response3.generated_images[0].image.show()
 
 ### Veo
 
-#### Generate Videos
+Support for generating videos is considered public preview
 
-Support for generate videos in Vertex and Gemini Developer API is behind an allowlist
+#### Generate Videos (Text to Video)
 
 ```python
 from google.genai import types
@@ -1111,7 +1114,6 @@ operation = client.models.generate_videos(
     prompt='A neon hologram of a cat driving at top speed',
     config=types.GenerateVideosConfig(
         number_of_videos=1,
-        fps=24,
         duration_seconds=5,
         enhance_prompt=True,
     ),
@@ -1122,7 +1124,73 @@ while not operation.done:
     time.sleep(20)
     operation = client.operations.get(operation)
 
-video = operation.result.generated_videos[0].video
+video = operation.response.generated_videos[0].video
+video.show()
+```
+
+#### Generate Videos (Image to Video)
+
+```python
+from google.genai import types
+
+# Read local image (uses mimetypes.guess_type to infer mime type)
+image = types.Image.from_file("local/path/file.png")
+
+# Create operation
+operation = client.models.generate_videos(
+    model='veo-2.0-generate-001',
+    # Prompt is optional if image is provided
+    prompt='Night sky',
+    image=image,
+    config=types.GenerateVideosConfig(
+        number_of_videos=1,
+        duration_seconds=5,
+        enhance_prompt=True,
+        # Can also pass an Image into last_frame for frame interpolation
+    ),
+)
+
+# Poll operation
+while not operation.done:
+    time.sleep(20)
+    operation = client.operations.get(operation)
+
+video = operation.response.generated_videos[0].video
+video.show()
+```
+
+#### Generate Videos (Video to Video)
+
+Currently, only Vertex supports Video to Video generation (Video extension).
+
+```python
+from google.genai import types
+
+# Read local video (uses mimetypes.guess_type to infer mime type)
+video = types.Video.from_file("local/path/video.mp4")
+
+# Create operation
+operation = client.models.generate_videos(
+    model='veo-2.0-generate-001',
+    # Prompt is optional if Video is provided
+    prompt='Night sky',
+    # Input video must be in GCS
+    video=types.Video(
+        uri="gs://bucket-name/inputs/videos/cat_driving.mp4",
+    ),
+    config=types.GenerateVideosConfig(
+        number_of_videos=1,
+        duration_seconds=5,
+        enhance_prompt=True,
+    ),
+)
+
+# Poll operation
+while not operation.done:
+    time.sleep(20)
+    operation = client.operations.get(operation)
+
+video = operation.response.generated_videos[0].video
 video.show()
 ```
 
@@ -1534,3 +1602,24 @@ except errors.APIError as e:
   print(e.code) # 404
   print(e.message)
 ```
+
+## Extra Request Body
+
+The `extra_body` field in `HttpOptions` accepts a dictionary of additional JSON
+properties to include in the request body. This can be used to access new or
+experimental backend features that are not yet formally supported in the SDK.
+The structure of the dictionary must match the backend API's request structure.
+
+- VertexAI backend API docs: https://cloud.google.com/vertex-ai/docs/reference/rest
+- GeminiAPI backend API docs: https://ai.google.dev/api/rest
+
+```python
+response = client.models.generate_content(
+    model="gemini-2.5-pro",
+    contents="What is the weather in Boston? and how about Sunnyvale?",
+    config=types.GenerateContentConfig(
+        tools=[get_current_weather],
+        http_options=types.HttpOptions(extra_body={'tool_config': {'function_calling_config': {'mode': 'COMPOSITIONAL'}}}),
+    ),
+)
+```

{google_genai-1.23.0 → google_genai-1.25.0}/google/genai/_api_client.py

@@ -74,8 +74,6 @@ try:
 except ImportError:
   pass
 
-# internal comment
-
 
 if TYPE_CHECKING:
   from multidict import CIMultiDictProxy
@@ -234,8 +232,18 @@ class HttpResponse:
       byte_stream: Union[Any, bytes] = None,
       session: Optional['aiohttp.ClientSession'] = None,
   ):
+    if isinstance(headers, dict):
+      self.headers = headers
+    elif isinstance(headers, httpx.Headers):
+      self.headers = {
+        key: ', '.join(headers.get_list(key))
+        for key in headers.keys()}
+    elif type(headers).__name__ == 'CIMultiDictProxy':
+      self.headers = {
+          key: ', '.join(headers.getall(key))
+        for key in headers.keys()}
+
     self.status_code: int = 200
-    self.headers = headers
     self.response_stream = response_stream
     self.byte_stream = byte_stream
     self._session = session
@@ -338,9 +346,11 @@ class HttpResponse:
 
 # Default retry options.
 # The config is based on https://cloud.google.com/storage/docs/retry-strategy.
-_RETRY_ATTEMPTS = 3
+# By default, the client will retry 4 times with approximately 1.0, 2.0, 4.0,
+# 8.0 seconds between each attempt.
+_RETRY_ATTEMPTS = 5  # including the initial call.
 _RETRY_INITIAL_DELAY = 1.0  # seconds
-_RETRY_MAX_DELAY = 120.0  # seconds
+_RETRY_MAX_DELAY = 60.0  # seconds
 _RETRY_EXP_BASE = 2
 _RETRY_JITTER = 1
 _RETRY_HTTP_STATUS_CODES = (
@@ -364,14 +374,13 @@ def _retry_args(options: Optional[HttpRetryOptions]) -> dict[str, Any]:
     The arguments passed to the tenacity.(Async)Retrying constructor.
   """
   if options is None:
-    return {'stop': tenacity.stop_after_attempt(1)}
+    return {'stop': tenacity.stop_after_attempt(1), 'reraise': True}
 
   stop = tenacity.stop_after_attempt(options.attempts or _RETRY_ATTEMPTS)
   retriable_codes = options.http_status_codes or _RETRY_HTTP_STATUS_CODES
-  retry = tenacity.retry_if_result(
-      lambda response: response.status_code in retriable_codes,
+  retry = tenacity.retry_if_exception(
+      lambda e: isinstance(e, errors.APIError) and e.code in retriable_codes,
   )
-  retry_error_callback = lambda retry_state: retry_state.outcome.result()
   wait = tenacity.wait_exponential_jitter(
       initial=options.initial_delay or _RETRY_INITIAL_DELAY,
       max=options.max_delay or _RETRY_MAX_DELAY,
@@ -381,7 +390,7 @@ def _retry_args(options: Optional[HttpRetryOptions]) -> dict[str, Any]:
   return {
       'stop': stop,
       'retry': retry,
-      'retry_error_callback': retry_error_callback,
+      'reraise': True,
       'wait': wait,
   }
 
@@ -569,18 +578,16 @@ class BaseApiClient:
     )
     self._httpx_client = SyncHttpxClient(**client_args)
     self._async_httpx_client = AsyncHttpxClient(**async_client_args)
-    if has_aiohttp:
+    if self._use_aiohttp():
       # Do it once at the genai.Client level. Share among all requests.
       self._async_client_session_request_args = self._ensure_aiohttp_ssl_ctx(
           self._http_options
-      ) 
-    self._websocket_ssl_ctx = self._ensure_websocket_ssl_ctx(
-        self._http_options
-    )
+      )
+    self._websocket_ssl_ctx = self._ensure_websocket_ssl_ctx(self._http_options)
 
     retry_kwargs = _retry_args(self._http_options.retry_options)
-    self._retry = tenacity.Retrying(**retry_kwargs, reraise=True)
-    self._async_retry = tenacity.AsyncRetrying(**retry_kwargs, reraise=True)
+    self._retry = tenacity.Retrying(**retry_kwargs)
+    self._async_retry = tenacity.AsyncRetrying(**retry_kwargs)
 
   @staticmethod
   def _ensure_httpx_ssl_ctx(
@@ -706,7 +713,6 @@ class BaseApiClient:
 
     return _maybe_set(async_args, ctx)
 
-
   @staticmethod
   def _ensure_websocket_ssl_ctx(options: HttpOptions) -> dict[str, Any]:
     """Ensures the SSL context is present in the async client args.
@@ -762,6 +768,14 @@ class BaseApiClient:
 
     return _maybe_set(async_args, ctx)
 
+  def _use_aiohttp(self) -> bool:
+    # If the instantiator has passed a custom transport, they want httpx not
+    # aiohttp.
+    return (
+        has_aiohttp
+        and (self._http_options.async_client_args or {}).get('transport')
+        is None
+    )
 
   def _websocket_base_url(self) -> str:
     url_parts = urlparse(self._http_options.base_url)
@@ -975,7 +989,7 @@ class BaseApiClient:
           data = http_request.data
 
     if stream:
-      if has_aiohttp:
+      if self._use_aiohttp():
         session = aiohttp.ClientSession(
             headers=http_request.headers,
             trust_env=True,
@@ -1007,7 +1021,7 @@ class BaseApiClient:
         await errors.APIError.raise_for_async_response(client_response)
         return HttpResponse(client_response.headers, client_response)
     else:
-      if has_aiohttp:
+      if self._use_aiohttp():
         async with aiohttp.ClientSession(
             headers=http_request.headers,
             trust_env=True,
@@ -1061,11 +1075,10 @@ class BaseApiClient:
         http_method, path, request_dict, http_options
     )
     response = self._request(http_request, stream=False)
-    response_body = response.response_stream[0] if response.response_stream else ''
-    return SdkHttpResponse(
-        headers=response.headers, body=response_body
+    response_body = (
+        response.response_stream[0] if response.response_stream else ''
     )
-
+    return SdkHttpResponse(headers=response.headers, body=response_body)
 
   def request_streamed(
       self,
@@ -1080,7 +1093,9 @@ class BaseApiClient:
 
     session_response = self._request(http_request, stream=True)
     for chunk in session_response.segments():
-      yield SdkHttpResponse(headers=session_response.headers, body=json.dumps(chunk))
+      yield SdkHttpResponse(
+          headers=session_response.headers, body=json.dumps(chunk)
+      )
 
   async def async_request(
       self,
@@ -1095,10 +1110,7 @@ class BaseApiClient:
 
     result = await self._async_request(http_request=http_request, stream=False)
     response_body = result.response_stream[0] if result.response_stream else ''
-    return SdkHttpResponse(
-        headers=result.headers, body=response_body
-    )
-
+    return SdkHttpResponse(headers=result.headers, body=response_body)
 
   async def async_request_streamed(
       self,
@@ -1324,7 +1336,7 @@ class BaseApiClient:
     """
     offset = 0
     # Upload the file in chunks
-    if has_aiohttp:  # pylint: disable=g-import-not-at-top
+    if self._use_aiohttp():  # pylint: disable=g-import-not-at-top
       async with aiohttp.ClientSession(
           headers=self._http_options.headers,
           trust_env=True,
@@ -1507,7 +1519,7 @@ class BaseApiClient:
       else:
         data = http_request.data
 
-    if has_aiohttp:
+    if self._use_aiohttp():
       async with aiohttp.ClientSession(
           headers=http_request.headers,
           trust_env=True,

{google_genai-1.23.0 → google_genai-1.25.0}/google/genai/_common.py

@@ -29,11 +29,13 @@ import warnings
 import pydantic
 from pydantic import alias_generators
 
-from . import _api_client
-from . import errors
-
 logger = logging.getLogger('google_genai._common')
 
+
+class ExperimentalWarning(Warning):
+  """Warning for experimental features."""
+
+
 def set_value_by_path(data: Optional[dict[Any, Any]], keys: list[str], value: Any) -> None:
   """Examples:
 
@@ -540,7 +542,7 @@ def experimental_warning(message: str) -> Callable[[Callable[..., Any]], Callabl
         warning_done = True
         warnings.warn(
             message=message,
-            category=errors.ExperimentalWarning,
+            category=ExperimentalWarning,
             stacklevel=2,
         )
       return func(*args, **kwargs)

{google_genai-1.23.0 → google_genai-1.25.0}/google/genai/_live_converters.py

@@ -877,6 +877,9 @@ def _Tool_to_mldev(
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
 
+  if getv(from_object, ['computer_use']) is not None:
+    setv(to_object, ['computerUse'], getv(from_object, ['computer_use']))
+
   return to_object
 
 
@@ -942,6 +945,9 @@ def _Tool_to_vertex(
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
 
+  if getv(from_object, ['computer_use']) is not None:
+    setv(to_object, ['computerUse'], getv(from_object, ['computer_use']))
+
   return to_object
 
 
@@ -1649,16 +1655,16 @@ def _LiveSendRealtimeInputParameters_to_vertex(
     setv(to_object, ['mediaChunks'], t.t_blobs(getv(from_object, ['media'])))
 
   if getv(from_object, ['audio']) is not None:
-    raise ValueError('audio parameter is not supported in Vertex AI.')
+    setv(to_object, ['audio'], t.t_audio_blob(getv(from_object, ['audio'])))
 
   if getv(from_object, ['audio_stream_end']) is not None:
     setv(to_object, ['audioStreamEnd'], getv(from_object, ['audio_stream_end']))
 
   if getv(from_object, ['video']) is not None:
-    raise ValueError('video parameter is not supported in Vertex AI.')
+    setv(to_object, ['video'], t.t_image_blob(getv(from_object, ['video'])))
 
   if getv(from_object, ['text']) is not None:
-    raise ValueError('text parameter is not supported in Vertex AI.')
+    setv(to_object, ['text'], getv(from_object, ['text']))
 
   if getv(from_object, ['activity_start']) is not None:
     setv(
@@ -1935,7 +1941,7 @@ def _LiveClientRealtimeInput_to_vertex(
     setv(to_object, ['mediaChunks'], getv(from_object, ['media_chunks']))
 
   if getv(from_object, ['audio']) is not None:
-    raise ValueError('audio parameter is not supported in Vertex AI.')
+    setv(to_object, ['audio'], getv(from_object, ['audio']))
 
   if getv(from_object, ['audio_stream_end']) is not None:
     raise ValueError(
@@ -1943,10 +1949,10 @@ def _LiveClientRealtimeInput_to_vertex(
     )
 
   if getv(from_object, ['video']) is not None:
-    raise ValueError('video parameter is not supported in Vertex AI.')
+    setv(to_object, ['video'], getv(from_object, ['video']))
 
   if getv(from_object, ['text']) is not None:
-    raise ValueError('text parameter is not supported in Vertex AI.')
+    setv(to_object, ['text'], getv(from_object, ['text']))
 
   if getv(from_object, ['activity_start']) is not None:
     setv(
@@ -2467,6 +2473,8 @@ def _LiveServerSetupComplete_from_vertex(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
+  if getv(from_object, ['sessionId']) is not None:
+    setv(to_object, ['session_id'], getv(from_object, ['sessionId']))
 
   return to_object
 

{google_genai-1.23.0 → google_genai-1.25.0}/google/genai/_replay_api_client.py

@@ -200,6 +200,12 @@ def _debug_print(message: str) -> None:
   )
 
 
+def pop_undeterministic_headers(headers: dict[str, str]) -> None:
+  """Remove headers that are not deterministic."""
+  headers.pop('Date', None)  # pytype: disable=attribute-error
+  headers.pop('Server-Timing', None)  # pytype: disable=attribute-error
+
+
 class ReplayRequest(BaseModel):
   """Represents a single request in a replay."""
 
@@ -219,10 +225,7 @@ class ReplayResponse(BaseModel):
   sdk_response_segments: list[dict[str, object]]
 
   def model_post_init(self, __context: Any) -> None:
-    # Remove headers that are not deterministic so the replay files don't change
-    # every time they are recorded.
-    self.headers.pop('Date', None)
-    self.headers.pop('Server-Timing', None)
+    pop_undeterministic_headers(self.headers)
 
 
 class ReplayInteraction(BaseModel):
@@ -447,11 +450,15 @@ class ReplayApiClient(BaseApiClient):
     if self._should_update_replay():
       if isinstance(response_model, list):
         response_model = response_model[0]
-      if (
-          response_model
-          and getattr(response_model, 'sdk_http_response', None) is not None
+      sdk_response_response = getattr(response_model, 'sdk_http_response', None)
+      if response_model and (
+          sdk_response_response is not None
       ):
-        response_model.sdk_http_response.headers.pop('Date', None)  # type: ignore[attr-defined]
+        headers = getattr(
+            sdk_response_response, 'headers', None
+        )
+        if headers:
+          pop_undeterministic_headers(headers)
       interaction.response.sdk_response_segments.append(
           response_model.model_dump(exclude_none=True)
       )

{google_genai-1.23.0 → google_genai-1.25.0}/google/genai/_tokens_converters.py

@@ -877,6 +877,9 @@ def _Tool_to_mldev(
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
 
+  if getv(from_object, ['computer_use']) is not None:
+    setv(to_object, ['computerUse'], getv(from_object, ['computer_use']))
+
   return to_object
 
 
@@ -942,6 +945,9 @@ def _Tool_to_vertex(
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
 
+  if getv(from_object, ['computer_use']) is not None:
+    setv(to_object, ['computerUse'], getv(from_object, ['computer_use']))
+
   return to_object
 
 

{google_genai-1.23.0 → google_genai-1.25.0}/google/genai/_transformers.py

@@ -625,17 +625,22 @@ def _raise_for_unsupported_schema_type(origin: Any) -> None:
 
 
 def _raise_for_unsupported_mldev_properties(
-    schema: Any, client: _api_client.BaseApiClient
+    schema: Any, client: Optional[_api_client.BaseApiClient]
 ) -> None:
-  if not client.vertexai and (
-      schema.get('additionalProperties') or schema.get('additional_properties')
+  if (
+      client
+      and not client.vertexai
+      and (
+          schema.get('additionalProperties')
+          or schema.get('additional_properties')
+      )
   ):
     raise ValueError('additionalProperties is not supported in the Gemini API.')
 
 
 def process_schema(
     schema: dict[str, Any],
-    client: _api_client.BaseApiClient,
+    client: Optional[_api_client.BaseApiClient],
     defs: Optional[dict[str, Any]] = None,
     *,
     order_properties: bool = True,
@@ -785,7 +790,7 @@ def process_schema(
 
 
 def _process_enum(
-    enum: EnumMeta, client: _api_client.BaseApiClient
+    enum: EnumMeta, client: Optional[_api_client.BaseApiClient]
 ) -> types.Schema:
   is_integer_enum = False
 
@@ -823,7 +828,8 @@ def _is_type_dict_str_any(
 
 
 def t_schema(
-    client: _api_client.BaseApiClient, origin: Union[types.SchemaUnionDict, Any]
+    client: Optional[_api_client.BaseApiClient],
+    origin: Union[types.SchemaUnionDict, Any],
 ) -> Optional[types.Schema]:
   if not origin:
     return None