google-genai 0.3.0__py3-none-any.whl → 0.5.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
@@ -32,7 +34,7 @@ def _Part_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['video_metadata']):
+  if getv(from_object, ['video_metadata']) is not None:
     raise ValueError('video_metadata parameter is not supported in Google AI.')
 
   if getv(from_object, ['thought']) is not None:
@@ -164,51 +166,51 @@ def _Schema_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['min_items']):
+  if getv(from_object, ['min_items']) is not None:
     raise ValueError('min_items parameter is not supported in Google AI.')
 
-  if getv(from_object, ['example']):
+  if getv(from_object, ['example']) is not None:
     raise ValueError('example parameter is not supported in Google AI.')
 
-  if getv(from_object, ['property_ordering']):
+  if getv(from_object, ['property_ordering']) is not None:
     raise ValueError(
         'property_ordering parameter is not supported in Google AI.'
     )
 
-  if getv(from_object, ['pattern']):
+  if getv(from_object, ['pattern']) is not None:
     raise ValueError('pattern parameter is not supported in Google AI.')
 
-  if getv(from_object, ['minimum']):
+  if getv(from_object, ['minimum']) is not None:
     raise ValueError('minimum parameter is not supported in Google AI.')
 
-  if getv(from_object, ['default']):
+  if getv(from_object, ['default']) is not None:
     raise ValueError('default parameter is not supported in Google AI.')
 
-  if getv(from_object, ['any_of']):
+  if getv(from_object, ['any_of']) is not None:
     raise ValueError('any_of parameter is not supported in Google AI.')
 
-  if getv(from_object, ['max_length']):
+  if getv(from_object, ['max_length']) is not None:
     raise ValueError('max_length parameter is not supported in Google AI.')
 
-  if getv(from_object, ['title']):
+  if getv(from_object, ['title']) is not None:
     raise ValueError('title parameter is not supported in Google AI.')
 
-  if getv(from_object, ['min_length']):
+  if getv(from_object, ['min_length']) is not None:
     raise ValueError('min_length parameter is not supported in Google AI.')
 
-  if getv(from_object, ['min_properties']):
+  if getv(from_object, ['min_properties']) is not None:
     raise ValueError('min_properties parameter is not supported in Google AI.')
 
-  if getv(from_object, ['max_items']):
+  if getv(from_object, ['max_items']) is not None:
     raise ValueError('max_items parameter is not supported in Google AI.')
 
-  if getv(from_object, ['maximum']):
+  if getv(from_object, ['maximum']) is not None:
     raise ValueError('maximum parameter is not supported in Google AI.')
 
-  if getv(from_object, ['nullable']):
+  if getv(from_object, ['nullable']) is not None:
     raise ValueError('nullable parameter is not supported in Google AI.')
 
-  if getv(from_object, ['max_properties']):
+  if getv(from_object, ['max_properties']) is not None:
     raise ValueError('max_properties parameter is not supported in Google AI.')
 
   if getv(from_object, ['type']) is not None:
@@ -320,7 +322,7 @@ def _SafetySetting_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['method']):
+  if getv(from_object, ['method']) is not None:
     raise ValueError('method parameter is not supported in Google AI.')
 
   if getv(from_object, ['category']) is not None:
@@ -356,7 +358,7 @@ def _FunctionDeclaration_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['response']):
+  if getv(from_object, ['response']) is not None:
     raise ValueError('response parameter is not supported in Google AI.')
 
   if getv(from_object, ['description']) is not None:
@@ -512,7 +514,7 @@ def _Tool_to_mldev(
         ],
     )
 
-  if getv(from_object, ['retrieval']):
+  if getv(from_object, ['retrieval']) is not None:
     raise ValueError('retrieval parameter is not supported in Google AI.')
 
   if getv(from_object, ['google_search']) is not None:
@@ -797,13 +799,15 @@ def _GenerateContentConfig_to_mldev(
   if getv(from_object, ['stop_sequences']) is not None:
     setv(to_object, ['stopSequences'], getv(from_object, ['stop_sequences']))
 
-  if getv(from_object, ['response_logprobs']):
-    raise ValueError(
-        'response_logprobs parameter is not supported in Google AI.'
+  if getv(from_object, ['response_logprobs']) is not None:
+    setv(
+        to_object,
+        ['responseLogprobs'],
+        getv(from_object, ['response_logprobs']),
     )
 
-  if getv(from_object, ['logprobs']):
-    raise ValueError('logprobs parameter is not supported in Google AI.')
+  if getv(from_object, ['logprobs']) is not None:
+    setv(to_object, ['logprobs'], getv(from_object, ['logprobs']))
 
   if getv(from_object, ['presence_penalty']) is not None:
     setv(
@@ -838,7 +842,7 @@ def _GenerateContentConfig_to_mldev(
         ),
     )
 
-  if getv(from_object, ['routing_config']):
+  if getv(from_object, ['routing_config']) is not None:
     raise ValueError('routing_config parameter is not supported in Google AI.')
 
   if getv(from_object, ['safety_settings']) is not None:
@@ -886,7 +890,7 @@ def _GenerateContentConfig_to_mldev(
         getv(from_object, ['response_modalities']),
     )
 
-  if getv(from_object, ['media_resolution']):
+  if getv(from_object, ['media_resolution']) is not None:
     raise ValueError(
         'media_resolution parameter is not supported in Google AI.'
     )
@@ -1152,10 +1156,10 @@ def _EmbedContentConfig_to_mldev(
         getv(from_object, ['output_dimensionality']),
     )
 
-  if getv(from_object, ['mime_type']):
+  if getv(from_object, ['mime_type']) is not None:
     raise ValueError('mime_type parameter is not supported in Google AI.')
 
-  if getv(from_object, ['auto_truncate']):
+  if getv(from_object, ['auto_truncate']) is not None:
     raise ValueError('auto_truncate parameter is not supported in Google AI.')
 
   return to_object
@@ -1282,7 +1286,7 @@ def _GenerateImageConfig_to_mldev(
   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']):
+  if getv(from_object, ['output_gcs_uri']) is not None:
     raise ValueError('output_gcs_uri parameter is not supported in Google AI.')
 
   if getv(from_object, ['negative_prompt']) is not None:
@@ -1306,7 +1310,7 @@ def _GenerateImageConfig_to_mldev(
         getv(from_object, ['guidance_scale']),
     )
 
-  if getv(from_object, ['seed']):
+  if getv(from_object, ['seed']) is not None:
     raise ValueError('seed parameter is not supported in Google AI.')
 
   if getv(from_object, ['safety_filter_level']) is not None:
@@ -1358,7 +1362,7 @@ def _GenerateImageConfig_to_mldev(
         getv(from_object, ['output_compression_quality']),
     )
 
-  if getv(from_object, ['add_watermark']):
+  if getv(from_object, ['add_watermark']) is not None:
     raise ValueError('add_watermark parameter is not supported in Google AI.')
 
   if getv(from_object, ['aspect_ratio']) is not None:
@@ -1539,11 +1543,15 @@ def _Image_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['gcs_uri']):
+  if getv(from_object, ['gcs_uri']) is not None:
     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
 
@@ -1558,7 +1566,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
 
@@ -1569,15 +1581,15 @@ def _MaskReferenceConfig_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['mask_mode']):
+  if getv(from_object, ['mask_mode']) is not None:
     raise ValueError('mask_mode parameter is not supported in Google AI.')
 
-  if getv(from_object, ['segmentation_classes']):
+  if getv(from_object, ['segmentation_classes']) is not None:
     raise ValueError(
         'segmentation_classes parameter is not supported in Google AI.'
     )
 
-  if getv(from_object, ['mask_dilation']):
+  if getv(from_object, ['mask_dilation']) is not None:
     raise ValueError('mask_dilation parameter is not supported in Google AI.')
 
   return to_object
@@ -1609,10 +1621,10 @@ def _ControlReferenceConfig_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['control_type']):
+  if getv(from_object, ['control_type']) is not None:
     raise ValueError('control_type parameter is not supported in Google AI.')
 
-  if getv(from_object, ['enable_control_image_computation']):
+  if getv(from_object, ['enable_control_image_computation']) is not None:
     raise ValueError(
         'enable_control_image_computation parameter is not supported in'
         ' Google AI.'
@@ -1646,7 +1658,7 @@ def _StyleReferenceConfig_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['style_description']):
+  if getv(from_object, ['style_description']) is not None:
     raise ValueError(
         'style_description parameter is not supported in Google AI.'
     )
@@ -1676,10 +1688,10 @@ def _SubjectReferenceConfig_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['subject_type']):
+  if getv(from_object, ['subject_type']) is not None:
     raise ValueError('subject_type parameter is not supported in Google AI.')
 
