google-genai 1.52.0__py3-none-any.whl → 1.54.0__py3-none-any.whl

google/genai/_api_client.py

@@ -1254,7 +1254,7 @@ class BaseApiClient:
               url=http_request.url,
               headers=http_request.headers,
               data=data,
-              timeout=aiohttp.ClientTimeout(connect=http_request.timeout),
+              timeout=aiohttp.ClientTimeout(total=http_request.timeout),
               **self._async_client_session_request_args,
           )
         except (
@@ -1276,7 +1276,7 @@ class BaseApiClient:
               url=http_request.url,
               headers=http_request.headers,
               data=data,
-              timeout=aiohttp.ClientTimeout(connect=http_request.timeout),
+              timeout=aiohttp.ClientTimeout(total=http_request.timeout),
               **self._async_client_session_request_args,
           )
 
@@ -1306,7 +1306,7 @@ class BaseApiClient:
               url=http_request.url,
               headers=http_request.headers,
               data=data,
-              timeout=aiohttp.ClientTimeout(connect=http_request.timeout),
+              timeout=aiohttp.ClientTimeout(total=http_request.timeout),
               **self._async_client_session_request_args,
           )
           await errors.APIError.raise_for_async_response(response)
@@ -1330,7 +1330,7 @@ class BaseApiClient:
               url=http_request.url,
               headers=http_request.headers,
               data=data,
-              timeout=aiohttp.ClientTimeout(connect=http_request.timeout),
+              timeout=aiohttp.ClientTimeout(total=http_request.timeout),
               **self._async_client_session_request_args,
           )
           await errors.APIError.raise_for_async_response(response)
@@ -1718,7 +1718,7 @@ class BaseApiClient:
               url=upload_url,
               data=file_chunk,
               headers=upload_headers,
-              timeout=aiohttp.ClientTimeout(connect=timeout_in_seconds),
+              timeout=aiohttp.ClientTimeout(total=timeout_in_seconds),
           )
 
           if response.headers.get('X-Goog-Upload-Status'):
@@ -1864,7 +1864,7 @@ class BaseApiClient:
           url=http_request.url,
           headers=http_request.headers,
           data=data,
-          timeout=aiohttp.ClientTimeout(connect=http_request.timeout),
+          timeout=aiohttp.ClientTimeout(total=http_request.timeout),
       )
       await errors.APIError.raise_for_async_response(response)
 

google/genai/_live_converters.py

@@ -1265,12 +1265,12 @@ def _SpeechConfig_to_vertex(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['language_code']) is not None:
-    setv(to_object, ['languageCode'], getv(from_object, ['language_code']))
-
   if getv(from_object, ['voice_config']) is not None:
     setv(to_object, ['voiceConfig'], getv(from_object, ['voice_config']))
 
+  if getv(from_object, ['language_code']) is not None:
+    setv(to_object, ['languageCode'], getv(from_object, ['language_code']))
+
   if getv(from_object, ['multi_speaker_voice_config']) is not None:
     raise ValueError(
         'multi_speaker_voice_config parameter is not supported in Vertex AI.'

google/genai/batches.py

@@ -2012,16 +2012,15 @@ class Batches(_api_module.BaseModule):
     Usage:
 
     .. code-block:: python
-
-      batch_jobs = client.batches.list(config={"page_size": 10})
-      for batch_job in batch_jobs:
-        print(f"Batch job: {batch_job.name}, state {batch_job.state}")
+      config = {'page_size': 10}
+      for batch_job in client.batches.list(config):
+        print(batch_job.name)
     """
-    if config is None:
-      config = types.ListBatchJobsConfig()
+
+    list_request = self._list
     return Pager(
         'batch_jobs',
-        self._list,
+        list_request,
         self._list(config=config),
         config,
     )
@@ -2568,17 +2567,14 @@ class AsyncBatches(_api_module.BaseModule):
     Usage:
 
     .. code-block:: python
-
-      batch_jobs = await client.aio.batches.list(config={'page_size': 5})
-      print(f"current page: {batch_jobs.page}")
-      await batch_jobs_pager.next_page()
-      print(f"next page: {batch_jobs_pager.page}")
+      async for batch_job in await client.aio.batches.list():
+        print(batch_job.name)
     """
-    if config is None:
-      config = types.ListBatchJobsConfig()
+
+    list_request = self._list
     return AsyncPager(
         'batch_jobs',
-        self._list,
+        list_request,
         await self._list(config=config),
         config,
     )

google/genai/caches.py

@@ -1129,15 +1129,6 @@ class Caches(_api_module.BaseModule):
   def _list(
       self, *, config: Optional[types.ListCachedContentsConfigOrDict] = None
   ) -> types.ListCachedContentsResponse:
-    """Lists cached content configurations.
-
-    .. code-block:: python
-
-      cached_contents = client.caches.list(config={'page_size': 2})
-      for cached_content in cached_contents:
-        print(cached_content)
-    """
-
     parameter_model = types._ListCachedContentsParameters(
         config=config,
     )
@@ -1196,9 +1187,28 @@ class Caches(_api_module.BaseModule):
   def list(
       self, *, config: Optional[types.ListCachedContentsConfigOrDict] = None
   ) -> Pager[types.CachedContent]:
+    """Lists cached contents.
+
+    Args:
+      config (ListCachedContentsConfig): Optional configuration for the list
+        request.
+
+    Returns:
+      A Pager object that contains one page of cached contents. When iterating
+      over
+      the pager, it automatically fetches the next page if there are more.
+
+    Usage:
+
+    .. code-block:: python
+      for cached_content in client.caches.list():
+        print(cached_content.name)
+    """
+
+    list_request = self._list
     return Pager(
         'cached_contents',
-        self._list,
+        list_request,
         self._list(config=config),
         config,
     )
@@ -1505,15 +1515,6 @@ class AsyncCaches(_api_module.BaseModule):
   async def _list(
       self, *, config: Optional[types.ListCachedContentsConfigOrDict] = None
   ) -> types.ListCachedContentsResponse:
-    """Lists cached content configurations.
-
-    .. code-block:: python
-
-      cached_contents = await client.aio.caches.list(config={'page_size': 2})
-      async for cached_content in cached_contents:
-        print(cached_content)
-    """
-
     parameter_model = types._ListCachedContentsParameters(
         config=config,
     )
@@ -1574,9 +1575,28 @@ class AsyncCaches(_api_module.BaseModule):
   async def list(
       self, *, config: Optional[types.ListCachedContentsConfigOrDict] = None
   ) -> AsyncPager[types.CachedContent]:
+    """Lists cached contents asynchronously.
+
+    Args:
+      config (ListCachedContentsConfig): Optional configuration for the list
+        request.
+
+    Returns:
+      A Pager object that contains one page of cached contents. When iterating
+      over
+      the pager, it automatically fetches the next page if there are more.
+
+    Usage:
+
+    .. code-block:: python
+      async for cached_content in await client.aio.caches.list():
+        print(cached_content.name)
+    """
+
+    list_request = self._list
     return AsyncPager(
         'cached_contents',
-        self._list,
+        list_request,
         await self._list(config=config),
         config,
     )

google/genai/documents.py

@@ -249,17 +249,6 @@ class Documents(_api_module.BaseModule):
       parent: str,
       config: Optional[types.ListDocumentsConfigOrDict] = None,
   ) -> types.ListDocumentsResponse:
-    """Lists all Documents in a FileSearchStore.
-
-    Args:
-      parent (str): The name of the FileSearchStore containing the Documents.
-      config (ListDocumentsConfig | None): Optional parameters for the request,
-        such as page_size.
-
-    Returns:
-      ListDocumentsResponse: A paginated list of Documents.
-    """
-
     parameter_model = types._ListDocumentsParameters(
         parent=parent,
         config=config,
@@ -328,6 +317,7 @@ 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',
@@ -461,17 +451,6 @@ class AsyncDocuments(_api_module.BaseModule):
       parent: str,
       config: Optional[types.ListDocumentsConfigOrDict] = None,
   ) -> types.ListDocumentsResponse:
-    """Lists all Documents in a FileSearchStore.
-
-    Args:
-      parent (str): The name of the FileSearchStore containing the Documents.
-      config (ListDocumentsConfig | None): Optional parameters for the request,
-        such as page_size.
-
-    Returns:
-      ListDocumentsResponse: A paginated list of Documents.
-    """
-
     parameter_model = types._ListDocumentsParameters(
         parent=parent,
         config=config,
@@ -540,9 +519,10 @@ class AsyncDocuments(_api_module.BaseModule):
     Usage:
     .. code-block:: python
       async for document in await
-      client.documents.list(parent='rag_store_name'):
+      client.aio.documents.list(parent='rag_store_name'):
         print(f"document: {document.name} - {document.display_name}")
     """
+
     list_request = partial(self._list, parent=parent)
     return AsyncPager(
         'documents',

google/genai/errors.py

@@ -15,7 +15,7 @@
 
 """Error classes for the GenAI SDK."""
 
-from typing import Any, Optional, TYPE_CHECKING, Union
+from typing import Any, Callable, Optional, TYPE_CHECKING, Union
 import httpx
 import json
 from . import _common
@@ -53,6 +53,21 @@ class APIError(Exception):
 
     super().__init__(f'{self.code} {self.status}. {self.details}')
 
+  def __reduce__(
+      self,
+  ) -> tuple[Callable[..., 'APIError'], tuple[dict[str, Any]]]:
+    """Returns a tuple that can be used to reconstruct the error for pickling."""
+    state = self.__dict__.copy()
+    return (self.__class__._rebuild, (state,))
+
+  @staticmethod
+  def _rebuild(state: dict[str, Any]) -> 'APIError':
+    """Rebuilds the error from the state."""
+    obj = APIError.__new__(APIError)
+    obj.__dict__.update(state)
+    Exception.__init__(obj, f'{obj.code} {obj.status}. {obj.details}')
+    return obj
+
   def _get_status(self, response_json: Any) -> Any:
     return response_json.get(
         'status', response_json.get('error', {}).get('status', None)

google/genai/file_search_stores.py

@@ -499,16 +499,6 @@ class FileSearchStores(_api_module.BaseModule):
   def _list(
       self, *, config: Optional[types.ListFileSearchStoresConfigOrDict] = None
   ) -> types.ListFileSearchStoresResponse:
-    """Lists all FileSearchStore owned by the user.
-
-    Args:
-      config (ListFileSearchStoresConfig | None): Optional parameters for the
-        request, such as page_size.
-
-    Returns:
-      ListFileSearchStoresResponse: A paginated list of FileSearchStore.
-    """
-
     parameter_model = types._ListFileSearchStoresParameters(
         config=config,
     )
@@ -802,9 +792,11 @@ class FileSearchStores(_api_module.BaseModule):
         print(f"file search store: {file_search_store.name} -
         {file_search_store.display_name}")
     """
+
+    list_request = self._list
     return Pager(
         'file_search_stores',
-        self._list,
+        list_request,
         self._list(config=config),
         config,
     )
@@ -999,16 +991,6 @@ class AsyncFileSearchStores(_api_module.BaseModule):
   async def _list(
       self, *, config: Optional[types.ListFileSearchStoresConfigOrDict] = None
   ) -> types.ListFileSearchStoresResponse:
-    """Lists all FileSearchStore owned by the user.
-
-    Args:
-      config (ListFileSearchStoresConfig | None): Optional parameters for the
-        request, such as page_size.
-
-    Returns:
-      ListFileSearchStoresResponse: A paginated list of FileSearchStore.
-    """
-
     parameter_model = types._ListFileSearchStoresParameters(
         config=config,
     )
@@ -1289,8 +1271,8 @@ class AsyncFileSearchStores(_api_module.BaseModule):
     """Lists FileSearchStores asynchronously.
 
     Args:
-      config (ListFileSearchStoresConfig): Optional configuration for the list
-        request.
+      config (ListFileSearchStoresConfig): Optional parameters for the request,
+        such as page_size.
 
     Returns:
       A Pager object that contains one page of FileSearchStores. When iterating
@@ -1300,13 +1282,15 @@ class AsyncFileSearchStores(_api_module.BaseModule):
     Usage:
 
     .. code-block:: python
-      async for file_search_store in await client.file_search_stores.list():
+      async for file_search_store in await client.aio.file_search_stores.list():
         print(f"file search store: {file_search_store.name} -
         {file_search_store.display_name}")
     """
+
+    list_request = self._list
     return AsyncPager(
         'file_search_stores',
-        self._list,
+        list_request,
         await self._list(config=config),
         config,
     )

google/genai/files.py

@@ -154,23 +154,6 @@ class Files(_api_module.BaseModule):
   def _list(
       self, *, config: Optional[types.ListFilesConfigOrDict] = None
   ) -> types.ListFilesResponse:
-    """Lists all files from the service.
-
-    Args:
-      config (ListFilesConfig): Optional, configuration for the list method.
-
-    Returns:
-      ListFilesResponse: The response for the list method.
-
-    Usage:
-
-    .. code-block:: python
-
-      pager = client.files.list(config={'page_size': 10})
-      for file in pager.page:
-        print(file.name)
-    """
-
     parameter_model = types._ListFilesParameters(
         config=config,
     )
@@ -495,16 +478,6 @@ class Files(_api_module.BaseModule):
         kwargs=config_model.model_dump() if config else {},
     )
 
