google-genai 1.53.0__py3-none-any.whl → 1.55.0__py3-none-any.whl

google/genai/_interactions/types/video_mime_type.py

@@ -0,0 +1,36 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Union
+from typing_extensions import Literal, TypeAlias
+
+__all__ = ["VideoMimeType"]
+
+VideoMimeType: TypeAlias = Union[
+    Literal[
+        "video/mp4",
+        "video/mpeg",
+        "video/mov",
+        "video/avi",
+        "video/x-flv",
+        "video/mpg",
+        "video/webm",
+        "video/wmv",
+        "video/3gpp",
+    ],
+    str,
+]

google/genai/_interactions/types/video_mime_type_param.py

@@ -0,0 +1,38 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union
+from typing_extensions import Literal, TypeAlias
+
+__all__ = ["VideoMimeTypeParam"]
+
+VideoMimeTypeParam: TypeAlias = Union[
+    Literal[
+        "video/mp4",
+        "video/mpeg",
+        "video/mov",
+        "video/avi",
+        "video/x-flv",
+        "video/mpg",
+        "video/webm",
+        "video/wmv",
+        "video/3gpp",
+    ],
+    str,
+]

google/genai/_live_converters.py

@@ -534,6 +534,11 @@ def _LiveClientSetup_to_mldev(
   if getv(from_object, ['proactivity']) is not None:
     setv(to_object, ['proactivity'], getv(from_object, ['proactivity']))
 
+  if getv(from_object, ['explicit_vad_signal']) is not None:
+    raise ValueError(
+        'explicit_vad_signal parameter is not supported in Gemini API.'
+    )
+
   return to_object
 
 
@@ -603,6 +608,13 @@ def _LiveClientSetup_to_vertex(
   if getv(from_object, ['proactivity']) is not None:
     setv(to_object, ['proactivity'], getv(from_object, ['proactivity']))
 
+  if getv(from_object, ['explicit_vad_signal']) is not None:
+    setv(
+        to_object,
+        ['explicitVadSignal'],
+        getv(from_object, ['explicit_vad_signal']),
+    )
+
   return to_object
 
 
@@ -753,6 +765,11 @@ def _LiveConnectConfig_to_mldev(
         getv(from_object, ['proactivity']),
     )
 
+  if getv(from_object, ['explicit_vad_signal']) is not None:
+    raise ValueError(
+        'explicit_vad_signal parameter is not supported in Gemini API.'
+    )
+
   return to_object
 
 
@@ -904,6 +921,13 @@ def _LiveConnectConfig_to_vertex(
         getv(from_object, ['proactivity']),
     )
 
+  if getv(from_object, ['explicit_vad_signal']) is not None:
+    setv(
+        parent_object,
+        ['setup', 'explicitVadSignal'],
+        getv(from_object, ['explicit_vad_signal']),
+    )
+
   return to_object
 
 
@@ -1176,6 +1200,13 @@ def _LiveServerMessage_from_vertex(
         getv(from_object, ['sessionResumptionUpdate']),
     )
 
+  if getv(from_object, ['voiceActivityDetectionSignal']) is not None:
+    setv(
+        to_object,
+        ['voice_activity_detection_signal'],
+        getv(from_object, ['voiceActivityDetectionSignal']),
+    )
+
   return to_object
 
 
@@ -1265,12 +1296,12 @@ def _SpeechConfig_to_vertex(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['language_code']) is not None:
-    setv(to_object, ['languageCode'], getv(from_object, ['language_code']))
-
   if getv(from_object, ['voice_config']) is not None:
     setv(to_object, ['voiceConfig'], getv(from_object, ['voice_config']))
 
+  if getv(from_object, ['language_code']) is not None:
+    setv(to_object, ['languageCode'], getv(from_object, ['language_code']))
+
   if getv(from_object, ['multi_speaker_voice_config']) is not None:
     raise ValueError(
         'multi_speaker_voice_config parameter is not supported in Vertex AI.'

google/genai/_tokens_converters.py

@@ -355,6 +355,11 @@ def _LiveConnectConfig_to_mldev(
         getv(from_object, ['proactivity']),
     )
 
+  if getv(from_object, ['explicit_vad_signal']) is not None:
+    raise ValueError(
+        'explicit_vad_signal parameter is not supported in Gemini API.'
+    )
+
   return to_object
 
 

google/genai/batches.py

@@ -1006,6 +1006,13 @@ def _GenerateContentConfig_to_mldev(
         _ImageConfig_to_mldev(getv(from_object, ['image_config']), to_object),
     )
 
+  if getv(from_object, ['enable_enhanced_civic_answers']) is not None:
+    setv(
+        to_object,
+        ['enableEnhancedCivicAnswers'],
+        getv(from_object, ['enable_enhanced_civic_answers']),
+    )
+
   return to_object
 
 
@@ -1902,34 +1909,6 @@ class Batches(_api_module.BaseModule):
     self._api_client._verify_response(return_value)
     return return_value
 
-  def list(
-      self, *, config: Optional[types.ListBatchJobsConfigOrDict] = None
-  ) -> Pager[types.BatchJob]:
-    """Lists batch jobs.
-
-    Args:
-      config (ListBatchJobsConfig): Optional configuration for the list request.
-
-    Returns:
-      A Pager object that contains one page of batch jobs. When iterating over
-      the pager, it automatically fetches the next page if there are more.
-
-    Usage:
-
-    .. code-block:: python
-      config = {'page_size': 10}
-      for batch_job in client.batches.list(config):
-        print(batch_job.name)
-    """
-
-    list_request = self._list
-    return Pager(
-        'batch_jobs',
-        list_request,
-        self._list(config=config),
-        config,
-    )
-
   def create(
       self,
       *,
@@ -2025,6 +2004,34 @@ class Batches(_api_module.BaseModule):
     else:
       return self._create_embeddings(model=model, src=src, config=config)
 
+  def list(
+      self, *, config: Optional[types.ListBatchJobsConfigOrDict] = None
+  ) -> Pager[types.BatchJob]:
+    """Lists batch jobs.
+
+    Args:
+      config (ListBatchJobsConfig): Optional configuration for the list request.
+
+    Returns:
+      A Pager object that contains one page of batch jobs. When iterating over
+      the pager, it automatically fetches the next page if there are more.
+
+    Usage:
+
+    .. code-block:: python
+      config = {'page_size': 10}
+      for batch_job in client.batches.list(config):
+        print(batch_job.name)
+    """
+
+    list_request = self._list
+    return Pager(
+        'batch_jobs',
+        list_request,
+        self._list(config=config),
+        config,
+    )
+
 
 class AsyncBatches(_api_module.BaseModule):
 
@@ -2451,33 +2458,6 @@ class AsyncBatches(_api_module.BaseModule):
     self._api_client._verify_response(return_value)
     return return_value
 
-  async def list(
-      self, *, config: Optional[types.ListBatchJobsConfigOrDict] = None
-  ) -> AsyncPager[types.BatchJob]:
-    """Lists batch jobs asynchronously.
-
-    Args:
-      config (ListBatchJobsConfig): Optional configuration for the list request.
-
-    Returns:
-      A Pager object that contains one page of batch jobs. When iterating over
-      the pager, it automatically fetches the next page if there are more.
-
-    Usage:
-
-    .. code-block:: python
-      async for batch_job in await client.aio.batches.list():
-        print(batch_job.name)
-    """
-
-    list_request = self._list
-    return AsyncPager(
-        'batch_jobs',
-        list_request,
-        await self._list(config=config),
-        config,
-    )
-
   async def create(
       self,
       *,
@@ -2578,3 +2558,30 @@ class AsyncBatches(_api_module.BaseModule):
       raise ValueError('Vertex AI does not support batches.create_embeddings.')
     else:
       return await self._create_embeddings(model=model, src=src, config=config)
+
+  async def list(
+      self, *, config: Optional[types.ListBatchJobsConfigOrDict] = None
+  ) -> AsyncPager[types.BatchJob]:
+    """Lists batch jobs asynchronously.
+
+    Args:
+      config (ListBatchJobsConfig): Optional configuration for the list request.
+
+    Returns:
+      A Pager object that contains one page of batch jobs. When iterating over
+      the pager, it automatically fetches the next page if there are more.
+
+    Usage:
+
+    .. code-block:: python
+      async for batch_job in await client.aio.batches.list():
+        print(batch_job.name)
+    """
+
+    list_request = self._list
+    return AsyncPager(
+        'batch_jobs',
+        list_request,
+        await self._list(config=config),
+        config,
+    )

google/genai/client.py

@@ -36,6 +36,20 @@ from .tokens import AsyncTokens, Tokens
 from .tunings import AsyncTunings, Tunings
 from .types import HttpOptions, HttpOptionsDict, HttpRetryOptions
 
+import warnings
+import httpx
+
+from ._api_client import has_aiohttp
+
+from . import _common
+
+from ._interactions import AsyncGeminiNextGenAPIClient, DEFAULT_MAX_RETRIES, DefaultAioHttpClient, GeminiNextGenAPIClient
+from ._interactions._models import FinalRequestOptions
+from ._interactions._types import Headers
+from ._interactions._utils import is_given
+from ._interactions.resources import AsyncInteractionsResource as AsyncNextGenInteractionsResource, InteractionsResource as NextGenInteractionsResource
+_interactions_experimental_warned = False
+
 
 class AsyncClient:
   """Client for making asynchronous (non-blocking) requests."""
@@ -52,6 +66,113 @@ class AsyncClient:
     self._live = AsyncLive(self._api_client)
     self._tokens = AsyncTokens(self._api_client)
     self._operations = AsyncOperations(self._api_client)
+    self._nextgen_client_instance: Optional[AsyncGeminiNextGenAPIClient] = None
+
+  @property
+  def _nextgen_client(self) -> AsyncGeminiNextGenAPIClient:
+    if self._nextgen_client_instance is not None:
+      return self._nextgen_client_instance
+
+    http_opts = self._api_client._http_options
+
+    if http_opts.extra_body:
+      warnings.warn(
+          'extra_body properties are not supported in `.interactions` yet',
+          category=UserWarning,
+          stacklevel=5,
+      )
+
+    retry_opts = http_opts.retry_options
+    if retry_opts is not None and (
+        retry_opts.initial_delay is not None
+        or retry_opts.max_delay is not None
+        or retry_opts.exp_base is not None
+        or retry_opts.jitter is not None
+        or retry_opts.http_status_codes is not None
+    ):
+      warnings.warn(
+          'Granular retry options are not supported in `.interactions` yet',
+          category=UserWarning,
+          stacklevel=5,
+      )
+
+    http_client: httpx.AsyncClient = self._api_client._async_httpx_client
+
+    async_client_args = self._api_client._http_options.async_client_args or {}
+    has_custom_transport = 'transport' in async_client_args
+
+    if has_aiohttp and not has_custom_transport:
+      warnings.warn(
+          'Async interactions client cannot use aiohttp, fallingback to httpx.',
+          category=UserWarning,
+          stacklevel=5,
+      )
+
+    if retry_opts is not None and retry_opts.attempts is not None:
+      max_retries = retry_opts.attempts
+    else:
+      max_retries = DEFAULT_MAX_RETRIES + 1
+
+    self._nextgen_client_instance = AsyncGeminiNextGenAPIClient(
+        base_url=http_opts.base_url,
+        api_key=self._api_client.api_key,
+        default_headers=http_opts.headers,
+        http_client=http_client,
+        # uSDk expects ms, nextgen uses a httpx Timeout -> expects seconds.
+        timeout=http_opts.timeout / 1000 if http_opts.timeout else None,
+        max_retries=max_retries,
+    )
+
+    client = self._nextgen_client_instance
+    if self._api_client.vertexai:
+      client._is_vertex = True
+      client._vertex_project = self._api_client.project
+      client._vertex_location = self._api_client.location
+
+      async def prepare_options(options: FinalRequestOptions) -> FinalRequestOptions:
+        headers = {}
+        if is_given(options.headers):
+          headers = {**options.headers}
+
+        headers['Authorization'] = f'Bearer {await self._api_client._async_access_token()}'
+        if (
+            self._api_client._credentials
+            and self._api_client._credentials.quota_project_id
+        ):
+          headers['x-goog-user-project'] = (
+              self._api_client._credentials.quota_project_id
+          )
+        options.headers = headers
+
+        return options
+
+      if self._api_client.project or self._api_client.location:
+        client._prepare_options = prepare_options  # type: ignore[method-assign]
+
+    def validate_headers(headers: Headers, custom_headers: Headers) -> None:
+      return
+
+    client._validate_headers = validate_headers  # type: ignore[method-assign]
+    return self._nextgen_client_instance
+
+  @property
+  def interactions(self) -> AsyncNextGenInteractionsResource:
+    global _interactions_experimental_warned
+    if not _interactions_experimental_warned:
+      _interactions_experimental_warned = True
+      warnings.warn(
+          'Interactions usage is experimental and may change in future versions.',
+          category=UserWarning,
+          stacklevel=1,
+      )
+    return self._nextgen_client.interactions
+
+  @property
+  def _has_nextgen_client(self) -> bool:
+    return (
+        hasattr(self, '_nextgen_client_instance') and
+        self._nextgen_client_instance is not None
+    )
 
   @property
   def models(self) -> AsyncModels:
@@ -120,6 +241,9 @@ class AsyncClient:
     """
     await self._api_client.aclose()
 
+    if self._has_nextgen_client:
+      await self._nextgen_client.close()
+
   async def __aenter__(self) -> 'AsyncClient':
     return self
 
@@ -287,6 +411,7 @@ class Client:
     self._files = Files(self._api_client)
     self._tokens = Tokens(self._api_client)
     self._operations = Operations(self._api_client)
+    self._nextgen_client_instance: Optional[GeminiNextGenAPIClient] = None
 
   @staticmethod
   def _get_api_client(
@@ -324,6 +449,101 @@ class Client:
         http_options=http_options,
     )
 
+  @property
+  def _nextgen_client(self) -> GeminiNextGenAPIClient:
+    if self._nextgen_client_instance is not None:
+      return self._nextgen_client_instance
+
+    http_opts = self._api_client._http_options
+
+    if http_opts.extra_body:
+      warnings.warn(
+          'extra_body properties are not supported in `.interactions` yet',
+          category=UserWarning,
+          stacklevel=5,
+      )
+
+    retry_opts = http_opts.retry_options
+    if retry_opts is not None and (
+        retry_opts.initial_delay is not None
+        or retry_opts.max_delay is not None
+        or retry_opts.exp_base is not None
+        or retry_opts.jitter is not None
+        or retry_opts.http_status_codes is not None
+    ):
+      warnings.warn(
+          'Granular retry options are not supported in `.interactions` yet',
+          category=UserWarning,
+          stacklevel=5,
+      )
+
+    if retry_opts is not None and retry_opts.attempts is not None:
+      max_retries = retry_opts.attempts
+    else:
+      max_retries = DEFAULT_MAX_RETRIES + 1
+
+    self._nextgen_client_instance = GeminiNextGenAPIClient(
+        base_url=http_opts.base_url,
+        api_key=self._api_client.api_key,
+        default_headers=http_opts.headers,
+        http_client=self._api_client._httpx_client,
+        # uSDk expects ms, nextgen uses a httpx Timeout -> expects seconds.
+        timeout=http_opts.timeout / 1000 if http_opts.timeout else None,
+        max_retries=max_retries,
+    )
+
+    client = self._nextgen_client_instance
+    if self.vertexai:
+      client._is_vertex = True
+      client._vertex_project = self._api_client.project
+      client._vertex_location = self._api_client.location
+
+      def prepare_options(options: FinalRequestOptions) -> FinalRequestOptions:
+        headers = {}
+        if is_given(options.headers):
+          headers = {**options.headers}
+        options.headers = headers
+
+        headers['Authorization'] = f'Bearer {self._api_client._access_token()}'
+        if (
+            self._api_client._credentials
+            and self._api_client._credentials.quota_project_id
+        ):
+          headers['x-goog-user-project'] = (
+              self._api_client._credentials.quota_project_id
+          )
+
+        return options
+
+      if self._api_client.project or self._api_client.location:
+        client._prepare_options = prepare_options  # type: ignore[method-assign]
+
+    def validate_headers(headers: Headers, custom_headers: Headers) -> None:
+      return
+
+    client._validate_headers = validate_headers  # type: ignore[method-assign]
+
+    return self._nextgen_client_instance
+
+  @property
+  def interactions(self) -> NextGenInteractionsResource:
+    global _interactions_experimental_warned
+    if not _interactions_experimental_warned:
+      _interactions_experimental_warned = True
+      warnings.warn(
+        'Interactions usage is experimental and may change in future versions.',
+        category=UserWarning,
+        stacklevel=2,
+      )
+    return self._nextgen_client.interactions
+
+  @property
+  def _has_nextgen_client(self) -> bool:
+    return (
+        hasattr(self, '_nextgen_client_instance') and
+        self._nextgen_client_instance is not None
+    )
+
   @property
   def chats(self) -> Chats:
     return Chats(modules=self.models)
@@ -396,6 +616,9 @@ class Client:
     """
     self._api_client.close()
 
+    if self._has_nextgen_client:
+      self._nextgen_client.close()
+
   def __enter__(self) -> 'Client':
     return self
 

google/genai/errors.py

@@ -15,7 +15,7 @@
 
 """Error classes for the GenAI SDK."""
 
-from typing import Any, Optional, TYPE_CHECKING, Union
+from typing import Any, Callable, Optional, TYPE_CHECKING, Union
 import httpx
 import json
 from . import _common
@@ -53,6 +53,21 @@ class APIError(Exception):
 
     super().__init__(f'{self.code} {self.status}. {self.details}')
 
+  def __reduce__(
+      self,
+  ) -> tuple[Callable[..., 'APIError'], tuple[dict[str, Any]]]:
+    """Returns a tuple that can be used to reconstruct the error for pickling."""
+    state = self.__dict__.copy()
+    return (self.__class__._rebuild, (state,))
+
+  @staticmethod
+  def _rebuild(state: dict[str, Any]) -> 'APIError':
+    """Rebuilds the error from the state."""
+    obj = APIError.__new__(APIError)
+    obj.__dict__.update(state)
+    Exception.__init__(obj, f'{obj.code} {obj.status}. {obj.details}')
+    return obj
+
   def _get_status(self, response_json: Any) -> Any:
     return response_json.get(
         'status', response_json.get('error', {}).get('status', None)