google-genai 1.49.0__tar.gz → 1.50.1__tar.gz

{google_genai-1.49.0/google_genai.egg-info → google_genai-1.50.1}/PKG-INFO

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

{google_genai-1.49.0 → google_genai-1.50.1}/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
 
@@ -629,15 +628,15 @@ class BaseApiClient:
         )
         self.api_key = None
 
-      if not self.location and not self.api_key:
-          self.location = 'global'
-
       self.custom_base_url = (
           validated_http_options.base_url
           if validated_http_options.base_url
           else None
       )
 
+      if not self.location and not self.api_key and not self.custom_base_url:
+          self.location = 'global'
+
       # Skip fetching project from ADC if base url is provided in http options.
       if (
           not self.project
@@ -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]
 
@@ -1811,12 +1836,17 @@ class BaseApiClient:
 
   def close(self) -> None:
     """Closes the API client."""
-    self._httpx_client.close()
+    # Let users close the custom client explicitly by themselves. Otherwise,
+    # close the client when the object is garbage collected.
+    if not self._http_options.httpx_client:
+      self._httpx_client.close()
 
   async def aclose(self) -> None:
     """Closes the API async client."""
-
-    await self._async_httpx_client.aclose()
+    # Let users close the custom client explicitly by themselves. Otherwise,
+    # close the client when the object is garbage collected.
+    if not self._http_options.httpx_async_client:
+      await self._async_httpx_client.aclose()
     if self._aiohttp_session:
       await self._aiohttp_session.close()
 
@@ -1828,17 +1858,12 @@ class BaseApiClient:
     """
 
     try:
-      # Let users close the custom client explicitly by themselves. Otherwise,
-      # close the client when the object is garbage collected.
       if not self._http_options.httpx_client:
         self.close()
     except Exception:  # pylint: disable=broad-except
       pass
 
     try:
-      # Let users close the custom client explicitly by themselves. Otherwise,
-      # close the client when the object is garbage collected.
-      if not self._http_options.httpx_async_client:
-        asyncio.get_running_loop().create_task(self.aclose())
+      asyncio.get_running_loop().create_task(self.aclose())
     except Exception:  # pylint: disable=broad-except
       pass

{google_genai-1.49.0 → google_genai-1.50.1}/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.49.0 → google_genai-1.50.1}/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.49.0 → google_genai-1.50.1}/google/genai/documents.py

@@ -15,6 +15,7 @@
 
 # Code generated by the Google Gen AI SDK generator DO NOT EDIT.
 
+from functools import partial
 import json
 import logging
 from typing import Any, Optional, Union
@@ -327,9 +328,10 @@ class Documents(_api_module.BaseModule):
       for document in client.documents.list(parent='rag_store_name'):
         print(f"document: {document.name} - {document.display_name}")
     """
+    list_request = partial(self._list, parent=parent)
     return Pager(
         'documents',
-        self._list,
+        list_request,
         self._list(parent=parent, config=config),
         config,
     )
