google-genai 1.17.0__tar.gz → 1.18.0__tar.gz

{google_genai-1.17.0/google_genai.egg-info → google_genai-1.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-genai
-Version: 1.17.0
+Version: 1.18.0
 Summary: GenAI Python SDK
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache-2.0

{google_genai-1.17.0 → google_genai-1.18.0}/google/genai/__init__.py

@@ -17,9 +17,8 @@
 
 from . import version
 from .client import Client
-from .live import live_ephemeral_connect
 
 
 __version__ = version.__version__
 
-__all__ = ['Client', 'live_ephemeral_connect']
+__all__ = ['Client']

{google_genai-1.17.0 → google_genai-1.18.0}/google/genai/_api_client.py

@@ -63,6 +63,11 @@ MAX_RETRY_COUNT = 3
 INITIAL_RETRY_DELAY = 1  # second
 DELAY_MULTIPLIER = 2
 
+
+class EphemeralTokenAPIKeyError(ValueError):
+  """Error raised when the API key is invalid."""
+
+
 def _append_library_version_headers(headers: dict[str, str]) -> None:
   """Appends the telemetry header to the headers dict."""
   library_label = f'google-genai-sdk/{version.__version__}'
@@ -625,6 +630,11 @@ class BaseApiClient:
         versioned_path,
     )
 
+    if self.api_key and self.api_key.startswith('auth_tokens/'):
+      raise EphemeralTokenAPIKeyError(
+          'Ephemeral tokens can only be used with the live API.'
+      )
+
     timeout_in_seconds = _get_timeout_in_seconds(patched_http_options.timeout)
 
     if patched_http_options.headers is None:

{google_genai-1.17.0 → google_genai-1.18.0}/google/genai/_common.py

@@ -20,7 +20,7 @@ import datetime
 import enum
 import functools
 import typing
-from typing import Any, Callable, Optional, Union
+from typing import Any, Callable, Optional, Union, get_origin, get_args
 import uuid
 import warnings
 
@@ -154,6 +154,38 @@ def convert_to_dict(obj: object) -> Any:
     return obj
 
 
+def _is_struct_type(annotation: type) -> bool:
+  """Checks if the given annotation is list[dict[str, typing.Any]]
+  or typing.List[typing.Dict[str, typing.Any]].
+
+  This maps to Struct type in the API.
+  """
+  outer_origin = get_origin(annotation)
+  outer_args = get_args(annotation)
+
+  if outer_origin is not list: # Python 3.9+ normalizes list
+    return False
+
+  if not outer_args or len(outer_args) != 1:
+    return False
+
+  inner_annotation = outer_args[0]
+
+  inner_origin = get_origin(inner_annotation)
+  inner_args = get_args(inner_annotation)
+
+  if inner_origin is not dict: # Python 3.9+ normalizes to dict
+    return False
+
+  if not inner_args or len(inner_args) != 2:
+    # dict should have exactly two type arguments
+    return False
+
+  # Check if the dict arguments are str and typing.Any
+  key_type, value_type = inner_args
+  return key_type is str and value_type is typing.Any
+
+
 def _remove_extra_fields(
     model: Any, response: dict[str, object]
 ) -> None:
@@ -188,6 +220,9 @@ def _remove_extra_fields(
     if isinstance(value, dict) and typing.get_origin(annotation) is not dict:
       _remove_extra_fields(annotation, value)
     elif isinstance(value, list):
+      if _is_struct_type(annotation):
+        continue
+
       for item in value:
         # assume a list of dict is list of BaseModel
         if isinstance(item, dict):

{google_genai-1.17.0 → google_genai-1.18.0}/google/genai/_live_converters.py

@@ -353,6 +353,13 @@ def _Part_to_mldev(
         ),
     )
 
+  if getv(from_object, ['thought_signature']) is not None:
+    setv(
+        to_object,
+        ['thoughtSignature'],
+        getv(from_object, ['thought_signature']),
+    )
+
   if getv(from_object, ['code_execution_result']) is not None:
     setv(
         to_object,
@@ -415,6 +422,13 @@ def _Part_to_vertex(
         ),
     )
 
+  if getv(from_object, ['thought_signature']) is not None:
+    setv(
+        to_object,
+        ['thoughtSignature'],
+        getv(from_object, ['thought_signature']),
+    )
+
   if getv(from_object, ['code_execution_result']) is not None:
     setv(
         to_object,
@@ -2759,6 +2773,13 @@ def _Part_from_mldev(
         ),
     )
 
+  if getv(from_object, ['thoughtSignature']) is not None:
+    setv(
+        to_object,
+        ['thought_signature'],
+        getv(from_object, ['thoughtSignature']),
+    )
+
   if getv(from_object, ['codeExecutionResult']) is not None:
     setv(
         to_object,
@@ -2821,6 +2842,13 @@ def _Part_from_vertex(
         ),
     )
 
+  if getv(from_object, ['thoughtSignature']) is not None:
+    setv(
+        to_object,
+        ['thought_signature'],
+        getv(from_object, ['thoughtSignature']),
+    )
+
   if getv(from_object, ['codeExecutionResult']) is not None:
     setv(
         to_object,

{google_genai-1.17.0 → google_genai-1.18.0}/google/genai/_tokens_converters.py

@@ -353,6 +353,13 @@ def _Part_to_mldev(
         ),
     )
 
+  if getv(from_object, ['thought_signature']) is not None:
+    setv(
+        to_object,
+        ['thoughtSignature'],
+        getv(from_object, ['thought_signature']),
+    )
+
   if getv(from_object, ['code_execution_result']) is not None:
     setv(
         to_object,
@@ -415,6 +422,13 @@ def _Part_to_vertex(
         ),
     )
 
