google-genai 1.48.0__tar.gz → 1.50.0__tar.gz

{google_genai-1.48.0/google_genai.egg-info → google_genai-1.50.0}/PKG-INFO

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

{google_genai-1.48.0 → google_genai-1.50.0}/google/genai/_api_client.py

@@ -37,14 +37,12 @@ import time
 from typing import Any, AsyncIterator, Iterator, Optional, Tuple, TYPE_CHECKING, Union
 from urllib.parse import urlparse
 from urllib.parse import urlunparse
-import warnings
 
 import anyio
 import certifi
 import google.auth
 import google.auth.credentials
 from google.auth.credentials import Credentials
-from google.auth.transport.requests import Request
 import httpx
 from pydantic import BaseModel
 from pydantic import ValidationError
@@ -197,6 +195,7 @@ def load_auth(*, project: Union[str, None]) -> Tuple[Credentials, str]:
 
 
 def refresh_auth(credentials: Credentials) -> Credentials:
+  from google.auth.transport.requests import Request
   credentials.refresh(Request())  # type: ignore[no-untyped-call]
   return credentials
 
@@ -1347,9 +1346,21 @@ class BaseApiClient:
 
     session_response = self._request(http_request, http_options, stream=True)
     for chunk in session_response.segments():
-      yield SdkHttpResponse(
-          headers=session_response.headers, body=json.dumps(chunk)
-      )
+      chunk_dump = json.dumps(chunk)
+      try:
+        if chunk_dump.startswith('{"error":'):
+          chunk_json = json.loads(chunk_dump)
+          errors.APIError.raise_error(
+              chunk_json.get('error', {}).get('code'),
+              chunk_json,
+              session_response,
+          )
+      except json.decoder.JSONDecodeError:
+        logger.debug(
+            'Failed to decode chunk that contains an error: %s' % chunk_dump
+        )
+        pass
+      yield SdkHttpResponse(headers=session_response.headers, body=chunk_dump)
 
   async def async_request(
       self,
@@ -1383,7 +1394,21 @@ class BaseApiClient:
 
     async def async_generator():  # type: ignore[no-untyped-def]
       async for chunk in response:
-        yield SdkHttpResponse(headers=response.headers, body=json.dumps(chunk))
+        chunk_dump = json.dumps(chunk)
+        try:
+          if chunk_dump.startswith('{"error":'):
+            chunk_json = json.loads(chunk_dump)
+            await errors.APIError.raise_error_async(
+                chunk_json.get('error', {}).get('code'),
+                chunk_json,
+                response,
+            )
+        except json.decoder.JSONDecodeError:
+          logger.debug(
+              'Failed to decode chunk that contains an error: %s' % chunk_dump
+          )
+          pass
+        yield SdkHttpResponse(headers=response.headers, body=chunk_dump)
 
     return async_generator()  # type: ignore[no-untyped-call]
 
@@ -1493,7 +1518,7 @@ class BaseApiClient:
             f'All content has been uploaded, but the upload status is not'
             f' finalized.'
         )
-
+    errors.APIError.raise_for_response(response)
     if response.headers.get('x-goog-upload-status') != 'final':
       raise ValueError('Failed to upload file: Upload status is not finalized.')
     return HttpResponse(response.headers, response_stream=[response.text])
@@ -1656,6 +1681,8 @@ class BaseApiClient:
               f'All content has been uploaded, but the upload status is not'
               f' finalized.'
           )
+
+      await errors.APIError.raise_for_async_response(response)
       if (
           response is not None
           and response.headers.get('X-Goog-Upload-Status') != 'final'
@@ -1733,6 +1760,8 @@ class BaseApiClient:
               'All content has been uploaded, but the upload status is not'
               ' finalized.'
           )
+
+      await errors.APIError.raise_for_async_response(client_response)
       if (
           client_response is not None
           and client_response.headers.get('x-goog-upload-status') != 'final'

{google_genai-1.48.0 → google_genai-1.50.0}/google/genai/_live_converters.py

@@ -127,6 +127,13 @@ def _GenerationConfig_to_vertex(
         getv(from_object, ['model_selection_config']),
     )
 
+  if getv(from_object, ['response_json_schema']) is not None:
+    setv(
+        to_object,
+        ['responseJsonSchema'],
+        getv(from_object, ['response_json_schema']),
+    )
+
   if getv(from_object, ['audio_timestamp']) is not None:
     setv(to_object, ['audioTimestamp'], getv(from_object, ['audio_timestamp']))
 
@@ -165,13 +172,6 @@ def _GenerationConfig_to_vertex(
         to_object, ['presencePenalty'], getv(from_object, ['presence_penalty'])
     )
 
-  if getv(from_object, ['response_json_schema']) is not None:
-    setv(
-        to_object,
-        ['responseJsonSchema'],
-        getv(from_object, ['response_json_schema']),
-    )
-
   if getv(from_object, ['response_logprobs']) is not None:
     setv(
         to_object,
@@ -1269,16 +1269,12 @@ def _Tool_to_mldev(
         getv(from_object, ['google_search_retrieval']),
     )
 
-  if getv(from_object, ['google_maps']) is not None:
-    setv(
-        to_object,
-        ['googleMaps'],
-        _GoogleMaps_to_mldev(getv(from_object, ['google_maps']), to_object),
-    )
-
   if getv(from_object, ['computer_use']) is not None:
     setv(to_object, ['computerUse'], getv(from_object, ['computer_use']))
 
+  if getv(from_object, ['file_search']) is not None:
+    setv(to_object, ['fileSearch'], getv(from_object, ['file_search']))
+
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
 
@@ -1287,6 +1283,13 @@ def _Tool_to_mldev(
         'enterprise_web_search parameter is not supported in Gemini API.'
     )
 
+  if getv(from_object, ['google_maps']) is not None:
+    setv(
+        to_object,
+        ['googleMaps'],
+        _GoogleMaps_to_mldev(getv(from_object, ['google_maps']), to_object),
+    )
+
   if getv(from_object, ['google_search']) is not None:
     setv(
         to_object,
@@ -1325,12 +1328,12 @@ def _Tool_to_vertex(
         getv(from_object, ['google_search_retrieval']),
     )
 
-  if getv(from_object, ['google_maps']) is not None:
-    setv(to_object, ['googleMaps'], getv(from_object, ['google_maps']))
-
   if getv(from_object, ['computer_use']) is not None:
     setv(to_object, ['computerUse'], getv(from_object, ['computer_use']))
 
+  if getv(from_object, ['file_search']) is not None:
+    raise ValueError('file_search parameter is not supported in Vertex AI.')
+
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
 
@@ -1341,6 +1344,9 @@ def _Tool_to_vertex(
         getv(from_object, ['enterprise_web_search']),
     )
 
+  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']))
 

{google_genai-1.48.0 → google_genai-1.50.0}/google/genai/_local_tokenizer_loader.py

@@ -28,9 +28,6 @@ from sentencepiece import sentencepiece_model_pb2
 
 # Source of truth: https://cloud.google.com/vertex-ai/generative-ai/docs/learn/models
 _GEMINI_MODELS_TO_TOKENIZER_NAMES = {
-    "gemini-1.0-pro": "gemma2",
-    "gemini-1.5-pro": "gemma2",
-    "gemini-1.5-flash": "gemma2",
     "gemini-2.5-pro": "gemma3",
     "gemini-2.5-flash": "gemma3",
     "gemini-2.5-flash-lite": "gemma3",
@@ -38,12 +35,6 @@ _GEMINI_MODELS_TO_TOKENIZER_NAMES = {
     "gemini-2.0-flash-lite": "gemma3",
 }
 _GEMINI_STABLE_MODELS_TO_TOKENIZER_NAMES = {
-    "gemini-1.0-pro-001": "gemma2",
-    "gemini-1.0-pro-002": "gemma2",
-    "gemini-1.5-pro-001": "gemma2",
-    "gemini-1.5-flash-001": "gemma2",
-    "gemini-1.5-flash-002": "gemma2",
-    "gemini-1.5-pro-002": "gemma2",
     "gemini-2.5-pro-preview-06-05": "gemma3",
     "gemini-2.5-pro-preview-05-06": "gemma3",
     "gemini-2.5-pro-exp-03-25": "gemma3",

{google_genai-1.48.0 → google_genai-1.50.0}/google/genai/_operations_converters.py

@@ -256,6 +256,102 @@ def _GetOperationParameters_to_vertex(
   return to_object
 
 
+def _ImportFileOperation_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, ['name']) is not None:
+    setv(to_object, ['name'], getv(from_object, ['name']))
+
+  if getv(from_object, ['metadata']) is not None:
+    setv(to_object, ['metadata'], getv(from_object, ['metadata']))
+
+  if getv(from_object, ['done']) is not None:
+    setv(to_object, ['done'], getv(from_object, ['done']))
+
+  if getv(from_object, ['error']) is not None:
+    setv(to_object, ['error'], getv(from_object, ['error']))
+
+  if getv(from_object, ['response']) is not None:
+    setv(
+        to_object,
+        ['response'],
+        _ImportFileResponse_from_mldev(
+            getv(from_object, ['response']), to_object
+        ),
+    )
+
+  return to_object
+
+
+def _ImportFileResponse_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, ['parent']) is not None:
+    setv(to_object, ['parent'], getv(from_object, ['parent']))
+
+  if getv(from_object, ['documentName']) is not None:
+    setv(to_object, ['document_name'], getv(from_object, ['documentName']))
+
+  return to_object
+
+
+def _UploadToFileSearchStoreOperation_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, ['name']) is not None:
+    setv(to_object, ['name'], getv(from_object, ['name']))
+
+  if getv(from_object, ['metadata']) is not None:
+    setv(to_object, ['metadata'], getv(from_object, ['metadata']))
+
+  if getv(from_object, ['done']) is not None:
+    setv(to_object, ['done'], getv(from_object, ['done']))
+
+  if getv(from_object, ['error']) is not None:
+    setv(to_object, ['error'], getv(from_object, ['error']))
+
+  if getv(from_object, ['response']) is not None:
+    setv(
+        to_object,
+        ['response'],
+        _UploadToFileSearchStoreResponse_from_mldev(
+            getv(from_object, ['response']), to_object
+        ),
+    )
+
+  return to_object
+
+
+def _UploadToFileSearchStoreResponse_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, ['parent']) is not None:
+    setv(to_object, ['parent'], getv(from_object, ['parent']))
+
+  if getv(from_object, ['documentName']) is not None:
+    setv(to_object, ['document_name'], getv(from_object, ['documentName']))
+
+  return to_object
+
+
 def _Video_from_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,

{google_genai-1.48.0 → google_genai-1.50.0}/google/genai/_replay_api_client.py

@@ -17,17 +17,16 @@
 
 import base64
 import copy
-import datetime
+import contextlib
 import enum
 import inspect
 import io
 import json
 import os
 import re
-from typing import Any, Literal, Optional, Union
+from typing import Any, Literal, Optional, Union, Iterator, AsyncIterator
 
 import google.auth
-from requests.exceptions import HTTPError
 
 from . import errors
 from ._api_client import BaseApiClient
@@ -210,6 +209,22 @@ def pop_undeterministic_headers(headers: dict[str, str]) -> None:
   headers.pop('Server-Timing', None)  # pytype: disable=attribute-error
 
 
+@contextlib.contextmanager
+def _record_on_api_error(client: 'ReplayApiClient', http_request: HttpRequest) -> Iterator[None]:
+  try:
+    yield
+  except errors.APIError as e:
+    client._record_interaction(http_request, e)
+    raise e
+
+@contextlib.asynccontextmanager
+async def _async_record_on_api_error(client: 'ReplayApiClient', http_request: HttpRequest) -> AsyncIterator[None]:
+  try:
+    yield
+  except errors.APIError as e:
+    client._record_interaction(http_request, e)
+    raise e
+
 class ReplayRequest(BaseModel):
   """Represents a single request in a replay."""
 
@@ -512,11 +527,8 @@ class ReplayApiClient(BaseApiClient):
     self._initialize_replay_session_if_not_loaded()
     if self._should_call_api():
       _debug_print('api mode request: %s' % http_request)
-      try:
+      with _record_on_api_error(self, http_request):
         result = super()._request(http_request, http_options, stream)
-      except errors.APIError as e:
-        self._record_interaction(http_request, e)
-        raise e
       if stream:
         result_segments = []
         for segment in result.segments():
@@ -541,13 +553,10 @@ class ReplayApiClient(BaseApiClient):
     self._initialize_replay_session_if_not_loaded()
     if self._should_call_api():
       _debug_print('api mode request: %s' % http_request)
-      try:
+      async with _async_record_on_api_error(self, http_request):
         result = await super()._async_request(
             http_request, http_options, stream
         )
-      except errors.APIError as e:
-        self._record_interaction(http_request, e)
-        raise e
       if stream:
         result_segments = []
         async for segment in result.async_segments():
@@ -587,16 +596,10 @@ class ReplayApiClient(BaseApiClient):
       )
     if self._should_call_api():
       result: Union[str, HttpResponse]
-      try:
+      with _record_on_api_error(self, request):
         result = super().upload_file(
             file_path, upload_url, upload_size, http_options=http_options
         )
-      except HTTPError as e:
-        result = HttpResponse(
-            dict(e.response.headers), [json.dumps({'reason': e.response.reason})]
-        )
-        result.status_code = e.response.status_code
-        raise e
       self._record_interaction(request, result)
       return result
     else:
@@ -626,16 +629,10 @@ class ReplayApiClient(BaseApiClient):
       )
     if self._should_call_api():
       result: HttpResponse
-      try:
+      async with _async_record_on_api_error(self, request):
         result = await super().async_upload_file(
             file_path, upload_url, upload_size, http_options=http_options
         )
-      except HTTPError as e:
-        result = HttpResponse(
-            dict(e.response.headers), [json.dumps({'reason': e.response.reason})]
-        )
-        result.status_code = e.response.status_code
-        raise e
       self._record_interaction(request, result)
       return result
     else:
@@ -649,14 +646,8 @@ class ReplayApiClient(BaseApiClient):
         'get', path=path, request_dict={}, http_options=http_options
     )
     if self._should_call_api():
-      try:
+      with _record_on_api_error(self, request):
         result = super().download_file(path, http_options=http_options)
-      except HTTPError as e:
-        result = HttpResponse(
-            dict(e.response.headers), [json.dumps({'reason': e.response.reason})]
-        )
-        result.status_code = e.response.status_code
-        raise e
       self._record_interaction(request, result)
       return result
     else:
@@ -670,16 +661,10 @@ class ReplayApiClient(BaseApiClient):
         'get', path=path, request_dict={}, http_options=http_options
     )
     if self._should_call_api():
-      try:
+      async with _async_record_on_api_error(self, request):
         result = await super().async_download_file(
             path, http_options=http_options
         )
-      except HTTPError as e:
-        result = HttpResponse(
-            dict(e.response.headers), [json.dumps({'reason': e.response.reason})]
-        )
-        result.status_code = e.response.status_code
-        raise e
       self._record_interaction(request, result)
       return result
     else:

{google_genai-1.48.0 → google_genai-1.50.0}/google/genai/_tokens_converters.py

@@ -454,16 +454,12 @@ def _Tool_to_mldev(
         getv(from_object, ['google_search_retrieval']),
     )
 
-  if getv(from_object, ['google_maps']) is not None:
-    setv(
-        to_object,
-        ['googleMaps'],
-        _GoogleMaps_to_mldev(getv(from_object, ['google_maps']), to_object),
-    )
-
   if getv(from_object, ['computer_use']) is not None:
     setv(to_object, ['computerUse'], getv(from_object, ['computer_use']))
 
+  if getv(from_object, ['file_search']) is not None:
+    setv(to_object, ['fileSearch'], getv(from_object, ['file_search']))
+
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
 
@@ -472,6 +468,13 @@ def _Tool_to_mldev(
         'enterprise_web_search parameter is not supported in Gemini API.'
     )
 
+  if getv(from_object, ['google_maps']) is not None:
+    setv(
+        to_object,
+        ['googleMaps'],
+        _GoogleMaps_to_mldev(getv(from_object, ['google_maps']), to_object),
+    )
+
   if getv(from_object, ['google_search']) is not None:
     setv(
         to_object,

{google_genai-1.48.0 → google_genai-1.50.0}/google/genai/_transformers.py

@@ -199,6 +199,8 @@ def _resource_name(
 def t_model(client: _api_client.BaseApiClient, model: str) -> str:
   if not model:
     raise ValueError('model is required.')
+  if '..' in model or '?' in model or '&' in model:
+    raise ValueError('invalid model parameter.')
   if client.vertexai:
     if (
         model.startswith('projects/')

{google_genai-1.48.0 → google_genai-1.50.0}/google/genai/batches.py

@@ -328,6 +328,11 @@ def _BatchJob_from_vertex(
         ),
     )
 
+  if getv(from_object, ['completionStats']) is not None:
+    setv(
+        to_object, ['completion_stats'], getv(from_object, ['completionStats'])
+    )
+
   return to_object
 
 
@@ -1332,16 +1337,12 @@ def _Tool_to_mldev(
         getv(from_object, ['google_search_retrieval']),
     )
 
-  if getv(from_object, ['google_maps']) is not None:
-    setv(
-        to_object,
-        ['googleMaps'],
-        _GoogleMaps_to_mldev(getv(from_object, ['google_maps']), to_object),
-    )
-
   if getv(from_object, ['computer_use']) is not None:
     setv(to_object, ['computerUse'], getv(from_object, ['computer_use']))
 
+  if getv(from_object, ['file_search']) is not None:
+    setv(to_object, ['fileSearch'], getv(from_object, ['file_search']))
+
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
 
@@ -1350,6 +1351,13 @@ def _Tool_to_mldev(
         'enterprise_web_search parameter is not supported in Gemini API.'
     )
 
+  if getv(from_object, ['google_maps']) is not None:
+    setv(
+        to_object,
+        ['googleMaps'],
+        _GoogleMaps_to_mldev(getv(from_object, ['google_maps']), to_object),
+    )
+
   if getv(from_object, ['google_search']) is not None:
     setv(
         to_object,

{google_genai-1.48.0 → google_genai-1.50.0}/google/genai/caches.py

@@ -591,16 +591,12 @@ def _Tool_to_mldev(
         getv(from_object, ['google_search_retrieval']),
     )
 
-  if getv(from_object, ['google_maps']) is not None:
-    setv(
-        to_object,
-        ['googleMaps'],
-        _GoogleMaps_to_mldev(getv(from_object, ['google_maps']), to_object),
-    )
-
   if getv(from_object, ['computer_use']) is not None:
     setv(to_object, ['computerUse'], getv(from_object, ['computer_use']))
 
+  if getv(from_object, ['file_search']) is not None:
+    setv(to_object, ['fileSearch'], getv(from_object, ['file_search']))
+
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
 
@@ -609,6 +605,13 @@ def _Tool_to_mldev(
         'enterprise_web_search parameter is not supported in Gemini API.'
     )
 
+  if getv(from_object, ['google_maps']) is not None:
+    setv(
+        to_object,
+        ['googleMaps'],
+        _GoogleMaps_to_mldev(getv(from_object, ['google_maps']), to_object),
+    )
+
   if getv(from_object, ['google_search']) is not None:
     setv(
         to_object,
@@ -647,12 +650,12 @@ def _Tool_to_vertex(
         getv(from_object, ['google_search_retrieval']),
     )
 
-  if getv(from_object, ['google_maps']) is not None:
-    setv(to_object, ['googleMaps'], getv(from_object, ['google_maps']))
-
   if getv(from_object, ['computer_use']) is not None:
     setv(to_object, ['computerUse'], getv(from_object, ['computer_use']))
 
+  if getv(from_object, ['file_search']) is not None:
+    raise ValueError('file_search parameter is not supported in Vertex AI.')
+
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
 
@@ -663,6 +666,9 @@ def _Tool_to_vertex(
         getv(from_object, ['enterprise_web_search']),
     )
 
+  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']))
 

{google_genai-1.48.0 → google_genai-1.50.0}/google/genai/client.py

@@ -27,6 +27,7 @@ from ._replay_api_client import ReplayApiClient
 from .batches import AsyncBatches, Batches
 from .caches import AsyncCaches, Caches
 from .chats import AsyncChats, Chats
+from .file_search_stores import AsyncFileSearchStores, FileSearchStores
 from .files import AsyncFiles, Files
 from .live import AsyncLive
 from .models import AsyncModels, Models
@@ -47,6 +48,7 @@ class AsyncClient:
     self._caches = AsyncCaches(self._api_client)
     self._batches = AsyncBatches(self._api_client)
     self._files = AsyncFiles(self._api_client)
+    self._file_search_stores = AsyncFileSearchStores(self._api_client)
     self._live = AsyncLive(self._api_client)
     self._tokens = AsyncTokens(self._api_client)
     self._operations = AsyncOperations(self._api_client)
@@ -63,6 +65,10 @@ class AsyncClient:
   def caches(self) -> AsyncCaches:
     return self._caches
 
+  @property
+  def file_search_stores(self) -> AsyncFileSearchStores:
+    return self._file_search_stores
+
   @property
   def batches(self) -> AsyncBatches:
     return self._batches
@@ -276,6 +282,7 @@ class Client:
     self._models = Models(self._api_client)
     self._tunings = Tunings(self._api_client)
     self._caches = Caches(self._api_client)
+    self._file_search_stores = FileSearchStores(self._api_client)
     self._batches = Batches(self._api_client)
     self._files = Files(self._api_client)
     self._tokens = Tokens(self._api_client)
@@ -337,6 +344,10 @@ class Client:
   def caches(self) -> Caches:
     return self._caches
 
+  @property
+  def file_search_stores(self) -> FileSearchStores:
+    return self._file_search_stores
+
   @property
   def batches(self) -> Batches:
     return self._batches