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

google/genai/_transformers.py

@@ -195,7 +195,6 @@ def t_models_url(
 
 
 def t_extract_models(
-    api_client: _api_client.BaseApiClient,
     response: dict[str, Any],
 ) -> list[dict[str, Any]]:
   if not response:
@@ -299,18 +298,15 @@ def t_function_responses(
 
 
 def t_blobs(
-    api_client: _api_client.BaseApiClient,
     blobs: Union[types.BlobImageUnionDict, list[types.BlobImageUnionDict]],
 ) -> list[types.Blob]:
   if isinstance(blobs, list):
-    return [t_blob(api_client, blob) for blob in blobs]
+    return [t_blob(blob) for blob in blobs]
   else:
-    return [t_blob(api_client, blobs)]
+    return [t_blob(blobs)]
 
 
-def t_blob(
-    api_client: _api_client.BaseApiClient, blob: types.BlobImageUnionDict
-) -> types.Blob:
+def t_blob(blob: types.BlobImageUnionDict) -> types.Blob:
   try:
     import PIL.Image
 
@@ -335,19 +331,15 @@ def t_blob(
   )
 
 
-def t_image_blob(
-    api_client: _api_client.BaseApiClient, blob: types.BlobImageUnionDict
-) -> types.Blob:
-  blob = t_blob(api_client, blob)
+def t_image_blob(blob: types.BlobImageUnionDict) -> types.Blob:
+  blob = t_blob(blob)
   if blob.mime_type and blob.mime_type.startswith('image/'):
     return blob
   raise ValueError(f'Unsupported mime type: {blob.mime_type!r}')
 
 
-def t_audio_blob(
-    api_client: _api_client.BaseApiClient, blob: types.BlobOrDict
-) -> types.Blob:
-  blob = t_blob(api_client, blob)
+def t_audio_blob(blob: types.BlobOrDict) -> types.Blob:
+  blob = t_blob(blob)
   if blob.mime_type and blob.mime_type.startswith('audio/'):
     return blob
   raise ValueError(f'Unsupported mime type: {blob.mime_type!r}')
@@ -393,7 +385,6 @@ def t_parts(
 
 
 def t_image_predictions(
-    client: _api_client.BaseApiClient,
     predictions: Optional[Iterable[Mapping[str, Any]]],
 ) -> Optional[list[types.GeneratedImage]]:
   if not predictions:
@@ -416,7 +407,6 @@ ContentType = Union[types.Content, types.ContentDict, types.PartUnionDict]
 
 
 def t_content(
-    client: _api_client.BaseApiClient,
     content: Optional[ContentType],
 ) -> types.Content:
   if content is None:
@@ -447,9 +437,9 @@ def t_contents_for_embed(
     contents: Union[list[types.Content], list[types.ContentDict], ContentType],
 ) -> Union[list[str], list[types.Content]]:
   if isinstance(contents, list):
-    transformed_contents = [t_content(client, content) for content in contents]
+    transformed_contents = [t_content(content) for content in contents]
   else:
-    transformed_contents = [t_content(client, contents)]
+    transformed_contents = [t_content(contents)]
 
   if client.vertexai:
     text_parts = []
@@ -469,7 +459,6 @@ def t_contents_for_embed(
 
 
 def t_contents(
-    client: _api_client.BaseApiClient,
     contents: Optional[
         Union[types.ContentListUnion, types.ContentListUnionDict, types.Content]
     ],
@@ -477,7 +466,7 @@ def t_contents(
   if contents is None or (isinstance(contents, list) and not contents):
     raise ValueError('contents are required.')
   if not isinstance(contents, list):
-    return [t_content(client, contents)]
+    return [t_content(contents)]
 
   try:
     import PIL.Image
@@ -635,14 +624,13 @@ def _raise_for_unsupported_schema_type(origin: Any) -> None:
   raise ValueError(f'Unsupported schema type: {origin}')
 
 
-def _raise_for_unsupported_mldev_properties(schema: Any, client: _api_client.BaseApiClient) -> None:
+def _raise_for_unsupported_mldev_properties(
+    schema: Any, client: _api_client.BaseApiClient
+) -> None:
   if not client.vertexai and (
-      schema.get('additionalProperties')
-      or schema.get('additional_properties')
+      schema.get('additionalProperties') or schema.get('additional_properties')
   ):
-    raise ValueError(
-        'additionalProperties is not supported in the Gemini API.'
-    )
+    raise ValueError('additionalProperties is not supported in the Gemini API.')
 
 
 def process_schema(
@@ -872,7 +860,6 @@ def t_schema(
 
 
 def t_speech_config(
-    _: _api_client.BaseApiClient,
     origin: Union[types.SpeechConfigUnionDict, Any],
 ) -> Optional[types.SpeechConfig]:
   if not origin:
@@ -892,7 +879,6 @@ def t_speech_config(
 
 
 def t_live_speech_config(
-    client: _api_client.BaseApiClient,
     origin: types.SpeechConfigOrDict,
 ) -> Optional[types.SpeechConfig]:
   if isinstance(origin, types.SpeechConfig):
@@ -958,9 +944,7 @@ def t_cached_content_name(client: _api_client.BaseApiClient, name: str) -> str:
   return _resource_name(client, name, collection_identifier='cachedContents')
 
 
-def t_batch_job_source(
-    client: _api_client.BaseApiClient, src: str
-) -> types.BatchJobSource:
+def t_batch_job_source(src: str) -> types.BatchJobSource:
   if src.startswith('gs://'):
     return types.BatchJobSource(
         format='jsonl',
@@ -975,9 +959,7 @@ def t_batch_job_source(
     raise ValueError(f'Unsupported source: {src}')
 
 
-def t_batch_job_destination(
-    client: _api_client.BaseApiClient, dest: str
-) -> types.BatchJobDestination:
+def t_batch_job_destination(dest: str) -> types.BatchJobDestination:
   if dest.startswith('gs://'):
     return types.BatchJobDestination(
         format='jsonl',
@@ -1042,7 +1024,6 @@ def t_resolve_operation(
 
 
 def t_file_name(
-    api_client: _api_client.BaseApiClient,
     name: Optional[Union[str, types.File, types.Video, types.GeneratedVideo]],
 ) -> str:
   # Remove the files/ prefix since it's added to the url path.
@@ -1076,9 +1057,7 @@ def t_file_name(
   return name
 
 
-def t_tuning_job_status(
-    api_client: _api_client.BaseApiClient, status: str
-) -> Union[types.JobState, str]:
+def t_tuning_job_status(status: str) -> Union[types.JobState, str]:
   if status == 'STATE_UNSPECIFIED':
     return types.JobState.JOB_STATE_UNSPECIFIED
   elif status == 'CREATING':
@@ -1098,7 +1077,7 @@ def t_tuning_job_status(
 # We shouldn't use this transformer if the backend adhere to Cloud Type
 # format https://cloud.google.com/docs/discovery/type-format.
 # TODO(b/389133914,b/390320301): Remove the hack after backend fix the issue.
-def t_bytes(api_client: _api_client.BaseApiClient, data: bytes) -> str:
+def t_bytes(data: bytes) -> str:
   if not isinstance(data, bytes):
     return data
   return base64.b64encode(data).decode('ascii')

google/genai/batches.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
@@ -33,7 +34,6 @@ logger = logging.getLogger('google_genai.batches')
 
 
 def _BatchJobSource_to_vertex(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -55,7 +55,6 @@ def _BatchJobSource_to_vertex(
 
 
 def _BatchJobDestination_to_vertex(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -81,7 +80,6 @@ def _BatchJobDestination_to_vertex(
 
 
 def _CreateBatchJobConfig_to_vertex(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -95,9 +93,7 @@ def _CreateBatchJobConfig_to_vertex(
         parent_object,
         ['outputConfig'],
         _BatchJobDestination_to_vertex(
-            api_client,
-            t.t_batch_job_destination(api_client, getv(from_object, ['dest'])),
-            to_object,
+            t.t_batch_job_destination(getv(from_object, ['dest'])), to_object
         ),
     )
 
@@ -122,9 +118,7 @@ def _CreateBatchJobParameters_to_vertex(
         to_object,
         ['inputConfig'],
         _BatchJobSource_to_vertex(
-            api_client,
-            t.t_batch_job_source(api_client, getv(from_object, ['src'])),
-            to_object,
+            t.t_batch_job_source(getv(from_object, ['src'])), to_object
         ),
     )
 
@@ -133,7 +127,7 @@ def _CreateBatchJobParameters_to_vertex(
         to_object,
         ['config'],
         _CreateBatchJobConfig_to_vertex(
-            api_client, getv(from_object, ['config']), to_object
+            getv(from_object, ['config']), to_object
         ),
     )
 
@@ -179,7 +173,6 @@ def _CancelBatchJobParameters_to_vertex(
 
 
 def _ListBatchJobsConfig_to_vertex(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -204,7 +197,6 @@ def _ListBatchJobsConfig_to_vertex(
 
 
 def _ListBatchJobsParameters_to_vertex(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -214,7 +206,7 @@ def _ListBatchJobsParameters_to_vertex(
         to_object,
         ['config'],
         _ListBatchJobsConfig_to_vertex(
-            api_client, getv(from_object, ['config']), to_object
+            getv(from_object, ['config']), to_object
         ),
     )
 
@@ -241,7 +233,6 @@ def _DeleteBatchJobParameters_to_vertex(
 
 
 def _JobError_from_vertex(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -259,7 +250,6 @@ def _JobError_from_vertex(
 
 
 def _BatchJobSource_from_vertex(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -281,7 +271,6 @@ def _BatchJobSource_from_vertex(
 
 
 def _BatchJobDestination_from_vertex(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -307,7 +296,6 @@ def _BatchJobDestination_from_vertex(
 
 
 def _BatchJob_from_vertex(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -325,9 +313,7 @@ def _BatchJob_from_vertex(
     setv(
         to_object,
         ['error'],
-        _JobError_from_vertex(
-            api_client, getv(from_object, ['error']), to_object
-        ),
+        _JobError_from_vertex(getv(from_object, ['error']), to_object),
     )
 
   if getv(from_object, ['createTime']) is not None:
@@ -350,7 +336,7 @@ def _BatchJob_from_vertex(
         to_object,
         ['src'],
         _BatchJobSource_from_vertex(
-            api_client, getv(from_object, ['inputConfig']), to_object
+            getv(from_object, ['inputConfig']), to_object
         ),
     )
 
@@ -359,7 +345,7 @@ def _BatchJob_from_vertex(
         to_object,
         ['dest'],
         _BatchJobDestination_from_vertex(
-            api_client, getv(from_object, ['outputConfig']), to_object
+            getv(from_object, ['outputConfig']), to_object
         ),
     )
 
@@ -367,7 +353,6 @@ def _BatchJob_from_vertex(
 
 
 def _ListBatchJobsResponse_from_vertex(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -380,7 +365,7 @@ def _ListBatchJobsResponse_from_vertex(
         to_object,
         ['batch_jobs'],
         [
-            _BatchJob_from_vertex(api_client, item, to_object)
+            _BatchJob_from_vertex(item, to_object)
             for item in getv(from_object, ['batchPredictionJobs'])
         ],
     )
@@ -389,7 +374,6 @@ def _ListBatchJobsResponse_from_vertex(
 
 
 def _DeleteResourceJob_from_vertex(
-    api_client: BaseApiClient,
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
@@ -404,9 +388,7 @@ def _DeleteResourceJob_from_vertex(
     setv(
         to_object,
         ['error'],
-        _JobError_from_vertex(
-            api_client, getv(from_object, ['error']), to_object
-        ),
+        _JobError_from_vertex(getv(from_object, ['error']), to_object),
     )
 
   return to_object
@@ -456,12 +438,14 @@ class Batches(_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 = _BatchJob_from_vertex(self._api_client, response_dict)
+      response_dict = _BatchJob_from_vertex(response_dict)
 
     return_value = types.BatchJob._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -524,12 +508,12 @@ class Batches(_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 = _BatchJob_from_vertex(self._api_client, response_dict)
+      response_dict = _BatchJob_from_vertex(response_dict)
 
     return_value = types.BatchJob._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -593,7 +577,7 @@ class Batches(_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
     )
 
@@ -608,9 +592,7 @@ class Batches(_api_module.BaseModule):
     if not self._api_client.vertexai:
       raise ValueError('This method is only supported in the Vertex AI client.')
     else:
-      request_dict = _ListBatchJobsParameters_to_vertex(
-          self._api_client, parameter_model
-      )
+      request_dict = _ListBatchJobsParameters_to_vertex(parameter_model)
       request_url_dict = request_dict.get('_url')
       if request_url_dict:
         path = 'batchPredictionJobs'.format_map(request_url_dict)
@@ -633,14 +615,12 @@ class Batches(_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 = _ListBatchJobsResponse_from_vertex(
-          self._api_client, response_dict
-      )
+      response_dict = _ListBatchJobsResponse_from_vertex(response_dict)
 
     return_value = types.ListBatchJobsResponse._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -705,14 +685,14 @@ class Batches(_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(
         'delete', path, request_dict, http_options
     )
 
+    response_dict = '' if not response.body else json.loads(response.body)
+
     if self._api_client.vertexai:
-      response_dict = _DeleteResourceJob_from_vertex(
-          self._api_client, response_dict
-      )
+      response_dict = _DeleteResourceJob_from_vertex(response_dict)
 
     return_value = types.DeleteResourceJob._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -826,12 +806,14 @@ class AsyncBatches(_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 = _BatchJob_from_vertex(self._api_client, response_dict)
+      response_dict = _BatchJob_from_vertex(response_dict)
 
     return_value = types.BatchJob._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -894,12 +876,14 @@ class AsyncBatches(_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 = _BatchJob_from_vertex(self._api_client, response_dict)
+      response_dict = _BatchJob_from_vertex(response_dict)
 
     return_value = types.BatchJob._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -963,7 +947,7 @@ class AsyncBatches(_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
     )
 
@@ -978,9 +962,7 @@ class AsyncBatches(_api_module.BaseModule):
     if not self._api_client.vertexai:
       raise ValueError('This method is only supported in the Vertex AI client.')
     else:
-      request_dict = _ListBatchJobsParameters_to_vertex(
-          self._api_client, parameter_model
-      )
+      request_dict = _ListBatchJobsParameters_to_vertex(parameter_model)
       request_url_dict = request_dict.get('_url')
       if request_url_dict:
         path = 'batchPredictionJobs'.format_map(request_url_dict)
@@ -1003,14 +985,14 @@ class AsyncBatches(_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 = _ListBatchJobsResponse_from_vertex(
-          self._api_client, response_dict
-      )
+      response_dict = _ListBatchJobsResponse_from_vertex(response_dict)
 
     return_value = types.ListBatchJobsResponse._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -1075,14 +1057,14 @@ class AsyncBatches(_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(
         'delete', path, request_dict, http_options
     )
 
+    response_dict = '' if not response.body else json.loads(response.body)
+
     if self._api_client.vertexai:
-      response_dict = _DeleteResourceJob_from_vertex(
-          self._api_client, response_dict
-      )
+      response_dict = _DeleteResourceJob_from_vertex(response_dict)
 
     return_value = types.DeleteResourceJob._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()