google-genai 1.33.0__py3-none-any.whl → 1.53.0__py3-none-any.whl

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

@@ -38,24 +38,6 @@ def _FetchPredictOperationParameters_to_mldev(
   return to_object
 
 
-def _GetOperationParameters_to_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, ['operation_name']) is not None:
-    setv(
-        to_object,
-        ['_url', 'operationName'],
-        getv(from_object, ['operation_name']),
-    )
-
-  if getv(from_object, ['config']) is not None:
-    setv(to_object, ['config'], getv(from_object, ['config']))
-
-  return to_object
-
-
 def _FetchPredictOperationParameters_to_vertex(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -71,61 +53,80 @@ def _FetchPredictOperationParameters_to_vertex(
         getv(from_object, ['resource_name']),
     )
 
-  if getv(from_object, ['config']) is not None:
-    setv(to_object, ['config'], getv(from_object, ['config']))
-
   return to_object
 
 
-def _GetOperationParameters_to_vertex(
+def _GenerateVideosOperation_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, ['operation_name']) is not None:
+  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', 'generateVideoResponse']) is not None:
     setv(
         to_object,
-        ['_url', 'operationName'],
-        getv(from_object, ['operation_name']),
+        ['response'],
+        _GenerateVideosResponse_from_mldev(
+            getv(from_object, ['response', 'generateVideoResponse']), to_object
+        ),
     )
 
-  if getv(from_object, ['config']) is not None:
-    setv(to_object, ['config'], getv(from_object, ['config']))
+  if getv(from_object, ['response', 'generateVideoResponse']) is not None:
+    setv(
+        to_object,
+        ['result'],
+        _GenerateVideosResponse_from_mldev(
+            getv(from_object, ['response', 'generateVideoResponse']), to_object
+        ),
+    )
 
   return to_object
 
 
-def _Video_from_mldev(
+def _GenerateVideosOperation_from_vertex(
     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, ['video', 'uri']) is not None:
-    setv(to_object, ['uri'], getv(from_object, ['video', 'uri']))
+  if getv(from_object, ['name']) is not None:
+    setv(to_object, ['name'], getv(from_object, ['name']))
 
-  if getv(from_object, ['video', 'encodedVideo']) is not None:
-    setv(
-        to_object,
-        ['video_bytes'],
-        base_t.t_bytes(getv(from_object, ['video', 'encodedVideo'])),
-    )
+  if getv(from_object, ['metadata']) is not None:
+    setv(to_object, ['metadata'], getv(from_object, ['metadata']))
 
-  if getv(from_object, ['encoding']) is not None:
-    setv(to_object, ['mime_type'], getv(from_object, ['encoding']))
+  if getv(from_object, ['done']) is not None:
+    setv(to_object, ['done'], getv(from_object, ['done']))
 
-  return to_object
+  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'],
+        _GenerateVideosResponse_from_vertex(
+            getv(from_object, ['response']), to_object
+        ),
+    )
 
-def _GeneratedVideo_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, ['_self']) is not None:
+  if getv(from_object, ['response']) is not None:
     setv(
         to_object,
-        ['video'],
-        _Video_from_mldev(getv(from_object, ['_self']), to_object),
+        ['result'],
+        _GenerateVideosResponse_from_vertex(
+            getv(from_object, ['response']), to_object
+        ),
     )
 
   return to_object
@@ -163,62 +164,50 @@ def _GenerateVideosResponse_from_mldev(
   return to_object
 
 
-def _GenerateVideosOperation_from_mldev(
+def _GenerateVideosResponse_from_vertex(
     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, ['videos']) is not None:
+    setv(
+        to_object,
+        ['generated_videos'],
+        [
+            _GeneratedVideo_from_vertex(item, to_object)
+            for item in getv(from_object, ['videos'])
+        ],
+    )
 
-  if getv(from_object, ['response', 'generateVideoResponse']) is not None:
+  if getv(from_object, ['raiMediaFilteredCount']) is not None:
     setv(
         to_object,
-        ['response'],
-        _GenerateVideosResponse_from_mldev(
-            getv(from_object, ['response', 'generateVideoResponse']), to_object
-        ),
+        ['rai_media_filtered_count'],
+        getv(from_object, ['raiMediaFilteredCount']),
     )
 
-  if getv(from_object, ['response', 'generateVideoResponse']) is not None:
+  if getv(from_object, ['raiMediaFilteredReasons']) is not None:
     setv(
         to_object,
-        ['result'],
-        _GenerateVideosResponse_from_mldev(
-            getv(from_object, ['response', 'generateVideoResponse']), to_object
-        ),
+        ['rai_media_filtered_reasons'],
+        getv(from_object, ['raiMediaFilteredReasons']),
     )
 
   return to_object
 
 
-def _Video_from_vertex(
+def _GeneratedVideo_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, ['gcsUri']) is not None:
-    setv(to_object, ['uri'], getv(from_object, ['gcsUri']))
-
-  if getv(from_object, ['bytesBase64Encoded']) is not None:
+  if getv(from_object, ['video']) is not None:
     setv(
         to_object,
-        ['video_bytes'],
-        base_t.t_bytes(getv(from_object, ['bytesBase64Encoded'])),
+        ['video'],
+        _Video_from_mldev(getv(from_object, ['video']), to_object),
     )
 
-  if getv(from_object, ['mimeType']) is not None:
-    setv(to_object, ['mime_type'], getv(from_object, ['mimeType']))
-
   return to_object
 
 
@@ -237,39 +226,37 @@ def _GeneratedVideo_from_vertex(
   return to_object
 
 
-def _GenerateVideosResponse_from_vertex(
+def _GetOperationParameters_to_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, ['videos']) is not None:
+  if getv(from_object, ['operation_name']) is not None:
     setv(
         to_object,
-        ['generated_videos'],
-        [
-            _GeneratedVideo_from_vertex(item, to_object)
-            for item in getv(from_object, ['videos'])
-        ],
+        ['_url', 'operationName'],
+        getv(from_object, ['operation_name']),
     )
 
-  if getv(from_object, ['raiMediaFilteredCount']) is not None:
-    setv(
-        to_object,
-        ['rai_media_filtered_count'],
-        getv(from_object, ['raiMediaFilteredCount']),
-    )
+  return to_object
 
-  if getv(from_object, ['raiMediaFilteredReasons']) is not None:
+
+def _GetOperationParameters_to_vertex(
+    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, ['operation_name']) is not None:
     setv(
         to_object,
-        ['rai_media_filtered_reasons'],
-        getv(from_object, ['raiMediaFilteredReasons']),
+        ['_url', 'operationName'],
+        getv(from_object, ['operation_name']),
     )
 
   return to_object
 
 
-def _GenerateVideosOperation_from_vertex(
+def _ImportFileOperation_from_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -290,18 +277,118 @@ def _GenerateVideosOperation_from_vertex(
     setv(
         to_object,
         ['response'],
-        _GenerateVideosResponse_from_vertex(
+        _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,
-        ['result'],
-        _GenerateVideosResponse_from_vertex(
+        ['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,
+) -> dict[str, Any]:
+  to_object: dict[str, Any] = {}
+  if getv(from_object, ['uri']) is not None:
+    setv(to_object, ['uri'], getv(from_object, ['uri']))
+
+  if getv(from_object, ['encodedVideo']) is not None:
+    setv(
+        to_object,
+        ['video_bytes'],
+        base_t.t_bytes(getv(from_object, ['encodedVideo'])),
+    )
+
+  if getv(from_object, ['encoding']) is not None:
+    setv(to_object, ['mime_type'], getv(from_object, ['encoding']))
+
+  return to_object
+
+
+def _Video_from_vertex(
+    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, ['gcsUri']) is not None:
+    setv(to_object, ['uri'], getv(from_object, ['gcsUri']))
+
+  if getv(from_object, ['bytesBase64Encoded']) is not None:
+    setv(
+        to_object,
+        ['video_bytes'],
+        base_t.t_bytes(getv(from_object, ['bytesBase64Encoded'])),
+    )
+
+  if getv(from_object, ['mimeType']) is not None:
+    setv(to_object, ['mime_type'], getv(from_object, ['mimeType']))
+
+  return to_object

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
@@ -35,7 +34,6 @@ from ._api_client import HttpRequest
 from ._api_client import HttpResponse
 from ._common import BaseModel
 from .types import HttpOptions, HttpOptionsOrDict
-from .types import GenerateVideosOperation
 
 
 def to_snake_case(name: str) -> str:
@@ -57,8 +55,13 @@ def _normalize_json_case(obj: Any) -> Any:
     return [_normalize_json_case(item) for item in obj]
   elif isinstance(obj, enum.Enum):
     return obj.value
-  else:
-    return obj
+  elif isinstance(obj, str):
+    # Python >= 3.14 has a new division by zero error message.
+    if 'division by zero' in obj:
+      return obj.replace(
+          'division by zero', 'integer division or modulo by zero'
+      )
+  return obj
 
 
 def _equals_ignore_key_case(obj1: Any, obj2: Any) -> bool:
@@ -89,7 +92,7 @@ def _equals_ignore_key_case(obj1: Any, obj2: Any) -> bool:
 
 def _redact_version_numbers(version_string: str) -> str:
   """Redacts version numbers in the form x.y.z from a string."""
-  return re.sub(r'\d+\.\d+\.\d+', '{VERSION_NUMBER}', version_string)
+  return re.sub(r'\d+\.\d+\.\d+[a-zA-Z0-9]*', '{VERSION_NUMBER}', version_string)
 
 
 def _redact_language_label(language_label: str) -> str:
@@ -139,7 +142,7 @@ def _redact_request_url(url: str) -> str:
       result,
   )
   result = re.sub(
-      r'https://generativelanguage.googleapis.com/[^/]+',
+      r'.*generativelanguage.*.googleapis.com/[^/]+',
       '{MLDEV_URL_PREFIX}',
       result,
   )
@@ -206,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."""
 
@@ -256,6 +275,7 @@ class ReplayApiClient(BaseApiClient):
       project: Optional[str] = None,
       location: Optional[str] = None,
       http_options: Optional[HttpOptions] = None,
+      private: bool = False,
   ):
     super().__init__(
         vertexai=vertexai,
@@ -274,6 +294,7 @@ class ReplayApiClient(BaseApiClient):
     self.replay_session: Union[ReplayFile, None] = None
     self._mode = mode
     self._replay_id = replay_id
+    self._private = private
 
   def initialize_replay_session(self, replay_id: str) -> None:
     self._replay_id = replay_id
@@ -394,6 +415,8 @@ class ReplayApiClient(BaseApiClient):
       http_request: HttpRequest,
       interaction: ReplayInteraction,
   ) -> None:
+    _debug_print(f'http_request.url: {http_request.url}')
+    _debug_print(f'interaction.request.url: {interaction.request.url}')
     assert http_request.url == interaction.request.url
     assert http_request.headers == interaction.request.headers, (
         'Request headers mismatch:\n'
@@ -466,7 +489,9 @@ class ReplayApiClient(BaseApiClient):
 
     if isinstance(response_model, list):
       response_model = response_model[0]
-    print('response_model: ', response_model.model_dump(exclude_none=True))
+    _debug_print(
+        f'response_model: {response_model.model_dump(exclude_none=True)}'
+    )
     actual = response_model.model_dump(exclude_none=True, mode='json')
     expected = interaction.response.sdk_response_segments[
         self._sdk_response_index
@@ -479,16 +504,18 @@ class ReplayApiClient(BaseApiClient):
       ):
         if 'body' in expected['sdk_http_response']:
           raw_body = expected['sdk_http_response']['body']
-          print('raw_body length: ', len(raw_body))
-          print('raw_body: ', raw_body)
+          _debug_print(f'raw_body length: {len(raw_body)}')
+          _debug_print(f'raw_body: {raw_body}')
           if isinstance(raw_body, str) and raw_body != '':
             raw_body = json.loads(raw_body)
             raw_body = json.dumps(raw_body)
             expected['sdk_http_response']['body'] = raw_body
-
-    assert (
-        actual == expected
-    ), f'SDK response mismatch:\nActual: {actual}\nExpected: {expected}'
+    if not self._private:
+      assert (
+          actual == expected
+      ), f'SDK response mismatch:\nActual: {actual}\nExpected: {expected}'
+    else:
+      _debug_print(f'Expected SDK response mismatch:\nActual: {actual}\nExpected: {expected}')
     self._sdk_response_index += 1
 
   def _request(
@@ -500,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():
@@ -529,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():
@@ -575,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:
@@ -614,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:
@@ -637,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:
@@ -658,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: