google-genai 0.5.0__py3-none-any.whl → 0.7.0__py3-none-any.whl

google/genai/models.py

@@ -16,13 +16,14 @@
 # Code generated by the Google Gen AI SDK generator DO NOT EDIT.
 
 import logging
-from typing import AsyncIterator, Iterator, Optional, Union
+from typing import AsyncIterator, Awaitable, Iterator, Optional, Union
 from urllib.parse import urlencode
+from . import _api_module
 from . import _common
 from . import _extra_utils
 from . import _transformers as t
 from . import types
-from ._api_client import ApiClient, HttpOptionsDict
+from ._api_client import ApiClient
 from ._common import get_value_by_path as getv
 from ._common import set_value_by_path as setv
 from .pagers import AsyncPager, Pager
@@ -35,7 +36,7 @@ def _Part_to_mldev(
 ) -> dict:
   to_object = {}
   if getv(from_object, ['video_metadata']) is not None:
-    raise ValueError('video_metadata parameter is not supported in Google AI.')
+    raise ValueError('video_metadata parameter is not supported in Gemini API.')
 
   if getv(from_object, ['thought']) is not None:
     setv(to_object, ['thought'], getv(from_object, ['thought']))
@@ -167,51 +168,51 @@ def _Schema_to_mldev(
 ) -> dict:
   to_object = {}
   if getv(from_object, ['min_items']) is not None:
-    raise ValueError('min_items parameter is not supported in Google AI.')
+    raise ValueError('min_items parameter is not supported in Gemini API.')
 
   if getv(from_object, ['example']) is not None:
-    raise ValueError('example parameter is not supported in Google AI.')
+    raise ValueError('example parameter is not supported in Gemini API.')
 
   if getv(from_object, ['property_ordering']) is not None:
     raise ValueError(
-        'property_ordering parameter is not supported in Google AI.'
+        'property_ordering parameter is not supported in Gemini API.'
     )
 
   if getv(from_object, ['pattern']) is not None:
-    raise ValueError('pattern parameter is not supported in Google AI.')
+    raise ValueError('pattern parameter is not supported in Gemini API.')
 
   if getv(from_object, ['minimum']) is not None:
-    raise ValueError('minimum parameter is not supported in Google AI.')
+    raise ValueError('minimum parameter is not supported in Gemini API.')
 
   if getv(from_object, ['default']) is not None:
-    raise ValueError('default parameter is not supported in Google AI.')
+    raise ValueError('default parameter is not supported in Gemini API.')
 
   if getv(from_object, ['any_of']) is not None:
-    raise ValueError('any_of parameter is not supported in Google AI.')
+    raise ValueError('any_of parameter is not supported in Gemini API.')
 
   if getv(from_object, ['max_length']) is not None:
-    raise ValueError('max_length parameter is not supported in Google AI.')
+    raise ValueError('max_length parameter is not supported in Gemini API.')
 
   if getv(from_object, ['title']) is not None:
-    raise ValueError('title parameter is not supported in Google AI.')
+    raise ValueError('title parameter is not supported in Gemini API.')
 
   if getv(from_object, ['min_length']) is not None:
-    raise ValueError('min_length parameter is not supported in Google AI.')
+    raise ValueError('min_length parameter is not supported in Gemini API.')
 
   if getv(from_object, ['min_properties']) is not None:
-    raise ValueError('min_properties parameter is not supported in Google AI.')
+    raise ValueError('min_properties parameter is not supported in Gemini API.')
 
   if getv(from_object, ['max_items']) is not None:
-    raise ValueError('max_items parameter is not supported in Google AI.')
+    raise ValueError('max_items parameter is not supported in Gemini API.')
 
   if getv(from_object, ['maximum']) is not None:
-    raise ValueError('maximum parameter is not supported in Google AI.')
+    raise ValueError('maximum parameter is not supported in Gemini API.')
 
   if getv(from_object, ['nullable']) is not None:
-    raise ValueError('nullable parameter is not supported in Google AI.')
+    raise ValueError('nullable parameter is not supported in Gemini API.')
 
   if getv(from_object, ['max_properties']) is not None:
-    raise ValueError('max_properties parameter is not supported in Google AI.')
+    raise ValueError('max_properties parameter is not supported in Gemini API.')
 
   if getv(from_object, ['type']) is not None:
     setv(to_object, ['type'], getv(from_object, ['type']))
@@ -323,7 +324,7 @@ def _SafetySetting_to_mldev(
 ) -> dict:
   to_object = {}
   if getv(from_object, ['method']) is not None:
-    raise ValueError('method parameter is not supported in Google AI.')
+    raise ValueError('method parameter is not supported in Gemini API.')
 
   if getv(from_object, ['category']) is not None:
     setv(to_object, ['category'], getv(from_object, ['category']))
@@ -359,7 +360,7 @@ def _FunctionDeclaration_to_mldev(
 ) -> dict:
   to_object = {}
   if getv(from_object, ['response']) is not None:
-    raise ValueError('response parameter is not supported in Google AI.')
+    raise ValueError('response parameter is not supported in Gemini API.')
 
   if getv(from_object, ['description']) is not None:
     setv(to_object, ['description'], getv(from_object, ['description']))
@@ -515,7 +516,7 @@ def _Tool_to_mldev(
     )
 
   if getv(from_object, ['retrieval']) is not None:
