google-genai 0.4.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

google/genai/models.py

@@ -13,6 +13,8 @@
 # limitations under the License.
 #
 
+# Code generated by the Google Gen AI SDK generator DO NOT EDIT.
+
 import logging
 from typing import AsyncIterator, Iterator, Optional, Union
 from urllib.parse import urlencode
@@ -20,7 +22,7 @@ from . import _common
 from . import _extra_utils
 from . import _transformers as t
 from . import types
-from ._api_client import ApiClient
+from ._api_client import ApiClient, HttpOptionsDict
 from ._common import get_value_by_path as getv
 from ._common import set_value_by_path as setv
 from .pagers import AsyncPager, Pager
@@ -760,6 +762,34 @@ 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],
@@ -904,6 +934,18 @@ def _GenerateContentConfig_to_mldev(
         ),
     )
 
+  if getv(from_object, ['audio_timestamp']) is not None:
+    raise ValueError('audio_timestamp parameter is not supported in Google AI.')
+
+  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
 
 
@@ -1051,6 +1093,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
 
 
@@ -1545,7 +1599,11 @@ def _Image_to_mldev(
     raise ValueError('gcs_uri parameter is not supported in Google AI.')
 
   if getv(from_object, ['image_bytes']) is not None:
-    setv(to_object, ['bytesBase64Encoded'], getv(from_object, ['image_bytes']))
+    setv(
+        to_object,
+        ['bytesBase64Encoded'],
+        t.t_bytes(api_client, getv(from_object, ['image_bytes'])),
+    )
 
   return to_object
 
@@ -1560,7 +1618,11 @@ def _Image_to_vertex(
     setv(to_object, ['gcsUri'], getv(from_object, ['gcs_uri']))
 
   if getv(from_object, ['image_bytes']) is not None:
-    setv(to_object, ['bytesBase64Encoded'], getv(from_object, ['image_bytes']))
+    setv(
+        to_object,
+        ['bytesBase64Encoded'],
+        t.t_bytes(api_client, getv(from_object, ['image_bytes'])),
+    )
 
   return to_object
 
@@ -2278,6 +2340,9 @@ 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(
         parent_object, ['_query', 'pageSize'], getv(from_object, ['page_size'])
@@ -2293,6 +2358,13 @@ def _ListModelsConfig_to_mldev(
   if getv(from_object, ['filter']) is not None:
     setv(parent_object, ['_query', 'filter'], getv(from_object, ['filter']))
 
+  if getv(from_object, ['query_base']) is not None:
+    setv(
+        parent_object,
+        ['_url', 'models_url'],
+        t.t_models_url(api_client, getv(from_object, ['query_base'])),
+    )
+
   return to_object
 
 
@@ -2302,6 +2374,9 @@ 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(
         parent_object, ['_query', 'pageSize'], getv(from_object, ['page_size'])
@@ -2317,6 +2392,13 @@ def _ListModelsConfig_to_vertex(
   if getv(from_object, ['filter']) is not None:
     setv(parent_object, ['_query', 'filter'], getv(from_object, ['filter']))
 
+  if getv(from_object, ['query_base']) is not None:
+    setv(
+        parent_object,
+        ['_url', 'models_url'],
+        t.t_models_url(api_client, getv(from_object, ['query_base'])),
+    )
+
   return to_object
 
 
@@ -2517,7 +2599,7 @@ def _CountTokensConfig_to_vertex(
 
   if getv(from_object, ['system_instruction']) is not None:
     setv(
-        to_object,
+        parent_object,
         ['systemInstruction'],
         _Content_to_vertex(
             api_client,
@@ -2528,7 +2610,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)
@@ -3171,7 +3253,11 @@ def _Image_from_mldev(
   to_object = {}
 
   if getv(from_object, ['bytesBase64Encoded']) is not None:
-    setv(to_object, ['image_bytes'], getv(from_object, ['bytesBase64Encoded']))
+    setv(
+        to_object,
+        ['image_bytes'],
+        t.t_bytes(api_client, getv(from_object, ['bytesBase64Encoded'])),
+    )
 
   return to_object
 
@@ -3186,7 +3272,11 @@ def _Image_from_vertex(
     setv(to_object, ['gcs_uri'], getv(from_object, ['gcsUri']))
 
   if getv(from_object, ['bytesBase64Encoded']) is not None:
-    setv(to_object, ['image_bytes'], getv(from_object, ['bytesBase64Encoded']))
+    setv(
+        to_object,
+        ['image_bytes'],
+        t.t_bytes(api_client, getv(from_object, ['bytesBase64Encoded'])),
+    )
 
   return to_object
 
@@ -3522,13 +3612,15 @@ def _ListModelsResponse_from_mldev(
   if getv(from_object, ['nextPageToken']) is not None:
     setv(to_object, ['next_page_token'], getv(from_object, ['nextPageToken']))
 
-  if getv(from_object, ['tunedModels']) is not None:
+  if getv(from_object, ['_self']) is not None:
     setv(
         to_object,
         ['models'],
         [
             _Model_from_mldev(api_client, item, to_object)
-            for item in getv(from_object, ['tunedModels'])
+            for item in t.t_extract_models(
+                api_client, getv(from_object, ['_self'])
+            )
         ],
     )
 
@@ -3544,13 +3636,15 @@ def _ListModelsResponse_from_vertex(
   if getv(from_object, ['nextPageToken']) is not None:
     setv(to_object, ['next_page_token'], getv(from_object, ['nextPageToken']))
 
-  if getv(from_object, ['models']) is not None:
+  if getv(from_object, ['_self']) is not None:
     setv(
         to_object,
         ['models'],
         [
             _Model_from_vertex(api_client, item, to_object)
-            for item in getv(from_object, ['models'])
+            for item in t.t_extract_models(
+                api_client, getv(from_object, ['_self'])
+            )
         ],
     )
 
@@ -3647,14 +3741,14 @@ class Models(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _GenerateContentParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:generateContent'.format_map(request_dict.get('_url'))
     else:
       request_dict = _GenerateContentParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:generateContent'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -3664,25 +3758,25 @@ class Models(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = self._api_client.request(
         'post', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _GenerateContentResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _GenerateContentResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.GenerateContentResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   def generate_content_stream(
@@ -3698,16 +3792,16 @@ class Models(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _GenerateContentParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:streamGenerateContent?alt=sse'.format_map(
           request_dict.get('_url')
       )
     else:
       request_dict = _GenerateContentParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:streamGenerateContent?alt=sse'.format_map(
           request_dict.get('_url')
@@ -3719,25 +3813,25 @@ class Models(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    for response_dict in self._api_client.request_streamed(
         'post', path, request_dict, http_options
     ):
 
-      if self.api_client.vertexai:
+      if self._api_client.vertexai:
         response_dict = _GenerateContentResponse_from_vertex(
-            self.api_client, response_dict
+            self._api_client, response_dict
         )
       else:
         response_dict = _GenerateContentResponse_from_mldev(
-            self.api_client, response_dict
+            self._api_client, response_dict
         )
 
       return_value = types.GenerateContentResponse._from_response(
           response_dict, parameter_model
       )
-      self.api_client._verify_response(return_value)
+      self._api_client._verify_response(return_value)
       yield return_value
 
   def embed_content(
@@ -3776,14 +3870,14 @@ class Models(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _EmbedContentParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:predict'.format_map(request_dict.get('_url'))
     else:
       request_dict = _EmbedContentParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:batchEmbedContents'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -3793,25 +3887,25 @@ class Models(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = self._api_client.request(
         'post', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _EmbedContentResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _EmbedContentResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.EmbedContentResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   def generate_image(
@@ -3850,14 +3944,14 @@ class Models(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _GenerateImageParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:predict'.format_map(request_dict.get('_url'))
     else:
       request_dict = _GenerateImageParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:predict'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -3867,25 +3961,25 @@ class Models(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = self._api_client.request(
         'post', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _GenerateImageResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _GenerateImageResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.GenerateImageResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   def edit_image(
@@ -3945,11 +4039,11 @@ class Models(_common.BaseModule):
         config=config,
     )
 
-    if not self.api_client.vertexai:
+    if not self._api_client.vertexai:
       raise ValueError('This method is only supported in the Vertex AI client.')
     else:
       request_dict = _EditImageParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:predict'.format_map(request_dict.get('_url'))
 
@@ -3960,25 +4054,25 @@ class Models(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = self._api_client.request(
         'post', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _EditImageResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _EditImageResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.EditImageResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   def _upscale_image(
@@ -4005,11 +4099,11 @@ class Models(_common.BaseModule):
         config=config,
     )
 
-    if not self.api_client.vertexai:
+    if not self._api_client.vertexai:
       raise ValueError('This method is only supported in the Vertex AI client.')
     else:
       request_dict = _UpscaleImageAPIParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:predict'.format_map(request_dict.get('_url'))
 
@@ -4020,25 +4114,25 @@ class Models(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = self._api_client.request(
         'post', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _UpscaleImageResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _UpscaleImageResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.UpscaleImageResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   def get(self, *, model: str) -> types.Model:
@@ -4046,14 +4140,14 @@ class Models(_common.BaseModule):
         model=model,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _GetModelParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     else:
       request_dict = _GetModelParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -4063,19 +4157,19 @@ class Models(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = self._api_client.request(
         'get', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
-      response_dict = _Model_from_vertex(self.api_client, response_dict)
+    if self._api_client.vertexai:
+      response_dict = _Model_from_vertex(self._api_client, response_dict)
     else:
-      response_dict = _Model_from_mldev(self.api_client, response_dict)
+      response_dict = _Model_from_mldev(self._api_client, response_dict)
 
     return_value = types.Model._from_response(response_dict, parameter_model)
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   def _list(
@@ -4085,16 +4179,16 @@ class Models(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _ListModelsParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
-      path = 'models'.format_map(request_dict.get('_url'))
+      path = '{models_url}'.format_map(request_dict.get('_url'))
     else:
       request_dict = _ListModelsParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
-      path = 'tunedModels'.format_map(request_dict.get('_url'))
+      path = '{models_url}'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
@@ -4102,25 +4196,25 @@ class Models(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = self._api_client.request(
         'get', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _ListModelsResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _ListModelsResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.ListModelsResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   def update(
@@ -4134,14 +4228,14 @@ class Models(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _UpdateModelParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}'.format_map(request_dict.get('_url'))
     else:
       request_dict = _UpdateModelParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -4151,19 +4245,19 @@ class Models(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = self._api_client.request(
         'patch', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
-      response_dict = _Model_from_vertex(self.api_client, response_dict)
+    if self._api_client.vertexai:
+      response_dict = _Model_from_vertex(self._api_client, response_dict)
     else:
-      response_dict = _Model_from_mldev(self.api_client, response_dict)
+      response_dict = _Model_from_mldev(self._api_client, response_dict)
 
     return_value = types.Model._from_response(response_dict, parameter_model)
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   def delete(self, *, model: str) -> types.DeleteModelResponse:
@@ -4171,14 +4265,14 @@ class Models(_common.BaseModule):
         model=model,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _DeleteModelParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     else:
       request_dict = _DeleteModelParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -4188,25 +4282,25 @@ class Models(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = self._api_client.request(
         'delete', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _DeleteModelResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _DeleteModelResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.DeleteModelResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   def count_tokens(
@@ -4242,14 +4336,14 @@ class Models(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _CountTokensParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:countTokens'.format_map(request_dict.get('_url'))
     else:
       request_dict = _CountTokensParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:countTokens'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -4259,25 +4353,25 @@ class Models(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = self._api_client.request(
         'post', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _CountTokensResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _CountTokensResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.CountTokensResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   def compute_tokens(
@@ -4315,11 +4409,11 @@ class Models(_common.BaseModule):
         config=config,
     )
 
-    if not self.api_client.vertexai:
+    if not self._api_client.vertexai:
       raise ValueError('This method is only supported in the Vertex AI client.')
     else:
       request_dict = _ComputeTokensParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:computeTokens'.format_map(request_dict.get('_url'))
 
@@ -4330,25 +4424,25 @@ class Models(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = self._api_client.request(
         'post', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _ComputeTokensResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _ComputeTokensResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.ComputeTokensResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   def generate_content(
@@ -4428,7 +4522,7 @@ class Models(_common.BaseModule):
       )
       if not func_response_parts:
         break
-      contents = t.t_contents(self.api_client, contents)
+      contents = t.t_contents(self._api_client, contents)
       contents.append(response.candidates[0].content)
       contents.append(
           types.Content(
@@ -4504,9 +4598,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.
+
+    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.
 
-    This method only lists tuned models for the Vertex AI API.
+    Args:
+      config (ListModelsConfigOrDict): Configuration for retrieving models.
 
     Usage:
 
@@ -4515,23 +4614,34 @@ 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 = (
         types._ListModelsParameters(config=config).config
         or types.ListModelsConfig()
     )
-
-    if self.api_client.vertexai:
-      # Filter for tuning jobs artifacts by labels.
+    if self._api_client.vertexai:
       config = config.copy()
-      filter_value = config.filter
-      config.filter = (
-          filter_value + '&filter=labels.tune-type:*'
-          if filter_value
-          else 'labels.tune-type:*'
-      )
-
+      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:
+        # Filter for tuning jobs artifacts by labels.
+        filter_value = config.filter
+        config.filter = (
+            filter_value + '&filter=labels.tune-type:*'
+            if filter_value
+            else 'labels.tune-type:*'
+        )
+    if not config.query_base:
+      config.query_base = False
     return Pager(
         'models',
         self._list,
@@ -4555,14 +4665,14 @@ class AsyncModels(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _GenerateContentParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:generateContent'.format_map(request_dict.get('_url'))
     else:
       request_dict = _GenerateContentParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:generateContent'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -4572,25 +4682,25 @@ class AsyncModels(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = await self._api_client.async_request(
         'post', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _GenerateContentResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _GenerateContentResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.GenerateContentResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   async def generate_content_stream(
@@ -4606,16 +4716,16 @@ class AsyncModels(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _GenerateContentParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:streamGenerateContent?alt=sse'.format_map(
           request_dict.get('_url')
       )
     else:
       request_dict = _GenerateContentParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:streamGenerateContent?alt=sse'.format_map(
           request_dict.get('_url')
@@ -4627,25 +4737,25 @@ class AsyncModels(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    async for response_dict in self._api_client.async_request_streamed(
         'post', path, request_dict, http_options
     ):
 
-      if self.api_client.vertexai:
+      if self._api_client.vertexai:
         response_dict = _GenerateContentResponse_from_vertex(
-            self.api_client, response_dict
+            self._api_client, response_dict
         )
       else:
         response_dict = _GenerateContentResponse_from_mldev(
-            self.api_client, response_dict
+            self._api_client, response_dict
         )
 
       return_value = types.GenerateContentResponse._from_response(
           response_dict, parameter_model
       )
-      self.api_client._verify_response(return_value)
+      self._api_client._verify_response(return_value)
       yield return_value
 
   async def embed_content(
@@ -4684,14 +4794,14 @@ class AsyncModels(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _EmbedContentParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:predict'.format_map(request_dict.get('_url'))
     else:
       request_dict = _EmbedContentParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:batchEmbedContents'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -4701,25 +4811,25 @@ class AsyncModels(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = await self._api_client.async_request(
         'post', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _EmbedContentResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _EmbedContentResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.EmbedContentResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   async def generate_image(
@@ -4758,14 +4868,14 @@ class AsyncModels(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _GenerateImageParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:predict'.format_map(request_dict.get('_url'))
     else:
       request_dict = _GenerateImageParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:predict'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -4775,25 +4885,25 @@ class AsyncModels(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = await self._api_client.async_request(
         'post', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _GenerateImageResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _GenerateImageResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.GenerateImageResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   async def edit_image(
@@ -4853,11 +4963,11 @@ class AsyncModels(_common.BaseModule):
         config=config,
     )
 
-    if not self.api_client.vertexai:
+    if not self._api_client.vertexai:
       raise ValueError('This method is only supported in the Vertex AI client.')
     else:
       request_dict = _EditImageParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:predict'.format_map(request_dict.get('_url'))
 
@@ -4868,25 +4978,25 @@ class AsyncModels(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = await self._api_client.async_request(
         'post', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _EditImageResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _EditImageResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.EditImageResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   async def _upscale_image(
@@ -4913,11 +5023,11 @@ class AsyncModels(_common.BaseModule):
         config=config,
     )
 
-    if not self.api_client.vertexai:
+    if not self._api_client.vertexai:
       raise ValueError('This method is only supported in the Vertex AI client.')
     else:
       request_dict = _UpscaleImageAPIParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:predict'.format_map(request_dict.get('_url'))
 
@@ -4928,25 +5038,25 @@ class AsyncModels(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = await self._api_client.async_request(
         'post', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _UpscaleImageResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _UpscaleImageResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.UpscaleImageResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   async def get(self, *, model: str) -> types.Model:
@@ -4954,14 +5064,14 @@ class AsyncModels(_common.BaseModule):
         model=model,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _GetModelParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     else:
       request_dict = _GetModelParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -4971,19 +5081,19 @@ class AsyncModels(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = await self._api_client.async_request(
         'get', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
-      response_dict = _Model_from_vertex(self.api_client, response_dict)
+    if self._api_client.vertexai:
+      response_dict = _Model_from_vertex(self._api_client, response_dict)
     else:
-      response_dict = _Model_from_mldev(self.api_client, response_dict)
+      response_dict = _Model_from_mldev(self._api_client, response_dict)
 
     return_value = types.Model._from_response(response_dict, parameter_model)
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   async def _list(
@@ -4993,16 +5103,16 @@ class AsyncModels(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _ListModelsParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
-      path = 'models'.format_map(request_dict.get('_url'))
+      path = '{models_url}'.format_map(request_dict.get('_url'))
     else:
       request_dict = _ListModelsParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
-      path = 'tunedModels'.format_map(request_dict.get('_url'))
+      path = '{models_url}'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
@@ -5010,25 +5120,25 @@ class AsyncModels(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = await self._api_client.async_request(
         'get', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _ListModelsResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _ListModelsResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.ListModelsResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   async def update(
@@ -5042,14 +5152,14 @@ class AsyncModels(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _UpdateModelParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}'.format_map(request_dict.get('_url'))
     else:
       request_dict = _UpdateModelParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -5059,19 +5169,19 @@ class AsyncModels(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = await self._api_client.async_request(
         'patch', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
-      response_dict = _Model_from_vertex(self.api_client, response_dict)
+    if self._api_client.vertexai:
+      response_dict = _Model_from_vertex(self._api_client, response_dict)
     else:
-      response_dict = _Model_from_mldev(self.api_client, response_dict)
+      response_dict = _Model_from_mldev(self._api_client, response_dict)
 
     return_value = types.Model._from_response(response_dict, parameter_model)
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   async def delete(self, *, model: str) -> types.DeleteModelResponse:
@@ -5079,14 +5189,14 @@ class AsyncModels(_common.BaseModule):
         model=model,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _DeleteModelParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     else:
       request_dict = _DeleteModelParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -5096,25 +5206,25 @@ class AsyncModels(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = await self._api_client.async_request(
         'delete', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _DeleteModelResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _DeleteModelResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.DeleteModelResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   async def count_tokens(
@@ -5150,14 +5260,14 @@ class AsyncModels(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _CountTokensParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:countTokens'.format_map(request_dict.get('_url'))
     else:
       request_dict = _CountTokensParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:countTokens'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -5167,25 +5277,25 @@ class AsyncModels(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = await self._api_client.async_request(
         'post', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _CountTokensResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _CountTokensResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.CountTokensResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   async def compute_tokens(
@@ -5223,11 +5333,11 @@ class AsyncModels(_common.BaseModule):
         config=config,
     )
 
-    if not self.api_client.vertexai:
+    if not self._api_client.vertexai:
       raise ValueError('This method is only supported in the Vertex AI client.')
     else:
       request_dict = _ComputeTokensParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{model}:computeTokens'.format_map(request_dict.get('_url'))
 
@@ -5238,25 +5348,25 @@ class AsyncModels(_common.BaseModule):
     config = request_dict.pop('config', None)
     http_options = config.pop('httpOptions', None) if config else None
     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(
+    response_dict = await self._api_client.async_request(
         'post', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _ComputeTokensResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _ComputeTokensResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.ComputeTokensResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   async def generate_content(
@@ -5326,7 +5436,7 @@ class AsyncModels(_common.BaseModule):
       )
       if not func_response_parts:
         break
-      contents = t.t_contents(self.api_client, contents)
+      contents = t.t_contents(self._api_client, contents)
       contents.append(response.candidates[0].content)
       contents.append(
           types.Content(
@@ -5347,9 +5457,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.
+
+    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.
 
-    This method only lists tuned models for the Vertex AI API.
+    Args:
+      config (ListModelsConfigOrDict): Configuration for retrieving models.
 
     Usage:
 
@@ -5358,22 +5473,36 @@ 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 = (
         types._ListModelsParameters(config=config).config
         or types.ListModelsConfig()
     )
-
-    if self.api_client.vertexai:
-      # Filter for tuning jobs artifacts by labels.
+    if self._api_client.vertexai:
       config = config.copy()
-      filter_value = config.filter
-      config.filter = (
-          filter_value + '&filter=labels.tune-type:*'
-          if filter_value
-          else 'labels.tune-type:*'
-      )
+      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:
+        # Filter for tuning jobs artifacts by labels.
+        filter_value = config.filter
+        config.filter = (
+            filter_value + '&filter=labels.tune-type:*'
+            if filter_value
+            else 'labels.tune-type:*'
+        )
+    if not config.query_base:
+      config.query_base = False
     return AsyncPager(
         'models',
         self._list,