google-genai 1.12.0__tar.gz → 1.13.0__tar.gz

{google_genai-1.12.0/google_genai.egg-info → google_genai-1.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-genai
-Version: 1.12.0
+Version: 1.13.0
 Summary: GenAI Python SDK
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache-2.0
@@ -1081,7 +1081,7 @@ else:
     file_uris = [file1.uri, file2.uri]
 
 cached_content = client.caches.create(
-    model='gemini-1.5-pro-002',
+    model='gemini-2.0-flash-001',
     config=types.CreateCachedContentConfig(
         contents=[
             types.Content(
@@ -1114,7 +1114,7 @@ cached_content = client.caches.get(name=cached_content.name)
 
 ```python
 response = client.models.generate_content(
-    model='gemini-1.5-pro-002',
+    model='gemini-2.0-flash-001',
     contents='Summarize the pdfs',
     config=types.GenerateContentConfig(
         cached_content=cached_content.name,
@@ -1135,12 +1135,12 @@ tuning through `tune`.
 
 ```python
 if client.vertexai:
-    model = 'gemini-1.5-pro-002'
+    model = 'gemini-2.0-flash-001'
     training_dataset = types.TuningDataset(
         gcs_uri='gs://cloud-samples-data/ai-platform/generative_ai/gemini-1_5/text/sft_train_data.jsonl',
     )
 else:
-    model = 'models/gemini-1.0-pro-001'
+    model = 'models/gemini-2.0-flash-001'
     training_dataset = types.TuningDataset(
         examples=[
             types.TuningExample(
@@ -1291,7 +1291,7 @@ Only supported in Vertex AI.
 ```python
 # Specify model and source file only, destination and job display name will be auto-populated
 job = client.batches.create(
-    model='gemini-1.5-flash-002',
+    model='gemini-2.0-flash-001',
     src='bq://my-project.my-dataset.my-table',
 )
 

{google_genai-1.12.0 → google_genai-1.13.0}/README.md

@@ -1050,7 +1050,7 @@ else:
     file_uris = [file1.uri, file2.uri]
 
 cached_content = client.caches.create(
-    model='gemini-1.5-pro-002',
+    model='gemini-2.0-flash-001',
     config=types.CreateCachedContentConfig(
         contents=[
             types.Content(
@@ -1083,7 +1083,7 @@ cached_content = client.caches.get(name=cached_content.name)
 
 ```python
 response = client.models.generate_content(
-    model='gemini-1.5-pro-002',
+    model='gemini-2.0-flash-001',
     contents='Summarize the pdfs',
     config=types.GenerateContentConfig(
         cached_content=cached_content.name,
@@ -1104,12 +1104,12 @@ tuning through `tune`.
 
 ```python
 if client.vertexai:
-    model = 'gemini-1.5-pro-002'
+    model = 'gemini-2.0-flash-001'
     training_dataset = types.TuningDataset(
         gcs_uri='gs://cloud-samples-data/ai-platform/generative_ai/gemini-1_5/text/sft_train_data.jsonl',
     )
 else:
-    model = 'models/gemini-1.0-pro-001'
+    model = 'models/gemini-2.0-flash-001'
     training_dataset = types.TuningDataset(
         examples=[
             types.TuningExample(
@@ -1260,7 +1260,7 @@ Only supported in Vertex AI.
 ```python
 # Specify model and source file only, destination and job display name will be auto-populated
 job = client.batches.create(
-    model='gemini-1.5-flash-002',
+    model='gemini-2.0-flash-001',
     src='bq://my-project.my-dataset.my-table',
 )
 

{google_genai-1.12.0 → google_genai-1.13.0}/google/genai/_api_client.py

@@ -283,15 +283,6 @@ class SyncHttpxClient(httpx.Client):
     kwargs.setdefault('follow_redirects', True)
     super().__init__(**kwargs)
 
-  def __del__(self) -> None:
-    """Closes the httpx client."""
-    if self.is_closed:
-      return
-    try:
-      self.close()
-    except Exception:
-      pass
-
 
 class AsyncHttpxClient(httpx.AsyncClient):
   """Async httpx client."""
@@ -301,14 +292,6 @@ class AsyncHttpxClient(httpx.AsyncClient):
     kwargs.setdefault('follow_redirects', True)
     super().__init__(**kwargs)
 
-  def __del__(self) -> None:
-    if self.is_closed:
-      return
-    try:
-      asyncio.get_running_loop().create_task(self.aclose())
-    except Exception:
-      pass
-
 
 class BaseApiClient:
   """Client for calling HTTP APIs sending and receiving JSON."""

google_genai-1.13.0/google/genai/_base_url.py

@@ -0,0 +1,50 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import os
+from typing import Optional
+
+from .types import HttpOptions
+
+_default_base_gemini_url = None
+_default_base_vertex_url = None
+
+
+def set_default_base_urls(
+    gemini_url: Optional[str], vertex_url: Optional[str]
+) -> None:
+  """Overrides the base URLs for the Gemini API and Vertex AI API."""
+  global _default_base_gemini_url, _default_base_vertex_url
+  _default_base_gemini_url = gemini_url
+  _default_base_vertex_url = vertex_url
+
+
+def get_base_url(
+    vertexai: bool,
+    http_options: Optional[HttpOptions] = None,
+) -> Optional[str]:
+  """Returns the default base URL based on the following priority.
+
+  1. Base URLs set via HttpOptions.
+  2. Base URLs set via the latest call to setDefaultBaseUrls.
+  3. Base URLs set via environment variables.
+  """
+  if http_options and http_options.base_url:
+    return http_options.base_url
+
+  if vertexai:
+    return _default_base_vertex_url or os.getenv('GOOGLE_VERTEX_BASE_URL')
+  else:
+    return _default_base_gemini_url or os.getenv('GOOGLE_GEMINI_BASE_URL')

{google_genai-1.12.0 → google_genai-1.13.0}/google/genai/_live_converters.py

@@ -154,212 +154,6 @@ def _Content_to_vertex(
   return to_object
 
 
-def _Schema_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, ['example']) is not None:
-    raise ValueError('example parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['pattern']) is not None:
-    raise ValueError('pattern parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['default']) is not None:
-    raise ValueError('default parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['max_length']) is not None:
-    raise ValueError('max_length parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['min_length']) is not None:
-    raise ValueError('min_length parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['min_properties']) is not None:
-    raise ValueError('min_properties parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['max_properties']) is not None:
-    raise ValueError('max_properties parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['any_of']) is not None:
-    setv(to_object, ['anyOf'], getv(from_object, ['any_of']))
-
-  if getv(from_object, ['description']) is not None:
-    setv(to_object, ['description'], getv(from_object, ['description']))
-
-  if getv(from_object, ['enum']) is not None:
-    setv(to_object, ['enum'], getv(from_object, ['enum']))
-
-  if getv(from_object, ['format']) is not None:
-    setv(to_object, ['format'], getv(from_object, ['format']))
-
-  if getv(from_object, ['items']) is not None:
-    setv(to_object, ['items'], getv(from_object, ['items']))
-
-  if getv(from_object, ['max_items']) is not None:
-    setv(to_object, ['maxItems'], getv(from_object, ['max_items']))
-
-  if getv(from_object, ['maximum']) is not None:
-    setv(to_object, ['maximum'], getv(from_object, ['maximum']))
-
-  if getv(from_object, ['min_items']) is not None:
-    setv(to_object, ['minItems'], getv(from_object, ['min_items']))
-
-  if getv(from_object, ['minimum']) is not None:
-    setv(to_object, ['minimum'], getv(from_object, ['minimum']))
-
-  if getv(from_object, ['nullable']) is not None:
-    setv(to_object, ['nullable'], getv(from_object, ['nullable']))
-
-  if getv(from_object, ['properties']) is not None:
-    setv(to_object, ['properties'], getv(from_object, ['properties']))
-
-  if getv(from_object, ['property_ordering']) is not None:
-    setv(
-        to_object,
-        ['propertyOrdering'],
-        getv(from_object, ['property_ordering']),
-    )
-
-  if getv(from_object, ['required']) is not None:
-    setv(to_object, ['required'], getv(from_object, ['required']))
-
-  if getv(from_object, ['title']) is not None:
-    setv(to_object, ['title'], getv(from_object, ['title']))
-
-  if getv(from_object, ['type']) is not None:
-    setv(to_object, ['type'], getv(from_object, ['type']))
-
-  return to_object
-
-
-def _Schema_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, ['example']) is not None:
-    setv(to_object, ['example'], getv(from_object, ['example']))
-
-  if getv(from_object, ['pattern']) is not None:
-    setv(to_object, ['pattern'], getv(from_object, ['pattern']))
-
-  if getv(from_object, ['default']) is not None:
-    setv(to_object, ['default'], getv(from_object, ['default']))
-
-  if getv(from_object, ['max_length']) is not None:
-    setv(to_object, ['maxLength'], getv(from_object, ['max_length']))
-
-  if getv(from_object, ['min_length']) is not None:
-    setv(to_object, ['minLength'], getv(from_object, ['min_length']))
-
-  if getv(from_object, ['min_properties']) is not None:
-    setv(to_object, ['minProperties'], getv(from_object, ['min_properties']))
-
-  if getv(from_object, ['max_properties']) is not None:
-    setv(to_object, ['maxProperties'], getv(from_object, ['max_properties']))
-
-  if getv(from_object, ['any_of']) is not None:
-    setv(to_object, ['anyOf'], getv(from_object, ['any_of']))
-
-  if getv(from_object, ['description']) is not None:
-    setv(to_object, ['description'], getv(from_object, ['description']))
-
-  if getv(from_object, ['enum']) is not None:
-    setv(to_object, ['enum'], getv(from_object, ['enum']))
-
-  if getv(from_object, ['format']) is not None:
-    setv(to_object, ['format'], getv(from_object, ['format']))
-
-  if getv(from_object, ['items']) is not None:
-    setv(to_object, ['items'], getv(from_object, ['items']))
-
-  if getv(from_object, ['max_items']) is not None:
-    setv(to_object, ['maxItems'], getv(from_object, ['max_items']))
-
-  if getv(from_object, ['maximum']) is not None:
-    setv(to_object, ['maximum'], getv(from_object, ['maximum']))
-
-  if getv(from_object, ['min_items']) is not None:
-    setv(to_object, ['minItems'], getv(from_object, ['min_items']))
-
-  if getv(from_object, ['minimum']) is not None:
-    setv(to_object, ['minimum'], getv(from_object, ['minimum']))
-
-  if getv(from_object, ['nullable']) is not None:
-    setv(to_object, ['nullable'], getv(from_object, ['nullable']))
-
-  if getv(from_object, ['properties']) is not None:
-    setv(to_object, ['properties'], getv(from_object, ['properties']))
-
-  if getv(from_object, ['property_ordering']) is not None:
-    setv(
-        to_object,
-        ['propertyOrdering'],
-        getv(from_object, ['property_ordering']),
-    )
-
-  if getv(from_object, ['required']) is not None:
-    setv(to_object, ['required'], getv(from_object, ['required']))
-
-  if getv(from_object, ['title']) is not None:
-    setv(to_object, ['title'], getv(from_object, ['title']))
-
-  if getv(from_object, ['type']) is not None:
-    setv(to_object, ['type'], getv(from_object, ['type']))
-
-  return to_object
-
-
-def _FunctionDeclaration_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, ['response']) is not None:
-    raise ValueError('response parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['description']) is not None:
-    setv(to_object, ['description'], getv(from_object, ['description']))
-
-  if getv(from_object, ['name']) is not None:
-    setv(to_object, ['name'], getv(from_object, ['name']))
-
-  if getv(from_object, ['parameters']) is not None:
-    setv(to_object, ['parameters'], getv(from_object, ['parameters']))
-
-  return to_object
-
-
-def _FunctionDeclaration_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, ['response']) is not None:
-    setv(
-        to_object,
-        ['response'],
-        _Schema_to_vertex(
-            api_client, getv(from_object, ['response']), to_object
-        ),
-    )
-
-  if getv(from_object, ['description']) is not None:
-    setv(to_object, ['description'], getv(from_object, ['description']))
-
-  if getv(from_object, ['name']) is not None:
-    setv(to_object, ['name'], getv(from_object, ['name']))
-
-  if getv(from_object, ['parameters']) is not None:
-    setv(to_object, ['parameters'], getv(from_object, ['parameters']))
-
-  return to_object
-
-
 def _GoogleSearch_to_mldev(
     api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
@@ -464,16 +258,6 @@ def _Tool_to_mldev(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['function_declarations']) is not None:
-    setv(
-        to_object,
-        ['functionDeclarations'],
-        [
-            _FunctionDeclaration_to_mldev(api_client, item, to_object)
-            for item in getv(from_object, ['function_declarations'])
-        ],
-    )
-
   if getv(from_object, ['retrieval']) is not None:
     raise ValueError('retrieval parameter is not supported in Gemini API.')
 
@@ -500,6 +284,13 @@ def _Tool_to_mldev(
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
 
+  if getv(from_object, ['function_declarations']) is not None:
+    setv(
+        to_object,
+        ['functionDeclarations'],
+        getv(from_object, ['function_declarations']),
+    )
+
   return to_object
 
 
@@ -509,16 +300,6 @@ def _Tool_to_vertex(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['function_declarations']) is not None:
-    setv(
-        to_object,
-        ['functionDeclarations'],
-        [
-            _FunctionDeclaration_to_vertex(api_client, item, to_object)
-            for item in getv(from_object, ['function_declarations'])
-        ],
-    )
-
   if getv(from_object, ['retrieval']) is not None:
     setv(to_object, ['retrieval'], getv(from_object, ['retrieval']))
 
@@ -545,6 +326,13 @@ def _Tool_to_vertex(
   if getv(from_object, ['code_execution']) is not None:
     setv(to_object, ['codeExecution'], getv(from_object, ['code_execution']))
 
+  if getv(from_object, ['function_declarations']) is not None:
+    setv(
+        to_object,
+        ['functionDeclarations'],
+        getv(from_object, ['function_declarations']),
+    )
+
   return to_object
 
 
@@ -1887,6 +1675,13 @@ def _LiveServerContent_from_mldev(
   if getv(from_object, ['interrupted']) is not None:
     setv(to_object, ['interrupted'], getv(from_object, ['interrupted']))
 
+  if getv(from_object, ['groundingMetadata']) is not None:
+    setv(
+        to_object,
+        ['grounding_metadata'],
+        getv(from_object, ['groundingMetadata']),
+    )
+
   if getv(from_object, ['generationComplete']) is not None:
     setv(
         to_object,
@@ -1936,6 +1731,13 @@ def _LiveServerContent_from_vertex(
   if getv(from_object, ['interrupted']) is not None:
     setv(to_object, ['interrupted'], getv(from_object, ['interrupted']))
 
+  if getv(from_object, ['groundingMetadata']) is not None:
+    setv(
+        to_object,
+        ['grounding_metadata'],
+        getv(from_object, ['groundingMetadata']),
+    )
+
   if getv(from_object, ['generationComplete']) is not None:
     setv(
         to_object,

{google_genai-1.12.0 → google_genai-1.13.0}/google/genai/_transformers.py

@@ -790,7 +790,7 @@ def t_schema(
   if not origin:
     return None
   if isinstance(origin, dict) and _is_type_dict_str_any(origin):
-    process_schema(origin, client, order_properties=False)
+    process_schema(origin, client)
     return types.Schema.model_validate(origin)
   if isinstance(origin, EnumMeta):
     return _process_enum(origin, client)
@@ -799,7 +799,7 @@ def t_schema(
       # response_schema value was coerced to an empty Schema instance because it did not adhere to the Schema field annotation
       raise ValueError(f'Unsupported schema type.')
     schema = origin.model_dump(exclude_unset=True)
-    process_schema(schema, client, order_properties=False)
+    process_schema(schema, client)
     return types.Schema.model_validate(schema)
 
   if (

{google_genai-1.12.0 → google_genai-1.13.0}/google/genai/batches.py

@@ -743,7 +743,7 @@ class Batches(_api_module.BaseModule):
     .. code-block:: python
 
       batch_job = client.batches.create(
-          model="gemini-1.5-flash",
+          model="gemini-2.0-flash-001",
           src="gs://path/to/input/data",
       )
       print(batch_job.state)
@@ -1113,7 +1113,7 @@ class AsyncBatches(_api_module.BaseModule):
     .. code-block:: python
 
       batch_job = await client.aio.batches.create(
-          model="gemini-1.5-flash",
+          model="gemini-2.0-flash-001",
           src="gs://path/to/input/data",
       )
     """