google-genai 1.41.0__py3-none-any.whl → 1.42.0__py3-none-any.whl

google/genai/operations.py

@@ -91,26 +91,6 @@ def _GetProjectOperationParameters_to_vertex(
   return to_object
 
 
-def _ProjectOperation_from_vertex(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['name']) is not None:
-    setv(to_object, ['name'], getv(from_object, ['name']))
-
-  if getv(from_object, ['metadata']) is not None:
-    setv(to_object, ['metadata'], getv(from_object, ['metadata']))
-
-  if getv(from_object, ['done']) is not None:
-    setv(to_object, ['done'], getv(from_object, ['done']))
-
-  if getv(from_object, ['error']) is not None:
-    setv(to_object, ['error'], getv(from_object, ['error']))
-
-  return to_object
-
-
 class Operations(_api_module.BaseModule):
 
   def _get_videos_operation(
@@ -158,7 +138,7 @@ class Operations(_api_module.BaseModule):
 
     response = self._api_client.request('get', path, request_dict, http_options)
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     return response_dict
 
@@ -208,7 +188,7 @@ class Operations(_api_module.BaseModule):
         'post', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     return response_dict
 
@@ -252,10 +232,7 @@ class Operations(_api_module.BaseModule):
 
     response = self._api_client.request('get', path, request_dict, http_options)
 
-    response_dict = '' if not response.body else json.loads(response.body)
-
-    if self._api_client.vertexai:
-      response_dict = _ProjectOperation_from_vertex(response_dict)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     return_value = types.ProjectOperation._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -366,7 +343,7 @@ class AsyncOperations(_api_module.BaseModule):
         'get', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     return response_dict
 
@@ -416,7 +393,7 @@ class AsyncOperations(_api_module.BaseModule):
         'post', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     return response_dict
 
@@ -462,10 +439,7 @@ class AsyncOperations(_api_module.BaseModule):
         'get', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
-
-    if self._api_client.vertexai:
-      response_dict = _ProjectOperation_from_vertex(response_dict)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     return_value = types.ProjectOperation._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()

google/genai/tokens.py

@@ -257,12 +257,7 @@ class Tokens(_api_module.BaseModule):
     response = self._api_client.request(
         'post', path, request_dict, http_options
     )
-    response_dict = '' if not response.body else json.loads(response.body)
-
-    if not self._api_client.vertexai:
-      response_dict = tokens_converters._AuthToken_from_mldev(
-          response_dict
-      )
+    response_dict = {} if not response.body else json.loads(response.body)
 
     return_value = types.AuthToken._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
@@ -358,12 +353,7 @@ class AsyncTokens(_api_module.BaseModule):
         request_dict,
         http_options=http_options,
     )
-    response_dict = '' if not response.body else json.loads(response.body)
-
-    if not self._api_client.vertexai:
-      response_dict = tokens_converters._AuthToken_from_mldev(
-          response_dict
-      )
+    response_dict = {} if not response.body else json.loads(response.body)
 
     return_value = types.AuthToken._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()

google/genai/tunings.py

@@ -32,40 +32,6 @@ from .pagers import AsyncPager, Pager
 logger = logging.getLogger('google_genai.tunings')
 
 
-def _AutoraterConfig_from_vertex(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['samplingCount']) is not None:
-    setv(to_object, ['sampling_count'], getv(from_object, ['samplingCount']))
-
-  if getv(from_object, ['flipEnabled']) is not None:
-    setv(to_object, ['flip_enabled'], getv(from_object, ['flipEnabled']))
-
-  if getv(from_object, ['autoraterModel']) is not None:
-    setv(to_object, ['autorater_model'], getv(from_object, ['autoraterModel']))
-
-  return to_object
-
-
-def _AutoraterConfig_to_vertex(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['sampling_count']) is not None:
-    setv(to_object, ['samplingCount'], getv(from_object, ['sampling_count']))
-
-  if getv(from_object, ['flip_enabled']) is not None:
-    setv(to_object, ['flipEnabled'], getv(from_object, ['flip_enabled']))
-
-  if getv(from_object, ['autorater_model']) is not None:
-    setv(to_object, ['autoraterModel'], getv(from_object, ['autorater_model']))
-
-  return to_object
-
-
 def _CancelTuningJobParameters_to_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -297,21 +263,11 @@ def _EvaluationConfig_from_vertex(
     setv(to_object, ['metrics'], t.t_metrics(getv(from_object, ['metrics'])))
 
   if getv(from_object, ['outputConfig']) is not None:
-    setv(
-        to_object,
-        ['output_config'],
-        _OutputConfig_from_vertex(
-            getv(from_object, ['outputConfig']), to_object
-        ),
-    )
+    setv(to_object, ['output_config'], getv(from_object, ['outputConfig']))
 
   if getv(from_object, ['autoraterConfig']) is not None:
     setv(
-        to_object,
-        ['autorater_config'],
-        _AutoraterConfig_from_vertex(
-            getv(from_object, ['autoraterConfig']), to_object
-        ),
+        to_object, ['autorater_config'], getv(from_object, ['autoraterConfig'])
     )
 
   return to_object
@@ -326,47 +282,11 @@ def _EvaluationConfig_to_vertex(
     setv(to_object, ['metrics'], t.t_metrics(getv(from_object, ['metrics'])))
 
   if getv(from_object, ['output_config']) is not None:
-    setv(
-        to_object,
-        ['outputConfig'],
-        _OutputConfig_to_vertex(
-            getv(from_object, ['output_config']), to_object
-        ),
-    )
+    setv(to_object, ['outputConfig'], getv(from_object, ['output_config']))
 
   if getv(from_object, ['autorater_config']) is not None:
     setv(
-        to_object,
-        ['autoraterConfig'],
-        _AutoraterConfig_to_vertex(
-            getv(from_object, ['autorater_config']), to_object
-        ),
-    )
-
-  return to_object
-
-
-def _GcsDestination_from_vertex(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['outputUriPrefix']) is not None:
-    setv(
-        to_object, ['output_uri_prefix'], getv(from_object, ['outputUriPrefix'])
-    )
-
-  return to_object
-
-
-def _GcsDestination_to_vertex(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['output_uri_prefix']) is not None:
-    setv(
-        to_object, ['outputUriPrefix'], getv(from_object, ['output_uri_prefix'])
+        to_object, ['autoraterConfig'], getv(from_object, ['autorater_config'])
     )
 
   return to_object
@@ -516,60 +436,6 @@ def _ListTuningJobsResponse_from_vertex(
   return to_object
 
 
-def _OutputConfig_from_vertex(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['gcsDestination']) is not None:
-    setv(
-        to_object,
-        ['gcs_destination'],
-        _GcsDestination_from_vertex(
-            getv(from_object, ['gcsDestination']), to_object
-        ),
-    )
-
-  return to_object
-
-
-def _OutputConfig_to_vertex(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['gcs_destination']) is not None:
-    setv(
-        to_object,
-        ['gcsDestination'],
-        _GcsDestination_to_vertex(
-            getv(from_object, ['gcs_destination']), to_object
-        ),
-    )
-
-  return to_object
-
-
-def _TunedModelCheckpoint_from_vertex(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['checkpointId']) is not None:
-    setv(to_object, ['checkpoint_id'], getv(from_object, ['checkpointId']))
-
-  if getv(from_object, ['epoch']) is not None:
-    setv(to_object, ['epoch'], getv(from_object, ['epoch']))
-
-  if getv(from_object, ['step']) is not None:
-    setv(to_object, ['step'], getv(from_object, ['step']))
-
-  if getv(from_object, ['endpoint']) is not None:
-    setv(to_object, ['endpoint'], getv(from_object, ['endpoint']))
-
-  return to_object
-
-
 def _TunedModel_from_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -584,30 +450,6 @@ def _TunedModel_from_mldev(
   return to_object
 
 
-def _TunedModel_from_vertex(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['model']) is not None:
-    setv(to_object, ['model'], getv(from_object, ['model']))
-
-  if getv(from_object, ['endpoint']) is not None:
-    setv(to_object, ['endpoint'], getv(from_object, ['endpoint']))
-
-  if getv(from_object, ['checkpoints']) is not None:
-    setv(
-        to_object,
-        ['checkpoints'],
-        [
-            _TunedModelCheckpoint_from_vertex(item, to_object)
-            for item in getv(from_object, ['checkpoints'])
-        ],
-    )
-
-  return to_object
-
-
 def _TuningDataset_to_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -625,10 +467,7 @@ def _TuningDataset_to_mldev(
     setv(
         to_object,
         ['examples', 'examples'],
-        [
-            _TuningExample_to_mldev(item, to_object)
-            for item in getv(from_object, ['examples'])
-        ],
+        [item for item in getv(from_object, ['examples'])],
     )
 
   return to_object
@@ -659,20 +498,6 @@ def _TuningDataset_to_vertex(
   return to_object
 
 
-def _TuningExample_to_mldev(
-    from_object: Union[dict[str, Any], object],
-    parent_object: Optional[dict[str, Any]] = None,
-) -> dict[str, Any]:
-  to_object: dict[str, Any] = {}
-  if getv(from_object, ['text_input']) is not None:
-    setv(to_object, ['textInput'], getv(from_object, ['text_input']))
-
-  if getv(from_object, ['output']) is not None:
-    setv(to_object, ['output'], getv(from_object, ['output']))
-
-  return to_object
-
-
 def _TuningJob_from_mldev(
     from_object: Union[dict[str, Any], object],
     parent_object: Optional[dict[str, Any]] = None,
@@ -801,11 +626,7 @@ def _TuningJob_from_vertex(
     setv(to_object, ['base_model'], getv(from_object, ['baseModel']))
 
   if getv(from_object, ['tunedModel']) is not None:
-    setv(
-        to_object,
-        ['tuned_model'],
-        _TunedModel_from_vertex(getv(from_object, ['tunedModel']), to_object),
-    )
+    setv(to_object, ['tuned_model'], getv(from_object, ['tunedModel']))
 
   if getv(from_object, ['preTunedModel']) is not None:
     setv(to_object, ['pre_tuned_model'], getv(from_object, ['preTunedModel']))
@@ -973,12 +794,12 @@ class Tunings(_api_module.BaseModule):
 
     response = self._api_client.request('get', path, request_dict, http_options)
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if self._api_client.vertexai:
       response_dict = _TuningJob_from_vertex(response_dict)
 
-    else:
+    if not self._api_client.vertexai:
       response_dict = _TuningJob_from_mldev(response_dict)
 
     return_value = types.TuningJob._from_response(
@@ -1040,12 +861,12 @@ class Tunings(_api_module.BaseModule):
 
     response = self._api_client.request('get', path, request_dict, http_options)
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if self._api_client.vertexai:
       response_dict = _ListTuningJobsResponse_from_vertex(response_dict)
 
-    else:
+    if not self._api_client.vertexai:
       response_dict = _ListTuningJobsResponse_from_mldev(response_dict)
 
     return_value = types.ListTuningJobsResponse._from_response(
@@ -1169,7 +990,7 @@ class Tunings(_api_module.BaseModule):
         'post', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if self._api_client.vertexai:
       response_dict = _TuningJob_from_vertex(response_dict)
@@ -1242,7 +1063,7 @@ class Tunings(_api_module.BaseModule):
         'post', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if not self._api_client.vertexai:
       response_dict = _TuningOperation_from_mldev(response_dict)
@@ -1426,12 +1247,12 @@ class AsyncTunings(_api_module.BaseModule):
         'get', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if self._api_client.vertexai:
       response_dict = _TuningJob_from_vertex(response_dict)
 
-    else:
+    if not self._api_client.vertexai:
       response_dict = _TuningJob_from_mldev(response_dict)
 
     return_value = types.TuningJob._from_response(
@@ -1495,12 +1316,12 @@ class AsyncTunings(_api_module.BaseModule):
         'get', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if self._api_client.vertexai:
       response_dict = _ListTuningJobsResponse_from_vertex(response_dict)
 
-    else:
+    if not self._api_client.vertexai:
       response_dict = _ListTuningJobsResponse_from_mldev(response_dict)
 
     return_value = types.ListTuningJobsResponse._from_response(
@@ -1624,7 +1445,7 @@ class AsyncTunings(_api_module.BaseModule):
         'post', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if self._api_client.vertexai:
       response_dict = _TuningJob_from_vertex(response_dict)
@@ -1697,7 +1518,7 @@ class AsyncTunings(_api_module.BaseModule):
         'post', path, request_dict, http_options
     )
 
-    response_dict = '' if not response.body else json.loads(response.body)
+    response_dict = {} if not response.body else json.loads(response.body)
 
     if not self._api_client.vertexai:
       response_dict = _TuningOperation_from_mldev(response_dict)

google/genai/types.py

@@ -1117,6 +1117,40 @@ class FunctionResponsePart(_common.BaseModel):
       default=None, description="""Optional. URI based data."""
   )
 
+  @classmethod
+  def from_bytes(cls, *, data: bytes, mime_type: str) -> 'FunctionResponsePart':
+    """Creates a FunctionResponsePart from bytes and mime type.
+
+    Args:
+      data (bytes): The bytes of the data
+      mime_type (str): mime_type: The MIME type of the data.
+    """
+    inline_data = FunctionResponseBlob(
+        data=data,
+        mime_type=mime_type,
+    )
+    return cls(inline_data=inline_data)
+
+  @classmethod
+  def from_uri(
+      cls, *, file_uri: str, mime_type: Optional[str] = None
+  ) -> 'FunctionResponsePart':
+    """Creates a FunctionResponsePart from a file uri.
+
+    Args:
+      file_uri (str): The uri of the file
+      mime_type (str): mime_type: The MIME type of the file. If not provided,
+        the MIME type will be automatically determined.
+    """
+    if mime_type is None:
+      import mimetypes
+
+      mime_type, _ = mimetypes.guess_type(file_uri)
+      if not mime_type:
+        raise ValueError(f'Failed to determine mime type for file: {file_uri}')
+    file_data = FunctionResponseFileData(file_uri=file_uri, mime_type=mime_type)
+    return cls(file_data=file_data)
+
 
 class FunctionResponsePartDict(TypedDict, total=False):
   """A datatype containing media that is part of a `FunctionResponse` message.
@@ -1274,7 +1308,7 @@ class Part(_common.BaseModel):
 
     Args:
       file_uri (str): The uri of the file
-      mime_type (str): mime_type: The MIME type of the image. If not provided,
+      mime_type (str): mime_type: The MIME type of the file. If not provided,
         the MIME type will be automatically determined.
     """
     if mime_type is None:
@@ -1305,9 +1339,15 @@ class Part(_common.BaseModel):
 
   @classmethod
   def from_function_response(
-      cls, *, name: str, response: dict[str, Any]
+      cls,
+      *,
+      name: str,
+      response: dict[str, Any],
+      parts: Optional[list[FunctionResponsePart]] = None,
   ) -> 'Part':
-    function_response = FunctionResponse(name=name, response=response)
+    function_response = FunctionResponse(
+        name=name, response=response, parts=parts
+    )
     return cls(function_response=function_response)
 
   @classmethod
@@ -6259,6 +6299,10 @@ class GenerateImagesConfig(_common.BaseModel):
       default=None,
       description="""Whether to add a watermark to the generated images.""",
   )
+  labels: Optional[dict[str, str]] = Field(
+      default=None,
+      description="""User specified labels to track billing usage.""",
+  )
   image_size: Optional[str] = Field(
       default=None,
       description="""The size of the largest dimension of the generated image.
@@ -6324,6 +6368,9 @@ class GenerateImagesConfigDict(TypedDict, total=False):
   add_watermark: Optional[bool]
   """Whether to add a watermark to the generated images."""
 
+  labels: Optional[dict[str, str]]
+  """User specified labels to track billing usage."""
+
   image_size: Optional[str]
   """The size of the largest dimension of the generated image.
       Supported sizes are 1K and 2K (not supported for Imagen 3 models)."""
@@ -6901,6 +6948,10 @@ class EditImageConfig(_common.BaseModel):
       default=None,
       description="""Whether to add a watermark to the generated images.""",
   )
+  labels: Optional[dict[str, str]] = Field(
+      default=None,
+      description="""User specified labels to track billing usage.""",
+  )
   edit_mode: Optional[EditMode] = Field(
       default=None,
       description="""Describes the editing mode for the request.""",
@@ -6967,6 +7018,9 @@ class EditImageConfigDict(TypedDict, total=False):
   add_watermark: Optional[bool]
   """Whether to add a watermark to the generated images."""
 
+  labels: Optional[dict[str, str]]
+  """User specified labels to track billing usage."""
+
   edit_mode: Optional[EditMode]
   """Describes the editing mode for the request."""
 
@@ -7082,6 +7136,10 @@ class _UpscaleImageAPIConfig(_common.BaseModel):
       output image will have be more different from the input image, but
       with finer details and less noise.""",
   )
+  labels: Optional[dict[str, str]] = Field(
+      default=None,
+      description="""User specified labels to track billing usage.""",
+  )
   number_of_images: Optional[int] = Field(default=None, description="""""")
   mode: Optional[str] = Field(default=None, description="""""")
 
@@ -7121,6 +7179,9 @@ class _UpscaleImageAPIConfigDict(TypedDict, total=False):
       output image will have be more different from the input image, but
       with finer details and less noise."""
 
+  labels: Optional[dict[str, str]]
+  """User specified labels to track billing usage."""
+
   number_of_images: Optional[int]
   """"""
 
@@ -7297,6 +7358,10 @@ class RecontextImageConfig(_common.BaseModel):
   enhance_prompt: Optional[bool] = Field(
       default=None, description="""Whether to use the prompt rewriting logic."""
   )
+  labels: Optional[dict[str, str]] = Field(
+      default=None,
+      description="""User specified labels to track billing usage.""",
+  )
 
 
 class RecontextImageConfigDict(TypedDict, total=False):
@@ -7338,6 +7403,9 @@ class RecontextImageConfigDict(TypedDict, total=False):
   enhance_prompt: Optional[bool]
   """Whether to use the prompt rewriting logic."""
 
+  labels: Optional[dict[str, str]]
+  """User specified labels to track billing usage."""
+
 
 RecontextImageConfigOrDict = Union[
     RecontextImageConfig, RecontextImageConfigDict
@@ -7488,6 +7556,10 @@ class SegmentImageConfig(_common.BaseModel):
       can be set to a decimal value between 0 and 255 non-inclusive.
       Set to -1 for no binary color thresholding.""",
   )
+  labels: Optional[dict[str, str]] = Field(
+      default=None,
+      description="""User specified labels to track billing usage.""",
+  )
 
 
 class SegmentImageConfigDict(TypedDict, total=False):
@@ -7518,6 +7590,9 @@ class SegmentImageConfigDict(TypedDict, total=False):
       can be set to a decimal value between 0 and 255 non-inclusive.
       Set to -1 for no binary color thresholding."""
 
+  labels: Optional[dict[str, str]]
+  """User specified labels to track billing usage."""
+
 
 SegmentImageConfigOrDict = Union[SegmentImageConfig, SegmentImageConfigDict]
 
@@ -8980,6 +9055,7 @@ class GenerateVideosOperation(_common.BaseModel, Operation):
       cls, api_response: Any, is_vertex_ai: bool = False
   ) -> Self:
     """Instantiates a GenerateVideosOperation from an API response."""
+
     if is_vertex_ai:
       response_dict = _GenerateVideosOperation_from_vertex(api_response)
     else:
@@ -13000,6 +13076,10 @@ class UpscaleImageConfig(_common.BaseModel):
       output image will have be more different from the input image, but
       with finer details and less noise.""",
   )
+  labels: Optional[dict[str, str]] = Field(
+      default=None,
+      description="""User specified labels to track billing usage.""",
+  )
 
 
 class UpscaleImageConfigDict(TypedDict, total=False):
@@ -13038,6 +13118,9 @@ class UpscaleImageConfigDict(TypedDict, total=False):
       output image will have be more different from the input image, but
       with finer details and less noise."""
 
+  labels: Optional[dict[str, str]]
+  """User specified labels to track billing usage."""
+
 
 UpscaleImageConfigOrDict = Union[UpscaleImageConfig, UpscaleImageConfigDict]
 

google/genai/version.py

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