google-genai 1.38.0__py3-none-any.whl → 1.39.1__py3-none-any.whl

google/genai/client.py

@@ -13,7 +13,9 @@
 # limitations under the License.
 #
 
+import asyncio
 import os
+from types import TracebackType
 from typing import Optional, Union
 
 import google.auth
@@ -85,6 +87,50 @@ class AsyncClient:
   def operations(self) -> AsyncOperations:
     return self._operations
 
+  async def aclose(self) -> None:
+    """Closes the async client explicitly.
+
+    However, it doesn't close the sync client, which can be closed using the
+    Client.close() method or using the context manager.
+
+    Usage:
+    .. code-block:: python
+
+      from google.genai import Client
+
+      async_client = Client(
+          vertexai=True, project='my-project-id', location='us-central1'
+      ).aio
+      response_1 = await async_client.models.generate_content(
+          model='gemini-2.0-flash',
+          contents='Hello World',
+      )
+      response_2 = await async_client.models.generate_content(
+          model='gemini-2.0-flash',
+          contents='Hello World',
+      )
+      # Close the client to release resources.
+      await async_client.aclose()
+    """
+    await self._api_client.aclose()
+
+  async def __aenter__(self) -> 'AsyncClient':
+    return self
+
+  async def __aexit__(
+      self,
+      exc_type: Optional[Exception],
+      exc_value: Optional[Exception],
+      traceback: Optional[TracebackType],
+  ) -> None:
+    await self.aclose()
+
+  def __del__(self) -> None:
+    try:
+      asyncio.get_running_loop().create_task(self.aclose())
+    except Exception:
+      pass
+
 
 class DebugConfig(pydantic.BaseModel):
   """Configuration options that change client network behavior when testing."""
@@ -311,3 +357,44 @@ class Client:
   def vertexai(self) -> bool:
     """Returns whether the client is using the Vertex AI API."""
     return self._api_client.vertexai or False
+
+  def close(self) -> None:
+    """Closes the synchronous client explicitly.
+
+    However, it doesn't close the async client, which can be closed using the
+    Client.aio.aclose() method or using the async context manager.
+
+    Usage:
+    .. code-block:: python
+
+      from google.genai import Client
+
+      client = Client(
+          vertexai=True, project='my-project-id', location='us-central1'
+      )
+      response_1 = client.models.generate_content(
+          model='gemini-2.0-flash',
+          contents='Hello World',
+      )
+      response_2 = client.models.generate_content(
+          model='gemini-2.0-flash',
+          contents='Hello World',
+      )
+      # Close the client to release resources.
+      client.close()
+    """
+    self._api_client.close()
+
+  def __enter__(self) -> 'Client':
+    return self
+
+  def __exit__(
+      self,
+      exc_type: Optional[Exception],
+      exc_value: Optional[Exception],
+      traceback: Optional[TracebackType],
+  ) -> None:
+    self.close()
+
+  def __del__(self) -> None:
+    self.close()

google/genai/files.py

@@ -35,164 +35,78 @@ from .pagers import AsyncPager, Pager
 logger = logging.getLogger('google_genai.files')
 
 
-def _ListFilesConfig_to_mldev(
+def _CreateFileParameters_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, ['page_size']) is not None:
-    setv(
-        parent_object, ['_query', 'pageSize'], getv(from_object, ['page_size'])
-    )
-
-  if getv(from_object, ['page_token']) is not None:
+  if getv(from_object, ['file']) is not None:
     setv(
-        parent_object,
-        ['_query', 'pageToken'],
-        getv(from_object, ['page_token']),
+        to_object,
+        ['file'],
+        _File_to_mldev(getv(from_object, ['file']), to_object),
     )
 
   return to_object
 
 
-def _ListFilesParameters_to_mldev(
+def _CreateFileResponse_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, ['config']) is not None:
+  if getv(from_object, ['sdkHttpResponse']) is not None:
     setv(
-        to_object,
-        ['config'],
-        _ListFilesConfig_to_mldev(getv(from_object, ['config']), to_object),
+        to_object, ['sdk_http_response'], getv(from_object, ['sdkHttpResponse'])
     )
 
   return to_object
 
 