+  if getv(from_object, ['thought_signature']) is not None:
+    setv(
+        to_object,
+        ['thoughtSignature'],
+        getv(from_object, ['thought_signature']),
+    )
+
   if getv(from_object, ['code_execution_result']) is not None:
     setv(
         to_object,
@@ -1585,7 +1599,7 @@ def _LiveConnectConfig_to_vertex(
   return to_object
 
 
-def _LiveEphemeralParameters_to_mldev(
+def _LiveConnectConstraints_to_mldev(
     api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -1610,7 +1624,7 @@ def _LiveEphemeralParameters_to_mldev(
   return to_object
 
 
-def _LiveEphemeralParameters_to_vertex(
+def _LiveConnectConstraints_to_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -1645,13 +1659,13 @@ def _CreateAuthTokenConfig_to_mldev(
   if getv(from_object, ['uses']) is not None:
     setv(parent_object, ['uses'], getv(from_object, ['uses']))
 
-  if getv(from_object, ['live_ephemeral_parameters']) is not None:
+  if getv(from_object, ['live_connect_constraints']) is not None:
     setv(
         parent_object,
         ['bidiGenerateContentSetup'],
-        _LiveEphemeralParameters_to_mldev(
+        _LiveConnectConstraints_to_mldev(
             api_client,
-            getv(from_object, ['live_ephemeral_parameters']),
+            getv(from_object, ['live_connect_constraints']),
             to_object,
         ),
     )
@@ -1684,9 +1698,9 @@ def _CreateAuthTokenConfig_to_vertex(
   if getv(from_object, ['uses']) is not None:
     raise ValueError('uses parameter is not supported in Vertex AI.')
 
-  if getv(from_object, ['live_ephemeral_parameters']) is not None:
+  if getv(from_object, ['live_connect_constraints']) is not None:
     raise ValueError(
-        'live_ephemeral_parameters parameter is not supported in Vertex AI.'
+        'live_connect_constraints parameter is not supported in Vertex AI.'
     )
 
   if getv(from_object, ['lock_additional_fields']) is not None:

{google_genai-1.17.0 → google_genai-1.18.0}/google/genai/_transformers.py

@@ -761,7 +761,8 @@ def process_schema(
   schema_type = schema.get('type')
   if isinstance(schema_type, Enum):
     schema_type = schema_type.value
-  schema_type = schema_type.upper()
+  if isinstance(schema_type, str):
+    schema_type = schema_type.upper()
 
   # model_json_schema() returns a schema with a 'const' field when a Literal with one value is provided as a pydantic field
   # For example `genre: Literal['action']` becomes: {'const': 'action', 'title': 'Genre', 'type': 'string'}

{google_genai-1.17.0 → google_genai-1.18.0}/google/genai/caches.py

@@ -120,6 +120,13 @@ def _Part_to_mldev(
         ),
     )
 
+  if getv(from_object, ['thought_signature']) is not None:
+    setv(
+        to_object,
+        ['thoughtSignature'],
+        getv(from_object, ['thought_signature']),
+    )
+
   if getv(from_object, ['code_execution_result']) is not None:
     setv(
         to_object,
@@ -785,6 +792,13 @@ def _Part_to_vertex(
         ),
     )
 
+  if getv(from_object, ['thought_signature']) is not None:
+    setv(
+        to_object,
+        ['thoughtSignature'],
+        getv(from_object, ['thought_signature']),
+    )
+
   if getv(from_object, ['code_execution_result']) is not None:
     setv(
         to_object,

{google_genai-1.17.0 → google_genai-1.18.0}/google/genai/chats.py

@@ -160,7 +160,7 @@ class _BaseChat:
         # Because the AFC input contains the entire curated chat history in
         # addition to the new user input, we need to truncate the AFC history
         # to deduplicate the existing chat history.
-        automatic_function_calling_history[len(self._curated_history):]
+        automatic_function_calling_history[len(self._curated_history) :]
         if automatic_function_calling_history
         else [user_input]
     )
@@ -328,7 +328,7 @@ class Chat(_BaseChat):
         yield chunk
       automatic_function_calling_history = (
           chunk.automatic_function_calling_history
-          if chunk.automatic_function_calling_history
+          if chunk is not None and chunk.automatic_function_calling_history
           else []
       )
       self.record_history(
@@ -495,9 +495,12 @@ class AsyncChat(_BaseChat):
       self.record_history(
           user_input=input_content,
           model_output=output_contents,
-          automatic_function_calling_history=chunk.automatic_function_calling_history if chunk.automatic_function_calling_history else [],
+          automatic_function_calling_history=chunk.automatic_function_calling_history
+          if chunk is not None and chunk.automatic_function_calling_history
+          else [],
           is_valid=is_valid,
       )
+
     return async_generator()  # type: ignore[no-untyped-call, no-any-return]
 
 

{google_genai-1.17.0 → google_genai-1.18.0}/google/genai/live.py

@@ -34,6 +34,7 @@ from . import _live_converters as live_converters
 from . import _mcp_utils
 from . import _transformers as t
 from . import client
+from . import errors
 from . import types
 from ._api_client import BaseApiClient
 from ._common import get_value_by_path as getv
@@ -78,10 +79,6 @@ _FUNCTION_RESPONSE_REQUIRES_ID = (
     ' response of a ToolCall.FunctionalCalls in Google AI.'
 )
 
-
-_DUMMY_KEY = 'dummy_key'
-
-
 class AsyncSession:
   """[Preview] AsyncSession."""
 
@@ -912,25 +909,10 @@ class AsyncLive(_api_module.BaseModule):
     Yields:
       An AsyncSession object.
     """
-    async with self._connect(
-        model=model,
-        config=config,
-    ) as session:
-      yield session
-
-  @contextlib.asynccontextmanager
-  async def _connect(
-      self,
-      *,
-      model: Optional[str] = None,
-      config: Optional[types.LiveConnectConfigOrDict] = None,
-      uri: Optional[str] = None,
-  ) -> AsyncIterator[AsyncSession]:
-
     # TODO(b/404946570): Support per request http options.
     if isinstance(config, dict):
       config = types.LiveConnectConfig(**config)
-    if config and config.http_options and uri is None:
+    if config and config.http_options:
       raise ValueError(
           'google.genai.client.aio.live.connect() does not support'
           ' http_options at request-level in LiveConnectConfig yet. Please use'
@@ -945,10 +927,22 @@ class AsyncLive(_api_module.BaseModule):
     parameter_model = await _t_live_connect_config(self._api_client, config)
 
     if self._api_client.api_key and not self._api_client.vertexai:
-      api_key = self._api_client.api_key
       version = self._api_client._http_options.api_version
-      if uri is None:
-        uri = f'{base_url}/ws/google.ai.generativelanguage.{version}.GenerativeService.BidiGenerateContent?key={api_key}'
+      api_key = self._api_client.api_key
+      method = 'BidiGenerateContent'
+      key_name = 'key'
+      if api_key.startswith('auth_tokens/'):
+        warnings.warn(
+            message=(
+                "The SDK's ephemeral token support is experimental, and may"
+                ' change in future versions.'
+            ),
+            category=errors.ExperimentalWarning,
+        )
+        method = 'BidiGenerateContentConstrained'
+        key_name = 'access_token'
+
+      uri = f'{base_url}/ws/google.ai.generativelanguage.{version}.GenerativeService.{method}?{key_name}={api_key}'
       headers = self._api_client._http_options.headers
 
       request_dict = _common.convert_to_dict(
@@ -969,8 +963,7 @@ class AsyncLive(_api_module.BaseModule):
       # Headers already contains api key for express mode.
       api_key = self._api_client.api_key
       version = self._api_client._http_options.api_version
-      if uri is None:
-        uri = f'{base_url}/ws/google.cloud.aiplatform.{version}.LlmBidiService/BidiGenerateContent'
+      uri = f'{base_url}/ws/google.cloud.aiplatform.{version}.LlmBidiService/BidiGenerateContent'
       headers = self._api_client._http_options.headers
 
       request_dict = _common.convert_to_dict(
@@ -1060,83 +1053,6 @@ class AsyncLive(_api_module.BaseModule):
         yield AsyncSession(api_client=self._api_client, websocket=ws)
 
 
-@_common.experimental_warning(
-    "The SDK's Live API connection with ephemeral token implementation is"
-    ' experimental, and may change in future versions.',
-)
-@contextlib.asynccontextmanager
-async def live_ephemeral_connect(
-    access_token: str,
-    model: Optional[str] = None,
-    config: Optional[types.LiveConnectConfigOrDict] = None,
-) -> AsyncIterator[AsyncSession]:
-  """[Experimental] Connect to the live server using ephermeral token (Gemini Developer API only).
-
-  Note: the live API is currently in experimental.
-
-  Usage:
-
-  .. code-block:: python
-    from google import genai
-
-    config = {}
-    async with genai.live_ephemeral_connect(
-        access_token='auth_tokens/12345',
-        model='...',
-        config=config,
-        http_options=types.HttpOptions(api_version='v1beta'),
-    ) as session:
-      await session.send_client_content(
-          turns=types.Content(
-              role='user',
-              parts=[types.Part(text='hello!')]
-          ),
-          turn_complete=True
-      )
-
-      async for message in session.receive():
-        print(message)
-
-    Args:
-      access_token: The access token to use for the Live session. It can be
-        generated by the `client.tokens.create` method.
-      model: The model to use for the Live session.
-      config: The configuration for the Live session.
-
-    Yields:
-      An AsyncSession object.
-  """
-  if isinstance(config, dict):
-    config = types.LiveConnectConfig(**config)
-
-  http_options = config.http_options if config else None
-
-  base_url = (
-      http_options.base_url
-      if http_options and http_options.base_url
-      else 'https://generativelanguage.googleapis.com/'
-  )
-  api_version = (
-      http_options.api_version
-      if http_options and http_options.api_version
-      else 'v1beta'
-  )
-  internal_client = client.Client(
-      api_key=_DUMMY_KEY,  # Can't be None during initialization
-      http_options=types.HttpOptions(
-          base_url=base_url,
-          api_version=api_version,
-      ),
-  )
-  websocket_base_url = internal_client._api_client._websocket_base_url()
-  uri = f'{websocket_base_url}/ws/google.ai.generativelanguage.{api_version}.GenerativeService.BidiGenerateContentConstrained?access_token={access_token}'
-
-  async with internal_client.aio.live._connect(
-      model=model, config=config, uri=uri
-  ) as session:
-    yield session
-
-
 async def _t_live_connect_config(
     api_client: BaseApiClient,
     config: Optional[types.LiveConnectConfigOrDict],

{google_genai-1.17.0 → google_genai-1.18.0}/google/genai/models.py

@@ -123,6 +123,13 @@ def _Part_to_mldev(
         ),
     )
 
+  if getv(from_object, ['thought_signature']) is not None:
+    setv(
+        to_object,
+        ['thoughtSignature'],
+        getv(from_object, ['thought_signature']),
+    )
+
   if getv(from_object, ['code_execution_result']) is not None:
     setv(
         to_object,
@@ -1548,6 +1555,13 @@ def _Part_to_vertex(
         ),
     )
 
+  if getv(from_object, ['thought_signature']) is not None:
+    setv(
+        to_object,
+        ['thoughtSignature'],
+        getv(from_object, ['thought_signature']),
+    )
+
   if getv(from_object, ['code_execution_result']) is not None:
     setv(
         to_object,
@@ -3441,6 +3455,13 @@ def _Part_from_mldev(
         ),
     )
 
+  if getv(from_object, ['thoughtSignature']) is not None:
+    setv(
+        to_object,
+        ['thought_signature'],
+        getv(from_object, ['thoughtSignature']),
+    )
+
   if getv(from_object, ['codeExecutionResult']) is not None:
     setv(
         to_object,
@@ -4138,6 +4159,13 @@ def _Part_from_vertex(
         ),
     )
 
+  if getv(from_object, ['thoughtSignature']) is not None:
+    setv(
+        to_object,
+        ['thought_signature'],
+        getv(from_object, ['thoughtSignature']),
+    )
+
   if getv(from_object, ['codeExecutionResult']) is not None:
     setv(
         to_object,
@@ -6105,7 +6133,8 @@ class Models(_api_module.BaseModule):
             )
           yield chunk
         if (
-            not chunk.candidates
+            chunk is None
+            or not chunk.candidates
             or not chunk.candidates[0].content
             or not chunk.candidates[0].content.parts
         ):
@@ -6120,7 +6149,7 @@ class Models(_api_module.BaseModule):
         break
 
       # Append function response parts to contents for the next request.
-      if chunk.candidates is not None:
+      if chunk is not None and chunk.candidates is not None:
         func_call_content = chunk.candidates[0].content
         func_response_content = types.Content(
             role='user',
@@ -7609,7 +7638,8 @@ class AsyncModels(_api_module.BaseModule):
               )
             yield chunk
           if (
-              not chunk.candidates
+              chunk is None
+              or not chunk.candidates
               or not chunk.candidates[0].content
               or not chunk.candidates[0].content.parts
           ):
@@ -7623,6 +7653,8 @@ class AsyncModels(_api_module.BaseModule):
         if not func_response_parts:
           break
 
+        if chunk is None:
+          continue
         # Append function response parts to contents for the next request.
         func_call_content = chunk.candidates[0].content
         func_response_content = types.Content(

{google_genai-1.17.0 → google_genai-1.18.0}/google/genai/types.py

@@ -225,6 +225,8 @@ class FinishReason(_common.CaseInSensitiveEnum):
   """The function call generated by the model is invalid."""
   IMAGE_SAFETY = 'IMAGE_SAFETY'
   """Token generation stopped because generated images have safety violations."""
+  UNEXPECTED_TOOL_CALL = 'UNEXPECTED_TOOL_CALL'
+  """The tool call generated by the model is invalid."""
 
 
 class HarmProbability(_common.CaseInSensitiveEnum):
@@ -887,6 +889,10 @@ class Part(_common.BaseModel):
   file_data: Optional[FileData] = Field(
       default=None, description="""Optional. URI based data."""
   )
+  thought_signature: Optional[bytes] = Field(
+      default=None,
+      description="""An opaque signature for the thought so it can be reused in subsequent requests.""",
+  )
   code_execution_result: Optional[CodeExecutionResult] = Field(
       default=None,
       description="""Optional. Result of executing the [ExecutableCode].""",
@@ -984,6 +990,9 @@ class PartDict(TypedDict, total=False):
   file_data: Optional[FileDataDict]
   """Optional. URI based data."""
 
+  thought_signature: Optional[bytes]
+  """An opaque signature for the thought so it can be reused in subsequent requests."""
+
   code_execution_result: Optional[CodeExecutionResultDict]
   """Optional. Result of executing the [ExecutableCode]."""
 
@@ -12492,8 +12501,8 @@ class AuthTokenDict(TypedDict, total=False):
 AuthTokenOrDict = Union[AuthToken, AuthTokenDict]
 
 
-class LiveEphemeralParameters(_common.BaseModel):
-  """Config for LiveEphemeralParameters for Auth Token creation."""
+class LiveConnectConstraints(_common.BaseModel):
+  """Config for LiveConnectConstraints for Auth Token creation."""
 
   model: Optional[str] = Field(
       default=None,
@@ -12507,8 +12516,8 @@ class LiveEphemeralParameters(_common.BaseModel):
   )
 
 
-class LiveEphemeralParametersDict(TypedDict, total=False):
-  """Config for LiveEphemeralParameters for Auth Token creation."""
+class LiveConnectConstraintsDict(TypedDict, total=False):
+  """Config for LiveConnectConstraints for Auth Token creation."""
 
   model: Optional[str]
   """ID of the model to configure in the ephemeral token for Live API.
@@ -12519,8 +12528,8 @@ class LiveEphemeralParametersDict(TypedDict, total=False):
   """Configuration specific to Live API connections created using this token."""
 
 
-LiveEphemeralParametersOrDict = Union[
-    LiveEphemeralParameters, LiveEphemeralParametersDict
+LiveConnectConstraintsOrDict = Union[
+    LiveConnectConstraints, LiveConnectConstraintsDict
 ]
 
 
@@ -12553,7 +12562,7 @@ class CreateAuthTokenConfig(_common.BaseModel):
       then no limit is applied. Default is 1. Resuming a Live API session does
       not count as a use.""",
   )
-  live_ephemeral_parameters: Optional[LiveEphemeralParameters] = Field(
+  live_connect_constraints: Optional[LiveConnectConstraints] = Field(
       default=None,
       description="""Configuration specific to Live API connections created using this token.""",
   )
@@ -12589,7 +12598,7 @@ class CreateAuthTokenConfigDict(TypedDict, total=False):
       then no limit is applied. Default is 1. Resuming a Live API session does
       not count as a use."""
 
-  live_ephemeral_parameters: Optional[LiveEphemeralParametersDict]
+  live_connect_constraints: Optional[LiveConnectConstraintsDict]
   """Configuration specific to Live API connections created using this token."""
 
   lock_additional_fields: Optional[list[str]]

{google_genai-1.17.0 → google_genai-1.18.0}/google/genai/version.py

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

{google_genai-1.17.0 → google_genai-1.18.0/google_genai.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-genai
-Version: 1.17.0
+Version: 1.18.0
 Summary: GenAI Python SDK
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache-2.0

{google_genai-1.17.0 → google_genai-1.18.0}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel", "twine>=6.1.0", "packaging>=24.2", "pkginfo>=
 
 [project]
 name = "google-genai"
-version = "1.17.0"
+version = "1.18.0"
 description = "GenAI Python SDK"
 readme = "README.md"
 license = {text = "Apache-2.0"}