google-genai 1.57.0__py3-none-any.whl → 1.59.0__py3-none-any.whl

google/genai/client.py

@@ -16,7 +16,7 @@
 import asyncio
 import os
 from types import TracebackType
-from typing import Optional, Union, cast
+from typing import Optional, Union
 
 import google.auth
 import pydantic
@@ -43,13 +43,65 @@ 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 import AsyncGeminiNextGenAPIClient, DEFAULT_MAX_RETRIES, GeminiNextGenAPIClient
+from . import _interactions
+
 from ._interactions.resources import AsyncInteractionsResource as AsyncNextGenInteractionsResource, InteractionsResource as NextGenInteractionsResource
 _interactions_experimental_warned = False
 
+class AsyncGeminiNextGenAPIClientAdapter(_interactions.AsyncGeminiNextGenAPIClientAdapter):
+  """Adapter for the Gemini NextGen API Client."""
+  def __init__(self, api_client: BaseApiClient):
+    self._api_client = api_client
+
+  def is_vertex_ai(self) -> bool:
+    return self._api_client.vertexai or False
+
+  def get_project(self) -> str | None:
+    return self._api_client.project
+
+  def get_location(self) -> str | None:
+    return self._api_client.location
+
+  async def async_get_auth_headers(self) -> dict[str, str]:
+    if self._api_client.api_key:
+      return {"x-goog-api-key": self._api_client.api_key}
+    access_token = await self._api_client._async_access_token()
+    headers = {
+      "Authorization": f"Bearer {access_token}",
+    }
+    if creds := self._api_client._credentials:
+      if creds.quota_project_id:
+        headers["x-goog-user-project"] = creds.quota_project_id
+    return headers
+
+
+class GeminiNextGenAPIClientAdapter(_interactions.GeminiNextGenAPIClientAdapter):
+  """Adapter for the Gemini NextGen API Client."""
+  def __init__(self, api_client: BaseApiClient):
+    self._api_client = api_client
+
+  def is_vertex_ai(self) -> bool:
+    return self._api_client.vertexai or False
+
+  def get_project(self) -> str | None:
+    return self._api_client.project
+
+  def get_location(self) -> str | None:
+    return self._api_client.location
+
+  def get_auth_headers(self) -> dict[str, str]:
+    if self._api_client.api_key:
+      return {"x-goog-api-key": self._api_client.api_key}
+    access_token = self._api_client._access_token()
+    headers = {
+      "Authorization": f"Bearer {access_token}",
+    }
+    if creds := self._api_client._credentials:
+      if creds.quota_project_id:
+        headers["x-goog-user-project"] = creds.quota_project_id
+    return headers
+
 
 class AsyncClient:
   """Client for making asynchronous (non-blocking) requests."""
@@ -122,6 +174,7 @@ class AsyncClient:
         # 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_adapter=AsyncGeminiNextGenAPIClientAdapter(self._api_client)
     )
 
     client = self._nextgen_client_instance
@@ -130,30 +183,6 @@ class AsyncClient:
       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
@@ -279,6 +308,7 @@ class DebugConfig(pydantic.BaseModel):
   )
 
 