-def _FileStatus_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, ['details']) is not None:
-    setv(to_object, ['details'], getv(from_object, ['details']))
-
-  if getv(from_object, ['message']) is not None:
-    setv(to_object, ['message'], getv(from_object, ['message']))
-
-  if getv(from_object, ['code']) is not None:
-    setv(to_object, ['code'], getv(from_object, ['code']))
-
-  return to_object
-
-
-def _File_to_mldev(
+def _DeleteFileParameters_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, ['name']) is not None:
-    setv(to_object, ['name'], getv(from_object, ['name']))
-
-  if getv(from_object, ['display_name']) is not None:
-    setv(to_object, ['displayName'], getv(from_object, ['display_name']))
-
-  if getv(from_object, ['mime_type']) is not None:
-    setv(to_object, ['mimeType'], getv(from_object, ['mime_type']))
-
-  if getv(from_object, ['size_bytes']) is not None:
-    setv(to_object, ['sizeBytes'], getv(from_object, ['size_bytes']))
-
-  if getv(from_object, ['create_time']) is not None:
-    setv(to_object, ['createTime'], getv(from_object, ['create_time']))
-
-  if getv(from_object, ['expiration_time']) is not None:
-    setv(to_object, ['expirationTime'], getv(from_object, ['expiration_time']))
-
-  if getv(from_object, ['update_time']) is not None:
-    setv(to_object, ['updateTime'], getv(from_object, ['update_time']))
-
-  if getv(from_object, ['sha256_hash']) is not None:
-    setv(to_object, ['sha256Hash'], getv(from_object, ['sha256_hash']))
-
-  if getv(from_object, ['uri']) is not None:
-    setv(to_object, ['uri'], getv(from_object, ['uri']))
-
-  if getv(from_object, ['download_uri']) is not None:
-    setv(to_object, ['downloadUri'], getv(from_object, ['download_uri']))
-
-  if getv(from_object, ['state']) is not None:
-    setv(to_object, ['state'], getv(from_object, ['state']))
-
-  if getv(from_object, ['source']) is not None:
-    setv(to_object, ['source'], getv(from_object, ['source']))
-
-  if getv(from_object, ['video_metadata']) is not None:
-    setv(to_object, ['videoMetadata'], getv(from_object, ['video_metadata']))
-
-  if getv(from_object, ['error']) is not None:
     setv(
-        to_object,
-        ['error'],
-        _FileStatus_to_mldev(getv(from_object, ['error']), to_object),
+        to_object, ['_url', 'file'], t.t_file_name(getv(from_object, ['name']))
     )
 
   return to_object
 
 
-def _CreateFileParameters_to_mldev(
+def _DeleteFileResponse_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, ['file']) is not None:
+  if getv(from_object, ['sdkHttpResponse']) is not None:
     setv(
-        to_object,
-        ['file'],
-        _File_to_mldev(getv(from_object, ['file']), to_object),
+        to_object, ['sdk_http_response'], getv(from_object, ['sdkHttpResponse'])
     )
 
-  if getv(from_object, ['config']) is not None:
-    setv(to_object, ['config'], getv(from_object, ['config']))
-
   return to_object
 
 
-def _GetFileParameters_to_mldev(
+def _FileStatus_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, ['_url', 'file'], t.t_file_name(getv(from_object, ['name']))
-    )
-
-  if getv(from_object, ['config']) is not None:
-    setv(to_object, ['config'], getv(from_object, ['config']))
-
-  return to_object
-
+  if getv(from_object, ['details']) is not None:
+    setv(to_object, ['details'], getv(from_object, ['details']))
 
-def _DeleteFileParameters_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, ['name']) is not None:
-    setv(
-        to_object, ['_url', 'file'], t.t_file_name(getv(from_object, ['name']))
-    )
+  if getv(from_object, ['message']) is not None:
+    setv(to_object, ['message'], getv(from_object, ['message']))
 
-  if getv(from_object, ['config']) is not None:
-    setv(to_object, ['config'], getv(from_object, ['config']))
+  if getv(from_object, ['code']) is not None:
+    setv(to_object, ['code'], getv(from_object, ['code']))
 
   return to_object
 
 
