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

google/genai/models.py

@@ -762,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],
@@ -906,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
 
 
@@ -1053,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
 
 
@@ -2547,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,
@@ -2558,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)
@@ -3706,7 +3758,7 @@ 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(
         'post', path, request_dict, http_options
@@ -3761,7 +3813,7 @@ 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(
         'post', path, request_dict, http_options
@@ -3835,7 +3887,7 @@ 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(
         'post', path, request_dict, http_options
@@ -3909,7 +3961,7 @@ 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(
         'post', path, request_dict, http_options
@@ -4002,7 +4054,7 @@ 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(
         'post', path, request_dict, http_options
@@ -4062,7 +4114,7 @@ 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(
         'post', path, request_dict, http_options
@@ -4105,7 +4157,7 @@ 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(
         'get', path, request_dict, http_options
@@ -4144,7 +4196,7 @@ 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(
         'get', path, request_dict, http_options
@@ -4193,7 +4245,7 @@ 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(
         'patch', path, request_dict, http_options
@@ -4230,7 +4282,7 @@ 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(
         'delete', path, request_dict, http_options
@@ -4301,7 +4353,7 @@ 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(
         'post', path, request_dict, http_options
@@ -4372,7 +4424,7 @@ 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(
         'post', path, request_dict, http_options
@@ -4546,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:
 
@@ -4557,6 +4614,10 @@ class Models(_common.BaseModule):
       response=client.models.list(config={'page_size': 5})
       print(response.page)
       # [Model(name='projects/./locations/./models/123', display_name='my_model'
+
+      response=client.models.list(config={'page_size': 5, 'query_base': True})
+      print(response.page)
+      # [Model(name='publishers/google/models/gemini-2.0-flash-exp' ...
     """
 
     config = (
@@ -4621,7 +4682,7 @@ 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(
         'post', path, request_dict, http_options
@@ -4676,7 +4737,7 @@ 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(
         'post', path, request_dict, http_options
@@ -4750,7 +4811,7 @@ 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(
         'post', path, request_dict, http_options
@@ -4824,7 +4885,7 @@ 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(
         'post', path, request_dict, http_options
@@ -4917,7 +4978,7 @@ 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(
         'post', path, request_dict, http_options
@@ -4977,7 +5038,7 @@ 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(
         'post', path, request_dict, http_options
@@ -5020,7 +5081,7 @@ 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(
         'get', path, request_dict, http_options
@@ -5059,7 +5120,7 @@ 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(
         'get', path, request_dict, http_options
@@ -5108,7 +5169,7 @@ 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(
         'patch', path, request_dict, http_options
@@ -5145,7 +5206,7 @@ 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(
         'delete', path, request_dict, http_options
@@ -5216,7 +5277,7 @@ 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(
         'post', path, request_dict, http_options
@@ -5287,7 +5348,7 @@ 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(
         'post', path, request_dict, http_options
@@ -5396,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.
 
-    This method only lists tuned models for the Vertex AI API.
+    If `query_base` is set to True in the config, the API will return all
+    available base models. If set to False or not set (default), it will return
+    all tuned models.
+
+    Args:
+      config (ListModelsConfigOrDict): Configuration for retrieving models.
 
     Usage:
 
@@ -5407,6 +5473,12 @@ class AsyncModels(_common.BaseModule):
       response = await client.aio.models.list(config={'page_size': 5})
       print(response.page)
       # [Model(name='projects/./locations/./models/123', display_name='my_model'
+
+      response = await client.aio.models.list(
+          config={'page_size': 5, 'query_base': True}
+        )
+      print(response.page)
+      # [Model(name='publishers/google/models/gemini-2.0-flash-exp' ...
     """
 
     config = (

google/genai/tunings.py

@@ -989,7 +989,7 @@ class Tunings(_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(
         'get', path, request_dict, http_options
@@ -1039,7 +1039,7 @@ class Tunings(_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(
         'get', path, request_dict, http_options
@@ -1101,7 +1101,7 @@ class Tunings(_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(
         'post', path, request_dict, http_options
@@ -1164,7 +1164,7 @@ class Tunings(_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(
         'post', path, request_dict, http_options
@@ -1261,7 +1261,7 @@ class AsyncTunings(_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(
         'get', path, request_dict, http_options
@@ -1311,7 +1311,7 @@ class AsyncTunings(_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(
         'get', path, request_dict, http_options
@@ -1373,7 +1373,7 @@ class AsyncTunings(_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(
         'post', path, request_dict, http_options
@@ -1436,7 +1436,7 @@ class AsyncTunings(_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(
         'post', path, request_dict, http_options