@@ -541,9 +543,10 @@ class AsyncDocuments(_api_module.BaseModule):
       client.documents.list(parent='rag_store_name'):
         print(f"document: {document.name} - {document.display_name}")
     """
+    list_request = partial(self._list, parent=parent)
     return AsyncPager(
         'documents',
-        self._list,
+        list_request,
         await self._list(parent=parent, config=config),
         config,
     )

{google_genai-1.49.0 → google_genai-1.50.1}/google/genai/errors.py

@@ -103,7 +103,30 @@ class APIError(Exception):
     else:
       response_json = response.body_segments[0].get('error', {})
 
-    status_code = response.status_code
+    cls.raise_error(response.status_code, response_json, response)
+
+  @classmethod
+  def raise_error(
+      cls,
+      status_code: int,
+      response_json: Any,
+      response: Optional[
+          Union['ReplayResponse', httpx.Response, 'aiohttp.ClientResponse']
+      ],
+  ) -> None:
+    """Raises an appropriate APIError subclass based on the status code.
+
+    Args:
+      status_code: The HTTP status code of the response.
+      response_json: The JSON body of the response, or a dict containing error
+        details.
+      response: The original response object.
+
+    Raises:
+      ClientError: If the status code is in the 4xx range.
+      ServerError: If the status code is in the 5xx range.
+      APIError: For other error status codes.
+    """
     if 400 <= status_code < 500:
       raise ClientError(status_code, response_json, response)
     elif 500 <= status_code < 600:
@@ -162,6 +185,27 @@ class APIError(Exception):
       except ImportError:
         raise ValueError(f'Unsupported response type: {type(response)}')
 
+    await cls.raise_error_async(status_code, response_json, response)
+
+  @classmethod
+  async def raise_error_async(
+      cls, status_code: int, response_json: Any, response: Optional[
+          Union['ReplayResponse', httpx.Response, 'aiohttp.ClientResponse']
+      ]
+  ) -> None:
+    """Raises an appropriate APIError subclass based on the status code.
+
+    Args:
+      status_code: The HTTP status code of the response.
+      response_json: The JSON body of the response, or a dict containing error
+        details.
+      response: The original response object.
+
+    Raises:
+      ClientError: If the status code is in the 4xx range.
+      ServerError: If the status code is in the 5xx range.
+      APIError: For other error status codes.
+    """
     if 400 <= status_code < 500:
       raise ClientError(status_code, response_json, response)
     elif 500 <= status_code < 600:

{google_genai-1.49.0 → google_genai-1.50.1}/google/genai/models.py

@@ -2759,6 +2759,21 @@ def _Model_from_mldev(
         getv(from_object, ['supportedGenerationMethods']),
     )
 
+  if getv(from_object, ['temperature']) is not None:
+    setv(to_object, ['temperature'], getv(from_object, ['temperature']))
+
+  if getv(from_object, ['maxTemperature']) is not None:
+    setv(to_object, ['max_temperature'], getv(from_object, ['maxTemperature']))
+
+  if getv(from_object, ['topP']) is not None:
+    setv(to_object, ['top_p'], getv(from_object, ['topP']))
+
+  if getv(from_object, ['topK']) is not None:
+    setv(to_object, ['top_k'], getv(from_object, ['topK']))
+
+  if getv(from_object, ['thinking']) is not None:
+    setv(to_object, ['thinking'], getv(from_object, ['thinking']))
+
   return to_object
 
 
@@ -2905,7 +2920,7 @@ def _RecontextImageConfig_to_vertex(
   if getv(from_object, ['base_steps']) is not None:
     setv(
         parent_object,
-        ['parameters', 'editConfig', 'baseSteps'],
+        ['parameters', 'baseSteps'],
         getv(from_object, ['base_steps']),
     )
 
@@ -4521,7 +4536,12 @@ class Models(_api_module.BaseModule):
       else:
         path = '{models_url}'
     query_params = request_dict.get('_query')
-    if query_params:
+    if query_params and query_params.get('filter'):
+      query_param_filter = query_params.pop('filter')
+      path = f'{path}?filter={query_param_filter}'
+      if query_params:
+        path += f'&{urlencode(query_params)}'
+    elif query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
     request_dict.pop('config', None)
@@ -6361,7 +6381,12 @@ class AsyncModels(_api_module.BaseModule):
       else:
         path = '{models_url}'
     query_params = request_dict.get('_query')
-    if query_params:
+    if query_params and query_params.get('filter'):
+      query_param_filter = query_params.pop('filter')
+      path = f'{path}?filter={query_param_filter}'
+      if query_params:
+        path += f'&{urlencode(query_params)}'
+    elif query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
     request_dict.pop('config', None)

{google_genai-1.49.0 → google_genai-1.50.1}/google/genai/operations.py

@@ -282,6 +282,8 @@ class Operations(_api_module.BaseModule):
       response_operation = operation.from_api_response(
           response_dict, is_vertex_ai=True
       )
+
+      self._api_client._verify_response(response_operation)  # type: ignore [arg-type]
       return response_operation  # type: ignore[no-any-return]
     else:
       response_dict = self._get_videos_operation(
@@ -291,6 +293,8 @@ class Operations(_api_module.BaseModule):
       response_operation = operation.from_api_response(
           response_dict, is_vertex_ai=False
       )
+
+      self._api_client._verify_response(response_operation)  # type: ignore [arg-type]
       return response_operation  # type: ignore[no-any-return]
 
 

{google_genai-1.49.0 → google_genai-1.50.1}/google/genai/types.py

@@ -114,6 +114,8 @@ else:
     HttpxAsyncClient = None
 
 logger = logging.getLogger('google_genai.types')
+_from_json_schema_warning_logged = False
+_json_schema_warning_logged = False
 
 T = typing.TypeVar('T', bound='GenerateContentResponse')
 
@@ -2026,7 +2028,9 @@ class Schema(_common.BaseModel):
     Schema](https://json-schema.org/)
     """
 
