google-genai 1.38.0__tar.gz → 1.39.1__tar.gz

{google_genai-1.38.0/google_genai.egg-info → google_genai-1.39.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-genai
-Version: 1.38.0
+Version: 1.39.1
 Summary: GenAI Python SDK
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache-2.0
@@ -122,6 +122,87 @@ from google import genai
 client = genai.Client()
 ```
 
+## Close a client
+
+Explicitly close the sync client to ensure that resources, such as the
+ underlying HTTP connections, are properly cleaned up and closed.
+
+```python
+
+from google.genai import Client
+
+client = Client()
+response_1 = client.models.generate_content(
+    model=MODEL_ID,
+    contents='Hello',
+)
+response_2 = client.models.generate_content(
+    model=MODEL_ID,
+    contents='Ask a question',
+)
+# Close the sync client to release resources.
+client.close()
+```
+
+To explicitly close the async client:
+
+```python
+
+from google.genai import Client
+
+aclient = Client(
+    vertexai=True, project='my-project-id', location='us-central1'
+).aio
+response_1 = await aclient.models.generate_content(
+    model=MODEL_ID,
+    contents='Hello',
+)
+response_2 = await aclient.models.generate_content(
+    model=MODEL_ID,
+    contents='Ask a question',
+)
+# Close the async client to release resources.
+await aclient.aclose()
+```
+
+## Client context managers
+
+By using the sync client context manager, it will close the underlying
+ sync client when exiting the with block.
+
+```python
+from google.genai import Client
+
+with Client() as client:
+  response_1 = client.models.generate_content(
+      model=MODEL_ID,
+      contents='Hello',
+  )
+  response_2 = client.models.generate_content(
+      model=MODEL_ID,
+      contents='Ask a question',
+  )
+
+```
+
+By using the async client context manager, it will close the underlying
+ async client when exiting the with block.
+
+```python
+from google.genai import Client
+
+async with Client().aio as aclient:
+  response_1 = await aclient.models.generate_content(
+      model=MODEL_ID,
+      contents='Hello',
+  )
+  response_2 = await aclient.models.generate_content(
+      model=MODEL_ID,
+      contents='Ask a question',
+  )
+
+```
+
 ### API Selection
 
 By default, the SDK uses the beta API endpoints provided by Google to support

{google_genai-1.38.0 → google_genai-1.39.1}/README.md

@@ -85,6 +85,87 @@ from google import genai
 client = genai.Client()
 ```
 
+## Close a client
+
+Explicitly close the sync client to ensure that resources, such as the
+ underlying HTTP connections, are properly cleaned up and closed.
+
+```python
+
+from google.genai import Client
+
+client = Client()
+response_1 = client.models.generate_content(
+    model=MODEL_ID,
+    contents='Hello',
+)
+response_2 = client.models.generate_content(
+    model=MODEL_ID,
+    contents='Ask a question',
+)
+# Close the sync client to release resources.
+client.close()
+```
+
+To explicitly close the async client:
+
+```python
+
+from google.genai import Client
+
+aclient = Client(
+    vertexai=True, project='my-project-id', location='us-central1'
+).aio
+response_1 = await aclient.models.generate_content(
+    model=MODEL_ID,
+    contents='Hello',
+)
+response_2 = await aclient.models.generate_content(
+    model=MODEL_ID,
+    contents='Ask a question',
+)
+# Close the async client to release resources.
+await aclient.aclose()
+```
+
+## Client context managers
+
+By using the sync client context manager, it will close the underlying
+ sync client when exiting the with block.
+
+```python
+from google.genai import Client
+
+with Client() as client:
+  response_1 = client.models.generate_content(
+      model=MODEL_ID,
+      contents='Hello',
+  )
+  response_2 = client.models.generate_content(
+      model=MODEL_ID,
+      contents='Ask a question',
+  )
+
+```
+
+By using the async client context manager, it will close the underlying
+ async client when exiting the with block.
+
+```python
+from google.genai import Client
+
+async with Client().aio as aclient:
+  response_1 = await aclient.models.generate_content(
+      model=MODEL_ID,
+      contents='Hello',
+  )
+  response_2 = await aclient.models.generate_content(
+      model=MODEL_ID,
+      contents='Ask a question',
+  )
+
+```
+
 ### API Selection
 
 By default, the SDK uses the beta API endpoints provided by Google to support

{google_genai-1.38.0 → google_genai-1.39.1}/google/genai/_api_client.py

@@ -37,6 +37,7 @@ 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
@@ -1763,3 +1764,31 @@ class BaseApiClient:
   # recorded response.
   def _verify_response(self, response_model: _common.BaseModel) -> None:
     pass
+
+  def close(self) -> None:
+    """Closes the API client."""
+    self._httpx_client.close()
+
+  async def aclose(self) -> None:
+    """Closes the API async client."""
+
+    await self._async_httpx_client.aclose()
+    if self._aiohttp_session:
+      await self._aiohttp_session.close()
+
+  def __del__(self) -> None:
+    """Closes the API client when the object is garbage collected.
+
+    ADK uses this client so cannot rely on the genai.[Async]Client.__del__
+    for cleanup.
+    """
+
+    try:
+      self.close()
+    except Exception:  # pylint: disable=broad-except
+      pass
+
+    try:
+      asyncio.get_running_loop().create_task(self.aclose())
+    except Exception:  # pylint: disable=broad-except
+      pass

{google_genai-1.38.0 → google_genai-1.39.1}/google/genai/_common.py

@@ -314,8 +314,15 @@ def _pretty_repr(
   elif isinstance(obj, collections.abc.Mapping):
     if not obj:
       return '{}'
+
+    # Check if the next level of recursion for keys/values will exceed the depth limit.
+    if depth <= 0:
+      item_count_str = f"{len(obj)} item{'s' if len(obj) != 1 else ''}"
+      return f'{{<... {item_count_str} at Max depth ...>}}'
+
     if len(obj) > max_items:
       return f'<dict len={len(obj)}>'
+
     items = []
     try:
       sorted_keys = sorted(obj.keys(), key=str)
@@ -374,10 +381,12 @@ def _format_collection(
     """Formats a collection (list, tuple, set)."""
     if isinstance(obj, list):
         brackets = ('[', ']')
+        internal_obj = obj
     elif isinstance(obj, tuple):
         brackets = ('(', ')')
+        internal_obj = list(obj)
     elif isinstance(obj, set):
-        obj = list(obj)
+        internal_obj = list(obj)
         if obj:
           brackets = ('{', '}')
         else:
@@ -385,19 +394,21 @@ def _format_collection(
     else:
         raise ValueError(f"Unsupported collection type: {type(obj)}")
 
-    if not obj:
+    if not internal_obj:
         return brackets[0] + brackets[1]
 
+    # If the call to _pretty_repr for elements will have depth < 0
+    if depth <= 0:
+        item_count_str = f"{len(internal_obj)} item{'s'*(len(internal_obj)!=1)}"
+        return f'{brackets[0]}<... {item_count_str} at Max depth ...>{brackets[1]}'
+
     indent = ' ' * indent_level
     next_indent_str = ' ' * (indent_level + indent_delta)
     elements = []
-    for i, elem in enumerate(obj):
-        if i >= max_items:
-            elements.append(
-                f'{next_indent_str}<... {len(obj) - max_items} more items ...>'
-            )
-            break
-        # Each element starts on a new line, fully indented
+    num_to_show = min(len(internal_obj), max_items)
+
+    for i in range(num_to_show):
+        elem = internal_obj[i]
         elements.append(
             next_indent_str
             + _pretty_repr(
@@ -411,8 +422,12 @@ def _format_collection(
             )
         )
 
-    return f'{brackets[0]}\n' + ',\n'.join(elements) + "," + f'\n{indent}{brackets[1]}'
+    if len(internal_obj) > max_items:
+        elements.append(
+            f'{next_indent_str}<... {len(internal_obj) - max_items} more items ...>'
+        )
 
+    return f'{brackets[0]}\n' + ',\n'.join(elements) + f',\n{indent}{brackets[1]}'
 
 class BaseModel(pydantic.BaseModel):