google-genai 1.56.0__py3-none-any.whl → 1.58.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/files.py

@@ -22,6 +22,9 @@ import os
 from typing import Any, Optional, Union
 from urllib.parse import urlencode
 
+import google.auth
+
+from . import _api_client
 from . import _api_module
 from . import _common
 from . import _extra_utils
@@ -149,6 +152,33 @@ def _ListFilesResponse_from_mldev(
   return to_object
 
 
+def _RegisterFilesParameters_to_mldev(
+    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, ['uris']) is not None:
+    setv(to_object, ['uris'], getv(from_object, ['uris']))
+
+  return to_object
+
+
+def _RegisterFilesResponse_from_mldev(
+    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, ['sdkHttpResponse']) is not None:
+    setv(
+        to_object, ['sdk_http_response'], getv(from_object, ['sdkHttpResponse'])
+    )
+
+  if getv(from_object, ['files']) is not None:
+    setv(to_object, ['files'], [item for item in getv(from_object, ['files'])])
+
+  return to_object
+
+
 class Files(_api_module.BaseModule):
 
   def _list(
@@ -402,6 +432,69 @@ class Files(_api_module.BaseModule):
     self._api_client._verify_response(return_value)
     return return_value
 
+  def _register_files(
+      self,
+      *,
+      uris: list[str],
+      config: Optional[types.RegisterFilesConfigOrDict] = None,
+  ) -> types.RegisterFilesResponse:
+    parameter_model = types._RegisterFilesParameters(
+        uris=uris,
+        config=config,
+    )
+
+    request_url_dict: Optional[dict[str, str]]
+    if self._api_client.vertexai:
+      raise ValueError(
+          'This method is only supported in the Gemini Developer client.'
+      )
+    else:
+      request_dict = _RegisterFilesParameters_to_mldev(parameter_model)
+      request_url_dict = request_dict.get('_url')
+      if request_url_dict:
+        path = 'files:register'.format_map(request_url_dict)
+      else:
+        path = 'files:register'
+
+    query_params = request_dict.get('_query')
+    if query_params:
+      path = f'{path}?{urlencode(query_params)}'
+    # TODO: remove the hack that pops config.
+    request_dict.pop('config', None)
+
+    http_options: Optional[types.HttpOptions] = None
+    if (
+        parameter_model.config is not None
+        and parameter_model.config.http_options is not None
+    ):
+      http_options = parameter_model.config.http_options
+
+    request_dict = _common.convert_to_dict(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
+
+    response = self._api_client.request(
+        'post', path, request_dict, http_options
+    )
+
+    if config is not None and getattr(
+        config, 'should_return_http_response', None
+    ):
+      return_value = types.RegisterFilesResponse(sdk_http_response=response)
+      self._api_client._verify_response(return_value)
+      return return_value
+
+    response_dict = {} if not response.body else json.loads(response.body)
+
+    if not self._api_client.vertexai:
+      response_dict = _RegisterFilesResponse_from_mldev(response_dict)
+
+    return_value = types.RegisterFilesResponse._from_response(
+        response=response_dict, kwargs=parameter_model.model_dump()
+    )
+
+    self._api_client._verify_response(return_value)
+    return return_value
+
   def upload(
       self,
       *,
@@ -559,6 +652,39 @@ class Files(_api_module.BaseModule):
 
     return data
 
+  def register_files(
+      self,
+      *,
+      auth: google.auth.credentials.Credentials,
+      uris: list[str],
+      config: Optional[types.RegisterFilesConfigOrDict] = None,
+  ) -> types.RegisterFilesResponse:
+    """Registers gcs files with the file service."""
+    if not isinstance(auth, google.auth.credentials.Credentials):
+      raise ValueError(
+          'auth must be a google.auth.credentials.Credentials object.'
+      )
+    if config is None:
+      config = types.RegisterFilesConfig()
+    else:
+      config = types.RegisterFilesConfig.model_validate(config)
+      config = config.model_copy(deep=True)
+
+    http_options = config.http_options or types.HttpOptions()
+    headers = http_options.headers or {}
+    headers = {k.lower(): v for k, v in headers.items()}
+
+    token = _api_client.get_token_from_credentials(self._api_client, auth)
+    headers['authorization'] = f'Bearer {token}'
+
+    if auth.quota_project_id:
+      headers['x-goog-user-project'] = auth.quota_project_id
+
+    http_options.headers = headers
+    config.http_options = http_options
+
+    return self._register_files(uris=uris, config=config)
+
   def list(
       self, *, config: Optional[types.ListFilesConfigOrDict] = None
   ) -> Pager[types.File]:
@@ -845,6 +971,69 @@ class AsyncFiles(_api_module.BaseModule):
     self._api_client._verify_response(return_value)
     return return_value
 
+  async def _register_files(
+      self,
+      *,
+      uris: list[str],
+      config: Optional[types.RegisterFilesConfigOrDict] = None,
+  ) -> types.RegisterFilesResponse:
+    parameter_model = types._RegisterFilesParameters(
+        uris=uris,
+        config=config,
+    )
+
+    request_url_dict: Optional[dict[str, str]]
+    if self._api_client.vertexai:
+      raise ValueError(
+          'This method is only supported in the Gemini Developer client.'
+      )
+    else:
+      request_dict = _RegisterFilesParameters_to_mldev(parameter_model)
+      request_url_dict = request_dict.get('_url')
+      if request_url_dict:
+        path = 'files:register'.format_map(request_url_dict)
+      else:
+        path = 'files:register'
+
+    query_params = request_dict.get('_query')
+    if query_params:
+      path = f'{path}?{urlencode(query_params)}'
+    # TODO: remove the hack that pops config.
+    request_dict.pop('config', None)
+
+    http_options: Optional[types.HttpOptions] = None
+    if (
+        parameter_model.config is not None
+        and parameter_model.config.http_options is not None
+    ):
+      http_options = parameter_model.config.http_options
+
+    request_dict = _common.convert_to_dict(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
+
+    response = await self._api_client.async_request(
+        'post', path, request_dict, http_options
+    )
+
+    if config is not None and getattr(
+        config, 'should_return_http_response', None
+    ):
+      return_value = types.RegisterFilesResponse(sdk_http_response=response)
+      self._api_client._verify_response(return_value)
+      return return_value
+
+    response_dict = {} if not response.body else json.loads(response.body)
+
+    if not self._api_client.vertexai:
+      response_dict = _RegisterFilesResponse_from_mldev(response_dict)
+
+    return_value = types.RegisterFilesResponse._from_response(
+        response=response_dict, kwargs=parameter_model.model_dump()
+    )
+
+    self._api_client._verify_response(return_value)
+    return return_value
+
   async def upload(
       self,
       *,
@@ -992,6 +1181,41 @@ class AsyncFiles(_api_module.BaseModule):
 
     return data
 
+  async def register_files(
+      self,
+      *,
+      auth: google.auth.credentials.Credentials,
+      uris: list[str],
+      config: Optional[types.RegisterFilesConfigOrDict] = None,
+  ) -> types.RegisterFilesResponse:
+    """Registers gcs files with the file service."""
+    if not isinstance(auth, google.auth.credentials.Credentials):
+      raise ValueError(
+          'auth must be a google.auth.credentials.Credentials object.'
+      )
+    if config is None:
+      config = types.RegisterFilesConfig()
+    else:
+      config = types.RegisterFilesConfig.model_validate(config)
+      config = config.model_copy(deep=True)
+
+    http_options = config.http_options or types.HttpOptions()
+    headers = http_options.headers or {}
+    headers = {k.lower(): v for k, v in headers.items()}
+
+    token = await _api_client.async_get_token_from_credentials(
+        self._api_client, auth
+    )
+    headers['authorization'] = f'Bearer {token}'
+
+    if auth.quota_project_id:
+      headers['x-goog-user-project'] = auth.quota_project_id
+
+    http_options.headers = headers
+    config.http_options = http_options
+
+    return await self._register_files(uris=uris, config=config)
+
   async def list(
       self, *, config: Optional[types.ListFilesConfigOrDict] = None
   ) -> AsyncPager[types.File]:

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/models.py

@@ -891,9 +891,6 @@ def _FunctionCallingConfig_to_mldev(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['mode']) is not None:
-    setv(to_object, ['mode'], getv(from_object, ['mode']))
-
   if getv(from_object, ['allowed_function_names']) is not None:
     setv(
         to_object,
@@ -901,6 +898,9 @@ def _FunctionCallingConfig_to_mldev(
         getv(from_object, ['allowed_function_names']),
     )
 
+  if getv(from_object, ['mode']) is not None:
+    setv(to_object, ['mode'], getv(from_object, ['mode']))
+
   if getv(from_object, ['stream_function_call_arguments']) is not None:
     raise ValueError(
         'stream_function_call_arguments parameter is not supported in Gemini'
@@ -915,9 +915,6 @@ def _FunctionDeclaration_to_vertex(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['behavior']) is not None:
-    raise ValueError('behavior parameter is not supported in Vertex AI.')
-
   if getv(from_object, ['description']) is not None:
     setv(to_object, ['description'], getv(from_object, ['description']))
 
@@ -944,6 +941,9 @@ def _FunctionDeclaration_to_vertex(
         getv(from_object, ['response_json_schema']),
     )
 
+  if getv(from_object, ['behavior']) is not None:
+    raise ValueError('behavior parameter is not supported in Vertex AI.')
+
   return to_object
 
 
@@ -2549,6 +2549,11 @@ def _ImageConfig_to_mldev(
   if getv(from_object, ['image_size']) is not None:
     setv(to_object, ['imageSize'], getv(from_object, ['image_size']))
 
+  if getv(from_object, ['person_generation']) is not None:
+    raise ValueError(
+        'person_generation parameter is not supported in Gemini API.'
+    )
+
   if getv(from_object, ['output_mime_type']) is not None:
     raise ValueError(
         'output_mime_type parameter is not supported in Gemini API.'
@@ -2573,6 +2578,13 @@ def _ImageConfig_to_vertex(
   if getv(from_object, ['image_size']) is not None:
     setv(to_object, ['imageSize'], getv(from_object, ['image_size']))
 
+  if getv(from_object, ['person_generation']) is not None:
+    setv(
+        to_object,
+        ['personGeneration'],
+        getv(from_object, ['person_generation']),
+    )
+
   if getv(from_object, ['output_mime_type']) is not None:
     setv(
         to_object,
@@ -3424,6 +3436,11 @@ def _ToolConfig_to_mldev(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
+  if getv(from_object, ['retrieval_config']) is not None:
+    setv(
+        to_object, ['retrievalConfig'], getv(from_object, ['retrieval_config'])
+    )
+
   if getv(from_object, ['function_calling_config']) is not None:
     setv(
         to_object,
@@ -3433,11 +3450,6 @@ def _ToolConfig_to_mldev(
         ),
     )
 
-  if getv(from_object, ['retrieval_config']) is not None:
-    setv(
-        to_object, ['retrievalConfig'], getv(from_object, ['retrieval_config'])
-    )
-
   return to_object
 
 
@@ -3446,23 +3458,9 @@ def _Tool_to_mldev(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['function_declarations']) is not None:
-    setv(
-        to_object,
-        ['functionDeclarations'],
-        [item for item in getv(from_object, ['function_declarations'])],
-    )
-
   if getv(from_object, ['retrieval']) is not None:
     raise ValueError('retrieval parameter is not supported in Gemini API.')
 
-  if getv(from_object, ['google_search_retrieval']) is not None:
-    setv(
-        to_object,
-        ['googleSearchRetrieval'],
-        getv(from_object, ['google_search_retrieval']),
-    )
-
   if getv(from_object, ['computer_use']) is not None:
     setv(to_object, ['computerUse'], getv(from_object, ['computer_use']))
 
@@ -3477,6 +3475,13 @@ def _Tool_to_mldev(
         'enterprise_web_search parameter is not supported in Gemini API.'
     )
 
+  if getv(from_object, ['function_declarations']) is not None:
+    setv(
+        to_object,
+        ['functionDeclarations'],
+        [item for item in getv(from_object, ['function_declarations'])],
+    )
+
   if getv(from_object, ['google_maps']) is not None:
     setv(
         to_object,
@@ -3491,6 +3496,13 @@ def _Tool_to_mldev(
         _GoogleSearch_to_mldev(getv(from_object, ['google_search']), to_object),
     )
 
+  if getv(from_object, ['google_search_retrieval']) is not None:
+    setv(
+        to_object,
+        ['googleSearchRetrieval'],
+        getv(from_object, ['google_search_retrieval']),
+    )
+
   if getv(from_object, ['url_context']) is not None:
     setv(to_object, ['urlContext'], getv(from_object, ['url_context']))
 
@@ -3502,26 +3514,9 @@ def _Tool_to_vertex(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['function_declarations']) is not None:
-    setv(
-        to_object,
-        ['functionDeclarations'],
-        [
-            _FunctionDeclaration_to_vertex(item, to_object)
-            for item in getv(from_object, ['function_declarations'])
-        ],
-    )
-
   if getv(from_object, ['retrieval']) is not None:
     setv(to_object, ['retrieval'], getv(from_object, ['retrieval']))
 
-  if getv(from_object, ['google_search_retrieval']) is not None:
-    setv(
-        to_object,
-        ['googleSearchRetrieval'],
-        getv(from_object, ['google_search_retrieval']),
-    )
-
   if getv(from_object, ['computer_use']) is not None:
     setv(to_object, ['computerUse'], getv(from_object, ['computer_use']))
 
@@ -3538,12 +3533,29 @@ def _Tool_to_vertex(
         getv(from_object, ['enterprise_web_search']),
     )
 
+  if getv(from_object, ['function_declarations']) is not None:
+    setv(
+        to_object,
+        ['functionDeclarations'],
+        [
+            _FunctionDeclaration_to_vertex(item, to_object)
+            for item in getv(from_object, ['function_declarations'])
+        ],
+    )
+
   if getv(from_object, ['google_maps']) is not None:
     setv(to_object, ['googleMaps'], getv(from_object, ['google_maps']))
 
   if getv(from_object, ['google_search']) is not None:
     setv(to_object, ['googleSearch'], getv(from_object, ['google_search']))
 
+  if getv(from_object, ['google_search_retrieval']) is not None:
+    setv(
+        to_object,
+        ['googleSearchRetrieval'],
+        getv(from_object, ['google_search_retrieval']),
+    )
+
   if getv(from_object, ['url_context']) is not None:
     setv(to_object, ['urlContext'], getv(from_object, ['url_context']))
 
@@ -4427,7 +4439,7 @@ class Models(_api_module.BaseModule):
       image = product_recontext_response.generated_images[0].image
 
       virtual_try_on_response = client.models.recontext_image(
-          model="virtual-try-on-preview-08-04",
+          model="virtual-try-on-001",
           source=types.RecontextImageSource(
               person_image=types.Image.from_file(IMAGE1_FILE_PATH),
               product_images=[types.ProductImage.from_file(IMAGE2_FILE_PATH)],
@@ -6271,7 +6283,7 @@ class AsyncModels(_api_module.BaseModule):
       image = product_recontext_response.generated_images[0].image
 
       virtual_try_on_response = client.models.recontext_image(
-          model="virtual-try-on-preview-08-04",
+          model="virtual-try-on-001",
           source=types.RecontextImageSource(
               person_image=types.Image.from_file(IMAGE1_FILE_PATH),
               product_images=[types.ProductImage.from_file(IMAGE2_FILE_PATH)],

google/genai/tests/__init__.py

@@ -0,0 +1,21 @@
+# 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.
+#
+
+
+"""Tests for the Google GenAI SDK."""
+
+
+import pytest
+pytest.register_assert_rewrite('genai.replay_api_client')

google/genai/tests/afc/__init__.py

@@ -0,0 +1,21 @@
+# 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.
+#
+
+
+"""AFC helper function unit tests.
+
+For AFC end to end test, please write test cases in
+test_generate_content_tools.py module
+"""