-    info_message = """
+    global _json_schema_warning_logged
+    if not _json_schema_warning_logged:
+      info_message = """
 Note: Conversion of fields that are not included in the JSONSchema class are
 ignored.
 Json Schema is now supported natively by both Vertex AI and Gemini API. Users
@@ -2041,7 +2045,9 @@ are recommended to pass/receive Json Schema directly to/from the API. For exampl
    FunctionDeclaration.response_json_schema, which accepts [JSON
    Schema](https://json-schema.org/)
 """
-    logger.info(info_message)
+      logger.info(info_message)
+      _json_schema_warning_logged = True
+
     json_schema_field_names: set[str] = set(JSONSchema.model_fields.keys())
     schema_field_names: tuple[str] = (
         'items',
@@ -2148,7 +2154,9 @@ are recommended to pass/receive Json Schema directly to/from the API. For exampl
            raise_error_on_unsupported_field is set to True. Or if the JSONSchema
            is not compatible with the specified API option.
     """
-    info_message = """
+    global _from_json_schema_warning_logged
+    if not _from_json_schema_warning_logged:
+      info_message = """
 Note: Conversion of fields that are not included in the JSONSchema class are ignored.
 Json Schema is now supported natively by both Vertex AI and Gemini API. Users
 are recommended to pass/receive Json Schema directly to/from the API. For example:
@@ -2162,7 +2170,9 @@ are recommended to pass/receive Json Schema directly to/from the API. For exampl
    FunctionDeclaration.response_json_schema, which accepts [JSON
    Schema](https://json-schema.org/)
 """
-    logger.info(info_message)
+      logger.info(info_message)
+      _from_json_schema_warning_logged = True
+
     google_schema_field_names: set[str] = set(cls.model_fields.keys())
     schema_field_names: tuple[str, ...] = (
         'items',
@@ -6311,7 +6321,7 @@ class GenerateContentResponse(_common.BaseModel):
     non_text_parts = []
     for part in self.candidates[0].content.parts:
       for field_name, field_value in part.model_dump(
-          exclude={'text', 'thought'}
+          exclude={'text', 'thought', 'thought_signature'}
       ).items():
         if field_value is not None:
           non_text_parts.append(field_name)
@@ -8479,6 +8489,38 @@ class Model(_common.BaseModel):
   checkpoints: Optional[list[Checkpoint]] = Field(
       default=None, description="""The checkpoints of the model."""
   )
+  temperature: Optional[float] = Field(
+      default=None,
+      description="""Temperature value used for sampling set when the dataset was saved.
+      This value is used to tune the degree of randomness.""",
+  )
+  max_temperature: Optional[float] = Field(
+      default=None,
+      description="""The maximum temperature value used for sampling set when the
+      dataset was saved. This value is used to tune the degree of randomness.""",
+  )
+  top_p: Optional[float] = Field(
+      default=None,
+      description="""Optional. Specifies the nucleus sampling threshold. The model
+      considers only the smallest set of tokens whose cumulative probability is
+      at least `top_p`. This helps generate more diverse and less repetitive
+      responses. For example, a `top_p` of 0.9 means the model considers tokens
+      until the cumulative probability of the tokens to select from reaches 0.9.
+      It's recommended to adjust either temperature or `top_p`, but not both.""",
+  )
+  top_k: Optional[int] = Field(
+      default=None,
+      description="""Optional. Specifies the top-k sampling threshold. The model
+      considers only the top k most probable tokens for the next token. This can
+      be useful for generating more coherent and less random text. For example,
+      a `top_k` of 40 means the model will choose the next word from the 40 most
+      likely words.""",
+  )
+  thinking: Optional[bool] = Field(
+      default=None,
+      description="""Whether the model supports thinking features. If true, thoughts are
+      returned only if the model supports thought and thoughts are available.""",
+  )
 
 
 class ModelDict(TypedDict, total=False):
@@ -8525,6 +8567,33 @@ class ModelDict(TypedDict, total=False):
   checkpoints: Optional[list[CheckpointDict]]
   """The checkpoints of the model."""
 
+  temperature: Optional[float]
+  """Temperature value used for sampling set when the dataset was saved.
+      This value is used to tune the degree of randomness."""
+
+  max_temperature: Optional[float]
+  """The maximum temperature value used for sampling set when the
+      dataset was saved. This value is used to tune the degree of randomness."""
+
+  top_p: Optional[float]
+  """Optional. Specifies the nucleus sampling threshold. The model
+      considers only the smallest set of tokens whose cumulative probability is
+      at least `top_p`. This helps generate more diverse and less repetitive
+      responses. For example, a `top_p` of 0.9 means the model considers tokens
+      until the cumulative probability of the tokens to select from reaches 0.9.
+      It's recommended to adjust either temperature or `top_p`, but not both."""
+
+  top_k: Optional[int]
+  """Optional. Specifies the top-k sampling threshold. The model
+      considers only the top k most probable tokens for the next token. This can
+      be useful for generating more coherent and less random text. For example,
+      a `top_k` of 40 means the model will choose the next word from the 40 most
+      likely words."""
+
+  thinking: Optional[bool]
+  """Whether the model supports thinking features. If true, thoughts are
+      returned only if the model supports thought and thoughts are available."""
+
 
 ModelOrDict = Union[Model, ModelDict]
 
@@ -10126,7 +10195,7 @@ class AutoraterConfig(_common.BaseModel):
   endpoint to use.
 
   Publisher model format:
-  `projects/{project}/locations/{location}/publishers/*/models/*`
+  `projects/{project}/locations/{location}/publishers/{publisher}/models/{model}`
 
   Tuned model endpoint format:
   `projects/{project}/locations/{location}/endpoints/{endpoint}`""",
@@ -10158,7 +10227,7 @@ class AutoraterConfigDict(TypedDict, total=False):
   endpoint to use.
 
   Publisher model format:
-  `projects/{project}/locations/{location}/publishers/*/models/*`
+  `projects/{project}/locations/{location}/publishers/{publisher}/models/{model}`
 
   Tuned model endpoint format:
   `projects/{project}/locations/{location}/endpoints/{endpoint}`"""
@@ -11261,7 +11330,7 @@ class TuningJob(_common.BaseModel):
       description="""Tuning Spec for open sourced and third party Partner models.""",
   )
   evaluation_config: Optional[EvaluationConfig] = Field(
-      default=None, description=""""""
+      default=None, description="""Evaluation config for the tuning job."""
   )
   custom_base_model: Optional[str] = Field(
       default=None,
@@ -11361,7 +11430,7 @@ class TuningJobDict(TypedDict, total=False):
   """Tuning Spec for open sourced and third party Partner models."""
 
   evaluation_config: Optional[EvaluationConfigDict]
-  """"""
+  """Evaluation config for the tuning job."""
 
   custom_base_model: Optional[str]
   """Optional. The user-provided path to custom model weights. Set this field to tune a custom model. The path must be a Cloud Storage directory that contains the model weights in .safetensors format along with associated model metadata files. If this field is set, the base_model field must still be set to indicate which base model the custom model is derived from. This feature is only available for open source models."""

{google_genai-1.49.0 → google_genai-1.50.1}/google/genai/version.py

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

{google_genai-1.49.0 → google_genai-1.50.1/google_genai.egg-info}/PKG-INFO

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

{google_genai-1.49.0 → google_genai-1.50.1}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools", "wheel", "twine>=6.1.0", "packaging>=24.2", "pkginfo>=
 
 [project]
 name = "google-genai"
-version = "1.49.0"
+version = "1.50.1"
 description = "GenAI Python SDK"
 readme = "README.md"
 license = "Apache-2.0"
@@ -55,3 +55,7 @@ plugins = ["pydantic.mypy"]
 # 'import-not-found' and 'import-untyped' are environment specific
 disable_error_code = ["import-not-found", "import-untyped", "unused-ignore"]
 strict = true
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"