google-genai 1.6.0__py3-none-any.whl → 1.8.0__py3-none-any.whl

google/genai/batches.py

@@ -31,24 +31,6 @@ from .pagers import AsyncPager, Pager
 logger = logging.getLogger('google_genai.batches')
 
 
-def _BatchJobSource_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, ['format']) is not None:
-    raise ValueError('format parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['gcs_uri']) is not None:
-    raise ValueError('gcs_uri parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['bigquery_uri']) is not None:
-    raise ValueError('bigquery_uri parameter is not supported in Gemini API.')
-
-  return to_object
-
-
 def _BatchJobSource_to_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
@@ -71,24 +53,6 @@ def _BatchJobSource_to_vertex(
   return to_object
 
 
-def _BatchJobDestination_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, ['format']) is not None:
-    raise ValueError('format parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['gcs_uri']) is not None:
-    raise ValueError('gcs_uri parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['bigquery_uri']) is not None:
-    raise ValueError('bigquery_uri parameter is not supported in Gemini API.')
-
-  return to_object
-
-
 def _BatchJobDestination_to_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
@@ -115,22 +79,6 @@ def _BatchJobDestination_to_vertex(
   return to_object
 
 
-def _CreateBatchJobConfig_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, ['display_name']) is not None:
-    setv(parent_object, ['displayName'], getv(from_object, ['display_name']))
-
-  if getv(from_object, ['dest']) is not None:
-    raise ValueError('dest parameter is not supported in Gemini API.')
-
-  return to_object
-
-
 def _CreateBatchJobConfig_to_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
@@ -155,30 +103,6 @@ def _CreateBatchJobConfig_to_vertex(
   return to_object
 
 
-def _CreateBatchJobParameters_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, ['model']) is not None:
-    raise ValueError('model parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['src']) is not None:
-    raise ValueError('src parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['config']) is not None:
-    setv(
-        to_object,
-        ['config'],
-        _CreateBatchJobConfig_to_mldev(
-            api_client, getv(from_object, ['config']), to_object
-        ),
-    )
-
-  return to_object
-
-
 def _CreateBatchJobParameters_to_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
@@ -215,21 +139,6 @@ def _CreateBatchJobParameters_to_vertex(
   return to_object
 
 
-def _GetBatchJobParameters_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, ['name']) is not None:
-    raise ValueError('name parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['config']) is not None:
-    setv(to_object, ['config'], getv(from_object, ['config']))
-
-  return to_object
-
-
 def _GetBatchJobParameters_to_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
@@ -249,21 +158,6 @@ def _GetBatchJobParameters_to_vertex(
   return to_object
 
 
-def _CancelBatchJobParameters_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, ['name']) is not None:
-    raise ValueError('name parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['config']) is not None:
-    setv(to_object, ['config'], getv(from_object, ['config']))
-
-  return to_object
-
-
 def _CancelBatchJobParameters_to_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
@@ -283,31 +177,6 @@ def _CancelBatchJobParameters_to_vertex(
   return to_object
 
 
-def _ListBatchJobsConfig_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, ['page_size']) is not None:
-    setv(
-        parent_object, ['_query', 'pageSize'], getv(from_object, ['page_size'])
-    )
-
-  if getv(from_object, ['page_token']) is not None:
-    setv(
-        parent_object,
-        ['_query', 'pageToken'],
-        getv(from_object, ['page_token']),
-    )
-
-  if getv(from_object, ['filter']) is not None:
-    raise ValueError('filter parameter is not supported in Gemini API.')
-
-  return to_object
-
-
 def _ListBatchJobsConfig_to_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
@@ -333,18 +202,6 @@ def _ListBatchJobsConfig_to_vertex(
   return to_object
 
 
-def _ListBatchJobsParameters_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, ['config']) is not None:
-    raise ValueError('config parameter is not supported in Gemini API.')
-
-  return to_object
-
-
 def _ListBatchJobsParameters_to_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
@@ -363,21 +220,6 @@ def _ListBatchJobsParameters_to_vertex(
   return to_object
 
 
-def _DeleteBatchJobParameters_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, ['name']) is not None:
-    raise ValueError('name parameter is not supported in Gemini API.')
-
-  if getv(from_object, ['config']) is not None:
-    setv(to_object, ['config'], getv(from_object, ['config']))
-
-  return to_object
-
-
 def _DeleteBatchJobParameters_to_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
@@ -397,16 +239,6 @@ def _DeleteBatchJobParameters_to_vertex(
   return to_object
 
 
-def _JobError_from_mldev(
-    api_client: BaseApiClient,
-    from_object: Union[dict, object],
-    parent_object: Optional[dict] = None,
-) -> dict:
-  to_object: dict[str, Any] = {}
-
-  return to_object
-
-
 def _JobError_from_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
@@ -425,16 +257,6 @@ def _JobError_from_vertex(
   return to_object
 
 
-def _BatchJobSource_from_mldev(
-    api_client: BaseApiClient,
-    from_object: Union[dict, object],
-    parent_object: Optional[dict] = None,
-) -> dict:
-  to_object: dict[str, Any] = {}
-
-  return to_object
-
-
 def _BatchJobSource_from_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
@@ -457,16 +279,6 @@ def _BatchJobSource_from_vertex(
   return to_object
 
 
-def _BatchJobDestination_from_mldev(
-    api_client: BaseApiClient,
-    from_object: Union[dict, object],
-    parent_object: Optional[dict] = None,
-) -> dict:
-  to_object: dict[str, Any] = {}
-
-  return to_object
-
-
 def _BatchJobDestination_from_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
@@ -493,16 +305,6 @@ def _BatchJobDestination_from_vertex(
   return to_object
 
 
-def _BatchJob_from_mldev(
-    api_client: BaseApiClient,
-    from_object: Union[dict, object],
-    parent_object: Optional[dict] = None,
-) -> dict:
-  to_object: dict[str, Any] = {}
-
-  return to_object
-
-
 def _BatchJob_from_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
@@ -563,18 +365,6 @@ def _BatchJob_from_vertex(
   return to_object
 
 
-def _ListBatchJobsResponse_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, ['nextPageToken']) is not None:
-    setv(to_object, ['next_page_token'], getv(from_object, ['nextPageToken']))
-
-  return to_object
-
-
 def _ListBatchJobsResponse_from_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
@@ -597,16 +387,6 @@ def _ListBatchJobsResponse_from_vertex(
   return to_object
 
 
-def _DeleteResourceJob_from_mldev(
-    api_client: BaseApiClient,
-    from_object: Union[dict, object],
-    parent_object: Optional[dict] = None,
-) -> dict:
-  to_object: dict[str, Any] = {}
-
-  return to_object
-
-
 def _DeleteResourceJob_from_vertex(
     api_client: BaseApiClient,
     from_object: Union[dict, object],
@@ -665,11 +445,12 @@ class Batches(_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)
@@ -680,8 +461,6 @@ class Batches(_api_module.BaseModule):
 
     if self._api_client.vertexai:
       response_dict = _BatchJob_from_vertex(self._api_client, response_dict)
-    else:
-      response_dict = _BatchJob_from_mldev(self._api_client, response_dict)
 
     return_value = types.BatchJob._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -734,11 +513,12 @@ class Batches(_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)
@@ -749,8 +529,6 @@ class Batches(_api_module.BaseModule):
 
     if self._api_client.vertexai:
       response_dict = _BatchJob_from_vertex(self._api_client, response_dict)
-    else:
-      response_dict = _BatchJob_from_mldev(self._api_client, response_dict)
 
     return_value = types.BatchJob._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -804,11 +582,12 @@ class Batches(_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)
@@ -843,11 +622,12 @@ class Batches(_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)
@@ -860,10 +640,6 @@ class Batches(_api_module.BaseModule):
       response_dict = _ListBatchJobsResponse_from_vertex(
           self._api_client, response_dict
       )
-    else:
-      response_dict = _ListBatchJobsResponse_from_mldev(
-          self._api_client, response_dict
-      )
 
     return_value = types.ListBatchJobsResponse._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -918,11 +694,12 @@ class Batches(_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)
@@ -935,10 +712,6 @@ class Batches(_api_module.BaseModule):
       response_dict = _DeleteResourceJob_from_vertex(
           self._api_client, response_dict
       )
-    else:
-      response_dict = _DeleteResourceJob_from_mldev(
-          self._api_client, response_dict
-      )
 
     return_value = types.DeleteResourceJob._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -1042,11 +815,12 @@ class AsyncBatches(_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)
@@ -1057,8 +831,6 @@ class AsyncBatches(_api_module.BaseModule):
 
     if self._api_client.vertexai:
       response_dict = _BatchJob_from_vertex(self._api_client, response_dict)
-    else:
-      response_dict = _BatchJob_from_mldev(self._api_client, response_dict)
 
     return_value = types.BatchJob._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -1111,11 +883,12 @@ class AsyncBatches(_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)
@@ -1126,8 +899,6 @@ class AsyncBatches(_api_module.BaseModule):
 
     if self._api_client.vertexai:
       response_dict = _BatchJob_from_vertex(self._api_client, response_dict)
-    else:
-      response_dict = _BatchJob_from_mldev(self._api_client, response_dict)
 
     return_value = types.BatchJob._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -1181,11 +952,12 @@ class AsyncBatches(_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)
@@ -1220,11 +992,12 @@ class AsyncBatches(_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)
@@ -1237,10 +1010,6 @@ class AsyncBatches(_api_module.BaseModule):
       response_dict = _ListBatchJobsResponse_from_vertex(
           self._api_client, response_dict
       )
-    else:
-      response_dict = _ListBatchJobsResponse_from_mldev(
-          self._api_client, response_dict
-      )
 
     return_value = types.ListBatchJobsResponse._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -1295,11 +1064,12 @@ class AsyncBatches(_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)
@@ -1312,10 +1082,6 @@ class AsyncBatches(_api_module.BaseModule):
       response_dict = _DeleteResourceJob_from_vertex(
           self._api_client, response_dict
       )
-    else:
-      response_dict = _DeleteResourceJob_from_mldev(
-          self._api_client, response_dict
-      )
 
     return_value = types.DeleteResourceJob._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()