-  if getv(from_object, ['subject_description']):
+  if getv(from_object, ['subject_description']) is not None:
     raise ValueError(
         'subject_description parameter is not supported in Google AI.'
     )
@@ -1712,31 +1724,31 @@ def _ReferenceImageAPI_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['reference_image']):
+  if getv(from_object, ['reference_image']) is not None:
     raise ValueError('reference_image parameter is not supported in Google AI.')
 
-  if getv(from_object, ['reference_id']):
+  if getv(from_object, ['reference_id']) is not None:
     raise ValueError('reference_id parameter is not supported in Google AI.')
 
-  if getv(from_object, ['reference_type']):
+  if getv(from_object, ['reference_type']) is not None:
     raise ValueError('reference_type parameter is not supported in Google AI.')
 
-  if getv(from_object, ['mask_image_config']):
+  if getv(from_object, ['mask_image_config']) is not None:
     raise ValueError(
         'mask_image_config parameter is not supported in Google AI.'
     )
 
-  if getv(from_object, ['control_image_config']):
+  if getv(from_object, ['control_image_config']) is not None:
     raise ValueError(
         'control_image_config parameter is not supported in Google AI.'
     )
 
-  if getv(from_object, ['style_image_config']):
+  if getv(from_object, ['style_image_config']) is not None:
     raise ValueError(
         'style_image_config parameter is not supported in Google AI.'
     )
 
-  if getv(from_object, ['subject_image_config']):
+  if getv(from_object, ['subject_image_config']) is not None:
     raise ValueError(
         'subject_image_config parameter is not supported in Google AI.'
     )
@@ -1813,7 +1825,7 @@ def _EditImageConfig_to_mldev(
   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']):
+  if getv(from_object, ['output_gcs_uri']) is not None:
     raise ValueError('output_gcs_uri parameter is not supported in Google AI.')
 
   if getv(from_object, ['negative_prompt']) is not None:
@@ -1837,7 +1849,7 @@ def _EditImageConfig_to_mldev(
         getv(from_object, ['guidance_scale']),
     )
 
-  if getv(from_object, ['seed']):
+  if getv(from_object, ['seed']) is not None:
     raise ValueError('seed parameter is not supported in Google AI.')
 
   if getv(from_object, ['safety_filter_level']) is not None:
@@ -2083,13 +2095,6 @@ def _UpscaleImageAPIConfig_to_mldev(
   if getv(from_object, ['http_options']) is not None:
     setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
-  if getv(from_object, ['upscale_factor']) is not None:
-    setv(
-        parent_object,
-        ['parameters', 'upscaleConfig', 'upscaleFactor'],
-        getv(from_object, ['upscale_factor']),
-    )
-
   if getv(from_object, ['include_rai_reason']) is not None:
     setv(
         parent_object,
@@ -2133,13 +2138,6 @@ def _UpscaleImageAPIConfig_to_vertex(
   if getv(from_object, ['http_options']) is not None:
     setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
-  if getv(from_object, ['upscale_factor']) is not None:
-    setv(
-        parent_object,
-        ['parameters', 'upscaleConfig', 'upscaleFactor'],
-        getv(from_object, ['upscale_factor']),
-    )
-
   if getv(from_object, ['include_rai_reason']) is not None:
     setv(
         parent_object,
@@ -2194,6 +2192,13 @@ def _UpscaleImageAPIParameters_to_mldev(
         _Image_to_mldev(api_client, getv(from_object, ['image']), to_object),
     )
 
+  if getv(from_object, ['upscale_factor']) is not None:
+    setv(
+        to_object,
+        ['parameters', 'upscaleConfig', 'upscaleFactor'],
+        getv(from_object, ['upscale_factor']),
+    )
+
   if getv(from_object, ['config']) is not None:
     setv(
         to_object,
@@ -2226,6 +2231,13 @@ def _UpscaleImageAPIParameters_to_vertex(
         _Image_to_vertex(api_client, getv(from_object, ['image']), to_object),
     )
 
+  if getv(from_object, ['upscale_factor']) is not None:
+    setv(
+        to_object,
+        ['parameters', 'upscaleConfig', 'upscaleFactor'],
+        getv(from_object, ['upscale_factor']),
+    )
+
   if getv(from_object, ['config']) is not None:
     setv(
         to_object,
@@ -2276,6 +2288,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'])
@@ -2291,6 +2306,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
 
 
@@ -2300,6 +2322,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'])
@@ -2315,6 +2340,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
 
 
@@ -2496,7 +2528,7 @@ def _CountTokensConfig_to_mldev(
         ],
     )
 
-  if getv(from_object, ['generation_config']):
+  if getv(from_object, ['generation_config']) is not None:
     raise ValueError(
         'generation_config parameter is not supported in Google AI.'
     )
@@ -2655,7 +2687,7 @@ def _ComputeTokensParameters_to_mldev(
         t.t_model(api_client, getv(from_object, ['model'])),
     )
 
-  if getv(from_object, ['contents']):
+  if getv(from_object, ['contents']) is not None:
     raise ValueError('contents parameter is not supported in Google AI.')
 
   if getv(from_object, ['config']) is not None:
@@ -3169,7 +3201,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
 
@@ -3184,7 +3220,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
 
@@ -3520,13 +3560,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'])
+            )
         ],
     )
 
@@ -3542,13 +3584,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'])
+            )
         ],
     )
 