-  def list(
-      self, *, config: Optional[types.ListFilesConfigOrDict] = None
-  ) -> Pager[types.File]:
-    return Pager(
-        'files',
-        self._list,
-        self._list(config=config),
-        config,
-    )
-
   def download(
       self,
       *,
@@ -586,29 +559,40 @@ class Files(_api_module.BaseModule):
 
     return data
 
-
-class AsyncFiles(_api_module.BaseModule):
-
-  async def _list(
+  def list(
       self, *, config: Optional[types.ListFilesConfigOrDict] = None
-  ) -> types.ListFilesResponse:
+  ) -> Pager[types.File]:
     """Lists all files from the service.
 
     Args:
       config (ListFilesConfig): Optional, configuration for the list method.
 
     Returns:
-      ListFilesResponse: The response for the list method.
+      A Pager object that contains one page of files. When iterating over
+      the pager, it automatically fetches the next page if there are more.
 
     Usage:
 
     .. code-block:: python
 
-      pager = await client.aio.files.list(config={'page_size': 10})
-      for file in pager.page:
+      for file in client.files.list(config={'page_size': 10}):
         print(file.name)
     """
 
+    list_request = self._list
+    return Pager(
+        'files',
+        list_request,
+        self._list(config=config),
+        config,
+    )
+
+
+class AsyncFiles(_api_module.BaseModule):
+
+  async def _list(
+      self, *, config: Optional[types.ListFilesConfigOrDict] = None
+  ) -> types.ListFilesResponse:
     parameter_model = types._ListFilesParameters(
         config=config,
     )
@@ -942,16 +926,6 @@ class AsyncFiles(_api_module.BaseModule):
         kwargs=config_model.model_dump() if config else {},
     )
 
-  async def list(
-      self, *, config: Optional[types.ListFilesConfigOrDict] = None
-  ) -> AsyncPager[types.File]:
-    return AsyncPager(
-        'files',
-        self._list,
-        await self._list(config=config),
-        config,
-    )
-
   async def download(
       self,
       *,
@@ -1017,3 +991,31 @@ class AsyncFiles(_api_module.BaseModule):
     )
 
     return data
+
+  async def list(
+      self, *, config: Optional[types.ListFilesConfigOrDict] = None
+  ) -> AsyncPager[types.File]:
+    """Lists all files from the service asynchronously.
+
+    Args:
+      config (ListFilesConfig): Optional, configuration for the list method.
+
+    Returns:
+      A Pager object that contains one page of files. When iterating over
+      the pager, it automatically fetches the next page if there are more.
+
+    Usage:
+
+    .. code-block:: python
+
+      async for file in await client.aio.files.list(config={'page_size': 10}):
+        print(file.name)
+    """
+
+    list_request = self._list
+    return AsyncPager(
+        'files',
+        list_request,
+        await self._list(config=config),
+        config,
+    )

google/genai/live.py

@@ -50,6 +50,11 @@ except ModuleNotFoundError:
   from websockets.client import ClientConnection  # type: ignore
   from websockets.client import connect as ws_connect  # type: ignore
 
+try:
+  from google.auth.transport import requests
+except ImportError:
+  requests = None  # type: ignore[assignment]
+
 if typing.TYPE_CHECKING:
   from mcp import ClientSession as McpClientSession
   from mcp.types import Tool as McpTool
@@ -1027,7 +1032,9 @@ class AsyncLive(_api_module.BaseModule):
         # creds.valid is False, and creds.token is None
         # Need to refresh credentials to populate those
         if not (creds.token and creds.valid):
-          auth_req = google.auth.transport.requests.Request()  # type: ignore
+          if requests is None:
+            raise ValueError('The requests module is required to refresh google-auth credentials. Please install with `pip install google-auth[requests]`')
+          auth_req = requests.Request()  # type: ignore
           creds.refresh(auth_req)
         bearer_token = creds.token
 

google/genai/models.py

@@ -3420,12 +3420,12 @@ def _SpeechConfig_to_vertex(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['language_code']) is not None:
-    setv(to_object, ['languageCode'], getv(from_object, ['language_code']))
-
   if getv(from_object, ['voice_config']) is not None:
     setv(to_object, ['voiceConfig'], getv(from_object, ['voice_config']))
 
+  if getv(from_object, ['language_code']) is not None:
+    setv(to_object, ['languageCode'], getv(from_object, ['language_code']))
+
   if getv(from_object, ['multi_speaker_voice_config']) is not None:
     raise ValueError(
         'multi_speaker_voice_config parameter is not supported in Vertex AI.'