google-genai 1.40.0__py3-none-any.whl → 1.42.0__py3-none-any.whl

google/genai/operations.py

@@ -91,26 +91,6 @@ def _GetProjectOperationParameters_to_vertex(
   return to_object
 
 
-def _ProjectOperation_from_vertex(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  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']))
-
-  return to_object
-
-
 class Operations(_api_module.BaseModule):
 
   def _get_videos_operation(
@@ -158,7 +138,7 @@ class Operations(_api_module.BaseModule):
 
     response = self._api_client.request('get', path, request_dict, http_options)
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     return response_dict
 
@@ -208,7 +188,7 @@ class Operations(_api_module.BaseModule):
         'post', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     return response_dict
 
@@ -252,10 +232,7 @@ class Operations(_api_module.BaseModule):
 
     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 = _ProjectOperation_from_vertex(response_dict)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     return_value = types.ProjectOperation._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -366,7 +343,7 @@ class AsyncOperations(_api_module.BaseModule):
         'get', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     return response_dict
 
@@ -416,7 +393,7 @@ class AsyncOperations(_api_module.BaseModule):
         'post', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     return response_dict
 
@@ -462,10 +439,7 @@ class AsyncOperations(_api_module.BaseModule):
         'get', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
-
-    if self._api_client.vertexai:
-      response_dict = _ProjectOperation_from_vertex(response_dict)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     return_value = types.ProjectOperation._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()

google/genai/tokens.py

@@ -257,12 +257,7 @@ class Tokens(_api_module.BaseModule):
     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(
-          response_dict
-      )
+    response_dict = {} if not response.body else json.loads(response.body)
 
     return_value = types.AuthToken._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -358,12 +353,7 @@ class AsyncTokens(_api_module.BaseModule):
         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(
-          response_dict
-      )
+    response_dict = {} if not response.body else json.loads(response.body)
 
     return_value = types.AuthToken._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()

google/genai/tunings.py

@@ -32,40 +32,6 @@ from .pagers import AsyncPager, Pager
 logger = logging.getLogger('google_genai.tunings')
 
 
-def _AutoraterConfig_from_vertex(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['samplingCount']) is not None:
-    setv(to_object, ['sampling_count'], getv(from_object, ['samplingCount']))
-
-  if getv(from_object, ['flipEnabled']) is not None:
-    setv(to_object, ['flip_enabled'], getv(from_object, ['flipEnabled']))
-
-  if getv(from_object, ['autoraterModel']) is not None:
-    setv(to_object, ['autorater_model'], getv(from_object, ['autoraterModel']))
-
-  return to_object
-
-
-def _AutoraterConfig_to_vertex(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['sampling_count']) is not None:
-    setv(to_object, ['samplingCount'], getv(from_object, ['sampling_count']))
-
-  if getv(from_object, ['flip_enabled']) is not None:
-    setv(to_object, ['flipEnabled'], getv(from_object, ['flip_enabled']))
-
-  if getv(from_object, ['autorater_model']) is not None:
-    setv(to_object, ['autoraterModel'], getv(from_object, ['autorater_model']))
-
-  return to_object
-
-
 def _CancelTuningJobParameters_to_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -297,21 +263,11 @@ def _EvaluationConfig_from_vertex(
     setv(to_object, ['metrics'], t.t_metrics(getv(from_object, ['metrics'])))
 
   if getv(from_object, ['outputConfig']) is not None:
-    setv(
-        to_object,
-        ['output_config'],
-        _OutputConfig_from_vertex(
-            getv(from_object, ['outputConfig']), to_object
-        ),
-    )
+    setv(to_object, ['output_config'], getv(from_object, ['outputConfig']))
 
   if getv(from_object, ['autoraterConfig']) is not None:
     setv(
-        to_object,
-        ['autorater_config'],
-        _AutoraterConfig_from_vertex(
-            getv(from_object, ['autoraterConfig']), to_object
-        ),
+        to_object, ['autorater_config'], getv(from_object, ['autoraterConfig'])
     )
 
   return to_object
@@ -326,47 +282,11 @@ def _EvaluationConfig_to_vertex(
     setv(to_object, ['metrics'], t.t_metrics(getv(from_object, ['metrics'])))
 
   if getv(from_object, ['output_config']) is not None:
-    setv(
-        to_object,
-        ['outputConfig'],
-        _OutputConfig_to_vertex(
-            getv(from_object, ['output_config']), to_object
-        ),
-    )
+    setv(to_object, ['outputConfig'], getv(from_object, ['output_config']))
 
   if getv(from_object, ['autorater_config']) is not None:
     setv(
-        to_object,
-        ['autoraterConfig'],
-        _AutoraterConfig_to_vertex(
-            getv(from_object, ['autorater_config']), to_object
-        ),
-    )
-
-  return to_object
-
-
-def _GcsDestination_from_vertex(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['outputUriPrefix']) is not None:
-    setv(
-        to_object, ['output_uri_prefix'], getv(from_object, ['outputUriPrefix'])
-    )
-
-  return to_object
-
-
-def _GcsDestination_to_vertex(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['output_uri_prefix']) is not None:
-    setv(
-        to_object, ['outputUriPrefix'], getv(from_object, ['output_uri_prefix'])
+        to_object, ['autoraterConfig'], getv(from_object, ['autorater_config'])
     )
 
   return to_object
@@ -516,60 +436,6 @@ def _ListTuningJobsResponse_from_vertex(
   return to_object
 
 
-def _OutputConfig_from_vertex(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['gcsDestination']) is not None:
-    setv(
-        to_object,
-        ['gcs_destination'],
-        _GcsDestination_from_vertex(
-            getv(from_object, ['gcsDestination']), to_object
-        ),
-    )
-
-  return to_object
-
-
-def _OutputConfig_to_vertex(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['gcs_destination']) is not None:
-    setv(
-        to_object,
-        ['gcsDestination'],
-        _GcsDestination_to_vertex(
-            getv(from_object, ['gcs_destination']), to_object
-        ),
-    )
-
-  return to_object
-
-
-def _TunedModelCheckpoint_from_vertex(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['checkpointId']) is not None:
-    setv(to_object, ['checkpoint_id'], getv(from_object, ['checkpointId']))
-
-  if getv(from_object, ['epoch']) is not None:
-    setv(to_object, ['epoch'], getv(from_object, ['epoch']))
-
-  if getv(from_object, ['step']) is not None:
-    setv(to_object, ['step'], getv(from_object, ['step']))
-
-  if getv(from_object, ['endpoint']) is not None:
-    setv(to_object, ['endpoint'], getv(from_object, ['endpoint']))
-
-  return to_object
-
-
 def _TunedModel_from_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -584,30 +450,6 @@ def _TunedModel_from_mldev(
   return to_object
 
 
-def _TunedModel_from_vertex(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['model']) is not None:
-    setv(to_object, ['model'], getv(from_object, ['model']))
-
-  if getv(from_object, ['endpoint']) is not None:
-    setv(to_object, ['endpoint'], getv(from_object, ['endpoint']))
-
-  if getv(from_object, ['checkpoints']) is not None:
-    setv(
-        to_object,
-        ['checkpoints'],
-        [
-            _TunedModelCheckpoint_from_vertex(item, to_object)
-            for item in getv(from_object, ['checkpoints'])
-        ],
-    )
-
-  return to_object
-
-
 def _TuningDataset_to_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -625,10 +467,7 @@ def _TuningDataset_to_mldev(
     setv(
         to_object,
         ['examples', 'examples'],
-        [
-            _TuningExample_to_mldev(item, to_object)
-            for item in getv(from_object, ['examples'])
-        ],
+        [item for item in getv(from_object, ['examples'])],
     )
 
   return to_object
@@ -659,20 +498,6 @@ def _TuningDataset_to_vertex(
   return to_object
 
 
-def _TuningExample_to_mldev(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['text_input']) is not None:
-    setv(to_object, ['textInput'], getv(from_object, ['text_input']))
-
-  if getv(from_object, ['output']) is not None:
-    setv(to_object, ['output'], getv(from_object, ['output']))
-
-  return to_object
-
-
 def _TuningJob_from_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -753,6 +578,9 @@ def _TuningJob_from_mldev(
         getv(from_object, ['tunedModelDisplayName']),
     )
 
+  if getv(from_object, ['veoTuningSpec']) is not None:
+    setv(to_object, ['veo_tuning_spec'], getv(from_object, ['veoTuningSpec']))
+
   return to_object
 
 
@@ -798,11 +626,7 @@ def _TuningJob_from_vertex(
     setv(to_object, ['base_model'], getv(from_object, ['baseModel']))
 
   if getv(from_object, ['tunedModel']) is not None:
-    setv(
-        to_object,
-        ['tuned_model'],
-        _TunedModel_from_vertex(getv(from_object, ['tunedModel']), to_object),
-    )
+    setv(to_object, ['tuned_model'], getv(from_object, ['tunedModel']))
 
   if getv(from_object, ['preTunedModel']) is not None:
     setv(to_object, ['pre_tuned_model'], getv(from_object, ['preTunedModel']))
@@ -865,6 +689,9 @@ def _TuningJob_from_vertex(
         getv(from_object, ['tunedModelDisplayName']),
     )
 
+  if getv(from_object, ['veoTuningSpec']) is not None:
+    setv(to_object, ['veo_tuning_spec'], getv(from_object, ['veoTuningSpec']))
+
   return to_object
 
 
@@ -967,12 +794,12 @@ class Tunings(_api_module.BaseModule):
 
     response = self._api_client.request('get', path, request_dict, http_options)
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if self._api_client.vertexai:
       response_dict = _TuningJob_from_vertex(response_dict)
 
-    else:
+    if not self._api_client.vertexai:
       response_dict = _TuningJob_from_mldev(response_dict)
 
     return_value = types.TuningJob._from_response(
@@ -1034,12 +861,12 @@ class Tunings(_api_module.BaseModule):
 
     response = self._api_client.request('get', path, request_dict, http_options)
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if self._api_client.vertexai:
       response_dict = _ListTuningJobsResponse_from_vertex(response_dict)
 
-    else:
+    if not self._api_client.vertexai:
       response_dict = _ListTuningJobsResponse_from_mldev(response_dict)
 
     return_value = types.ListTuningJobsResponse._from_response(
@@ -1163,7 +990,7 @@ class Tunings(_api_module.BaseModule):
         'post', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if self._api_client.vertexai:
       response_dict = _TuningJob_from_vertex(response_dict)
@@ -1236,7 +1063,7 @@ class Tunings(_api_module.BaseModule):
         'post', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if not self._api_client.vertexai:
       response_dict = _TuningOperation_from_mldev(response_dict)
@@ -1420,12 +1247,12 @@ class AsyncTunings(_api_module.BaseModule):
         'get', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if self._api_client.vertexai:
       response_dict = _TuningJob_from_vertex(response_dict)
 
-    else:
+    if not self._api_client.vertexai:
       response_dict = _TuningJob_from_mldev(response_dict)
 
     return_value = types.TuningJob._from_response(
@@ -1489,12 +1316,12 @@ class AsyncTunings(_api_module.BaseModule):
         'get', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if self._api_client.vertexai:
       response_dict = _ListTuningJobsResponse_from_vertex(response_dict)
 
-    else:
+    if not self._api_client.vertexai:
       response_dict = _ListTuningJobsResponse_from_mldev(response_dict)
 
     return_value = types.ListTuningJobsResponse._from_response(
@@ -1618,7 +1445,7 @@ class AsyncTunings(_api_module.BaseModule):
         'post', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if self._api_client.vertexai:
       response_dict = _TuningJob_from_vertex(response_dict)
@@ -1691,7 +1518,7 @@ class AsyncTunings(_api_module.BaseModule):
         'post', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if not self._api_client.vertexai:
       response_dict = _TuningOperation_from_mldev(response_dict)