@@ -3645,14 +3689,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,23 +3708,23 @@ class Models(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -3696,16 +3740,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,23 +3763,23 @@ class Models(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -3774,14 +3818,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,23 +3837,23 @@ class Models(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -3848,14 +3892,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,23 +3911,23 @@ class Models(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -3943,11 +3987,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,23 +4004,23 @@ class Models(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -3984,6 +4028,7 @@ class Models(_common.BaseModule):
       *,
       model: str,
       image: types.ImageOrDict,
+      upscale_factor: str,
       config: Optional[types._UpscaleImageAPIConfigOrDict] = None,
   ) -> types.UpscaleImageResponse:
     """Upscales an image.
@@ -3991,20 +4036,22 @@ class Models(_common.BaseModule):
     Args:
       model (str): The model to use.
       image (Image): The input image for upscaling.
+      upscale_factor (str): The factor to upscale the image (x2 or x4).
       config (_UpscaleImageAPIConfig): Configuration for upscaling.
     """
 
     parameter_model = types._UpscaleImageAPIParameters(
         model=model,
         image=image,
+        upscale_factor=upscale_factor,
         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'))
 
@@ -4017,23 +4064,23 @@ class Models(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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:
@@ -4041,14 +4088,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')
@@ -4060,17 +4107,17 @@ class Models(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -4080,16 +4127,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)}'
@@ -4099,23 +4146,23 @@ class Models(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -4129,14 +4176,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')
@@ -4148,17 +4195,17 @@ class Models(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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:
@@ -4166,14 +4213,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')
@@ -4185,23 +4232,23 @@ class Models(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -4237,14 +4284,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')
@@ -4256,23 +4303,23 @@ class Models(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -4310,11 +4357,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'))
 
@@ -4327,23 +4374,23 @@ class Models(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -4423,7 +4470,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(
@@ -4443,13 +4490,15 @@ class Models(_common.BaseModule):
       *,
       model: str,
       image: types.ImageOrDict,
-      config: types.UpscaleImageConfigOrDict,
+      upscale_factor: str,
+      config: Optional[types.UpscaleImageConfigOrDict] = None,
   ) -> types.UpscaleImageResponse:
     """Makes an API request to upscale a provided image.
 
     Args:
       model (str): The model to use.
       image (Image): The input image for upscaling.
+      upscale_factor (str): The factor to upscale the image (x2 or x4).
       config (UpscaleImageConfig): Configuration for upscaling.
 
     Usage:
@@ -4462,9 +4511,7 @@ class Models(_common.BaseModule):
       response=client.models.upscale_image(
           model='imagen-3.0-generate-001',
           image=types.Image.from_file(IMAGE_FILE_PATH),
-                  config={
-                    'upscale_factor': 'x2',
-                  }
+          upscale_factor='x2',
       )
       response.generated_images[0].image.show()
       # Opens my-image.png which is upscaled by a factor of 2.
@@ -4474,10 +4521,12 @@ class Models(_common.BaseModule):
     types.UpscaleImageParameters(
         model=model,
         image=image,
+        upscale_factor=upscale_factor,
         config=config,
     )
 
     # Convert to API config.
+    config = config or {}
     config_dct = config if isinstance(config, dict) else config.dict()
     api_config = types._UpscaleImageAPIConfigDict(**config_dct)  # pylint: disable=protected-access
 
@@ -4485,7 +4534,12 @@ class Models(_common.BaseModule):
     api_config['mode'] = 'upscale'
     api_config['number_of_images'] = 1
 
-    return self._upscale_image(model=model, image=image, config=api_config)
+    return self._upscale_image(
+        model=model,
+        image=image,
+        upscale_factor=upscale_factor,
+        config=api_config,
+    )
 
   def list(
       self,
@@ -4509,17 +4563,24 @@ class Models(_common.BaseModule):
         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,
@@ -4543,14 +4604,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')
@@ -4562,23 +4623,23 @@ class AsyncModels(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -4594,16 +4655,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')
@@ -4617,23 +4678,23 @@ class AsyncModels(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -4672,14 +4733,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')
@@ -4691,23 +4752,23 @@ class AsyncModels(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -4746,14 +4807,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')
@@ -4765,23 +4826,23 @@ class AsyncModels(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -4841,11 +4902,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'))
 
@@ -4858,23 +4919,23 @@ class AsyncModels(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -4882,6 +4943,7 @@ class AsyncModels(_common.BaseModule):
       *,
       model: str,
       image: types.ImageOrDict,
+      upscale_factor: str,
       config: Optional[types._UpscaleImageAPIConfigOrDict] = None,
   ) -> types.UpscaleImageResponse:
     """Upscales an image.
@@ -4889,20 +4951,22 @@ class AsyncModels(_common.BaseModule):
     Args:
       model (str): The model to use.
       image (Image): The input image for upscaling.
+      upscale_factor (str): The factor to upscale the image (x2 or x4).
       config (_UpscaleImageAPIConfig): Configuration for upscaling.
     """
 
     parameter_model = types._UpscaleImageAPIParameters(
         model=model,
         image=image,
+        upscale_factor=upscale_factor,
         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'))
 
@@ -4915,23 +4979,23 @@ class AsyncModels(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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:
@@ -4939,14 +5003,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')
@@ -4958,17 +5022,17 @@ class AsyncModels(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -4978,16 +5042,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)}'
@@ -4997,23 +5061,23 @@ class AsyncModels(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -5027,14 +5091,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')
@@ -5046,17 +5110,17 @@ class AsyncModels(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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:
@@ -5064,14 +5128,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')
@@ -5083,23 +5147,23 @@ class AsyncModels(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -5135,14 +5199,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')
@@ -5154,23 +5218,23 @@ class AsyncModels(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -5208,11 +5272,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'))
 
@@ -5225,23 +5289,23 @@ class AsyncModels(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(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(
@@ -5311,7 +5375,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(
@@ -5349,16 +5413,24 @@ class AsyncModels(_common.BaseModule):
         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,
@@ -5371,13 +5443,15 @@ class AsyncModels(_common.BaseModule):
       *,
       model: str,
       image: types.ImageOrDict,
-      config: types.UpscaleImageConfigOrDict,
+      upscale_factor: str,
+      config: Optional[types.UpscaleImageConfigOrDict] = None,
   ) -> types.UpscaleImageResponse:
     """Makes an API request to upscale a provided image.
 
     Args:
       model (str): The model to use.
       image (Image): The input image for upscaling.
+      upscale_factor (str): The factor to upscale the image (x2 or x4).
       config (UpscaleImageConfig): Configuration for upscaling.
 
     Usage:
@@ -5388,11 +5462,9 @@ class AsyncModels(_common.BaseModule):
 
       IMAGE_FILE_PATH="my-image.png"
       response = await client.aio.models.upscale_image(
-          model = 'imagen-3.0-generate-001',
-          image = types.Image.from_file(IMAGE_FILE_PATH),
-                  config = {
-                    'upscale_factor': 'x2',
-                  }
+          model='imagen-3.0-generate-001',
+          image=types.Image.from_file(IMAGE_FILE_PATH),
+          upscale_factor='x2',
       )
       response.generated_images[0].image.show()
       # Opens my-image.png which is upscaled by a factor of 2.
@@ -5402,10 +5474,12 @@ class AsyncModels(_common.BaseModule):
     types.UpscaleImageParameters(
         model=model,
         image=image,
+        upscale_factor=upscale_factor,
         config=config,
     )
 
     # Convert to API config.
+    config = config or {}
     config_dct = config if isinstance(config, dict) else config.dict()
     api_config = types._UpscaleImageAPIConfigDict(**config_dct)  # pylint: disable=protected-access
 
@@ -5414,5 +5488,8 @@ class AsyncModels(_common.BaseModule):
     api_config['number_of_images'] = 1
 
     return await self._upscale_image(
-        model=model, image=image, config=api_config
+        model=model,
+        image=image,
+        upscale_factor=upscale_factor,
+        config=api_config,
     )