-def _FileStatus_from_mldev(
+def _FileStatus_to_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -263,46 +177,106 @@ def _File_from_mldev(
   return to_object
 
 
-def _ListFilesResponse_from_mldev(
+def _File_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, ['sdkHttpResponse']) is not None:
+  if getv(from_object, ['name']) is not None:
+    setv(to_object, ['name'], getv(from_object, ['name']))
+
+  if getv(from_object, ['display_name']) is not None:
+    setv(to_object, ['displayName'], getv(from_object, ['display_name']))
+
+  if getv(from_object, ['mime_type']) is not None:
+    setv(to_object, ['mimeType'], getv(from_object, ['mime_type']))
+
+  if getv(from_object, ['size_bytes']) is not None:
+    setv(to_object, ['sizeBytes'], getv(from_object, ['size_bytes']))
+
+  if getv(from_object, ['create_time']) is not None:
+    setv(to_object, ['createTime'], getv(from_object, ['create_time']))
+
+  if getv(from_object, ['expiration_time']) is not None:
+    setv(to_object, ['expirationTime'], getv(from_object, ['expiration_time']))
+
+  if getv(from_object, ['update_time']) is not None:
+    setv(to_object, ['updateTime'], getv(from_object, ['update_time']))
+
+  if getv(from_object, ['sha256_hash']) is not None:
+    setv(to_object, ['sha256Hash'], getv(from_object, ['sha256_hash']))
+
+  if getv(from_object, ['uri']) is not None:
+    setv(to_object, ['uri'], getv(from_object, ['uri']))
+
+  if getv(from_object, ['download_uri']) is not None:
+    setv(to_object, ['downloadUri'], getv(from_object, ['download_uri']))
+
+  if getv(from_object, ['state']) is not None:
+    setv(to_object, ['state'], getv(from_object, ['state']))
+
+  if getv(from_object, ['source']) is not None:
+    setv(to_object, ['source'], getv(from_object, ['source']))
+
+  if getv(from_object, ['video_metadata']) is not None:
+    setv(to_object, ['videoMetadata'], getv(from_object, ['video_metadata']))
+
+  if getv(from_object, ['error']) is not None:
     setv(
-        to_object, ['sdk_http_response'], getv(from_object, ['sdkHttpResponse'])
+        to_object,
+        ['error'],
+        _FileStatus_to_mldev(getv(from_object, ['error']), to_object),
     )
 
-  if getv(from_object, ['nextPageToken']) is not None:
-    setv(to_object, ['next_page_token'], getv(from_object, ['nextPageToken']))
+  return to_object
 
-  if getv(from_object, ['files']) is not None:
+
+def _GetFileParameters_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, ['name']) is not None:
     setv(
-        to_object,
-        ['files'],
-        [
-            _File_from_mldev(item, to_object)
-            for item in getv(from_object, ['files'])
-        ],
+        to_object, ['_url', 'file'], t.t_file_name(getv(from_object, ['name']))
     )
 
   return to_object
 
 
-def _CreateFileResponse_from_mldev(
+def _ListFilesConfig_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, ['sdkHttpResponse']) is not None:
+
+  if getv(from_object, ['page_size']) is not None:
     setv(
-        to_object, ['sdk_http_response'], getv(from_object, ['sdkHttpResponse'])
+        parent_object, ['_query', 'pageSize'], getv(from_object, ['page_size'])
+    )
+
+  if getv(from_object, ['page_token']) is not None:
+    setv(
+        parent_object,
+        ['_query', 'pageToken'],
+        getv(from_object, ['page_token']),
     )
 
   return to_object
 
 
-def _DeleteFileResponse_from_mldev(
+def _ListFilesParameters_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, ['config']) is not None:
+    _ListFilesConfig_to_mldev(getv(from_object, ['config']), to_object)
+
+  return to_object
+
+
+def _ListFilesResponse_from_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -312,6 +286,19 @@ def _DeleteFileResponse_from_mldev(
         to_object, ['sdk_http_response'], getv(from_object, ['sdkHttpResponse'])
     )
 
+  if getv(from_object, ['nextPageToken']) is not None:
+    setv(to_object, ['next_page_token'], getv(from_object, ['nextPageToken']))
+
+  if getv(from_object, ['files']) is not None:
+    setv(
+        to_object,
+        ['files'],
+        [
+            _File_from_mldev(item, to_object)
+            for item in getv(from_object, ['files'])
+        ],
+    )
+
   return to_object
 
 

google/genai/local_tokenizer.py

@@ -25,11 +25,16 @@ from . import _common
 from . import _local_tokenizer_loader as loader
 from . import _transformers as t
 from . import types
-from . import types
-from ._transformers import t_contents
 
 logger = logging.getLogger("google_genai.local_tokenizer")
 
+__all__ = [
+    "_parse_hex_byte",
+    "_token_str_to_bytes",
+    "LocalTokenizer",
+    "_TextsAccumulator",
+]
+
 
 class _TextsAccumulator:
   """Accumulates countable texts from `Content` and `Tool` objects.