google-genai 1.17.0__py3-none-any.whl → 1.19.0__py3-none-any.whl

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

@@ -63,6 +63,31 @@ MAX_RETRY_COUNT = 3
 INITIAL_RETRY_DELAY = 1  # second
 DELAY_MULTIPLIER = 2
 
+
+class EphemeralTokenAPIKeyError(ValueError):
+  """Error raised when the API key is invalid."""
+
+
+# This method checks for the API key in the environment variables. Google API
+# key is precedenced over Gemini API key.
+def _get_env_api_key() -> Optional[str]:
+  """Gets the API key from environment variables, prioritizing GOOGLE_API_KEY.
+
+  Returns:
+      The API key string if found, otherwise None. Empty string is considered
+      invalid.
+  """
+  env_google_api_key = os.environ.get('GOOGLE_API_KEY', None)
+  env_gemini_api_key = os.environ.get('GEMINI_API_KEY', None)
+  if env_google_api_key and env_gemini_api_key:
+    logger.warning(
+        'Both GOOGLE_API_KEY and GEMINI_API_KEY are set. Using'
+        ' GOOGLE_API_KEY.'
+    )
+
+  return env_google_api_key or env_gemini_api_key or None
+
+
 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__}'
@@ -366,7 +391,7 @@ class BaseApiClient:
     # Retrieve implicitly set values from the environment.
     env_project = os.environ.get('GOOGLE_CLOUD_PROJECT', None)
     env_location = os.environ.get('GOOGLE_CLOUD_LOCATION', None)
-    env_api_key = os.environ.get('GOOGLE_API_KEY', None)
+    env_api_key = _get_env_api_key()
     self.project = project or env_project
     self.location = location or env_location
     self.api_key = api_key or env_api_key
@@ -625,6 +650,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/_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/_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,
@@ -967,7 +981,13 @@ def _Tool_to_vertex(
     )
 
   if getv(from_object, ['url_context']) is not None:
-    raise ValueError('url_context parameter is not supported in Vertex AI.')
+    setv(
+        to_object,
+        ['urlContext'],
+        _UrlContext_to_vertex(
+            api_client, getv(from_object, ['url_context']), to_object
+        ),
+    )
 
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
@@ -2759,6 +2779,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 +2848,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/_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,
@@ -967,7 +981,13 @@ def _Tool_to_vertex(
     )
 
   if getv(from_object, ['url_context']) is not None:
-    raise ValueError('url_context parameter is not supported in Vertex AI.')
+    setv(
+        to_object,
+        ['urlContext'],
+        _UrlContext_to_vertex(
+            api_client, getv(from_object, ['url_context']), to_object
+        ),
+    )
 
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
@@ -1585,7 +1605,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 +1630,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 +1665,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 +1704,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/_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/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,
@@ -1078,7 +1092,13 @@ def _Tool_to_vertex(
     )
 
   if getv(from_object, ['url_context']) is not None:
-    raise ValueError('url_context parameter is not supported in Vertex AI.')
+    setv(
+        to_object,
+        ['urlContext'],
+        _UrlContext_to_vertex(
+            api_client, getv(from_object, ['url_context']), to_object
+        ),
+    )
 
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))

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/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/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,
@@ -1415,7 +1422,11 @@ def _GenerateVideosConfig_to_mldev(
     )
 
   if getv(from_object, ['enhance_prompt']) is not None:
-    raise ValueError('enhance_prompt parameter is not supported in Gemini API.')
+    setv(
+        parent_object,
+        ['parameters', 'enhancePrompt'],
+        getv(from_object, ['enhance_prompt']),
+    )
 
   if getv(from_object, ['generate_audio']) is not None:
     raise ValueError('generate_audio parameter is not supported in Gemini API.')
@@ -1548,6 +1559,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,
@@ -1967,7 +1985,13 @@ def _Tool_to_vertex(
     )
 
   if getv(from_object, ['url_context']) is not None:
