google-genai 1.16.1__py3-none-any.whl → 1.18.0__py3-none-any.whl

google/genai/caches.py

@@ -66,6 +66,24 @@ def _Blob_to_mldev(
   return to_object
 
 
+def _FileData_to_mldev(
+    api_client: BaseApiClient,
+    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, ['display_name']) is not None:
+    raise ValueError('display_name parameter is not supported in Gemini API.')
+
+  if getv(from_object, ['file_uri']) is not None:
+    setv(to_object, ['fileUri'], getv(from_object, ['file_uri']))
+
+  if getv(from_object, ['mime_type']) is not None:
+    setv(to_object, ['mimeType'], getv(from_object, ['mime_type']))
+
+  return to_object
+
+
 def _Part_to_mldev(
     api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
@@ -93,6 +111,22 @@ def _Part_to_mldev(
         ),
     )
 
+  if getv(from_object, ['file_data']) is not None:
+    setv(
+        to_object,
+        ['fileData'],
+        _FileData_to_mldev(
+            api_client, getv(from_object, ['file_data']), to_object
+        ),
+    )
+
+  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,
@@ -103,9 +137,6 @@ def _Part_to_mldev(
   if getv(from_object, ['executable_code']) is not None:
     setv(to_object, ['executableCode'], getv(from_object, ['executable_code']))
 
-  if getv(from_object, ['file_data']) is not None:
-    setv(to_object, ['fileData'], getv(from_object, ['file_data']))
-
   if getv(from_object, ['function_call']) is not None:
     setv(to_object, ['functionCall'], getv(from_object, ['function_call']))
 
@@ -428,6 +459,9 @@ def _RetrievalConfig_to_mldev(
         _LatLng_to_mldev(api_client, getv(from_object, ['lat_lng']), to_object),
     )
 
+  if getv(from_object, ['language_code']) is not None:
+    setv(to_object, ['languageCode'], getv(from_object, ['language_code']))
+
   return to_object
 
 
@@ -704,6 +738,24 @@ def _Blob_to_vertex(
   return to_object
 
 
+def _FileData_to_vertex(
+    api_client: BaseApiClient,
+    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, ['display_name']) is not None:
+    setv(to_object, ['displayName'], getv(from_object, ['display_name']))
+
+  if getv(from_object, ['file_uri']) is not None:
+    setv(to_object, ['fileUri'], getv(from_object, ['file_uri']))
+
+  if getv(from_object, ['mime_type']) is not None:
+    setv(to_object, ['mimeType'], getv(from_object, ['mime_type']))
+
+  return to_object
+
+
 def _Part_to_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
@@ -731,6 +783,22 @@ def _Part_to_vertex(
         ),
     )
 
+  if getv(from_object, ['file_data']) is not None:
+    setv(
+        to_object,
+        ['fileData'],
+        _FileData_to_vertex(
+            api_client, getv(from_object, ['file_data']), to_object
+        ),
+    )
+
+  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,
@@ -741,9 +809,6 @@ def _Part_to_vertex(
   if getv(from_object, ['executable_code']) is not None:
     setv(to_object, ['executableCode'], getv(from_object, ['executable_code']))
 
-  if getv(from_object, ['file_data']) is not None:
-    setv(to_object, ['fileData'], getv(from_object, ['file_data']))
-
   if getv(from_object, ['function_call']) is not None:
     setv(to_object, ['functionCall'], getv(from_object, ['function_call']))
 
@@ -1084,6 +1149,9 @@ def _RetrievalConfig_to_vertex(
         ),
     )
 
+  if getv(from_object, ['language_code']) is not None:
+    setv(to_object, ['languageCode'], getv(from_object, ['language_code']))
+
   return to_object
 
 

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'
@@ -944,11 +926,23 @@ class AsyncLive(_api_module.BaseModule):
 
     parameter_model = await _t_live_connect_config(self._api_client, config)
 
-    if self._api_client.api_key:
-      api_key = self._api_client.api_key
+    if self._api_client.api_key and not self._api_client.vertexai:
       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(
@@ -964,6 +958,27 @@ class AsyncLive(_api_module.BaseModule):
 
       setv(request_dict, ['setup', 'model'], transformed_model)
 
+      request = json.dumps(request_dict)
+    elif self._api_client.api_key and self._api_client.vertexai:
+      # Headers already contains api key for express mode.
+      api_key = self._api_client.api_key
+      version = self._api_client._http_options.api_version
+      uri = f'{base_url}/ws/google.cloud.aiplatform.{version}.LlmBidiService/BidiGenerateContent'
+      headers = self._api_client._http_options.headers
+
+      request_dict = _common.convert_to_dict(
+          live_converters._LiveConnectParameters_to_vertex(
+              api_client=self._api_client,
+              from_object=types.LiveConnectParameters(
+                  model=transformed_model,
+                  config=parameter_model,
+              ).model_dump(exclude_none=True),
+          )
+      )
+      del request_dict['config']
+
+      setv(request_dict, ['setup', 'model'], transformed_model)
+
       request = json.dumps(request_dict)
     else:
       if not self._api_client._credentials:
@@ -1038,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],