google-genai 1.5.0__py3-none-any.whl → 1.7.0__py3-none-any.whl

google/genai/tunings.py

@@ -332,7 +332,7 @@ def _CreateTuningJobConfig_to_vertex(
 
   if getv(from_object, ['learning_rate_multiplier']) is not None:
     setv(
-        to_object,
+        parent_object,
         ['supervisedTuningSpec', 'hyperParameters', 'learningRateMultiplier'],
         getv(from_object, ['learning_rate_multiplier']),
     )
@@ -781,13 +781,13 @@ class Tunings(_api_module.BaseModule):
   def _list(
       self, *, config: Optional[types.ListTuningJobsConfigOrDict] = None
   ) -> types.ListTuningJobsResponse:
-    """Lists tuning jobs.
+    """Lists `TuningJob` objects.
 
     Args:
       config: The configuration for the list request.
 
     Returns:
-      A list of tuning jobs.
+      A list of `TuningJob` objects.
     """
 
     parameter_model = types._ListTuningJobsParameters(
@@ -855,7 +855,7 @@ class Tunings(_api_module.BaseModule):
       training_dataset: types.TuningDatasetOrDict,
       config: Optional[types.CreateTuningJobConfigOrDict] = None,
   ) -> types.TuningJob:
-    """Creates a supervised fine-tuning job.
+    """Creates a supervised fine-tuning job and returns the TuningJob object.
 
     Args:
       base_model: The name of the model to tune.
@@ -922,7 +922,7 @@ class Tunings(_api_module.BaseModule):
       training_dataset: types.TuningDatasetOrDict,
       config: Optional[types.CreateTuningJobConfigOrDict] = None,
   ) -> types.Operation:
-    """Creates a supervised fine-tuning job.
+    """Creates a supervised fine-tuning job and returns the TuningJob object.
 
     Args:
       base_model: The name of the model to tune.
@@ -999,7 +999,11 @@ class Tunings(_api_module.BaseModule):
       config: Optional[types.GetTuningJobConfigOrDict] = None,
   ) -> types.TuningJob:
     job = self._get(name=name, config=config)
-    if job.experiment and self._api_client.vertexai:
+    if (
+        job.experiment
+        and self._api_client.vertexai
+        and self._api_client.project is not None
+    ):
       _IpythonUtils.display_experiment_button(
           experiment=job.experiment,
           project=self._api_client.project,
@@ -1029,11 +1033,12 @@ class Tunings(_api_module.BaseModule):
           training_dataset=training_dataset,
           config=config,
       )
-      operation_dict = operation.to_json_dict()
-      try:
-        tuned_model_name = operation_dict['metadata']['tunedModel']
-      except KeyError:
-        tuned_model_name = operation_dict['name'].partition('/operations/')[0]
+      if operation.metadata is not None and 'tunedModel' in operation.metadata:
+        tuned_model_name = operation.metadata['tunedModel']
+      else:
+        if operation.name is None:
+          raise ValueError('Operation name is required.')
+        tuned_model_name = operation.name.partition('/operations/')[0]
       tuning_job = types.TuningJob(
           name=tuned_model_name,
           state=types.JobState.JOB_STATE_QUEUED,
@@ -1120,13 +1125,13 @@ class AsyncTunings(_api_module.BaseModule):
   async def _list(
       self, *, config: Optional[types.ListTuningJobsConfigOrDict] = None
   ) -> types.ListTuningJobsResponse:
-    """Lists tuning jobs.
+    """Lists `TuningJob` objects.
 
     Args:
       config: The configuration for the list request.
 
     Returns:
-      A list of tuning jobs.
+      A list of `TuningJob` objects.
     """
 
     parameter_model = types._ListTuningJobsParameters(
@@ -1194,7 +1199,7 @@ class AsyncTunings(_api_module.BaseModule):
       training_dataset: types.TuningDatasetOrDict,
       config: Optional[types.CreateTuningJobConfigOrDict] = None,
   ) -> types.TuningJob:
-    """Creates a supervised fine-tuning job.
+    """Creates a supervised fine-tuning job and returns the TuningJob object.
 
     Args:
       base_model: The name of the model to tune.
@@ -1261,7 +1266,7 @@ class AsyncTunings(_api_module.BaseModule):
       training_dataset: types.TuningDatasetOrDict,
       config: Optional[types.CreateTuningJobConfigOrDict] = None,
   ) -> types.Operation:
-    """Creates a supervised fine-tuning job.
+    """Creates a supervised fine-tuning job and returns the TuningJob object.
 
     Args:
       base_model: The name of the model to tune.
@@ -1338,7 +1343,11 @@ class AsyncTunings(_api_module.BaseModule):
       config: Optional[types.GetTuningJobConfigOrDict] = None,
   ) -> types.TuningJob:
     job = await self._get(name=name, config=config)
-    if job.experiment and self._api_client.vertexai:
+    if (
+        job.experiment
+        and self._api_client.vertexai
+        and self._api_client.project is not None
+    ):
       _IpythonUtils.display_experiment_button(
           experiment=job.experiment,
           project=self._api_client.project,
@@ -1368,11 +1377,12 @@ class AsyncTunings(_api_module.BaseModule):
           training_dataset=training_dataset,
           config=config,
       )
-      operation_dict = operation.to_json_dict()
-      try:
-        tuned_model_name = operation_dict['metadata']['tunedModel']
-      except KeyError:
-        tuned_model_name = operation_dict['name'].partition('/operations/')[0]
+      if operation.metadata is not None and 'tunedModel' in operation.metadata:
+        tuned_model_name = operation.metadata['tunedModel']
+      else:
+        if operation.name is None:
+          raise ValueError('Operation name is required.')
+        tuned_model_name = operation.name.partition('/operations/')[0]
       tuning_job = types.TuningJob(
           name=tuned_model_name,
           state=types.JobState.JOB_STATE_QUEUED,

google/genai/types.py

@@ -719,7 +719,9 @@ class UserContent(Content):
   role: Literal['user'] = Field(default='user', init=False, frozen=True)
   parts: list[Part] = Field()
 
-  def __init__(self, parts: Union['PartUnionDict', list['PartUnionDict']]):
+  def __init__(
+      self, parts: Union['PartUnionDict', list['PartUnionDict'], list['Part']]
+  ):
     from . import _transformers as t
 
     super().__init__(parts=t.t_parts(parts=parts))
@@ -747,7 +749,9 @@ class ModelContent(Content):
   role: Literal['model'] = Field(default='model', init=False, frozen=True)
   parts: list[Part] = Field()
 
-  def __init__(self, parts: Union['PartUnionDict', list['PartUnionDict']]):
+  def __init__(
+      self, parts: Union['PartUnionDict', list['PartUnionDict'], list['Part']]
+  ):
     from . import _transformers as t
 
     super().__init__(parts=t.t_parts(parts=parts))
@@ -821,17 +825,9 @@ class Schema(_common.BaseModel):
       default=None,
       description="""Optional. Pattern of the Type.STRING to restrict a string to a regular expression.""",
   )
-  minimum: Optional[float] = Field(
-      default=None,
-      description="""Optional. SCHEMA FIELDS FOR TYPE INTEGER and NUMBER Minimum value of the Type.INTEGER and Type.NUMBER""",
-  )
   default: Optional[Any] = Field(
       default=None, description="""Optional. Default value of the data."""
   )
-  any_of: Optional[list['Schema']] = Field(
-      default=None,
-      description="""Optional. The value should be validated against any (one or more) of the subschemas in the list.""",
-  )
   max_length: Optional[int] = Field(
       default=None,
       description="""Optional. Maximum length of the Type.STRING""",
@@ -847,14 +843,14 @@ class Schema(_common.BaseModel):
       default=None,
       description="""Optional. Minimum number of the properties for Type.OBJECT.""",
   )
-  maximum: Optional[float] = Field(
-      default=None,
-      description="""Optional. Maximum value of the Type.INTEGER and Type.NUMBER""",
-  )
   max_properties: Optional[int] = Field(
       default=None,
       description="""Optional. Maximum number of the properties for Type.OBJECT.""",
   )
+  any_of: Optional[list['Schema']] = Field(
+      default=None,
+      description="""Optional. The value should be validated against any (one or more) of the subschemas in the list.""",
+  )
   description: Optional[str] = Field(
       default=None, description="""Optional. The description of the data."""
   )
@@ -874,10 +870,18 @@ class Schema(_common.BaseModel):
       default=None,
       description="""Optional. Maximum number of the elements for Type.ARRAY.""",
   )
+  maximum: Optional[float] = Field(
+      default=None,
+      description="""Optional. Maximum value of the Type.INTEGER and Type.NUMBER""",
+  )
   min_items: Optional[int] = Field(
       default=None,
       description="""Optional. Minimum number of the elements for Type.ARRAY.""",
   )
+  minimum: Optional[float] = Field(
+      default=None,
+      description="""Optional. SCHEMA FIELDS FOR TYPE INTEGER and NUMBER Minimum value of the Type.INTEGER and Type.NUMBER""",
+  )
   nullable: Optional[bool] = Field(
       default=None,
       description="""Optional. Indicates if the value may be null.""",
@@ -911,15 +915,9 @@ class SchemaDict(TypedDict, total=False):
   pattern: Optional[str]
   """Optional. Pattern of the Type.STRING to restrict a string to a regular expression."""
 
-  minimum: Optional[float]
-  """Optional. SCHEMA FIELDS FOR TYPE INTEGER and NUMBER Minimum value of the Type.INTEGER and Type.NUMBER"""
-
   default: Optional[Any]
   """Optional. Default value of the data."""
 
-  any_of: Optional[list['SchemaDict']]
-  """Optional. The value should be validated against any (one or more) of the subschemas in the list."""
-
   max_length: Optional[int]
   """Optional. Maximum length of the Type.STRING"""
 
@@ -932,12 +930,12 @@ class SchemaDict(TypedDict, total=False):
   min_properties: Optional[int]
   """Optional. Minimum number of the properties for Type.OBJECT."""
 
-  maximum: Optional[float]
-  """Optional. Maximum value of the Type.INTEGER and Type.NUMBER"""
-
   max_properties: Optional[int]
   """Optional. Maximum number of the properties for Type.OBJECT."""
 
+  any_of: Optional[list['SchemaDict']]
+  """Optional. The value should be validated against any (one or more) of the subschemas in the list."""
+
   description: Optional[str]
   """Optional. The description of the data."""
 
@@ -953,9 +951,15 @@ class SchemaDict(TypedDict, total=False):
   max_items: Optional[int]
   """Optional. Maximum number of the elements for Type.ARRAY."""
 
+  maximum: Optional[float]
+  """Optional. Maximum value of the Type.INTEGER and Type.NUMBER"""
+
   min_items: Optional[int]
   """Optional. Minimum number of the elements for Type.ARRAY."""
 
+  minimum: Optional[float]
+  """Optional. SCHEMA FIELDS FOR TYPE INTEGER and NUMBER Minimum value of the Type.INTEGER and Type.NUMBER"""
+
   nullable: Optional[bool]
   """Optional. Indicates if the value may be null."""
 
@@ -1074,12 +1078,11 @@ class FunctionDeclaration(_common.BaseModel):
           type='OBJECT',
           properties=parameters_properties,
       )
-      if api_option == 'VERTEX_AI':
-        declaration.parameters.required = (
-            _automatic_function_calling_util._get_required_fields(
-                declaration.parameters
-            )
-        )
+      declaration.parameters.required = (
+          _automatic_function_calling_util._get_required_fields(
+              declaration.parameters
+          )
+      )
     if api_option == 'GEMINI_API':
       return declaration
 
@@ -1663,7 +1666,7 @@ class File(_common.BaseModel):
   )
   sha256_hash: Optional[str] = Field(
       default=None,
-      description="""Output only. SHA-256 hash of the uploaded bytes.""",
+      description="""Output only. SHA-256 hash of the uploaded bytes. The hash value is encoded in base64 format.""",
   )
   uri: Optional[str] = Field(
       default=None, description="""Output only. The URI of the `File`."""
@@ -1712,7 +1715,7 @@ class FileDict(TypedDict, total=False):
   """Output only. The timestamp of when the `File` was last updated."""
 
   sha256_hash: Optional[str]
-  """Output only. SHA-256 hash of the uploaded bytes."""
+  """Output only. SHA-256 hash of the uploaded bytes. The hash value is encoded in base64 format."""
 
   uri: Optional[str]
   """Output only. The URI of the `File`."""
@@ -3745,6 +3748,36 @@ class ImageDict(TypedDict, total=False):
 ImageOrDict = Union[Image, ImageDict]
 
 
+class SafetyAttributes(_common.BaseModel):
+  """Safety attributes of a GeneratedImage or the user-provided prompt."""
+
+  categories: Optional[list[str]] = Field(
+      default=None,
+      description="""List of RAI categories.
+      """,
+  )
+  scores: Optional[list[float]] = Field(
+      default=None,
+      description="""List of scores of each categories.
+      """,
+  )
+
+
+class SafetyAttributesDict(TypedDict, total=False):
+  """Safety attributes of a GeneratedImage or the user-provided prompt."""
+
+  categories: Optional[list[str]]
+  """List of RAI categories.
+      """
+
+  scores: Optional[list[float]]
+  """List of scores of each categories.
+      """
+
+
+SafetyAttributesOrDict = Union[SafetyAttributes, SafetyAttributesDict]
+
+
 class GeneratedImage(_common.BaseModel):
   """An output image."""
 
@@ -3759,6 +3792,12 @@ class GeneratedImage(_common.BaseModel):
       response.
       """,
   )
+  safety_attributes: Optional[SafetyAttributes] = Field(
+      default=None,
+      description="""Safety attributes of the image. Lists of RAI categories and their
+      scores of each content.
+      """,
+  )
   enhanced_prompt: Optional[str] = Field(
       default=None,
       description="""The rewritten prompt used for the image generation if the prompt
@@ -3779,6 +3818,11 @@ class GeneratedImageDict(TypedDict, total=False):
       response.
       """
 
+  safety_attributes: Optional[SafetyAttributesDict]
+  """Safety attributes of the image. Lists of RAI categories and their
+      scores of each content.
+      """
+
   enhanced_prompt: Optional[str]
   """The rewritten prompt used for the image generation if the prompt
       enhancer is enabled.
@@ -4070,6 +4114,11 @@ class EditImageConfig(_common.BaseModel):
       default=None,
       description="""Describes the editing mode for the request.""",
   )
+  base_steps: Optional[int] = Field(
+      default=None,
+      description="""The number of sampling steps. A higher value has better image
+      quality, while a lower value has better latency.""",
+  )
 
 
 class EditImageConfigDict(TypedDict, total=False):
@@ -4138,6 +4187,10 @@ class EditImageConfigDict(TypedDict, total=False):
   edit_mode: Optional[EditMode]
   """Describes the editing mode for the request."""
 
+  base_steps: Optional[int]
+  """The number of sampling steps. A higher value has better image
+      quality, while a lower value has better latency."""
+
 
 EditImageConfigOrDict = Union[EditImageConfig, EditImageConfigDict]
 
@@ -5178,8 +5231,10 @@ class Video(_common.BaseModel):
       IPython_display = None
 
     if IPython_display:
-      return IPython_display.Video(
-          data=self.video_bytes, mimetype=mime_type, embed=True
+      IPython_display.display(
+          IPython_display.Video(
+              data=self.video_bytes, mimetype=mime_type, embed=True
+          )
       )
 
   def __repr__(self):

google/genai/version.py

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