-    raise ValueError('url_context parameter is not supported in Vertex AI.')
+    setv(
+        to_object,
+        ['urlContext'],
+        _UrlContext_to_vertex(
+            api_client, getv(from_object, ['url_context']), to_object
+        ),
+    )
 
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
@@ -3441,6 +3465,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 +4169,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,
@@ -4266,6 +4304,15 @@ def _Candidate_from_vertex(
   if getv(from_object, ['finishReason']) is not None:
     setv(to_object, ['finish_reason'], getv(from_object, ['finishReason']))
 
+  if getv(from_object, ['urlContextMetadata']) is not None:
+    setv(
+        to_object,
+        ['url_context_metadata'],
+        _UrlContextMetadata_from_vertex(
+            api_client, getv(from_object, ['urlContextMetadata']), to_object
+        ),
+    )
+
   if getv(from_object, ['avgLogprobs']) is not None:
     setv(to_object, ['avg_logprobs'], getv(from_object, ['avgLogprobs']))
 
@@ -6105,7 +6152,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 +6168,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 +7657,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 +7672,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/tokens.py

@@ -143,6 +143,7 @@ class Tokens(_api_module.BaseModule):
     Usage:
 
     .. code-block:: python
+
       # Case 1: If LiveEphemeralParameters is unset, unlock LiveConnectConfig
       # when using the token in Live API sessions. Each session connection can
       # use a different configuration.
@@ -154,6 +155,7 @@ class Tokens(_api_module.BaseModule):
       auth_token = client.tokens.create(config=config)
 
     .. code-block:: python
+
       # Case 2: If LiveEphemeralParameters is set, lock all fields in
       # LiveConnectConfig when using the token in Live API sessions. For
       # example, changing `output_audio_transcription` in the Live API
@@ -170,7 +172,9 @@ class Tokens(_api_module.BaseModule):
               ),
           )
       )
-      .. code-block:: python
+
+    .. code-block:: python
+
       # Case 3: If LiveEphemeralParameters is set and lockAdditionalFields is
       # empty, lock LiveConnectConfig with set fields (e.g.
       # system_instruction in this example) when using the token in Live API
@@ -187,7 +191,8 @@ class Tokens(_api_module.BaseModule):
           )
       )
 
-      .. code-block:: python
+    .. code-block:: python
+
       # Case 4: If LiveEphemeralParameters is set and lockAdditionalFields is
       # set, lock LiveConnectConfig with set and additional fields (e.g.
       # system_instruction, temperature in this example) when using the token

google/genai/types.py

@@ -59,17 +59,21 @@ _is_mcp_imported = False
 if typing.TYPE_CHECKING:
   from mcp import types as mcp_types
   from mcp import ClientSession as McpClientSession
+  from mcp.types import CallToolResult as McpCallToolResult
 
   _is_mcp_imported = True
 else:
   McpClientSession: typing.Type = Any
+  McpCallToolResult: typing.Type = Any
   try:
     from mcp import types as mcp_types
     from mcp import ClientSession as McpClientSession
+    from mcp.types import CallToolResult as McpCallToolResult
 
     _is_mcp_imported = True
   except ImportError:
     McpClientSession = None
+    McpCallToolResult = None
 
 logger = logging.getLogger('google_genai.types')
 
@@ -225,6 +229,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):
@@ -843,6 +849,21 @@ class FunctionResponse(_common.BaseModel):
       description="""Required. The function response in JSON object format. Use "output" key to specify function output and "error" key to specify error details (if any). If "output" and "error" keys are not specified, then whole "response" is treated as function output.""",
   )
 
+  @classmethod
+  def from_mcp_response(
+      cls, *, name: str, response: McpCallToolResult
+  ) -> 'FunctionResponse':
+    if not _is_mcp_imported:
+      raise ValueError(
+          'MCP response is not supported. Please ensure that the MCP library is'
+          ' imported.'
+      )
+
+    if response.isError:
+      return cls(name=name, response={'error': 'MCP response is error.'})
+    else:
+      return cls(name=name, response={'result': response.content})
+
 
 class FunctionResponseDict(TypedDict, total=False):
   """A function response."""
