google-genai 1.52.0__py3-none-any.whl → 1.54.0__py3-none-any.whl

google/genai/tunings.py

@@ -110,6 +110,34 @@ def _CancelTuningJobParameters_to_vertex(
   return to_object
 
 
+def _CancelTuningJobResponse_from_mldev(
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+    root_object: Optional[Union[dict[str, Any], object]] = None,
+) -> dict[str, Any]:
+  to_object: dict[str, Any] = {}
+  if getv(from_object, ['sdkHttpResponse']) is not None:
+    setv(
+        to_object, ['sdk_http_response'], getv(from_object, ['sdkHttpResponse'])
+    )
+
+  return to_object
+
+
+def _CancelTuningJobResponse_from_vertex(
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+    root_object: Optional[Union[dict[str, Any], object]] = None,
+) -> dict[str, Any]:
+  to_object: dict[str, Any] = {}
+  if getv(from_object, ['sdkHttpResponse']) is not None:
+    setv(
+        to_object, ['sdk_http_response'], getv(from_object, ['sdkHttpResponse'])
+    )
+
+  return to_object
+
+
 def _CreateTuningJobConfig_to_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -839,12 +867,12 @@ def _SpeechConfig_to_vertex(
     root_object: Optional[Union[dict[str, Any], object]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['language_code']) is not None:
-    setv(to_object, ['languageCode'], getv(from_object, ['language_code']))
-
   if getv(from_object, ['voice_config']) is not None:
     setv(to_object, ['voiceConfig'], getv(from_object, ['voice_config']))
 
+  if getv(from_object, ['language_code']) is not None:
+    setv(to_object, ['languageCode'], getv(from_object, ['language_code']))
+
   if getv(from_object, ['multi_speaker_voice_config']) is not None:
     raise ValueError(
         'multi_speaker_voice_config parameter is not supported in Vertex AI.'
@@ -1246,15 +1274,6 @@ class Tunings(_api_module.BaseModule):
   def _list(
       self, *, config: Optional[types.ListTuningJobsConfigOrDict] = None
   ) -> types.ListTuningJobsResponse:
-    """Lists `TuningJob` objects.
-
-    Args:
-      config: The configuration for the list request.
-
-    Returns:
-      A list of `TuningJob` objects.
-    """
-
     parameter_model = types._ListTuningJobsParameters(
         config=config,
     )
@@ -1319,7 +1338,7 @@ class Tunings(_api_module.BaseModule):
       *,
       name: str,
       config: Optional[types.CancelTuningJobConfigOrDict] = None,
-  ) -> None:
+  ) -> types.CancelTuningJobResponse:
     """Cancels a tuning job.
 
     Args:
@@ -1371,6 +1390,23 @@ class Tunings(_api_module.BaseModule):
         'post', path, request_dict, http_options
     )
 
+    response_dict = {} if not response.body else json.loads(response.body)
+
+    if self._api_client.vertexai:
+      response_dict = _CancelTuningJobResponse_from_vertex(response_dict)
+
+    if not self._api_client.vertexai:
+      response_dict = _CancelTuningJobResponse_from_mldev(response_dict)
+
+    return_value = types.CancelTuningJobResponse._from_response(
+        response=response_dict, kwargs=parameter_model.model_dump()
+    )
+    return_value.sdk_http_response = types.HttpResponse(
+        headers=response.headers
+    )
+    self._api_client._verify_response(return_value)
+    return return_value
+
   def _tune(
       self,
       *,
@@ -1519,16 +1555,6 @@ class Tunings(_api_module.BaseModule):
     self._api_client._verify_response(return_value)
     return return_value
 
-  def list(
-      self, *, config: Optional[types.ListTuningJobsConfigOrDict] = None
-  ) -> Pager[types.TuningJob]:
-    return Pager(
-        'tuning_jobs',
-        self._list,
-        self._list(config=config),
-        config,
-    )
-
   def get(
       self,
       *,
@@ -1630,6 +1656,33 @@ class Tunings(_api_module.BaseModule):
       )
     return tuning_job
 
+  def list(
+      self, *, config: Optional[types.ListTuningJobsConfigOrDict] = None
+  ) -> Pager[types.TuningJob]:
+    """Lists `TuningJob` objects.
+
+    Args:
+      config: The configuration for the list request.
+
+    Returns:
+      A Pager object that contains one page of tuning jobs. When iterating over
+      the pager, it automatically fetches the next page if there are more.
+
+    Usage:
+
+    .. code-block:: python
+        for tuning_job in client.tunings.list():
+            print(tuning_job.name)
+    """
+
+    list_request = self._list
+    return Pager(
+        'tuning_jobs',
+        list_request,
+        self._list(config=config),
+        config,
+    )
+
 
 class AsyncTunings(_api_module.BaseModule):
 
@@ -1713,15 +1766,6 @@ class AsyncTunings(_api_module.BaseModule):
   async def _list(
       self, *, config: Optional[types.ListTuningJobsConfigOrDict] = None
   ) -> types.ListTuningJobsResponse:
-    """Lists `TuningJob` objects.
-
-    Args:
-      config: The configuration for the list request.
-
-    Returns:
-      A list of `TuningJob` objects.
-    """
-
     parameter_model = types._ListTuningJobsParameters(
         config=config,
     )
@@ -1788,7 +1832,7 @@ class AsyncTunings(_api_module.BaseModule):
       *,
       name: str,
       config: Optional[types.CancelTuningJobConfigOrDict] = None,
-  ) -> None:
+  ) -> types.CancelTuningJobResponse:
     """Cancels a tuning job asynchronously.
 
     Args:
@@ -1840,6 +1884,23 @@ class AsyncTunings(_api_module.BaseModule):
         'post', path, request_dict, http_options
     )
 
+    response_dict = {} if not response.body else json.loads(response.body)
+
+    if self._api_client.vertexai:
+      response_dict = _CancelTuningJobResponse_from_vertex(response_dict)
+
+    if not self._api_client.vertexai:
+      response_dict = _CancelTuningJobResponse_from_mldev(response_dict)
+
+    return_value = types.CancelTuningJobResponse._from_response(
+        response=response_dict, kwargs=parameter_model.model_dump()
+    )
+    return_value.sdk_http_response = types.HttpResponse(
+        headers=response.headers
+    )
+    self._api_client._verify_response(return_value)
+    return return_value
+
   async def _tune(
       self,
       *,
@@ -1988,16 +2049,6 @@ class AsyncTunings(_api_module.BaseModule):
     self._api_client._verify_response(return_value)
     return return_value
 
-  async def list(
-      self, *, config: Optional[types.ListTuningJobsConfigOrDict] = None
-  ) -> AsyncPager[types.TuningJob]:
-    return AsyncPager(
-        'tuning_jobs',
-        self._list,
-        await self._list(config=config),
-        config,
-    )
-
   async def get(
       self,
       *,
@@ -2093,6 +2144,33 @@ class AsyncTunings(_api_module.BaseModule):
       )
     return tuning_job
 
+  async def list(
+      self, *, config: Optional[types.ListTuningJobsConfigOrDict] = None
+  ) -> AsyncPager[types.TuningJob]:
+    """Lists `TuningJob` objects asynchronously.
+
+    Args:
+      config: The configuration for the list request.
+
+    Returns:
+      A Pager object that contains one page of tuning jobs. When iterating over
+      the pager, it automatically fetches the next page if there are more.
+
+    Usage:
+
+    .. code-block:: python
+        async for tuning_job in await client.aio.tunings.list():
+            print(tuning_job.name)
+    """
+
+    list_request = self._list
+    return AsyncPager(
+        'tuning_jobs',
+        list_request,
+        await self._list(config=config),
+        config,
+    )
+
 
 class _IpythonUtils:
   """Temporary class to hold the IPython related functions."""

google/genai/types.py

@@ -2497,12 +2497,13 @@ are recommended to pass/receive Json Schema directly to/from the API. For exampl
             'defs',
         ]:
           raise ValueError(
-              f'JSONSchema field "{field_name}" is not supported by the '
-              'Schema object. And the "raise_error_on_unsupported_field" '
-              'argument is set to True. If you still want to convert '
-              'it into the Schema object, please either remove the field '
-              f'"{field_name}" from the JSONSchema object, or leave the '
-              '"raise_error_on_unsupported_field" unset.'
+              f'JSONSchema field "{field_name}" is not supported by the Schema'
+              ' object. And the "raise_error_on_unsupported_field" argument is'
+              ' set to True. If you still want to convert it into the Schema'
+              f' object, please either remove the field "{field_name}" from the'
+              ' JSONSchema object, leave the'
+              ' "raise_error_on_unsupported_field" unset, or try using'
+              ' response_json_schema instead.'
           )
         if (
             field_name in gemini_api_unsupported_field_names
@@ -4367,6 +4368,163 @@ class ToolConfigDict(TypedDict, total=False):
 ToolConfigOrDict = Union[ToolConfig, ToolConfigDict]
 
 
+class ReplicatedVoiceConfig(_common.BaseModel):
+  """ReplicatedVoiceConfig is used to configure replicated voice."""
+
+  mime_type: Optional[str] = Field(
+      default=None,
+      description="""The mime type of the replicated voice.
+      """,
+  )
+  voice_sample_audio: Optional[bytes] = Field(
+      default=None,
+      description="""The sample audio of the replicated voice.
+      """,
+  )
+
+
+class ReplicatedVoiceConfigDict(TypedDict, total=False):
+  """ReplicatedVoiceConfig is used to configure replicated voice."""
+
+  mime_type: Optional[str]
+  """The mime type of the replicated voice.
+      """
+
+  voice_sample_audio: Optional[bytes]
+  """The sample audio of the replicated voice.
+      """
+
+
+ReplicatedVoiceConfigOrDict = Union[
+    ReplicatedVoiceConfig, ReplicatedVoiceConfigDict
+]
+
+
+class PrebuiltVoiceConfig(_common.BaseModel):
+  """The configuration for the prebuilt speaker to use."""
+
+  voice_name: Optional[str] = Field(
+      default=None, description="""The name of the preset voice to use."""
+  )
+
+
+class PrebuiltVoiceConfigDict(TypedDict, total=False):
+  """The configuration for the prebuilt speaker to use."""
+
+  voice_name: Optional[str]
+  """The name of the preset voice to use."""
+
+
+PrebuiltVoiceConfigOrDict = Union[PrebuiltVoiceConfig, PrebuiltVoiceConfigDict]
+
+
+class VoiceConfig(_common.BaseModel):
+
+  replicated_voice_config: Optional[ReplicatedVoiceConfig] = Field(
+      default=None,
+      description="""If true, the model will use a replicated voice for the response.""",
+  )
+  prebuilt_voice_config: Optional[PrebuiltVoiceConfig] = Field(
+      default=None,
+      description="""The configuration for the prebuilt voice to use.""",
+  )
+
+
+class VoiceConfigDict(TypedDict, total=False):
+
+  replicated_voice_config: Optional[ReplicatedVoiceConfigDict]
+  """If true, the model will use a replicated voice for the response."""
+
+  prebuilt_voice_config: Optional[PrebuiltVoiceConfigDict]
+  """The configuration for the prebuilt voice to use."""
+
+
+VoiceConfigOrDict = Union[VoiceConfig, VoiceConfigDict]
+
+
+class SpeakerVoiceConfig(_common.BaseModel):
+  """Configuration for a single speaker in a multi speaker setup."""
+
+  speaker: Optional[str] = Field(
+      default=None,
+      description="""Required. The name of the speaker. This should be the same as the speaker name used in the prompt.""",
+  )
+  voice_config: Optional[VoiceConfig] = Field(
+      default=None,
+      description="""Required. The configuration for the voice of this speaker.""",
+  )
+
+
+class SpeakerVoiceConfigDict(TypedDict, total=False):
+  """Configuration for a single speaker in a multi speaker setup."""
+
+  speaker: Optional[str]
+  """Required. The name of the speaker. This should be the same as the speaker name used in the prompt."""
+
+  voice_config: Optional[VoiceConfigDict]
+  """Required. The configuration for the voice of this speaker."""
+
+
+SpeakerVoiceConfigOrDict = Union[SpeakerVoiceConfig, SpeakerVoiceConfigDict]
+
+
+class MultiSpeakerVoiceConfig(_common.BaseModel):
+  """The configuration for the multi-speaker setup.
+
+  This data type is not supported in Vertex AI.
+  """
+
+  speaker_voice_configs: Optional[list[SpeakerVoiceConfig]] = Field(
+      default=None, description="""Required. All the enabled speaker voices."""
+  )
+
+
+class MultiSpeakerVoiceConfigDict(TypedDict, total=False):
+  """The configuration for the multi-speaker setup.
+
+  This data type is not supported in Vertex AI.
+  """
+
+  speaker_voice_configs: Optional[list[SpeakerVoiceConfigDict]]
+  """Required. All the enabled speaker voices."""
+
+
+MultiSpeakerVoiceConfigOrDict = Union[
+    MultiSpeakerVoiceConfig, MultiSpeakerVoiceConfigDict
+]
+
+
+class SpeechConfig(_common.BaseModel):
+
+  voice_config: Optional[VoiceConfig] = Field(
+      default=None,
+      description="""Configuration for the voice of the response.""",
+  )
+  language_code: Optional[str] = Field(
+      default=None,
+      description="""Optional. Language code (ISO 639. e.g. en-US) for the speech synthesization.""",
+  )
+  multi_speaker_voice_config: Optional[MultiSpeakerVoiceConfig] = Field(
+      default=None,
+      description="""Optional. The configuration for the multi-speaker setup. It is mutually exclusive with the voice_config field. This field is not supported in Vertex AI.""",
+  )
+
+
+class SpeechConfigDict(TypedDict, total=False):
+
+  voice_config: Optional[VoiceConfigDict]
+  """Configuration for the voice of the response."""
+
+  language_code: Optional[str]
+  """Optional. Language code (ISO 639. e.g. en-US) for the speech synthesization."""
+
+  multi_speaker_voice_config: Optional[MultiSpeakerVoiceConfigDict]
+  """Optional. The configuration for the multi-speaker setup. It is mutually exclusive with the voice_config field. This field is not supported in Vertex AI."""
+
+
+SpeechConfigOrDict = Union[SpeechConfig, SpeechConfigDict]
+
+
 class AutomaticFunctionCallingConfig(_common.BaseModel):
   """The configuration for automatic function calling."""
 
@@ -4791,38 +4949,6 @@ class SafetySettingDict(TypedDict, total=False):
 SafetySettingOrDict = Union[SafetySetting, SafetySettingDict]
 
 
-class SpeechConfig(_common.BaseModel):
-  """The speech generation config."""
-
-  language_code: Optional[str] = Field(
-      default=None,
-      description="""Optional. Language code (ISO 639. e.g. en-US) for the speech synthesization.""",
-  )
-  voice_config: Optional['VoiceConfig'] = Field(
-      default=None, description="""The configuration for the speaker to use."""
-  )
-  multi_speaker_voice_config: Optional['MultiSpeakerVoiceConfig'] = Field(
-      default=None,
-      description="""Optional. The configuration for the multi-speaker setup. It is mutually exclusive with the voice_config field. This field is not supported in Vertex AI.""",
-  )
-
-
-class SpeechConfigDict(TypedDict, total=False):
-  """The speech generation config."""
-
-  language_code: Optional[str]
-  """Optional. Language code (ISO 639. e.g. en-US) for the speech synthesization."""
-
-  voice_config: Optional['VoiceConfigDict']
-  """The configuration for the speaker to use."""
-
-  multi_speaker_voice_config: Optional['MultiSpeakerVoiceConfigDict']
-  """Optional. The configuration for the multi-speaker setup. It is mutually exclusive with the voice_config field. This field is not supported in Vertex AI."""
-
-
-SpeechConfigOrDict = Union[SpeechConfig, SpeechConfigDict]
-
-
 SpeechConfigUnion = Union[str, SpeechConfig]
 
 
@@ -4942,6 +5068,9 @@ class GenerateContentConfig(_common.BaseModel):
       object](https://spec.openapis.org/oas/v3.0.3#schema).
       If set, a compatible response_mime_type must also be set.
       Compatible mimetypes: `application/json`: Schema for JSON response.
+
+      If `response_schema` doesn't process your schema correctly, try using
+      `response_json_schema` instead.
       """,
   )
   response_json_schema: Optional[Any] = Field(
@@ -5159,6 +5288,9 @@ class GenerateContentConfigDict(TypedDict, total=False):
       object](https://spec.openapis.org/oas/v3.0.3#schema).
       If set, a compatible response_mime_type must also be set.
       Compatible mimetypes: `application/json`: Schema for JSON response.
+
+      If `response_schema` doesn't process your schema correctly, try using
+      `response_json_schema` instead.
       """
 
   response_json_schema: Optional[Any]
@@ -5437,6 +5569,13 @@ class CitationMetadata(_common.BaseModel):
       """,
   )
 
+  @model_validator(mode='before')
+  @classmethod
+  def _rename_citation_sources(cls, data: Any) -> Any:
+    if isinstance(data, dict) and 'citationSources' in data:
+      data['citations'] = data.pop('citationSources')
+    return data
+
 
 class CitationMetadataDict(TypedDict, total=False):
   """Citation information when the model quotes another source."""
@@ -9054,95 +9193,6 @@ class DeleteModelResponseDict(TypedDict, total=False):
 DeleteModelResponseOrDict = Union[DeleteModelResponse, DeleteModelResponseDict]
 
 
-class PrebuiltVoiceConfig(_common.BaseModel):
-  """The configuration for the prebuilt speaker to use."""
-
-  voice_name: Optional[str] = Field(
-      default=None, description="""The name of the preset voice to use."""
-  )
-
-
-class PrebuiltVoiceConfigDict(TypedDict, total=False):
-  """The configuration for the prebuilt speaker to use."""
-
-  voice_name: Optional[str]
-  """The name of the preset voice to use."""
-
-
-PrebuiltVoiceConfigOrDict = Union[PrebuiltVoiceConfig, PrebuiltVoiceConfigDict]
-
-
-class VoiceConfig(_common.BaseModel):
-  """The configuration for the voice to use."""
-
-  prebuilt_voice_config: Optional[PrebuiltVoiceConfig] = Field(
-      default=None,
-      description="""The configuration for the prebuilt voice to use.""",
-  )
-
-
-class VoiceConfigDict(TypedDict, total=False):
-  """The configuration for the voice to use."""
-
-  prebuilt_voice_config: Optional[PrebuiltVoiceConfigDict]
-  """The configuration for the prebuilt voice to use."""
-
-
-VoiceConfigOrDict = Union[VoiceConfig, VoiceConfigDict]
-
-
-class SpeakerVoiceConfig(_common.BaseModel):
-  """Configuration for a single speaker in a multi speaker setup."""
-
-  speaker: Optional[str] = Field(
-      default=None,
-      description="""Required. The name of the speaker. This should be the same as the speaker name used in the prompt.""",
-  )
-  voice_config: Optional[VoiceConfig] = Field(
-      default=None,
-      description="""Required. The configuration for the voice of this speaker.""",
-  )
-
-
-class SpeakerVoiceConfigDict(TypedDict, total=False):
-  """Configuration for a single speaker in a multi speaker setup."""
-
-  speaker: Optional[str]
-  """Required. The name of the speaker. This should be the same as the speaker name used in the prompt."""
-
-  voice_config: Optional[VoiceConfigDict]
-  """Required. The configuration for the voice of this speaker."""
-
-
-SpeakerVoiceConfigOrDict = Union[SpeakerVoiceConfig, SpeakerVoiceConfigDict]
-
-
-class MultiSpeakerVoiceConfig(_common.BaseModel):
-  """The configuration for the multi-speaker setup.
-
-  This data type is not supported in Vertex AI.
-  """
-
-  speaker_voice_configs: Optional[list[SpeakerVoiceConfig]] = Field(
-      default=None, description="""Required. All the enabled speaker voices."""
-  )
-
-
-class MultiSpeakerVoiceConfigDict(TypedDict, total=False):
-  """The configuration for the multi-speaker setup.
-
-  This data type is not supported in Vertex AI.
-  """
-
-  speaker_voice_configs: Optional[list[SpeakerVoiceConfigDict]]
-  """Required. All the enabled speaker voices."""
-
-
-MultiSpeakerVoiceConfigOrDict = Union[
-    MultiSpeakerVoiceConfig, MultiSpeakerVoiceConfigDict
-]
-
-
 class GenerationConfig(_common.BaseModel):
   """Generation config."""
 
@@ -11862,6 +11912,26 @@ _CancelTuningJobParametersOrDict = Union[
 ]
 
 
+class CancelTuningJobResponse(_common.BaseModel):
+  """Empty response for tunings.cancel method."""
+
+  sdk_http_response: Optional[HttpResponse] = Field(
+      default=None, description="""Used to retain the full HTTP response."""
+  )
+
+
+class CancelTuningJobResponseDict(TypedDict, total=False):
+  """Empty response for tunings.cancel method."""
+
+  sdk_http_response: Optional[HttpResponseDict]
+  """Used to retain the full HTTP response."""
+
+
+CancelTuningJobResponseOrDict = Union[
+    CancelTuningJobResponse, CancelTuningJobResponseDict
+]
+
+
 class TuningExample(_common.BaseModel):
   """A single example for tuning.
 

google/genai/version.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 #
 
-__version__ = '1.52.0' # x-release-please-version
+__version__ = '1.54.0' # x-release-please-version