+
 class Client:
   """Client for making synchronous requests.
 
@@ -492,39 +522,15 @@ class 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_adapter=GeminiNextGenAPIClientAdapter(self._api_client),
     )
 
     client = self._nextgen_client_instance
-    if self.vertexai:
+    if self._api_client.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

google/genai/live.py

@@ -1036,7 +1036,7 @@ class AsyncLive(_api_module.BaseModule):
           if requests is None:
             raise ValueError('The requests module is required to refresh google-auth credentials. Please install with `pip install google-auth[requests]`')
           auth_req = requests.Request()  # type: ignore
-          creds.refresh(auth_req)
+          creds.refresh(auth_req)  # type: ignore[no-untyped-call]
         bearer_token = creds.token
 
         original_headers = self._api_client._http_options.headers

google/genai/tests/client/test_custom_client.py

@@ -75,3 +75,30 @@ def test_constructor_with_httpx_clients():
   assert not mldev_client.models._api_client._use_aiohttp()
 
 
+# Aiohttp
+@requires_aiohttp
+@pytest.mark.asyncio
+@pytest.mark.skipif(
+    AIOHTTP_NOT_INSTALLED, reason='aiohttp is not installed, skipping test.'
+)
+async def test_constructor_with_aiohttp_clients():
+  api_client.has_aiohttp = True
+  mldev_http_options = {
+      'aiohttp_client': aiohttp.ClientSession(trust_env=False),
+  }
+  vertexai_http_options = {
+      'aiohttp_client': aiohttp.ClientSession(trust_env=False),
+  }
+  mldev_client = Client(
+      api_key='google_api_key', http_options=mldev_http_options
+  )
+  assert not mldev_client.models._api_client._aiohttp_session.trust_env
+
+  vertexai_client = Client(
+      vertexai=True,
+      project='fake_project_id',
+      location='fake-location',
+      http_options=vertexai_http_options,
+  )
+  assert not vertexai_client.models._api_client._aiohttp_session.trust_env
+

google/genai/tests/client/test_http_options.py

@@ -40,7 +40,7 @@ def test_patch_http_options_with_copies_all_fields():
 
   for key in http_options_keys:
     assert hasattr(patched, key)
-    if key not in ['httpx_client', 'httpx_async_client', 'aiohttp_client_session']:
+    if key not in ['httpx_client', 'httpx_async_client', 'aiohttp_client']:
       assert getattr(patched, key) is not None
   assert patched.base_url == 'https://fake-url.com/'
   assert patched.api_version == 'v1'

google/genai/tests/interactions/test_auth.py

@@ -214,7 +214,7 @@ def test_interactions_vertex_auth_refresh_on_retry():
             headers = mock_send.call_args_list[i][0][0].headers
             assert headers['authorization'] == f'Bearer {token_values[i]}'
 
-@pytest.mark.xfail(reason="extra_headers don't override default auth")
+
 def test_interactions_vertex_extra_headers_override():
     from ..._api_client import BaseApiClient
     from httpx import Client as HTTPClient
@@ -358,8 +358,6 @@ async def test_async_interactions_vertex_auth_header():
 @pytest.mark.asyncio
 async def test_async_interactions_vertex_key_no_auth_header():
   from ..._api_client import BaseApiClient
-  from ..._api_client import AsyncHttpxClient
-  creds = mock.Mock()
   client = Client(vertexai=True, api_key='test-api-key')
 
   with (
@@ -436,7 +434,6 @@ async def test_async_interactions_vertex_auth_refresh_on_retry():
             headers = mock_send.call_args_list[i][0][0].headers
             assert headers['authorization'] == f'Bearer {token_values[i]}'
 
-@pytest.mark.xfail(reason="extra_headers don't override default auth")
 @pytest.mark.asyncio
 async def test_async_interactions_vertex_extra_headers_override():
     from ..._api_client import BaseApiClient

google/genai/tests/interactions/test_integration.py

@@ -55,6 +55,7 @@ def test_client_timeout():
         http_client=mock.ANY,
         timeout=5.0,
         max_retries=mock.ANY,
+        client_adapter=mock.ANY,
     )
 
 
@@ -79,4 +80,5 @@ async def test_async_client_timeout():
         http_client=mock.ANY,
         timeout=5.0,
         max_retries=mock.ANY,
+        client_adapter=mock.ANY,
     )

google/genai/tests/transformers/test_blobs.py

@@ -26,14 +26,17 @@ from ... import types
 
 
 def test_blob_dict():
-  blob = t.t_blob({'data': bytes([0, 0, 0, 0, 0, 0]), 'mime_type': 'audio/pcm'}
-  )
+  blob = t.t_blob({
+      'data': bytes([0, 0, 0, 0, 0, 0]),
+      'mime_type': 'audio/pcm',
+  })
   assert blob.data == bytes([0, 0, 0, 0, 0, 0])
   assert blob.mime_type == 'audio/pcm'
 
 
 def test_blob():
-  blob = t.t_blob(types.Blob(data=bytes([0, 0, 0, 0, 0, 0]), mime_type='audio/pcm')
+  blob = t.t_blob(
+      types.Blob(data=bytes([0, 0, 0, 0, 0, 0]), mime_type='audio/pcm')
   )
   assert blob.data == bytes([0, 0, 0, 0, 0, 0])
   assert blob.mime_type == 'audio/pcm'
@@ -50,10 +53,12 @@ def test_image(image_jpeg):
   assert round_trip_image.mode == image_jpeg.mode
   assert round_trip_image.format == image_jpeg.format
 
+
 def test_not_image():
   blob = types.Blob(data=bytes([0, 0, 0, 0, 0, 0]), mime_type='audio/pcm')
   assert blob.as_image() is None
 
+
 def test_part_image(image_jpeg):
   part = t.t_part(image_jpeg)
   assert part.inline_data.data[6:10] == b'JFIF'
@@ -69,3 +74,11 @@ def test_part_image(image_jpeg):
 def test_part_not_image():
   part = t.t_part('hello world')
   assert part.as_image() is None
+
+
+def test_pil_to_blob_with_memory_pil_image():
+  img = PIL.Image.new('RGB', (1, 1), color='red')
+  blob = t.pil_to_blob(img)
+  assert blob.mime_type == 'image/png'
+  assert blob.data and len(blob.data) == 69
+  assert blob.data[0:4] == b'\x89PNG'

google/genai/types.py

@@ -108,6 +108,20 @@ else:
     HttpxClient = None
     HttpxAsyncClient = None
 
+_is_aiohttp_imported = False
+if typing.TYPE_CHECKING:
+  from aiohttp import ClientSession
+
+  _is_aiohttp_imported = True
+else:
+  ClientSession: typing.Type = Any
+  try:
+    from aiohttp import ClientSession
+
+    _is_aiohttp_imported = True
+  except ImportError:
+    ClientSession = None
+
 logger = logging.getLogger('google_genai.types')
 _from_json_schema_warning_logged = False
 _json_schema_warning_logged = False
@@ -869,6 +883,17 @@ class VadSignalType(_common.CaseInSensitiveEnum):
   """End of sentence signal."""
 
 
+class VoiceActivityType(_common.CaseInSensitiveEnum):
+  """The type of the voice activity signal."""
+
+  TYPE_UNSPECIFIED = 'TYPE_UNSPECIFIED'
+  """The default is VOICE_ACTIVITY_TYPE_UNSPECIFIED."""
+  ACTIVITY_START = 'ACTIVITY_START'
+  """Start of sentence signal."""
+  ACTIVITY_END = 'ACTIVITY_END'
+  """End of sentence signal."""
+
+
 class StartSensitivity(_common.CaseInSensitiveEnum):
   """Start of speech sensitivity."""
 
@@ -1925,6 +1950,10 @@ class HttpOptions(_common.BaseModel):
       default=None,
       description="""A custom httpx async client to be used for the request.""",
   )
+  aiohttp_client: Optional['ClientSession'] = Field(
+      default=None,
+      description="""A custom aiohttp client session to be used for the request.""",
+  )
 
 
 class HttpOptionsDict(TypedDict, total=False):
@@ -16347,6 +16376,24 @@ VoiceActivityDetectionSignalOrDict = Union[
 ]
 
 
+class VoiceActivity(_common.BaseModel):
+  """Voice activity signal."""
+
+  voice_activity_type: Optional[VoiceActivityType] = Field(
+      default=None, description="""The type of the voice activity signal."""
+  )
+
+
+class VoiceActivityDict(TypedDict, total=False):
+  """Voice activity signal."""
+
+  voice_activity_type: Optional[VoiceActivityType]
+  """The type of the voice activity signal."""
+
+
+VoiceActivityOrDict = Union[VoiceActivity, VoiceActivityDict]
+
+
 class LiveServerMessage(_common.BaseModel):
   """Response message for API call."""
 
@@ -16379,7 +16426,13 @@ class LiveServerMessage(_common.BaseModel):
       )
   )
   voice_activity_detection_signal: Optional[VoiceActivityDetectionSignal] = (
-      Field(default=None, description="""Voice activity detection signal.""")
+      Field(
+          default=None,
+          description="""Voice activity detection signal. Allowlisted only.""",
+      )
+  )
+  voice_activity: Optional[VoiceActivity] = Field(
+      default=None, description="""Voice activity signal."""
   )
 
   @property
@@ -16478,7 +16531,10 @@ class LiveServerMessageDict(TypedDict, total=False):
   """Update of the session resumption state."""
 
   voice_activity_detection_signal: Optional[VoiceActivityDetectionSignalDict]
-  """Voice activity detection signal."""
+  """Voice activity detection signal. Allowlisted only."""
+
+  voice_activity: Optional[VoiceActivityDict]
+  """Voice activity signal."""
 
 
 LiveServerMessageOrDict = Union[LiveServerMessage, LiveServerMessageDict]

google/genai/version.py

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

{google_genai-1.57.0.dist-info → google_genai-1.59.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-genai
-Version: 1.57.0
+Version: 1.59.0
 Summary: GenAI Python SDK
 Author-email: Google LLC <googleapis-packages@google.com>
 License-Expression: Apache-2.0
@@ -20,7 +20,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: anyio<5.0.0,>=4.8.0
-Requires-Dist: google-auth[requests]<3.0.0,>=2.46.0
+Requires-Dist: google-auth[requests]<3.0.0,>=2.47.0
 Requires-Dist: httpx<1.0.0,>=0.28.1
 Requires-Dist: pydantic<3.0.0,>=2.9.0
 Requires-Dist: requests<3.0.0,>=2.28.1
@@ -112,7 +112,7 @@ Below is an example `generate_content()` call using types from the types module:
 
 ```python
 response = client.models.generate_content(
-    model='gemini-2.0-flash-001',
+    model='gemini-2.5-flash',
     contents=types.Part.from_text(text='Why is the sky blue?'),
     config=types.GenerateContentConfig(
         temperature=0,
@@ -127,7 +127,7 @@ types:
 
 ```python
 response = client.models.generate_content(
-    model='gemini-2.0-flash-001',
+    model='gemini-2.5-flash',
     contents={'text': 'Why is the sky blue?'},
     config={
         'temperature': 0,
@@ -621,7 +621,7 @@ and [Gemini API docs](https://ai.google.dev/gemini-api/docs/models) respectively
 from google.genai import types
 
 response = client.models.generate_content(
-    model='gemini-2.0-flash-001',
+    model='gemini-2.5-flash',
     contents='high',
     config=types.GenerateContentConfig(
         system_instruction='I say high, you say low',
@@ -1238,7 +1238,6 @@ print(response)
 ```python
 from google.genai import types
 
-# multiple contents with config
 response = client.models.embed_content(
     model='gemini-embedding-001',
     contents=['why is the sky blue?', 'What is your age?'],
@@ -1252,12 +1251,9 @@ print(response)
 
 #### Generate Images
 
-Support for generate images in Gemini Developer API is behind an allowlist
-
 ```python
 from google.genai import types
 
-# Generate Image
 response1 = client.models.generate_images(
     model='imagen-4.0-generate-001',
     prompt='An umbrella in the foreground, and a rainy night sky in the background',
@@ -1277,7 +1273,6 @@ Upscale image is only supported in Vertex AI.
 ```python
 from google.genai import types
 
-# Upscale the generated image from above
 response2 = client.models.upscale_image(
     model='imagen-4.0-upscale-preview',
     image=response1.generated_images[0].image,
@@ -1977,7 +1972,7 @@ file = client.files.upload(
 
 # Create a batch job with file name
 batch_job = client.batches.create(
-    model="gemini-2.0-flash",
+    model="gemini-2.5-flash",
     src="files/test-json",
 )
 ```