google-genai 1.7.0__py3-none-any.whl → 1.9.0__py3-none-any.whl

google/genai/operations.py

@@ -1,4 +1,4 @@
-# Copyright 2024 Google LLC
+# Copyright 2025 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -67,24 +67,6 @@ def _GetOperationParameters_to_vertex(
   return to_object
 
 
-def _FetchPredictOperationParameters_to_mldev(
-    api_client: BaseApiClient,
-    from_object: Union[dict, object],
-    parent_object: Optional[dict] = None,
-) -> dict:
-  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.')
-
-  if getv(from_object, ['resource_name']) is not None:
-    raise ValueError('resource_name parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['config']) is not None:
-    raise ValueError('config parameter is not supported in Gemini API.')
-
-  return to_object
-
-
 def _FetchPredictOperationParameters_to_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
@@ -129,88 +111,123 @@ def _Video_from_mldev(
   return to_object
 
 
-def _Video_from_vertex(
+def _GeneratedVideo_from_mldev(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
     parent_object: Optional[dict] = None,
 ) -> dict:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['gcsUri']) is not None:
-    setv(to_object, ['uri'], getv(from_object, ['gcsUri']))
-
-  if getv(from_object, ['bytesBase64Encoded']) is not None:
+  if getv(from_object, ['_self']) is not None:
     setv(
         to_object,
-        ['video_bytes'],
-        t.t_bytes(api_client, getv(from_object, ['bytesBase64Encoded'])),
+        ['video'],
+        _Video_from_mldev(api_client, getv(from_object, ['_self']), to_object),
     )
 
-  if getv(from_object, ['mimeType']) is not None:
-    setv(to_object, ['mime_type'], getv(from_object, ['mimeType']))
-
   return to_object
 
 
-def _GeneratedVideo_from_mldev(
+def _GenerateVideosResponse_from_mldev(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
     parent_object: Optional[dict] = None,
 ) -> dict:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['_self']) is not None:
+  if getv(from_object, ['generatedSamples']) is not None:
     setv(
         to_object,
-        ['video'],
-        _Video_from_mldev(api_client, getv(from_object, ['_self']), to_object),
+        ['generated_videos'],
+        [
+            _GeneratedVideo_from_mldev(api_client, item, to_object)
+            for item in getv(from_object, ['generatedSamples'])
+        ],
+    )
+
+  if getv(from_object, ['raiMediaFilteredCount']) is not None:
+    setv(
+        to_object,
+        ['rai_media_filtered_count'],
+        getv(from_object, ['raiMediaFilteredCount']),
+    )
+
+  if getv(from_object, ['raiMediaFilteredReasons']) is not None:
+    setv(
+        to_object,
+        ['rai_media_filtered_reasons'],
+        getv(from_object, ['raiMediaFilteredReasons']),
     )
 
   return to_object
 
 
-def _GeneratedVideo_from_vertex(
+def _GenerateVideosOperation_from_mldev(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
     parent_object: Optional[dict] = None,
 ) -> dict:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['_self']) is not None:
+  if getv(from_object, ['name']) is not None:
+    setv(to_object, ['name'], getv(from_object, ['name']))
+
+  if getv(from_object, ['metadata']) is not None:
+    setv(to_object, ['metadata'], getv(from_object, ['metadata']))
+
+  if getv(from_object, ['done']) is not None:
+    setv(to_object, ['done'], getv(from_object, ['done']))
+
+  if getv(from_object, ['error']) is not None:
+    setv(to_object, ['error'], getv(from_object, ['error']))
+
+  if getv(from_object, ['response']) is not None:
+    setv(to_object, ['response'], getv(from_object, ['response']))
+
+  if getv(from_object, ['response', 'generateVideoResponse']) is not None:
     setv(
         to_object,
-        ['video'],
-        _Video_from_vertex(api_client, getv(from_object, ['_self']), to_object),
+        ['result'],
+        _GenerateVideosResponse_from_mldev(
+            api_client,
+            getv(from_object, ['response', 'generateVideoResponse']),
+            to_object,
+        ),
     )
 
   return to_object
 
 
-def _GenerateVideosResponse_from_mldev(
+def _Video_from_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
     parent_object: Optional[dict] = None,
 ) -> dict:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['generatedSamples']) is not None:
-    setv(
-        to_object,
-        ['generated_videos'],
-        [
-            _GeneratedVideo_from_mldev(api_client, item, to_object)
-            for item in getv(from_object, ['generatedSamples'])
-        ],
-    )
+  if getv(from_object, ['gcsUri']) is not None:
+    setv(to_object, ['uri'], getv(from_object, ['gcsUri']))
 
-  if getv(from_object, ['raiMediaFilteredCount']) is not None:
+  if getv(from_object, ['bytesBase64Encoded']) is not None:
     setv(
         to_object,
-        ['rai_media_filtered_count'],
-        getv(from_object, ['raiMediaFilteredCount']),
+        ['video_bytes'],
+        t.t_bytes(api_client, getv(from_object, ['bytesBase64Encoded'])),
     )
 
-  if getv(from_object, ['raiMediaFilteredReasons']) is not None:
+  if getv(from_object, ['mimeType']) is not None:
+    setv(to_object, ['mime_type'], getv(from_object, ['mimeType']))
+
+  return to_object
+
+
+def _GeneratedVideo_from_vertex(
+    api_client: BaseApiClient,
+    from_object: Union[dict, object],
+    parent_object: Optional[dict] = None,
+) -> dict:
+  to_object: dict[str, Any] = {}
+  if getv(from_object, ['_self']) is not None:
     setv(
         to_object,
-        ['rai_media_filtered_reasons'],
-        getv(from_object, ['raiMediaFilteredReasons']),
+        ['video'],
+        _Video_from_vertex(api_client, getv(from_object, ['_self']), to_object),
     )
 
   return to_object
@@ -249,41 +266,6 @@ def _GenerateVideosResponse_from_vertex(
   return to_object
 
 
-def _GenerateVideosOperation_from_mldev(
-    api_client: BaseApiClient,
-    from_object: Union[dict, object],
-    parent_object: Optional[dict] = None,
-) -> dict:
-  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, ['metadata']) is not None:
-    setv(to_object, ['metadata'], getv(from_object, ['metadata']))
-
-  if getv(from_object, ['done']) is not None:
-    setv(to_object, ['done'], getv(from_object, ['done']))
-
-  if getv(from_object, ['error']) is not None:
-    setv(to_object, ['error'], getv(from_object, ['error']))
-
-  if getv(from_object, ['response']) is not None:
-    setv(to_object, ['response'], getv(from_object, ['response']))
-
-  if getv(from_object, ['response', 'generateVideoResponse']) is not None:
-    setv(
-        to_object,
-        ['result'],
-        _GenerateVideosResponse_from_mldev(
-            api_client,
-            getv(from_object, ['response', 'generateVideoResponse']),
-            to_object,
-        ),
-    )
-
-  return to_object
-
-
 def _GenerateVideosOperation_from_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
@@ -319,7 +301,7 @@ def _GenerateVideosOperation_from_vertex(
 
 class Operations(_api_module.BaseModule):
 
-  def _get_operation(
+  def _get_videos_operation(
       self,
       *,
       operation_name: str,
@@ -356,11 +338,12 @@ class Operations(_api_module.BaseModule):
     # TODO: remove the hack that pops config.
     request_dict.pop('config', None)
 
-    http_options: Optional[types.HttpOptionsOrDict] = None
-    if isinstance(config, dict):
-      http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options') and config is not None:
-      http_options = config.http_options
+    http_options: Optional[types.HttpOptions] = None
+    if (
+        parameter_model.config is not None
+        and parameter_model.config.http_options is not None
+    ):
+      http_options = parameter_model.config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
@@ -373,6 +356,7 @@ class Operations(_api_module.BaseModule):
       response_dict = _GenerateVideosOperation_from_vertex(
           self._api_client, response_dict
       )
+
     else:
       response_dict = _GenerateVideosOperation_from_mldev(
           self._api_client, response_dict
@@ -384,7 +368,7 @@ class Operations(_api_module.BaseModule):
     self._api_client._verify_response(return_value)
     return return_value
 
-  def _fetch_predict_operation(
+  def _fetch_predict_videos_operation(
       self,
       *,
       operation_name: str,
@@ -418,11 +402,12 @@ class Operations(_api_module.BaseModule):
     # TODO: remove the hack that pops config.
     request_dict.pop('config', None)
 
-    http_options: Optional[types.HttpOptionsOrDict] = None
-    if isinstance(config, dict):
-      http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options') and config is not None:
-      http_options = config.http_options
+    http_options: Optional[types.HttpOptions] = None
+    if (
+        parameter_model.config is not None
+        and parameter_model.config.http_options is not None
+    ):
+      http_options = parameter_model.config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
@@ -435,10 +420,6 @@ class Operations(_api_module.BaseModule):
       response_dict = _GenerateVideosOperation_from_vertex(
           self._api_client, response_dict
       )
-    else:
-      response_dict = _GenerateVideosOperation_from_mldev(
-          self._api_client, response_dict
-      )
 
     return_value = types.GenerateVideosOperation._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -479,13 +460,13 @@ class Operations(_api_module.BaseModule):
       fetch_operation_config = types.FetchPredictOperationConfig(
           http_options=http_options
       )
-      return self._fetch_predict_operation(
+      return self._fetch_predict_videos_operation(
           operation_name=operation_name,
           resource_name=resource_name,
           config=fetch_operation_config,
       )
     else:
-      return self._get_operation(
+      return self._get_videos_operation(
           operation_name=operation_name,
           config=config,
       )
@@ -493,7 +474,7 @@ class Operations(_api_module.BaseModule):
 
 class AsyncOperations(_api_module.BaseModule):
 
-  async def _get_operation(
+  async def _get_videos_operation(
       self,
       *,
       operation_name: str,
@@ -530,11 +511,12 @@ class AsyncOperations(_api_module.BaseModule):
     # TODO: remove the hack that pops config.
     request_dict.pop('config', None)
 
-    http_options: Optional[types.HttpOptionsOrDict] = None
-    if isinstance(config, dict):
-      http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options') and config is not None:
-      http_options = config.http_options
+    http_options: Optional[types.HttpOptions] = None
+    if (
+        parameter_model.config is not None
+        and parameter_model.config.http_options is not None
+    ):
+      http_options = parameter_model.config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
@@ -547,6 +529,7 @@ class AsyncOperations(_api_module.BaseModule):
       response_dict = _GenerateVideosOperation_from_vertex(
           self._api_client, response_dict
       )
+
     else:
       response_dict = _GenerateVideosOperation_from_mldev(
           self._api_client, response_dict
@@ -558,7 +541,7 @@ class AsyncOperations(_api_module.BaseModule):
     self._api_client._verify_response(return_value)
     return return_value
 
-  async def _fetch_predict_operation(
+  async def _fetch_predict_videos_operation(
       self,
       *,
       operation_name: str,
@@ -592,11 +575,12 @@ class AsyncOperations(_api_module.BaseModule):
     # TODO: remove the hack that pops config.
     request_dict.pop('config', None)
 
-    http_options: Optional[types.HttpOptionsOrDict] = None
-    if isinstance(config, dict):
-      http_options = config.get('http_options', None)
-    elif hasattr(config, 'http_options') and config is not None:
-      http_options = config.http_options
+    http_options: Optional[types.HttpOptions] = None
+    if (
+        parameter_model.config is not None
+        and parameter_model.config.http_options is not None
+    ):
+      http_options = parameter_model.config.http_options
 
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
@@ -609,10 +593,6 @@ class AsyncOperations(_api_module.BaseModule):
       response_dict = _GenerateVideosOperation_from_vertex(
           self._api_client, response_dict
       )
-    else:
-      response_dict = _GenerateVideosOperation_from_mldev(
-          self._api_client, response_dict
-      )
 
     return_value = types.GenerateVideosOperation._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -651,13 +631,13 @@ class AsyncOperations(_api_module.BaseModule):
       fetch_operation_config = types.FetchPredictOperationConfig(
           http_options=http_options
       )
-      return await self._fetch_predict_operation(
+      return await self._fetch_predict_videos_operation(
           operation_name=operation_name,
           resource_name=resource_name,
           config=fetch_operation_config,
       )
     else:
-      return await self._get_operation(
+      return await self._get_videos_operation(
           operation_name=operation_name,
           config=config,
       )