google-genai 1.20.0__py3-none-any.whl → 1.21.1__py3-none-any.whl

google/genai/operations.py

@@ -15,6 +15,7 @@
 
 # Code generated by the Google Gen AI SDK generator DO NOT EDIT.
 
+import json
 import logging
 from typing import Any, Optional, Union
 from urllib.parse import urlencode
@@ -23,7 +24,6 @@ from . import _api_module
 from . import _common
 from . import _transformers as t
 from . import types
-from ._api_client import BaseApiClient
 from ._common import get_value_by_path as getv
 from ._common import set_value_by_path as setv
 
@@ -31,7 +31,6 @@ logger = logging.getLogger('google_genai.operations')
 
 
 def _GetOperationParameters_to_mldev(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -50,7 +49,6 @@ def _GetOperationParameters_to_mldev(
 
 
 def _GetOperationParameters_to_vertex(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -69,7 +67,6 @@ def _GetOperationParameters_to_vertex(
 
 
 def _FetchPredictOperationParameters_to_vertex(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -91,7 +88,6 @@ def _FetchPredictOperationParameters_to_vertex(
 
 
 def _Video_from_mldev(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -103,7 +99,7 @@ def _Video_from_mldev(
     setv(
         to_object,
         ['video_bytes'],
-        t.t_bytes(api_client, getv(from_object, ['video', 'encodedVideo'])),
+        t.t_bytes(getv(from_object, ['video', 'encodedVideo'])),
     )
 
   if getv(from_object, ['encoding']) is not None:
@@ -113,7 +109,6 @@ def _Video_from_mldev(
 
 
 def _GeneratedVideo_from_mldev(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -122,14 +117,13 @@ def _GeneratedVideo_from_mldev(
     setv(
         to_object,
         ['video'],
-        _Video_from_mldev(api_client, getv(from_object, ['_self']), to_object),
+        _Video_from_mldev(getv(from_object, ['_self']), to_object),
     )
 
   return to_object
 
 
 def _GenerateVideosResponse_from_mldev(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -139,7 +133,7 @@ def _GenerateVideosResponse_from_mldev(
         to_object,
         ['generated_videos'],
         [
-            _GeneratedVideo_from_mldev(api_client, item, to_object)
+            _GeneratedVideo_from_mldev(item, to_object)
             for item in getv(from_object, ['generatedSamples'])
         ],
     )
@@ -162,7 +156,6 @@ def _GenerateVideosResponse_from_mldev(
 
 
 def _GenerateVideosOperation_from_mldev(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -184,9 +177,7 @@ def _GenerateVideosOperation_from_mldev(
         to_object,
         ['response'],
         _GenerateVideosResponse_from_mldev(
-            api_client,
-            getv(from_object, ['response', 'generateVideoResponse']),
-            to_object,
+            getv(from_object, ['response', 'generateVideoResponse']), to_object
         ),
     )
 
@@ -195,9 +186,7 @@ def _GenerateVideosOperation_from_mldev(
         to_object,
         ['result'],
         _GenerateVideosResponse_from_mldev(
-            api_client,
-            getv(from_object, ['response', 'generateVideoResponse']),
-            to_object,
+            getv(from_object, ['response', 'generateVideoResponse']), to_object
         ),
     )
 
@@ -205,7 +194,6 @@ def _GenerateVideosOperation_from_mldev(
 
 
 def _Video_from_vertex(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -217,7 +205,7 @@ def _Video_from_vertex(
     setv(
         to_object,
         ['video_bytes'],
-        t.t_bytes(api_client, getv(from_object, ['bytesBase64Encoded'])),
+        t.t_bytes(getv(from_object, ['bytesBase64Encoded'])),
     )
 
   if getv(from_object, ['mimeType']) is not None:
@@ -227,7 +215,6 @@ def _Video_from_vertex(
 
 
 def _GeneratedVideo_from_vertex(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -236,14 +223,13 @@ def _GeneratedVideo_from_vertex(
     setv(
         to_object,
         ['video'],
-        _Video_from_vertex(api_client, getv(from_object, ['_self']), to_object),
+        _Video_from_vertex(getv(from_object, ['_self']), to_object),
     )
 
   return to_object
 
 
 def _GenerateVideosResponse_from_vertex(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -253,7 +239,7 @@ def _GenerateVideosResponse_from_vertex(
         to_object,
         ['generated_videos'],
         [
-            _GeneratedVideo_from_vertex(api_client, item, to_object)
+            _GeneratedVideo_from_vertex(item, to_object)
             for item in getv(from_object, ['videos'])
         ],
     )
@@ -276,7 +262,6 @@ def _GenerateVideosResponse_from_vertex(
 
 
 def _GenerateVideosOperation_from_vertex(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -298,7 +283,7 @@ def _GenerateVideosOperation_from_vertex(
         to_object,
         ['response'],
         _GenerateVideosResponse_from_vertex(
-            api_client, getv(from_object, ['response']), to_object
+            getv(from_object, ['response']), to_object
         ),
     )
 
@@ -307,7 +292,7 @@ def _GenerateVideosOperation_from_vertex(
         to_object,
         ['result'],
         _GenerateVideosResponse_from_vertex(
-            api_client, getv(from_object, ['response']), to_object
+            getv(from_object, ['response']), to_object
         ),
     )
 
@@ -330,18 +315,14 @@ class Operations(_api_module.BaseModule):
     request_url_dict: Optional[dict[str, str]]
 
     if self._api_client.vertexai:
-      request_dict = _GetOperationParameters_to_vertex(
-          self._api_client, parameter_model
-      )
+      request_dict = _GetOperationParameters_to_vertex(parameter_model)
       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
-      )
+      request_dict = _GetOperationParameters_to_mldev(parameter_model)
       request_url_dict = request_dict.get('_url')
       if request_url_dict:
         path = '{operationName}'.format_map(request_url_dict)
@@ -363,19 +344,15 @@ class Operations(_api_module.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
-    response_dict = self._api_client.request(
-        'get', path, request_dict, http_options
-    )
+    response = self._api_client.request('get', path, request_dict, http_options)
+
+    response_dict = '' if not response.body else json.loads(response.body)
 
     if self._api_client.vertexai:
-      response_dict = _GenerateVideosOperation_from_vertex(
-          self._api_client, response_dict
-      )
+      response_dict = _GenerateVideosOperation_from_vertex(response_dict)
 
     else:
-      response_dict = _GenerateVideosOperation_from_mldev(
-          self._api_client, response_dict
-      )
+      response_dict = _GenerateVideosOperation_from_mldev(response_dict)
 
     return_value = types.GenerateVideosOperation._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -400,9 +377,7 @@ class Operations(_api_module.BaseModule):
     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
-      )
+      request_dict = _FetchPredictOperationParameters_to_vertex(parameter_model)
       request_url_dict = request_dict.get('_url')
       if request_url_dict:
         path = '{resourceName}:fetchPredictOperation'.format_map(
@@ -427,14 +402,14 @@ class Operations(_api_module.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
-    response_dict = self._api_client.request(
+    response = self._api_client.request(
         'post', path, request_dict, http_options
     )
 
+    response_dict = '' if not response.body else json.loads(response.body)
+
     if self._api_client.vertexai:
-      response_dict = _GenerateVideosOperation_from_vertex(
-          self._api_client, response_dict
-      )
+      response_dict = _GenerateVideosOperation_from_vertex(response_dict)
 
     return_value = types.GenerateVideosOperation._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -500,18 +475,14 @@ class AsyncOperations(_api_module.BaseModule):
     request_url_dict: Optional[dict[str, str]]
 
     if self._api_client.vertexai:
-      request_dict = _GetOperationParameters_to_vertex(
-          self._api_client, parameter_model
-      )
+      request_dict = _GetOperationParameters_to_vertex(parameter_model)
       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
-      )
+      request_dict = _GetOperationParameters_to_mldev(parameter_model)
       request_url_dict = request_dict.get('_url')
       if request_url_dict:
         path = '{operationName}'.format_map(request_url_dict)
@@ -533,19 +504,17 @@ class AsyncOperations(_api_module.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
-    response_dict = await self._api_client.async_request(
+    response = await self._api_client.async_request(
         'get', path, request_dict, http_options
     )
 
+    response_dict = '' if not response.body else json.loads(response.body)
+
     if self._api_client.vertexai:
-      response_dict = _GenerateVideosOperation_from_vertex(
-          self._api_client, response_dict
-      )
+      response_dict = _GenerateVideosOperation_from_vertex(response_dict)
 
     else:
-      response_dict = _GenerateVideosOperation_from_mldev(
-          self._api_client, response_dict
-      )
+      response_dict = _GenerateVideosOperation_from_mldev(response_dict)
 
     return_value = types.GenerateVideosOperation._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -570,9 +539,7 @@ class AsyncOperations(_api_module.BaseModule):
     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
-      )
+      request_dict = _FetchPredictOperationParameters_to_vertex(parameter_model)
       request_url_dict = request_dict.get('_url')
       if request_url_dict:
         path = '{resourceName}:fetchPredictOperation'.format_map(
@@ -597,14 +564,14 @@ class AsyncOperations(_api_module.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
-    response_dict = await self._api_client.async_request(
+    response = await self._api_client.async_request(
         'post', path, request_dict, http_options
     )
 
+    response_dict = '' if not response.body else json.loads(response.body)
+
     if self._api_client.vertexai:
-      response_dict = _GenerateVideosOperation_from_vertex(
-          self._api_client, response_dict
-      )
+      response_dict = _GenerateVideosOperation_from_vertex(response_dict)
 
     return_value = types.GenerateVideosOperation._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()

google/genai/tokens.py

@@ -15,6 +15,7 @@
 
 """[Experimental] Auth Tokens API client."""
 
+import json
 import logging
 from typing import Any, Dict, List, Optional
 from urllib.parse import urlencode
@@ -221,7 +222,8 @@ class Tokens(_api_module.BaseModule):
       )
     else:
       request_dict = tokens_converters._CreateAuthTokenParameters_to_mldev(
-          self._api_client, parameter_model
+          self._api_client,
+          parameter_model
       )
       request_url_dict = request_dict.get('_url')
       if request_url_dict:
@@ -252,13 +254,14 @@ class Tokens(_api_module.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
-    response_dict = self._api_client.request(
+    response = self._api_client.request(
         'post', path, request_dict, http_options
     )
+    response_dict = '' if not response.body else json.loads(response.body)
 
     if not self._api_client.vertexai:
       response_dict = tokens_converters._AuthToken_from_mldev(
-          self._api_client, response_dict
+          response_dict
       )
 
     return_value = types.AuthToken._from_response(
@@ -314,7 +317,8 @@ class AsyncTokens(_api_module.BaseModule):
       )
     else:
       request_dict = tokens_converters._CreateAuthTokenParameters_to_mldev(
-          self._api_client, parameter_model
+          self._api_client,
+          parameter_model
       )
       request_url_dict = request_dict.get('_url')
       if request_url_dict:
@@ -343,16 +347,17 @@ class AsyncTokens(_api_module.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
-    response_dict = await self._api_client.async_request(
+    response = await self._api_client.async_request(
         'post',
         path,
         request_dict,
         http_options=http_options,
     )
+    response_dict = '' if not response.body else json.loads(response.body)
 
     if not self._api_client.vertexai:
       response_dict = tokens_converters._AuthToken_from_mldev(
-          self._api_client, response_dict
+          response_dict
       )
 
     return_value = types.AuthToken._from_response(