google-genai 1.24.0__py3-none-any.whl → 1.25.0__py3-none-any.whl

google/genai/_api_client.py

@@ -232,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

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/_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/_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

google/genai/errors.py

@@ -18,6 +18,7 @@
 from typing import Any, Optional, TYPE_CHECKING, Union
 import httpx
 import json
+from . import _common
 
 
 if TYPE_CHECKING:
@@ -185,5 +186,4 @@ class FunctionInvocationError(ValueError):
   pass
 
 
-class ExperimentalWarning(Warning):
-  """Warning for experimental features."""
+ExperimentalWarning = _common.ExperimentalWarning

google/genai/live.py

@@ -196,7 +196,7 @@ class AsyncSession:
     if os.environ.get('GOOGLE_GENAI_USE_VERTEXAI'):
       MODEL_NAME = 'gemini-2.0-flash-live-preview-04-09'
     else:
-      MODEL_NAME = 'gemini-2.0-flash-live-001';
+      MODEL_NAME = 'gemini-live-2.5-flash-preview';
 
     client = genai.Client()
     async with client.aio.live.connect(
@@ -267,7 +267,7 @@ class AsyncSession:
     if os.environ.get('GOOGLE_GENAI_USE_VERTEXAI'):
       MODEL_NAME = 'gemini-2.0-flash-live-preview-04-09'
     else:
-      MODEL_NAME = 'gemini-2.0-flash-live-001';
+      MODEL_NAME = 'gemini-live-2.5-flash-preview';
 
 
     client = genai.Client()
@@ -361,7 +361,7 @@ class AsyncSession:
     if os.environ.get('GOOGLE_GENAI_USE_VERTEXAI'):
       MODEL_NAME = 'gemini-2.0-flash-live-preview-04-09'
     else:
-      MODEL_NAME = 'gemini-2.0-flash-live-001';
+      MODEL_NAME = 'gemini-live-2.5-flash-preview';
 
     client = genai.Client()
 
@@ -372,7 +372,7 @@ class AsyncSession:
     }
 
     async with client.aio.live.connect(
-        model='models/gemini-2.0-flash-live-001',
+        model='models/gemini-live-2.5-flash-preview',
         config=config
     ) as session:
       prompt = "Turn on the lights please"
@@ -940,7 +940,16 @@ class AsyncLive(_api_module.BaseModule):
         )
         method = 'BidiGenerateContentConstrained'
         key_name = 'access_token'
-
+        if version != 'v1alpha':
+          warnings.warn(
+              message=(
+                  "The SDK's ephemeral token support is in v1alpha only."
+                  'Please use client = genai.Client(api_key=token.name, '
+                  'http_options=types.HttpOptions(api_version="v1alpha"))'
+                  ' before session connection.'
+              ),
+              category=errors.ExperimentalWarning,
+          )
       uri = f'{base_url}/ws/google.ai.generativelanguage.{version}.GenerativeService.{method}?{key_name}={api_key}'
       headers = self._api_client._http_options.headers
 

google/genai/tokens.py

@@ -166,7 +166,7 @@ class Tokens(_api_module.BaseModule):
           config=types.CreateAuthTokenConfig(
               uses=10,
               live_constrained_parameters=types.LiveEphemeralParameters(
-                  model='gemini-2.0-flash-live-001',
+                  model='gemini-live-2.5-flash-preview',
                   config=types.LiveConnectConfig(
                       system_instruction='You are an LLM called Gemini.'
                   ),
@@ -202,7 +202,7 @@ class Tokens(_api_module.BaseModule):
           config=types.CreateAuthTokenConfig(
               uses=10,
               live_constrained_parameters=types.LiveEphemeralParameters(
-                  model='gemini-2.0-flash-live-001',
+                  model='gemini-live-2.5-flash-preview',
                   config=types.LiveConnectConfig(
                       system_instruction='You are an LLM called Gemini.'
                   ),
@@ -284,7 +284,7 @@ class AsyncTokens(_api_module.BaseModule):
   async def create(
       self, *, config: Optional[types.CreateAuthTokenConfigOrDict] = None
   ) -> types.AuthToken:
-    """Creates an auth token asynchronously.
+    """Creates an auth token asynchronously. Support in v1alpha only.
 
     Args:
       config (CreateAuthTokenConfig): Optional configuration for the request.
@@ -292,12 +292,16 @@ class AsyncTokens(_api_module.BaseModule):
     Usage:
 
     .. code-block:: python
+      client = genai.Client(
+          api_key=API_KEY,
+          http_options=types.HttpOptions(api_version='v1alpha'),
+      )
 
       auth_token = await client.aio.tokens.create(
           config=types.CreateAuthTokenConfig(
               uses=10,
               live_constrained_parameters=types.LiveEphemeralParameters(
-                  model='gemini-2.0-flash-live-001',
+                  model='gemini-live-2.5-flash-preview',
                   config=types.LiveConnectConfig(
                       system_instruction='You are an LLM called Gemini.'
                   ),

google/genai/types.py

@@ -480,10 +480,21 @@ class ImagePromptLanguage(_common.CaseInSensitiveEnum):
   """Enum that specifies the language of the text in the prompt."""
 
   auto = 'auto'
+  """Auto-detect the language."""
   en = 'en'
+  """English"""
   ja = 'ja'
+  """Japanese"""
   ko = 'ko'
+  """Korean"""
   hi = 'hi'
+  """Hindi"""
+  zh = 'zh'
+  """Chinese"""
+  pt = 'pt'
+  """Portuguese"""
+  es = 'es'
+  """Spanish"""
 
 
 class MaskReferenceMode(_common.CaseInSensitiveEnum):
@@ -5242,6 +5253,12 @@ class GenerateContentResponse(_common.BaseModel):
     response_schema = _common.get_value_by_path(
         kwargs, ['config', 'response_schema']
     )
+    # Handles response_json_schema. Backend will throw error if both
+    # response_schema and response_json_schema are set.
+    if response_schema is None:
+      response_schema = _common.get_value_by_path(
+          kwargs, ['config', 'response_json_schema']
+      )
     if (
         inspect.isclass(response_schema)
         and not (

google/genai/version.py

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

{google_genai-1.24.0.dist-info → google_genai-1.25.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-genai
-Version: 1.24.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`,
@@ -1633,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.24.0.dist-info → google_genai-1.25.0.dist-info}/RECORD

@@ -1,35 +1,35 @@
 google/genai/__init__.py,sha256=SYTxz3Ho06pP2TBlvDU0FkUJz8ytbR3MgEpS9HvVYq4,709
 google/genai/_adapters.py,sha256=Kok38miNYJff2n--l0zEK_hbq0y2rWOH7k75J7SMYbQ,1744
-google/genai/_api_client.py,sha256=ISgrtT7-XVOdyv3Dtwz2Eve9w3C3RO4ylEY1bND8ElY,52757
+google/genai/_api_client.py,sha256=X9JVR_XBnedZgkOKbBcvJjMuHupA75XXJkmlrVZqTw0,53102
 google/genai/_api_module.py,sha256=lj8eUWx8_LBGBz-49qz6_ywWm3GYp3d8Bg5JoOHbtbI,902
 google/genai/_automatic_function_calling_util.py,sha256=IJkPq2fT9pYxYm5Pbu5-e0nBoZKoZla7yT4_txWRKLs,10324
 google/genai/_base_url.py,sha256=E5H4dew14Y16qfnB3XRnjSCi19cJVlkaMNoM_8ip-PM,1597
-google/genai/_common.py,sha256=CuG7wvroFu9kV0Im-asXJGmfbaFCAjCocZyRxYDss5g,19849
+google/genai/_common.py,sha256=sJpzeoEJ6dZSPPfHb2Dsar-F5KmpwLjFqNSkxxxVfS8,19876
 google/genai/_extra_utils.py,sha256=GoIh_SxB5nf_0sjErYkjm8wdg93sfemLKrU_5QhlcBo,20562
 google/genai/_live_converters.py,sha256=mkxudlXXXAxuK6eWMj_-jVLQs9eOr4EX0GYCBvhIZAw,108962
 google/genai/_mcp_utils.py,sha256=khECx-DMuHemKzOQQ3msWp7FivPeEOnl3n1lvWc_b5o,3833
-google/genai/_replay_api_client.py,sha256=0IXroewCZbyZ01qN3ZQwW5OUZRMzCrf2-3nyfTerqNY,21363
+google/genai/_replay_api_client.py,sha256=2ndavmUMySvjLIdYEvjPZIOPfc-IA5rbWQgEwWuWpfc,21567
 google/genai/_test_api_client.py,sha256=4ruFIy5_1qcbKqqIBu3HSQbpSOBrxiecBtDZaTGFR1s,4797
 google/genai/_tokens_converters.py,sha256=jQlwRZU4mlIBv6i8Lu62e6u9dvgNtOnko5WEYnjkU_A,49159
-google/genai/_transformers.py,sha256=Nd_h_zYVOkWN1XTSnM9r3IR7R_qg3tPe2mE9jozaX-Q,36935
+google/genai/_transformers.py,sha256=aNWqCQid4ISorbE8nj_ONfrkbQiD75vBFkYCYbXxzHQ,37033
 google/genai/batches.py,sha256=qnyWQ1RfAdSVQgV7vGor9BIWmRwUilJ0wfqOvxUwpq8,172745
 google/genai/caches.py,sha256=q8N3YIpgJYWrLWSy-zUZ6w9CPRjH113E8ff4MyykYA8,66169
 google/genai/chats.py,sha256=0QdOUeWEYDQgAWBy1f7a3z3yY9S8tXSowUzNrzazzj4,16651
 google/genai/client.py,sha256=wXnfZBSv9p-yKtX_gabUrfBXoYHuqHhzK_VgwRttMgY,10777
-google/genai/errors.py,sha256=UebysH1cDeIdtp1O06CW7lQjnNrWtuqZTeVgEJylX48,5589
+google/genai/errors.py,sha256=IdSymOuUJDprfPRBhBtFDkc_XX81UvgNbWrOLR8L2GU,5582
 google/genai/files.py,sha256=MCcHRXiMFKjbnt78yVPejszEgGz_MHRXfJyDi5-07Gs,39655
-google/genai/live.py,sha256=8Vts1bX8ZWOa0PiS3zmYhG1QMhLtBPC_ATLTSAIrazs,38945
+google/genai/live.py,sha256=zkKlSAi378DiAL9iRug8c8zOfqG1BK45u1ttfxrrZqU,39393
 google/genai/live_music.py,sha256=3GG9nsto8Vhkohcs-4CPMS4DFp1ZtMuLYzHfvEPYAeg,6971
 google/genai/models.py,sha256=DQx31b43CxVg2YCWHVGGKBzcuB-AfBApmPm9zPVLq6o,239567
 google/genai/operations.py,sha256=99zs__fTWsyQu7rMGmBI1_4tuAJxLR0g3yp7ymsUsBA,19609
 google/genai/pagers.py,sha256=nyVYxp92rS-UaewO_oBgP593knofeLU6yOn6RolNoGQ,6797
 google/genai/py.typed,sha256=RsMFoLwBkAvY05t6izop4UHZtqOPLiKp3GkIEizzmQY,40
-google/genai/tokens.py,sha256=oew9I0fGuGLlXMdCn2Ot9Lv_herHMnvZOYjjdOz2CAM,12324
+google/genai/tokens.py,sha256=QGW1jI0Y5wXqiaad0-N6Utgh9sK4TK0todHf5h0GLeI,12490
 google/genai/tunings.py,sha256=fSiD4RQZI8YsFaPbBoXOIoSDA0BIuJwGg2Ac_uy5_kM,49596
-google/genai/types.py,sha256=dj1Va75V8kLkrtFPIiIYXQNukE5xuogoJmqo0nu0-N4,469923
-google/genai/version.py,sha256=3V_J-TpVrcSp70_3LzpCOt3SQpDmFAXnGSiq5eVjSrU,627
-google_genai-1.24.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-google_genai-1.24.0.dist-info/METADATA,sha256=yxyVgjMGvqGuGrRM8HO9fO35MTuewHnGMQYohChHULs,40539
-google_genai-1.24.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-google_genai-1.24.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
-google_genai-1.24.0.dist-info/RECORD,,
+google/genai/types.py,sha256=z5NTdkK2-UNZ54VK7fFTmvf1tCJhf_aSQ0d6C-c70mU,470375
+google/genai/version.py,sha256=Bxlj38TRVWAtzVotucCfIgyEBiHiLWfid2FNcMmGuP4,627
+google_genai-1.25.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+google_genai-1.25.0.dist-info/METADATA,sha256=X94rtkQYckaADmyC8ULKYLSm2gq3m4shZAYT_tHx3Yk,41566
+google_genai-1.25.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+google_genai-1.25.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
+google_genai-1.25.0.dist-info/RECORD,,