@@ -887,6 +908,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 +1009,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]."""
 
@@ -1916,12 +1944,16 @@ class FunctionDeclaration(_common.BaseModel):
     from . import _automatic_function_calling_util
 
     parameters_properties = {}
+    annotation_under_future = typing.get_type_hints(callable)
     for name, param in inspect.signature(callable).parameters.items():
       if param.kind in (
           inspect.Parameter.POSITIONAL_OR_KEYWORD,
           inspect.Parameter.KEYWORD_ONLY,
           inspect.Parameter.POSITIONAL_ONLY,
       ):
+        # This snippet catches the case when type hints are stored as strings
+        if isinstance(param.annotation, str):
+          param = param.replace(annotation=annotation_under_future[name])
         schema = _automatic_function_calling_util._parse_schema_from_parameter(
             api_option, param, callable.__name__
         )
@@ -1943,6 +1975,7 @@ class FunctionDeclaration(_common.BaseModel):
               declaration.parameters
           )
       )
+    # TODO: b/421991354 - Remove this check once the bug is fixed.
     if api_option == 'GEMINI_API':
       return declaration
 
@@ -1950,14 +1983,21 @@ class FunctionDeclaration(_common.BaseModel):
     if return_annotation is inspect._empty:
       return declaration
 
+    return_value = inspect.Parameter(
+        'return_value',
+        inspect.Parameter.POSITIONAL_OR_KEYWORD,
+        annotation=return_annotation,
+    )
+
+    # This snippet catches the case when type hints are stored as strings
+    if isinstance(return_value.annotation, str):
+      return_value = return_value.replace(
+          annotation=annotation_under_future['return']
+      )
     declaration.response = (
         _automatic_function_calling_util._parse_schema_from_parameter(
             api_option,
-            inspect.Parameter(
-                'return_value',
-                inspect.Parameter.POSITIONAL_OR_KEYWORD,
-                annotation=return_annotation,
-            ),
+            return_value,
             callable.__name__,
         )
     )
@@ -12492,8 +12532,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 +12547,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 +12559,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 +12593,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 +12629,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/version.py

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

{google_genai-1.17.0.dist-info → google_genai-1.19.0.dist-info}/METADATA

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

{google_genai-1.17.0.dist-info → google_genai-1.19.0.dist-info}/RECORD

@@ -1,35 +1,35 @@
-google/genai/__init__.py,sha256=Po1TtEyh1oa7fSqVI9Yzj2gywmo7OVDKEyqJ8rs9aAk,776
+google/genai/__init__.py,sha256=SYTxz3Ho06pP2TBlvDU0FkUJz8ytbR3MgEpS9HvVYq4,709
 google/genai/_adapters.py,sha256=Kok38miNYJff2n--l0zEK_hbq0y2rWOH7k75J7SMYbQ,1744
-google/genai/_api_client.py,sha256=N31CFoU5pj29l3RBVNDeEeFKj96TN8ZVoXRGPwJALrE,37922
+google/genai/_api_client.py,sha256=AOhv4_L9aTDzT6ALvH54s5ozPUPCx4w4ShLdh8qpXvM,38879
 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=JcRu5Qo5idx1caTEJDw4Li-aJz8UT4KNAqh4N0LTmDw,10573
+google/genai/_common.py,sha256=hDqunjaAL__GXZzhr37QGOCR6z6PMc_EfiRy_ukAxHo,11545
 google/genai/_extra_utils.py,sha256=_w8hB9Ag7giRR94nIOBJFTLiLEufulPXkCZpJG1XY5g,19241
-google/genai/_live_converters.py,sha256=lNcvNaFRcUbI5OISDGi-vjD_5hN7neHsOYichm8-czk,114696
+google/genai/_live_converters.py,sha256=8J0h9JUdkwkPFugFBAW4EKTMkZATMDZWgNkc9WOh2Hg,115488
 google/genai/_mcp_utils.py,sha256=khECx-DMuHemKzOQQ3msWp7FivPeEOnl3n1lvWc_b5o,3833
 google/genai/_replay_api_client.py,sha256=BrnKkdUVejpuHvqVHK0V4m4TjvL4LaBLHRMv6vw0vGE,21361
 google/genai/_test_api_client.py,sha256=4ruFIy5_1qcbKqqIBu3HSQbpSOBrxiecBtDZaTGFR1s,4797
-google/genai/_tokens_converters.py,sha256=SsHrhFD_mwNKWt8IecSvkpEnjVtC6B7HfqqX3xvhcfU,51040
-google/genai/_transformers.py,sha256=GineAcXvT7b-GG8o9c5P4uvmI3RO7m6ixFp40MOuITc,35520
+google/genai/_tokens_converters.py,sha256=IUmpIC7nKjZzp_azavxXgeML35nYSC0KRkCnGG0iZao,51477
+google/genai/_transformers.py,sha256=Ii8u54Ni8388jU8OAei5sixZAmFP3o-OKbxomzBul4o,35557
 google/genai/batches.py,sha256=gyNb--psM7cqXEP5RsJ908ismvsFFlDNRxt7mCwhYgM,34943
-google/genai/caches.py,sha256=KeDTnt9wSe0NFoA7mwwgm81plX6sUKvNRRvCNz5Un_c,67594
-google/genai/chats.py,sha256=I4PlyEmyC43CdlDpHlxXpwDeYKT36AnUl7RgYUX-O5U,16978
+google/genai/caches.py,sha256=Z1DiYwZUjY9zrCapfEFOz77lwfWyCsAbnrcMF2tr24g,68038
+google/genai/chats.py,sha256=Hl08SbpSCMS0kYiBNGNzPI8q3rijGEW_up0g2Wun9cY,17044
 google/genai/client.py,sha256=9AWoFL2g-OQFA4Zqpecg74b7h3i5Q9ZlXF4bFePV0zA,10759
 google/genai/errors.py,sha256=nLAVglUGuPdLqLcnN_VCifoi7V17u9BQ9AfxUdRzZLg,4795
 google/genai/files.py,sha256=PB5Rh5WiLOPHcqPR1inGyhqL9PiE0BFHSL4Dz9HKtl8,39516
-google/genai/live.py,sha256=3_ZMdHG2Y7nlzlLcN5jF1JWj7DhtIo6hrJmC6MEpDio,41747
+google/genai/live.py,sha256=ZpXHO7AFayOz2viISxs34rlG85dFH9qk-5-qOC9pcZE,39375
 google/genai/live_music.py,sha256=lO-nDz2gEJ8bYesJC1Aru4IrsV7raEePf4sH3QQT6yI,7119
-google/genai/models.py,sha256=87KRye1LOOPg-vmfezGkq4gdVU5YhR4qmazoC0Zmg1U,238239
+google/genai/models.py,sha256=B9T4g7VLUiaZbUADKJG1UrVlvwQziZbUSgOXo3yj4oA,239463
 google/genai/operations.py,sha256=wWGngU4N3U2y_JteBkwqTmoNncehk2NcZgPyHaVulfI,20304
 google/genai/pagers.py,sha256=nyVYxp92rS-UaewO_oBgP593knofeLU6yOn6RolNoGQ,6797
 google/genai/py.typed,sha256=RsMFoLwBkAvY05t6izop4UHZtqOPLiKp3GkIEizzmQY,40
-google/genai/tokens.py,sha256=g2gxefzN5-36B5qUkLL6MBSe31IgXgW7k_WEstRZypg,12187
+google/genai/tokens.py,sha256=31HRdGkuN1VkHn21qKBwa6PeiLFGMN-aFldPIGo9WxE,12188
 google/genai/tunings.py,sha256=aEKTVfpn6rYWEKu0CRaS93mo2iLQtX5K3nSqX6UB_jM,49500
-google/genai/types.py,sha256=3NgIfqsrFwc8nzHQ0q18MjT4i4PEgbUZOcNu_MLAuqk,435807
-google/genai/version.py,sha256=hpRoVW-Vf0hIu6bbkzred3UTNNy-QrOv-olH5U1Vaag,627
-google_genai-1.17.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-google_genai-1.17.0.dist-info/METADATA,sha256=2GrUrmL5GLTyS8mgXQzk20qN0Vn0YDX0WyoFyXoj_bU,35579
-google_genai-1.17.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-google_genai-1.17.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
-google_genai-1.17.0.dist-info/RECORD,,
+google/genai/types.py,sha256=SjZ9GaMEHn_YoOHnCLQm0Sl9AsnYPqBVbExlF6l9fo4,437412
+google/genai/version.py,sha256=4Bj2qKIYUQDZnSbV8me-05HqXSvijhv-sXzln7K77wA,627
+google_genai-1.19.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+google_genai-1.19.0.dist-info/METADATA,sha256=AdmMMUAAVkTxCNDAANY8SJsTlxBoXVKg2zdxj4-RgOs,35579
+google_genai-1.19.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+google_genai-1.19.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
+google_genai-1.19.0.dist-info/RECORD,,