-    raise ValueError('retrieval parameter is not supported in Google AI.')
+    raise ValueError('retrieval parameter is not supported in Gemini API.')
 
   if getv(from_object, ['google_search']) is not None:
     setv(
@@ -762,12 +763,41 @@ def _SpeechConfig_to_vertex(
   return to_object
 
 
+def _ThinkingConfig_to_mldev(
+    api_client: ApiClient,
+    from_object: Union[dict, object],
+    parent_object: dict = None,
+) -> dict:
+  to_object = {}
+  if getv(from_object, ['include_thoughts']) is not None:
+    setv(
+        to_object, ['includeThoughts'], getv(from_object, ['include_thoughts'])
+    )
+
+  return to_object
+
+
+def _ThinkingConfig_to_vertex(
+    api_client: ApiClient,
+    from_object: Union[dict, object],
+    parent_object: dict = None,
+) -> dict:
+  to_object = {}
+  if getv(from_object, ['include_thoughts']) is not None:
+    setv(
+        to_object, ['includeThoughts'], getv(from_object, ['include_thoughts'])
+    )
+
+  return to_object
+
+
 def _GenerateContentConfig_to_mldev(
     api_client: ApiClient,
     from_object: Union[dict, object],
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
+
   if getv(from_object, ['system_instruction']) is not None:
     setv(
         parent_object,
@@ -843,7 +873,7 @@ def _GenerateContentConfig_to_mldev(
     )
 
   if getv(from_object, ['routing_config']) is not None:
-    raise ValueError('routing_config parameter is not supported in Google AI.')
+    raise ValueError('routing_config parameter is not supported in Gemini API.')
 
   if getv(from_object, ['safety_settings']) is not None:
     setv(
@@ -892,7 +922,7 @@ def _GenerateContentConfig_to_mldev(
 
   if getv(from_object, ['media_resolution']) is not None:
     raise ValueError(
-        'media_resolution parameter is not supported in Google AI.'
+        'media_resolution parameter is not supported in Gemini API.'
     )
 
   if getv(from_object, ['speech_config']) is not None:
@@ -906,6 +936,20 @@ def _GenerateContentConfig_to_mldev(
         ),
     )
 
+  if getv(from_object, ['audio_timestamp']) is not None:
+    raise ValueError(
+        'audio_timestamp parameter is not supported in Gemini API.'
+    )
+
+  if getv(from_object, ['thinking_config']) is not None:
+    setv(
+        to_object,
+        ['thinkingConfig'],
+        _ThinkingConfig_to_mldev(
+            api_client, getv(from_object, ['thinking_config']), to_object
+        ),
+    )
+
   return to_object
 
 
@@ -915,6 +959,7 @@ def _GenerateContentConfig_to_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
+
   if getv(from_object, ['system_instruction']) is not None:
     setv(
         parent_object,
@@ -1053,6 +1098,18 @@ def _GenerateContentConfig_to_vertex(
         ),
     )
 
+  if getv(from_object, ['audio_timestamp']) is not None:
+    setv(to_object, ['audioTimestamp'], getv(from_object, ['audio_timestamp']))
+
+  if getv(from_object, ['thinking_config']) is not None:
+    setv(
+        to_object,
+        ['thinkingConfig'],
+        _ThinkingConfig_to_vertex(
+            api_client, getv(from_object, ['thinking_config']), to_object
+        ),
+    )
+
   return to_object
 
 
@@ -1136,8 +1193,6 @@ def _EmbedContentConfig_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['task_type']) is not None:
     setv(
@@ -1157,10 +1212,10 @@ def _EmbedContentConfig_to_mldev(
     )
 
   if getv(from_object, ['mime_type']) is not None:
-    raise ValueError('mime_type parameter is not supported in Google AI.')
+    raise ValueError('mime_type parameter is not supported in Gemini API.')
 
   if getv(from_object, ['auto_truncate']) is not None:
-    raise ValueError('auto_truncate parameter is not supported in Google AI.')
+    raise ValueError('auto_truncate parameter is not supported in Gemini API.')
 
   return to_object
 
@@ -1171,8 +1226,6 @@ def _EmbedContentConfig_to_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['task_type']) is not None:
     setv(
@@ -1277,17 +1330,15 @@ def _EmbedContentParameters_to_vertex(
   return to_object
 
 
-def _GenerateImageConfig_to_mldev(
+def _GenerateImagesConfig_to_mldev(
     api_client: ApiClient,
     from_object: Union[dict, object],
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['output_gcs_uri']) is not None:
-    raise ValueError('output_gcs_uri parameter is not supported in Google AI.')
+    raise ValueError('output_gcs_uri parameter is not supported in Gemini API.')
 
   if getv(from_object, ['negative_prompt']) is not None:
     setv(
@@ -1311,9 +1362,12 @@ def _GenerateImageConfig_to_mldev(
     )
 
   if getv(from_object, ['seed']) is not None:
-    raise ValueError('seed parameter is not supported in Google AI.')
+    raise ValueError('seed parameter is not supported in Gemini API.')
 
   if getv(from_object, ['safety_filter_level']) is not None:
+    _SafetyFilterLevel_to_mldev_enum_validate(
+        getv(from_object, ['safety_filter_level'])
+    )
     setv(
         parent_object,
         ['parameters', 'safetySetting'],
@@ -1321,6 +1375,9 @@ def _GenerateImageConfig_to_mldev(
     )
 
   if getv(from_object, ['person_generation']) is not None:
+    _PersonGeneration_to_mldev_enum_validate(
+        getv(from_object, ['person_generation'])
+    )
     setv(
         parent_object,
         ['parameters', 'personGeneration'],
@@ -1363,7 +1420,7 @@ def _GenerateImageConfig_to_mldev(
     )
 
   if getv(from_object, ['add_watermark']) is not None:
-    raise ValueError('add_watermark parameter is not supported in Google AI.')
+    raise ValueError('add_watermark parameter is not supported in Gemini API.')
 
   if getv(from_object, ['aspect_ratio']) is not None:
     setv(
@@ -1372,17 +1429,22 @@ def _GenerateImageConfig_to_mldev(
         getv(from_object, ['aspect_ratio']),
     )
 
+  if getv(from_object, ['enhance_prompt']) is not None:
+    setv(
+        parent_object,
+        ['parameters', 'enhancePrompt'],
+        getv(from_object, ['enhance_prompt']),
+    )
+
   return to_object
 
 
-def _GenerateImageConfig_to_vertex(
+def _GenerateImagesConfig_to_vertex(
     api_client: ApiClient,
     from_object: Union[dict, object],
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['output_gcs_uri']) is not None:
     setv(
@@ -1478,10 +1540,17 @@ def _GenerateImageConfig_to_vertex(
         getv(from_object, ['aspect_ratio']),
     )
 
+  if getv(from_object, ['enhance_prompt']) is not None:
+    setv(
+        parent_object,
+        ['parameters', 'enhancePrompt'],
+        getv(from_object, ['enhance_prompt']),
+    )
+
   return to_object
 
 
-def _GenerateImageParameters_to_mldev(
+def _GenerateImagesParameters_to_mldev(
     api_client: ApiClient,
     from_object: Union[dict, object],
     parent_object: dict = None,
@@ -1501,7 +1570,7 @@ def _GenerateImageParameters_to_mldev(
     setv(
         to_object,
         ['config'],
-        _GenerateImageConfig_to_mldev(
+        _GenerateImagesConfig_to_mldev(
             api_client, getv(from_object, ['config']), to_object
         ),
     )
@@ -1509,7 +1578,7 @@ def _GenerateImageParameters_to_mldev(
   return to_object
 
 
-def _GenerateImageParameters_to_vertex(
+def _GenerateImagesParameters_to_vertex(
     api_client: ApiClient,
     from_object: Union[dict, object],
     parent_object: dict = None,
@@ -1529,7 +1598,7 @@ def _GenerateImageParameters_to_vertex(
     setv(
         to_object,
         ['config'],
-        _GenerateImageConfig_to_vertex(
+        _GenerateImagesConfig_to_vertex(
             api_client, getv(from_object, ['config']), to_object
         ),
     )
@@ -1544,7 +1613,7 @@ def _Image_to_mldev(
 ) -> dict:
   to_object = {}
   if getv(from_object, ['gcs_uri']) is not None:
-    raise ValueError('gcs_uri parameter is not supported in Google AI.')
+    raise ValueError('gcs_uri parameter is not supported in Gemini API.')
 
   if getv(from_object, ['image_bytes']) is not None:
     setv(
@@ -1553,6 +1622,9 @@ def _Image_to_mldev(
         t.t_bytes(api_client, getv(from_object, ['image_bytes'])),
     )
 
+  if getv(from_object, ['mime_type']) is not None:
+    setv(to_object, ['mimeType'], getv(from_object, ['mime_type']))
+
   return to_object
 
 
@@ -1572,6 +1644,9 @@ def _Image_to_vertex(
         t.t_bytes(api_client, getv(from_object, ['image_bytes'])),
     )
 
+  if getv(from_object, ['mime_type']) is not None:
+    setv(to_object, ['mimeType'], getv(from_object, ['mime_type']))
+
   return to_object
 
 
@@ -1582,15 +1657,15 @@ def _MaskReferenceConfig_to_mldev(
 ) -> dict:
   to_object = {}
   if getv(from_object, ['mask_mode']) is not None:
-    raise ValueError('mask_mode parameter is not supported in Google AI.')
+    raise ValueError('mask_mode parameter is not supported in Gemini API.')
 
   if getv(from_object, ['segmentation_classes']) is not None:
     raise ValueError(
-        'segmentation_classes parameter is not supported in Google AI.'
+        'segmentation_classes parameter is not supported in Gemini API.'
     )
 
   if getv(from_object, ['mask_dilation']) is not None:
-    raise ValueError('mask_dilation parameter is not supported in Google AI.')
+    raise ValueError('mask_dilation parameter is not supported in Gemini API.')
 
   return to_object
 
@@ -1622,12 +1697,12 @@ def _ControlReferenceConfig_to_mldev(
 ) -> dict:
   to_object = {}
   if getv(from_object, ['control_type']) is not None:
-    raise ValueError('control_type parameter is not supported in Google AI.')
+    raise ValueError('control_type parameter is not supported in Gemini API.')
 
   if getv(from_object, ['enable_control_image_computation']) is not None:
     raise ValueError(
-        'enable_control_image_computation parameter is not supported in'
-        ' Google AI.'
+        'enable_control_image_computation parameter is not supported in Gemini'
+        ' API.'
     )
 
   return to_object
@@ -1660,7 +1735,7 @@ def _StyleReferenceConfig_to_mldev(
   to_object = {}
   if getv(from_object, ['style_description']) is not None:
     raise ValueError(
-        'style_description parameter is not supported in Google AI.'
+        'style_description parameter is not supported in Gemini API.'
     )
 
   return to_object
@@ -1689,11 +1764,11 @@ def _SubjectReferenceConfig_to_mldev(
 ) -> dict:
   to_object = {}
   if getv(from_object, ['subject_type']) is not None:
-    raise ValueError('subject_type parameter is not supported in Google AI.')
+    raise ValueError('subject_type parameter is not supported in Gemini API.')
 
   if getv(from_object, ['subject_description']) is not None:
     raise ValueError(
-        'subject_description parameter is not supported in Google AI.'
+        'subject_description parameter is not supported in Gemini API.'
     )
 
   return to_object
@@ -1725,32 +1800,34 @@ def _ReferenceImageAPI_to_mldev(
 ) -> dict:
   to_object = {}
   if getv(from_object, ['reference_image']) is not None:
-    raise ValueError('reference_image parameter is not supported in Google AI.')
+    raise ValueError(
+        'reference_image parameter is not supported in Gemini API.'
+    )
 
   if getv(from_object, ['reference_id']) is not None:
-    raise ValueError('reference_id parameter is not supported in Google AI.')
+    raise ValueError('reference_id parameter is not supported in Gemini API.')
 
   if getv(from_object, ['reference_type']) is not None:
-    raise ValueError('reference_type parameter is not supported in Google AI.')
+    raise ValueError('reference_type parameter is not supported in Gemini API.')
 
   if getv(from_object, ['mask_image_config']) is not None:
     raise ValueError(
-        'mask_image_config parameter is not supported in Google AI.'
+        'mask_image_config parameter is not supported in Gemini API.'
     )
 
   if getv(from_object, ['control_image_config']) is not None:
     raise ValueError(
-        'control_image_config parameter is not supported in Google AI.'
+        'control_image_config parameter is not supported in Gemini API.'
     )
 
   if getv(from_object, ['style_image_config']) is not None:
     raise ValueError(
-        'style_image_config parameter is not supported in Google AI.'
+        'style_image_config parameter is not supported in Gemini API.'
     )
 
   if getv(from_object, ['subject_image_config']) is not None:
     raise ValueError(
-        'subject_image_config parameter is not supported in Google AI.'
+        'subject_image_config parameter is not supported in Gemini API.'
     )
 
   return to_object
@@ -1822,11 +1899,9 @@ def _EditImageConfig_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['output_gcs_uri']) is not None:
-    raise ValueError('output_gcs_uri parameter is not supported in Google AI.')
+    raise ValueError('output_gcs_uri parameter is not supported in Gemini API.')
 
   if getv(from_object, ['negative_prompt']) is not None:
     setv(
@@ -1850,9 +1925,12 @@ def _EditImageConfig_to_mldev(
     )
 
   if getv(from_object, ['seed']) is not None:
-    raise ValueError('seed parameter is not supported in Google AI.')
+    raise ValueError('seed parameter is not supported in Gemini API.')
 
   if getv(from_object, ['safety_filter_level']) is not None:
+    _SafetyFilterLevel_to_mldev_enum_validate(
+        getv(from_object, ['safety_filter_level'])
+    )
     setv(
         parent_object,
         ['parameters', 'safetySetting'],
@@ -1860,6 +1938,9 @@ def _EditImageConfig_to_mldev(
     )
 
   if getv(from_object, ['person_generation']) is not None:
+    _PersonGeneration_to_mldev_enum_validate(
+        getv(from_object, ['person_generation'])
+    )
     setv(
         parent_object,
         ['parameters', 'personGeneration'],
@@ -1902,6 +1983,7 @@ def _EditImageConfig_to_mldev(
     )
 
   if getv(from_object, ['edit_mode']) is not None:
+    _EditMode_to_mldev_enum_validate(getv(from_object, ['edit_mode']))
     setv(
         parent_object,
         ['parameters', 'editMode'],
@@ -1917,8 +1999,6 @@ def _EditImageConfig_to_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['output_gcs_uri']) is not None:
     setv(
@@ -2092,8 +2172,6 @@ def _UpscaleImageAPIConfig_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['include_rai_reason']) is not None:
     setv(
@@ -2135,8 +2213,6 @@ def _UpscaleImageAPIConfig_to_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['include_rai_reason']) is not None:
     setv(
@@ -2263,6 +2339,9 @@ def _GetModelParameters_to_mldev(
         t.t_model(api_client, getv(from_object, ['model'])),
     )
 
+  if getv(from_object, ['config']) is not None:
+    setv(to_object, ['config'], getv(from_object, ['config']))
+
   return to_object
 
 
@@ -2279,6 +2358,9 @@ def _GetModelParameters_to_vertex(
         t.t_model(api_client, getv(from_object, ['model'])),
     )
 
+  if getv(from_object, ['config']) is not None:
+    setv(to_object, ['config'], getv(from_object, ['config']))
+
   return to_object
 
 
@@ -2288,8 +2370,6 @@ def _ListModelsConfig_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['page_size']) is not None:
     setv(
@@ -2322,8 +2402,6 @@ def _ListModelsConfig_to_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['page_size']) is not None:
     setv(
@@ -2392,6 +2470,7 @@ def _UpdateModelConfig_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
+
   if getv(from_object, ['display_name']) is not None:
     setv(parent_object, ['displayName'], getv(from_object, ['display_name']))
 
@@ -2407,6 +2486,7 @@ def _UpdateModelConfig_to_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
+
   if getv(from_object, ['display_name']) is not None:
     setv(parent_object, ['displayName'], getv(from_object, ['display_name']))
 
@@ -2479,6 +2559,9 @@ def _DeleteModelParameters_to_mldev(
         t.t_model(api_client, getv(from_object, ['model'])),
     )
 
+  if getv(from_object, ['config']) is not None:
+    setv(to_object, ['config'], getv(from_object, ['config']))
+
   return to_object
 
 
@@ -2495,6 +2578,9 @@ def _DeleteModelParameters_to_vertex(
         t.t_model(api_client, getv(from_object, ['model'])),
     )
 
+  if getv(from_object, ['config']) is not None:
+    setv(to_object, ['config'], getv(from_object, ['config']))
+
   return to_object
 
 
@@ -2504,8 +2590,6 @@ def _CountTokensConfig_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['system_instruction']) is not None:
     setv(
@@ -2530,7 +2614,7 @@ def _CountTokensConfig_to_mldev(
 
   if getv(from_object, ['generation_config']) is not None:
     raise ValueError(
-        'generation_config parameter is not supported in Google AI.'
+        'generation_config parameter is not supported in Gemini API.'
     )
 
   return to_object
@@ -2542,12 +2626,10 @@ def _CountTokensConfig_to_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['system_instruction']) is not None:
     setv(
-        to_object,
+        parent_object,
         ['systemInstruction'],
         _Content_to_vertex(
             api_client,
@@ -2558,7 +2640,7 @@ def _CountTokensConfig_to_vertex(
 
   if getv(from_object, ['tools']) is not None:
     setv(
-        to_object,
+        parent_object,
         ['tools'],
         [
             _Tool_to_vertex(api_client, item, to_object)
@@ -2650,30 +2732,6 @@ def _CountTokensParameters_to_vertex(
   return to_object
 
 
-def _ComputeTokensConfig_to_mldev(
-    api_client: ApiClient,
-    from_object: Union[dict, object],
-    parent_object: dict = None,
-) -> dict:
-  to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
-
-  return to_object
-
-
-def _ComputeTokensConfig_to_vertex(
-    api_client: ApiClient,
-    from_object: Union[dict, object],
-    parent_object: dict = None,
-) -> dict:
-  to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
-
-  return to_object
-
-
 def _ComputeTokensParameters_to_mldev(
     api_client: ApiClient,
     from_object: Union[dict, object],
@@ -2688,16 +2746,10 @@ def _ComputeTokensParameters_to_mldev(
     )
 
   if getv(from_object, ['contents']) is not None:
-    raise ValueError('contents parameter is not supported in Google AI.')
+    raise ValueError('contents parameter is not supported in Gemini API.')
 
   if getv(from_object, ['config']) is not None:
-    setv(
-        to_object,
-        ['config'],
-        _ComputeTokensConfig_to_mldev(
-            api_client, getv(from_object, ['config']), to_object
-        ),
-    )
+    setv(to_object, ['config'], getv(from_object, ['config']))
 
   return to_object
 
@@ -2728,17 +2780,76 @@ def _ComputeTokensParameters_to_vertex(
     )
 
   if getv(from_object, ['config']) is not None:
-    setv(
-        to_object,
-        ['config'],
-        _ComputeTokensConfig_to_vertex(
-            api_client, getv(from_object, ['config']), to_object
-        ),
-    )
+    setv(to_object, ['config'], getv(from_object, ['config']))
 
   return to_object
 
 
+def _MediaResolution_to_mldev_enum_validate(enum_value: any):
+  if enum_value in set([
+      'MEDIA_RESOLUTION_UNSPECIFIED',
+      'MEDIA_RESOLUTION_LOW',
+      'MEDIA_RESOLUTION_MEDIUM',
+      'MEDIA_RESOLUTION_HIGH',
+  ]):
+    raise ValueError(f'{enum_value} enum value is not supported in Gemini API.')
+
+
+def _SafetyFilterLevel_to_mldev_enum_validate(enum_value: any):
+  if enum_value in set(['BLOCK_NONE']):
+    raise ValueError(f'{enum_value} enum value is not supported in Gemini API.')
+
+
+def _PersonGeneration_to_mldev_enum_validate(enum_value: any):
+  if enum_value in set(['ALLOW_ALL']):
+    raise ValueError(f'{enum_value} enum value is not supported in Gemini API.')
+
+
+def _MaskReferenceMode_to_mldev_enum_validate(enum_value: any):
+  if enum_value in set([
+      'MASK_MODE_DEFAULT',
+      'MASK_MODE_USER_PROVIDED',
+      'MASK_MODE_BACKGROUND',
+      'MASK_MODE_FOREGROUND',
+      'MASK_MODE_SEMANTIC',
+  ]):
+    raise ValueError(f'{enum_value} enum value is not supported in Gemini API.')
+
+
+def _ControlReferenceType_to_mldev_enum_validate(enum_value: any):
+  if enum_value in set([
+      'CONTROL_TYPE_DEFAULT',
+      'CONTROL_TYPE_CANNY',
+      'CONTROL_TYPE_SCRIBBLE',
+      'CONTROL_TYPE_FACE_MESH',
+  ]):
+    raise ValueError(f'{enum_value} enum value is not supported in Gemini API.')
+
+
+def _SubjectReferenceType_to_mldev_enum_validate(enum_value: any):
+  if enum_value in set([
+      'SUBJECT_TYPE_DEFAULT',
+      'SUBJECT_TYPE_PERSON',
+      'SUBJECT_TYPE_ANIMAL',
+      'SUBJECT_TYPE_PRODUCT',
+  ]):
+    raise ValueError(f'{enum_value} enum value is not supported in Gemini API.')
+
+
+def _EditMode_to_mldev_enum_validate(enum_value: any):
+  if enum_value in set([
+      'EDIT_MODE_DEFAULT',
+      'EDIT_MODE_INPAINT_REMOVAL',
+      'EDIT_MODE_INPAINT_INSERTION',
+      'EDIT_MODE_OUTPAINT',
+      'EDIT_MODE_CONTROLLED_EDITING',
+      'EDIT_MODE_STYLE',
+      'EDIT_MODE_BGSWAP',
+      'EDIT_MODE_PRODUCT_IMAGE',
+  ]):
+    raise ValueError(f'{enum_value} enum value is not supported in Gemini API.')
+
+
 def _Part_from_mldev(
     api_client: ApiClient,
     from_object: Union[dict, object],
@@ -3207,6 +3318,9 @@ def _Image_from_mldev(
         t.t_bytes(api_client, getv(from_object, ['bytesBase64Encoded'])),
     )
 
+  if getv(from_object, ['mimeType']) is not None:
+    setv(to_object, ['mime_type'], getv(from_object, ['mimeType']))
+
   return to_object
 
 
@@ -3226,6 +3340,9 @@ def _Image_from_vertex(
         t.t_bytes(api_client, getv(from_object, ['bytesBase64Encoded'])),
     )
 
+  if getv(from_object, ['mimeType']) is not None:
+    setv(to_object, ['mime_type'], getv(from_object, ['mimeType']))
+
   return to_object
 
 
@@ -3275,7 +3392,7 @@ def _GeneratedImage_from_vertex(
   return to_object
 
 
-def _GenerateImageResponse_from_mldev(
+def _GenerateImagesResponse_from_mldev(
     api_client: ApiClient,
     from_object: Union[dict, object],
     parent_object: dict = None,
@@ -3294,7 +3411,7 @@ def _GenerateImageResponse_from_mldev(
   return to_object
 
 
-def _GenerateImageResponse_from_vertex(
+def _GenerateImagesResponse_from_vertex(
     api_client: ApiClient,
     from_object: Union[dict, object],
     parent_object: dict = None,
@@ -3674,7 +3791,7 @@ def _ComputeTokensResponse_from_vertex(
   return to_object
 
 
-class Models(_common.BaseModule):
+class Models(_api_module.BaseModule):
 
   def _generate_content(
       self,
@@ -3703,10 +3820,16 @@ class Models(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = self._api_client.request(
         'post', path, request_dict, http_options
@@ -3722,7 +3845,7 @@ class Models(_common.BaseModule):
       )
 
     return_value = types.GenerateContentResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -3758,10 +3881,16 @@ class Models(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     for response_dict in self._api_client.request_streamed(
         'post', path, request_dict, http_options
@@ -3777,7 +3906,7 @@ class Models(_common.BaseModule):
         )
 
       return_value = types.GenerateContentResponse._from_response(
-          response_dict, parameter_model
+          response=response_dict, kwargs=parameter_model
       )
       self._api_client._verify_response(return_value)
       yield return_value
@@ -3832,10 +3961,16 @@ class Models(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = self._api_client.request(
         'post', path, request_dict, http_options
@@ -3851,33 +3986,33 @@ class Models(_common.BaseModule):
       )
 
     return_value = types.EmbedContentResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
 
-  def generate_image(
+  def generate_images(
       self,
       *,
       model: str,
       prompt: str,
-      config: Optional[types.GenerateImageConfigOrDict] = None,
-  ) -> types.GenerateImageResponse:
-    """Generates an image based on a text description and configuration.
+      config: Optional[types.GenerateImagesConfigOrDict] = None,
+  ) -> types.GenerateImagesResponse:
+    """Generates images based on a text description and configuration.
 
     Args:
       model (str): The model to use.
-      prompt (str): A text description of the image to generate.
-      config (GenerateImageConfig): Configuration for generation.
+      prompt (str): A text description of the images to generate.
+      config (GenerateImagesConfig): Configuration for generation.
 
     Usage:
 
     .. code-block:: python
 
-      response = client.models.generate_image(
+      response = client.models.generate_images(
         model='imagen-3.0-generate-001',
         prompt='Man with a dog',
-        config=types.GenerateImageConfig(
+        config=types.GenerateImagesConfig(
             number_of_images= 1,
             include_rai_reason= True,
         )
@@ -3886,19 +4021,19 @@ class Models(_common.BaseModule):
       # Shows a man with a dog.
     """
 
-    parameter_model = types._GenerateImageParameters(
+    parameter_model = types._GenerateImagesParameters(
         model=model,
         prompt=prompt,
         config=config,
     )
 
     if self._api_client.vertexai:
-      request_dict = _GenerateImageParameters_to_vertex(
+      request_dict = _GenerateImagesParameters_to_vertex(
           self._api_client, parameter_model
       )
       path = '{model}:predict'.format_map(request_dict.get('_url'))
     else:
-      request_dict = _GenerateImageParameters_to_mldev(
+      request_dict = _GenerateImagesParameters_to_mldev(
           self._api_client, parameter_model
       )
       path = '{model}:predict'.format_map(request_dict.get('_url'))
@@ -3906,26 +4041,32 @@ class Models(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = self._api_client.request(
         'post', path, request_dict, http_options
     )
 
     if self._api_client.vertexai:
-      response_dict = _GenerateImageResponse_from_vertex(
+      response_dict = _GenerateImagesResponse_from_vertex(
           self._api_client, response_dict
       )
     else:
-      response_dict = _GenerateImageResponse_from_mldev(
+      response_dict = _GenerateImagesResponse_from_mldev(
           self._api_client, response_dict
       )
 
-    return_value = types.GenerateImageResponse._from_response(
-        response_dict, parameter_model
+    return_value = types.GenerateImagesResponse._from_response(
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -3999,10 +4140,16 @@ class Models(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = self._api_client.request(
         'post', path, request_dict, http_options
@@ -4018,7 +4165,7 @@ class Models(_common.BaseModule):
       )
 
     return_value = types.EditImageResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -4059,10 +4206,16 @@ class Models(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = self._api_client.request(
         'post', path, request_dict, http_options
@@ -4078,14 +4231,17 @@ class Models(_common.BaseModule):
       )
 
     return_value = types.UpscaleImageResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
 
-  def get(self, *, model: str) -> types.Model:
+  def get(
+      self, *, model: str, config: Optional[types.GetModelConfigOrDict] = None
+  ) -> types.Model:
     parameter_model = types._GetModelParameters(
         model=model,
+        config=config,
     )
 
     if self._api_client.vertexai:
@@ -4102,10 +4258,16 @@ class Models(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = self._api_client.request(
         'get', path, request_dict, http_options
@@ -4116,7 +4278,9 @@ class Models(_common.BaseModule):
     else:
       response_dict = _Model_from_mldev(self._api_client, response_dict)
 
-    return_value = types.Model._from_response(response_dict, parameter_model)
+    return_value = types.Model._from_response(
+        response=response_dict, kwargs=parameter_model
+    )
     self._api_client._verify_response(return_value)
     return return_value
 
@@ -4141,10 +4305,16 @@ class Models(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = self._api_client.request(
         'get', path, request_dict, http_options
@@ -4160,7 +4330,7 @@ class Models(_common.BaseModule):
       )
 
     return_value = types.ListModelsResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -4190,10 +4360,16 @@ class Models(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = self._api_client.request(
         'patch', path, request_dict, http_options
@@ -4204,13 +4380,21 @@ class Models(_common.BaseModule):
     else:
       response_dict = _Model_from_mldev(self._api_client, response_dict)
 
-    return_value = types.Model._from_response(response_dict, parameter_model)
+    return_value = types.Model._from_response(
+        response=response_dict, kwargs=parameter_model
+    )
     self._api_client._verify_response(return_value)
     return return_value
 
-  def delete(self, *, model: str) -> types.DeleteModelResponse:
+  def delete(
+      self,
+      *,
+      model: str,
+      config: Optional[types.DeleteModelConfigOrDict] = None,
+  ) -> types.DeleteModelResponse:
     parameter_model = types._DeleteModelParameters(
         model=model,
+        config=config,
     )
 
     if self._api_client.vertexai:
@@ -4227,10 +4411,16 @@ class Models(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = self._api_client.request(
         'delete', path, request_dict, http_options
@@ -4246,7 +4436,7 @@ class Models(_common.BaseModule):
       )
 
     return_value = types.DeleteModelResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -4298,10 +4488,16 @@ class Models(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = self._api_client.request(
         'post', path, request_dict, http_options
@@ -4317,7 +4513,7 @@ class Models(_common.BaseModule):
       )
 
     return_value = types.CountTokensResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -4369,10 +4565,16 @@ class Models(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = self._api_client.request(
         'post', path, request_dict, http_options
@@ -4388,7 +4590,7 @@ class Models(_common.BaseModule):
       )
 
     return_value = types.ComputeTokensResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -4402,6 +4604,24 @@ class Models(_common.BaseModule):
   ) -> types.GenerateContentResponse:
     """Makes an API request to generate content using a model.
 
+    For the `model` parameter, supported format for Vertex AI API includes:
+    - the Gemini model ID, for example: 'gemini-1.5-flash-002'
+    - the full resource name starts with 'projects/', for example:
+      'projects/my-project-id/locations/us-central1/publishers/google/models/gemini-1.5-flash-002'
+    - the partial resource name with 'publishers/', for example:
+      'publishers/google/models/gemini-1.5-flash-002' or
+      'publishers/meta/models/llama-3.1-405b-instruct-maas'
+    - `/` separated publisher and model name, for example:
+      'google/gemini-1.5-flash-002' or 'meta/llama-3.1-405b-instruct-maas'
+
+    For the `model` parameter, supported format for Gemini API includes:
+    - the Gemini model ID, for example: 'gemini-1.5-flash-002'
+    - the model name starts with 'models/', for example:
+      'models/gemini-1.5-flash-002'
+    - if you would like to use a tuned model, the model name starts with
+      'tunedModels/', for example:
+      'tunedModels/1234567890123456789'
+
     Some models support multimodal input and output.
 
     Usage:
@@ -4546,9 +4766,14 @@ class Models(_common.BaseModule):
       *,
       config: Optional[types.ListModelsConfigOrDict] = None,
   ) -> Pager[types.Model]:
-    """Makes an API request to list the tuned models available to your project.
+    """Makes an API request to list the available models.
 
-    This method only lists tuned models for the Vertex AI API.
+    If `query_base` is set to True in the config, the API will return all
+    available base models. If set to False or not set (default), it will return
+    all tuned models.
+
+    Args:
+      config (ListModelsConfigOrDict): Configuration for retrieving models.
 
     Usage:
 
@@ -4557,6 +4782,10 @@ class Models(_common.BaseModule):
       response=client.models.list(config={'page_size': 5})
       print(response.page)
       # [Model(name='projects/./locations/./models/123', display_name='my_model'
+
+      response=client.models.list(config={'page_size': 5, 'query_base': True})
+      print(response.page)
+      # [Model(name='publishers/google/models/gemini-2.0-flash-exp' ...
     """
 
     config = (
@@ -4565,13 +4794,7 @@ class Models(_common.BaseModule):
     )
     if self._api_client.vertexai:
       config = config.copy()
-      if config.query_base:
-        http_options = (
-            config.http_options if config.http_options else HttpOptionsDict()
-        )
-        http_options['skip_project_and_location_in_path'] = True
-        config.http_options = http_options
-      else:
+      if not config.query_base:
         # Filter for tuning jobs artifacts by labels.
         filter_value = config.filter
         config.filter = (
@@ -4589,7 +4812,7 @@ class Models(_common.BaseModule):
     )
 
 
-class AsyncModels(_common.BaseModule):
+class AsyncModels(_api_module.BaseModule):
 
   async def _generate_content(
       self,
@@ -4618,10 +4841,16 @@ class AsyncModels(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = await self._api_client.async_request(
         'post', path, request_dict, http_options
@@ -4637,7 +4866,7 @@ class AsyncModels(_common.BaseModule):
       )
 
     return_value = types.GenerateContentResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -4648,7 +4877,7 @@ class AsyncModels(_common.BaseModule):
       model: str,
       contents: Union[types.ContentListUnion, types.ContentListUnionDict],
       config: Optional[types.GenerateContentConfigOrDict] = None,
-  ) -> AsyncIterator[types.GenerateContentResponse]:
+  ) -> Awaitable[AsyncIterator[types.GenerateContentResponse]]:
     parameter_model = types._GenerateContentParameters(
         model=model,
         contents=contents,
@@ -4673,29 +4902,40 @@ class AsyncModels(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
-    async for response_dict in self._api_client.async_request_streamed(
+    response_stream = await self._api_client.async_request_streamed(
         'post', path, request_dict, http_options
-    ):
+    )
 
-      if self._api_client.vertexai:
-        response_dict = _GenerateContentResponse_from_vertex(
-            self._api_client, response_dict
-        )
-      else:
-        response_dict = _GenerateContentResponse_from_mldev(
-            self._api_client, response_dict
+    async def async_generator():
+      async for response_dict in response_stream:
+
+        if self._api_client.vertexai:
+          response_dict = _GenerateContentResponse_from_vertex(
+              self._api_client, response_dict
+          )
+        else:
+          response_dict = _GenerateContentResponse_from_mldev(
+              self._api_client, response_dict
+          )
+
+        return_value = types.GenerateContentResponse._from_response(
+            response=response_dict, kwargs=parameter_model
         )
+        self._api_client._verify_response(return_value)
+        yield return_value
 
-      return_value = types.GenerateContentResponse._from_response(
-          response_dict, parameter_model
-      )
-      self._api_client._verify_response(return_value)
-      yield return_value
+    return async_generator()
 
   async def embed_content(
       self,
@@ -4747,10 +4987,16 @@ class AsyncModels(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = await self._api_client.async_request(
         'post', path, request_dict, http_options
@@ -4766,33 +5012,33 @@ class AsyncModels(_common.BaseModule):
       )
 
     return_value = types.EmbedContentResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
 
-  async def generate_image(
+  async def generate_images(
       self,
       *,
       model: str,
       prompt: str,
-      config: Optional[types.GenerateImageConfigOrDict] = None,
-  ) -> types.GenerateImageResponse:
-    """Generates an image based on a text description and configuration.
+      config: Optional[types.GenerateImagesConfigOrDict] = None,
+  ) -> types.GenerateImagesResponse:
+    """Generates images based on a text description and configuration.
 
     Args:
       model (str): The model to use.
-      prompt (str): A text description of the image to generate.
-      config (GenerateImageConfig): Configuration for generation.
+      prompt (str): A text description of the images to generate.
+      config (GenerateImagesConfig): Configuration for generation.
 
     Usage:
 
     .. code-block:: python
 
-      response = client.models.generate_image(
+      response = client.models.generate_images(
         model='imagen-3.0-generate-001',
         prompt='Man with a dog',
-        config=types.GenerateImageConfig(
+        config=types.GenerateImagesConfig(
             number_of_images= 1,
             include_rai_reason= True,
         )
@@ -4801,19 +5047,19 @@ class AsyncModels(_common.BaseModule):
       # Shows a man with a dog.
     """
 
-    parameter_model = types._GenerateImageParameters(
+    parameter_model = types._GenerateImagesParameters(
         model=model,
         prompt=prompt,
         config=config,
     )
 
     if self._api_client.vertexai:
-      request_dict = _GenerateImageParameters_to_vertex(
+      request_dict = _GenerateImagesParameters_to_vertex(
           self._api_client, parameter_model
       )
       path = '{model}:predict'.format_map(request_dict.get('_url'))
     else:
-      request_dict = _GenerateImageParameters_to_mldev(
+      request_dict = _GenerateImagesParameters_to_mldev(
           self._api_client, parameter_model
       )
       path = '{model}:predict'.format_map(request_dict.get('_url'))
@@ -4821,26 +5067,32 @@ class AsyncModels(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = await self._api_client.async_request(
         'post', path, request_dict, http_options
     )
 
     if self._api_client.vertexai:
-      response_dict = _GenerateImageResponse_from_vertex(
+      response_dict = _GenerateImagesResponse_from_vertex(
           self._api_client, response_dict
       )
     else:
-      response_dict = _GenerateImageResponse_from_mldev(
+      response_dict = _GenerateImagesResponse_from_mldev(
           self._api_client, response_dict
       )
 
-    return_value = types.GenerateImageResponse._from_response(
-        response_dict, parameter_model
+    return_value = types.GenerateImagesResponse._from_response(
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -4914,10 +5166,16 @@ class AsyncModels(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = await self._api_client.async_request(
         'post', path, request_dict, http_options
@@ -4933,7 +5191,7 @@ class AsyncModels(_common.BaseModule):
       )
 
     return_value = types.EditImageResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -4974,10 +5232,16 @@ class AsyncModels(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = await self._api_client.async_request(
         'post', path, request_dict, http_options
@@ -4993,14 +5257,17 @@ class AsyncModels(_common.BaseModule):
       )
 
     return_value = types.UpscaleImageResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
 
-  async def get(self, *, model: str) -> types.Model:
+  async def get(
+      self, *, model: str, config: Optional[types.GetModelConfigOrDict] = None
+  ) -> types.Model:
     parameter_model = types._GetModelParameters(
         model=model,
+        config=config,
     )
 
     if self._api_client.vertexai:
@@ -5017,10 +5284,16 @@ class AsyncModels(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = await self._api_client.async_request(
         'get', path, request_dict, http_options
@@ -5031,7 +5304,9 @@ class AsyncModels(_common.BaseModule):
     else:
       response_dict = _Model_from_mldev(self._api_client, response_dict)
 
-    return_value = types.Model._from_response(response_dict, parameter_model)
+    return_value = types.Model._from_response(
+        response=response_dict, kwargs=parameter_model
+    )
     self._api_client._verify_response(return_value)
     return return_value
 
@@ -5056,10 +5331,16 @@ class AsyncModels(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = await self._api_client.async_request(
         'get', path, request_dict, http_options
@@ -5075,7 +5356,7 @@ class AsyncModels(_common.BaseModule):
       )
 
     return_value = types.ListModelsResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -5105,10 +5386,16 @@ class AsyncModels(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = await self._api_client.async_request(
         'patch', path, request_dict, http_options
@@ -5119,13 +5406,21 @@ class AsyncModels(_common.BaseModule):
     else:
       response_dict = _Model_from_mldev(self._api_client, response_dict)
 
-    return_value = types.Model._from_response(response_dict, parameter_model)
+    return_value = types.Model._from_response(
+        response=response_dict, kwargs=parameter_model
+    )
     self._api_client._verify_response(return_value)
     return return_value
 
-  async def delete(self, *, model: str) -> types.DeleteModelResponse:
+  async def delete(
+      self,
+      *,
+      model: str,
+      config: Optional[types.DeleteModelConfigOrDict] = None,
+  ) -> types.DeleteModelResponse:
     parameter_model = types._DeleteModelParameters(
         model=model,
+        config=config,
     )
 
     if self._api_client.vertexai:
@@ -5142,10 +5437,16 @@ class AsyncModels(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = await self._api_client.async_request(
         'delete', path, request_dict, http_options
@@ -5161,7 +5462,7 @@ class AsyncModels(_common.BaseModule):
       )
 
     return_value = types.DeleteModelResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -5213,10 +5514,16 @@ class AsyncModels(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = await self._api_client.async_request(
         'post', path, request_dict, http_options
@@ -5232,7 +5539,7 @@ class AsyncModels(_common.BaseModule):
       )
 
     return_value = types.CountTokensResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -5284,10 +5591,16 @@ class AsyncModels(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
-    request_dict = _common.apply_base64_encoding(request_dict)
+    request_dict = _common.encode_unserializable_types(request_dict)
 
     response_dict = await self._api_client.async_request(
         'post', path, request_dict, http_options
@@ -5303,7 +5616,7 @@ class AsyncModels(_common.BaseModule):
       )
 
     return_value = types.ComputeTokensResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -5396,9 +5709,14 @@ class AsyncModels(_common.BaseModule):
       *,
       config: Optional[types.ListModelsConfigOrDict] = None,
   ) -> AsyncPager[types.Model]:
-    """Makes an API request to list the tuned models available to your project.
+    """Makes an API request to list the available models.
 
-    This method only lists tuned models for the Vertex AI API.
+    If `query_base` is set to True in the config, the API will return all
+    available base models. If set to False or not set (default), it will return
+    all tuned models.
+
+    Args:
+      config (ListModelsConfigOrDict): Configuration for retrieving models.
 
     Usage:
 
@@ -5407,6 +5725,12 @@ class AsyncModels(_common.BaseModule):
       response = await client.aio.models.list(config={'page_size': 5})
       print(response.page)
       # [Model(name='projects/./locations/./models/123', display_name='my_model'
+
+      response = await client.aio.models.list(
+          config={'page_size': 5, 'query_base': True}
+        )
+      print(response.page)
+      # [Model(name='publishers/google/models/gemini-2.0-flash-exp' ...
     """
 
     config = (
@@ -5415,13 +5739,7 @@ class AsyncModels(_common.BaseModule):
     )
     if self._api_client.vertexai:
       config = config.copy()
-      if config.query_base:
-        http_options = (
-            config.http_options if config.http_options else HttpOptionsDict()
-        )
-        http_options['skip_project_and_location_in_path'] = True
-        config.http_options = http_options
-      else:
+      if not config.query_base:
         # Filter for tuning jobs artifacts by labels.
         filter_value = config.filter
         config.filter = (