google-genai 1.3.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

google/genai/operations.py

@@ -16,13 +16,13 @@
 # Code generated by the Google Gen AI SDK generator DO NOT EDIT.
 
 import logging
-from typing import Optional, Union
+from typing import Any, Optional, Union
 from urllib.parse import urlencode
 from . import _api_module
 from . import _common
 from . import _transformers as t
 from . import types
-from ._api_client import ApiClient
+from ._api_client import BaseApiClient
 from ._common import get_value_by_path as getv
 from ._common import set_value_by_path as setv
 
@@ -30,11 +30,11 @@ logger = logging.getLogger('google_genai.operations')
 
 
 def _GetOperationParameters_to_mldev(
-    api_client: ApiClient,
+    api_client: BaseApiClient,
     from_object: Union[dict, object],
-    parent_object: dict = None,
+    parent_object: Optional[dict] = None,
 ) -> dict:
-  to_object = {}
+  to_object: dict[str, Any] = {}
   if getv(from_object, ['operation_name']) is not None:
     setv(
         to_object,
@@ -49,11 +49,11 @@ def _GetOperationParameters_to_mldev(
 
 
 def _GetOperationParameters_to_vertex(
-    api_client: ApiClient,
+    api_client: BaseApiClient,
     from_object: Union[dict, object],
-    parent_object: dict = None,
+    parent_object: Optional[dict] = None,
 ) -> dict:
-  to_object = {}
+  to_object: dict[str, Any] = {}
   if getv(from_object, ['operation_name']) is not None:
     setv(
         to_object,
@@ -68,11 +68,11 @@ def _GetOperationParameters_to_vertex(
 
 
 def _FetchPredictOperationParameters_to_mldev(
-    api_client: ApiClient,
+    api_client: BaseApiClient,
     from_object: Union[dict, object],
-    parent_object: dict = None,
+    parent_object: Optional[dict] = None,
 ) -> dict:
-  to_object = {}
+  to_object: dict[str, Any] = {}
   if getv(from_object, ['operation_name']) is not None:
     raise ValueError('operation_name parameter is not supported in Gemini API.')
 
@@ -86,11 +86,11 @@ def _FetchPredictOperationParameters_to_mldev(
 
 
 def _FetchPredictOperationParameters_to_vertex(
-    api_client: ApiClient,
+    api_client: BaseApiClient,
     from_object: Union[dict, object],
-    parent_object: dict = None,
+    parent_object: Optional[dict] = None,
 ) -> dict:
-  to_object = {}
+  to_object: dict[str, Any] = {}
   if getv(from_object, ['operation_name']) is not None:
     setv(to_object, ['operationName'], getv(from_object, ['operation_name']))
 
@@ -108,11 +108,11 @@ def _FetchPredictOperationParameters_to_vertex(
 
 
 def _Video_from_mldev(
-    api_client: ApiClient,
+    api_client: BaseApiClient,
     from_object: Union[dict, object],
-    parent_object: dict = None,
+    parent_object: Optional[dict] = None,
 ) -> dict:
-  to_object = {}
+  to_object: dict[str, Any] = {}
   if getv(from_object, ['uri']) is not None:
     setv(to_object, ['uri'], getv(from_object, ['uri']))
 
@@ -130,11 +130,11 @@ def _Video_from_mldev(
 
 
 def _Video_from_vertex(
-    api_client: ApiClient,
+    api_client: BaseApiClient,
     from_object: Union[dict, object],
-    parent_object: dict = None,
+    parent_object: Optional[dict] = None,
 ) -> dict:
-  to_object = {}
+  to_object: dict[str, Any] = {}
   if getv(from_object, ['gcsUri']) is not None:
     setv(to_object, ['uri'], getv(from_object, ['gcsUri']))
 
@@ -152,11 +152,11 @@ def _Video_from_vertex(
 
 
 def _GeneratedVideo_from_mldev(
-    api_client: ApiClient,
+    api_client: BaseApiClient,
     from_object: Union[dict, object],
-    parent_object: dict = None,
+    parent_object: Optional[dict] = None,
 ) -> dict:
-  to_object = {}
+  to_object: dict[str, Any] = {}
   if getv(from_object, ['_self']) is not None:
     setv(
         to_object,
@@ -168,11 +168,11 @@ def _GeneratedVideo_from_mldev(
 
 
 def _GeneratedVideo_from_vertex(
-    api_client: ApiClient,
+    api_client: BaseApiClient,
     from_object: Union[dict, object],
-    parent_object: dict = None,
+    parent_object: Optional[dict] = None,
 ) -> dict:
-  to_object = {}
+  to_object: dict[str, Any] = {}
   if getv(from_object, ['_self']) is not None:
     setv(
         to_object,
@@ -184,11 +184,11 @@ def _GeneratedVideo_from_vertex(
 
 
 def _GenerateVideosResponse_from_mldev(
-    api_client: ApiClient,
+    api_client: BaseApiClient,
     from_object: Union[dict, object],
-    parent_object: dict = None,
+    parent_object: Optional[dict] = None,
 ) -> dict:
-  to_object = {}
+  to_object: dict[str, Any] = {}
   if getv(from_object, ['videos']) is not None:
     setv(
         to_object,
@@ -217,11 +217,11 @@ def _GenerateVideosResponse_from_mldev(
 
 
 def _GenerateVideosResponse_from_vertex(
-    api_client: ApiClient,
+    api_client: BaseApiClient,
     from_object: Union[dict, object],
-    parent_object: dict = None,
+    parent_object: Optional[dict] = None,
 ) -> dict:
-  to_object = {}
+  to_object: dict[str, Any] = {}
   if getv(from_object, ['videos']) is not None:
     setv(
         to_object,
@@ -250,11 +250,11 @@ def _GenerateVideosResponse_from_vertex(
 
 
 def _GenerateVideosOperation_from_mldev(
-    api_client: ApiClient,
+    api_client: BaseApiClient,
     from_object: Union[dict, object],
-    parent_object: dict = None,
+    parent_object: Optional[dict] = None,
 ) -> dict:
-  to_object = {}
+  to_object: dict[str, Any] = {}
   if getv(from_object, ['name']) is not None:
     setv(to_object, ['name'], getv(from_object, ['name']))
 
@@ -285,11 +285,11 @@ def _GenerateVideosOperation_from_mldev(
 
 
 def _GenerateVideosOperation_from_vertex(
-    api_client: ApiClient,
+    api_client: BaseApiClient,
     from_object: Union[dict, object],
-    parent_object: dict = None,
+    parent_object: Optional[dict] = None,
 ) -> dict:
-  to_object = {}
+  to_object: dict[str, Any] = {}
   if getv(from_object, ['name']) is not None:
     setv(to_object, ['name'], getv(from_object, ['name']))
 
@@ -330,23 +330,33 @@ class Operations(_api_module.BaseModule):
         config=config,
     )
 
+    request_url_dict: Optional[dict[str, str]]
+
     if self._api_client.vertexai:
       request_dict = _GetOperationParameters_to_vertex(
           self._api_client, parameter_model
       )
-      path = '{operationName}'.format_map(request_dict.get('_url'))
+      request_url_dict = request_dict.get('_url')
+      if request_url_dict:
+        path = '{operationName}'.format_map(request_url_dict)
+      else:
+        path = '{operationName}'
     else:
       request_dict = _GetOperationParameters_to_mldev(
           self._api_client, parameter_model
       )
-      path = '{operationName}'.format_map(request_dict.get('_url'))
+      request_url_dict = request_dict.get('_url')
+      if request_url_dict:
+        path = '{operationName}'.format_map(request_url_dict)
+      else:
+        path = '{operationName}'
     query_params = request_dict.get('_query')
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
     request_dict.pop('config', None)
 
-    http_options = None
+    http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
     elif hasattr(config, 'http_options'):
@@ -369,7 +379,7 @@ class Operations(_api_module.BaseModule):
       )
 
     return_value = types.GenerateVideosOperation._from_response(
-        response=response_dict, kwargs=parameter_model
+        response=response_dict, kwargs=parameter_model.model_dump()
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -387,15 +397,20 @@ class Operations(_api_module.BaseModule):
         config=config,
     )
 
+    request_url_dict: Optional[dict[str, str]]
     if not self._api_client.vertexai:
       raise ValueError('This method is only supported in the Vertex AI client.')
     else:
       request_dict = _FetchPredictOperationParameters_to_vertex(
           self._api_client, parameter_model
       )
-      path = '{resourceName}:fetchPredictOperation'.format_map(
-          request_dict.get('_url')
-      )
+      request_url_dict = request_dict.get('_url')
+      if request_url_dict:
+        path = '{resourceName}:fetchPredictOperation'.format_map(
+            request_url_dict
+        )
+      else:
+        path = '{resourceName}:fetchPredictOperation'
 
     query_params = request_dict.get('_query')
     if query_params:
@@ -403,7 +418,7 @@ class Operations(_api_module.BaseModule):
     # TODO: remove the hack that pops config.
     request_dict.pop('config', None)
 
-    http_options = None
+    http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
     elif hasattr(config, 'http_options'):
@@ -426,7 +441,7 @@ class Operations(_api_module.BaseModule):
       )
 
     return_value = types.GenerateVideosOperation._from_response(
-        response=response_dict, kwargs=parameter_model
+        response=response_dict, kwargs=parameter_model.model_dump()
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -475,23 +490,33 @@ class AsyncOperations(_api_module.BaseModule):
         config=config,
     )
 
+    request_url_dict: Optional[dict[str, str]]
+
     if self._api_client.vertexai:
       request_dict = _GetOperationParameters_to_vertex(
           self._api_client, parameter_model
       )
-      path = '{operationName}'.format_map(request_dict.get('_url'))
+      request_url_dict = request_dict.get('_url')
+      if request_url_dict:
+        path = '{operationName}'.format_map(request_url_dict)
+      else:
+        path = '{operationName}'
     else:
       request_dict = _GetOperationParameters_to_mldev(
           self._api_client, parameter_model
       )
-      path = '{operationName}'.format_map(request_dict.get('_url'))
+      request_url_dict = request_dict.get('_url')
+      if request_url_dict:
+        path = '{operationName}'.format_map(request_url_dict)
+      else:
+        path = '{operationName}'
     query_params = request_dict.get('_query')
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
     request_dict.pop('config', None)
 
-    http_options = None
+    http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
     elif hasattr(config, 'http_options'):
@@ -514,7 +539,7 @@ class AsyncOperations(_api_module.BaseModule):
       )
 
     return_value = types.GenerateVideosOperation._from_response(
-        response=response_dict, kwargs=parameter_model
+        response=response_dict, kwargs=parameter_model.model_dump()
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -532,15 +557,20 @@ class AsyncOperations(_api_module.BaseModule):
         config=config,
     )
 
+    request_url_dict: Optional[dict[str, str]]
     if not self._api_client.vertexai:
       raise ValueError('This method is only supported in the Vertex AI client.')
     else:
       request_dict = _FetchPredictOperationParameters_to_vertex(
           self._api_client, parameter_model
       )
-      path = '{resourceName}:fetchPredictOperation'.format_map(
-          request_dict.get('_url')
-      )
+      request_url_dict = request_dict.get('_url')
+      if request_url_dict:
+        path = '{resourceName}:fetchPredictOperation'.format_map(
+            request_url_dict
+        )
+      else:
+        path = '{resourceName}:fetchPredictOperation'
 
     query_params = request_dict.get('_query')
     if query_params:
@@ -548,7 +578,7 @@ class AsyncOperations(_api_module.BaseModule):
     # TODO: remove the hack that pops config.
     request_dict.pop('config', None)
 
-    http_options = None
+    http_options: Optional[types.HttpOptionsOrDict] = None
     if isinstance(config, dict):
       http_options = config.get('http_options', None)
     elif hasattr(config, 'http_options'):
@@ -571,7 +601,7 @@ class AsyncOperations(_api_module.BaseModule):
       )
 
     return_value = types.GenerateVideosOperation._from_response(
-        response=response_dict, kwargs=parameter_model
+        response=response_dict, kwargs=parameter_model.model_dump()
     )
     self._api_client._verify_response(return_value)
     return return_value

google/genai/pagers.py

@@ -18,7 +18,7 @@
 # pylint: disable=protected-access
 
 import copy
-from typing import Any, AsyncIterator, Awaitable, Callable, Generic, Iterator, Literal, TypeVar
+from typing import Any, Awaitable, Callable, Generic, Iterator, Literal, TypeVar
 
 T = TypeVar('T')
 
@@ -33,7 +33,7 @@ class _BasePager(Generic[T]):
   def __init__(
       self,
       name: PagedItem,
-      request: Callable[Any, Any],
+      request: Callable[..., Any],
       response: Any,
       config: Any,
   ):
@@ -191,18 +191,18 @@ class AsyncPager(_BasePager[T]):
   def __init__(
       self,
       name: PagedItem,
-      request: Callable[Any, Awaitable[Any]],
+      request: Callable[..., Awaitable[Any]],
       response: Any,
       config: Any,
   ):
     super().__init__(name, request, response, config)
 
-  def __aiter__(self) -> AsyncIterator[T]:
+  def __aiter__(self) -> T:
     """Returns an async iterator over the items."""
     self._idx = 0
     return self
 
-  async def __anext__(self) -> Awaitable[T]:
+  async def __anext__(self) -> T:
     """Returns the next item asynchronously."""
     if self._idx >= len(self):
       try: