Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 35 additions & 35 deletions vertexai/_genai/datasets.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,6 @@ def _CreateMultimodalDatasetParameters_to_vertex(
parent_object: Optional[dict[str, Any]] = None,
) -> dict[str, Any]:
to_object: dict[str, Any] = {}
if getv(from_object, ["config"]) is not None:
setv(to_object, ["config"], getv(from_object, ["config"]))

if getv(from_object, ["name"]) is not None:
setv(to_object, ["name"], getv(from_object, ["name"]))

Expand All @@ -136,6 +133,9 @@ def _CreateMultimodalDatasetParameters_to_vertex(
if getv(from_object, ["encryption_spec"]) is not None:
setv(to_object, ["encryptionSpec"], getv(from_object, ["encryption_spec"]))

if getv(from_object, ["config"]) is not None:
setv(to_object, ["config"], getv(from_object, ["config"]))

return to_object


Expand All @@ -144,12 +144,12 @@ def _DeleteMultimodalDatasetRequestParameters_to_vertex(
parent_object: Optional[dict[str, Any]] = None,
) -> dict[str, Any]:
to_object: dict[str, Any] = {}
if getv(from_object, ["config"]) is not None:
setv(to_object, ["config"], getv(from_object, ["config"]))

if getv(from_object, ["name"]) is not None:
setv(to_object, ["_url", "name"], getv(from_object, ["name"]))

if getv(from_object, ["config"]) is not None:
setv(to_object, ["config"], getv(from_object, ["config"]))

return to_object


Expand All @@ -158,15 +158,15 @@ def _GetMultimodalDatasetOperationParameters_to_vertex(
parent_object: Optional[dict[str, Any]] = None,
) -> dict[str, Any]:
to_object: dict[str, Any] = {}
if getv(from_object, ["config"]) is not None:
setv(to_object, ["config"], getv(from_object, ["config"]))

if getv(from_object, ["dataset_id"]) is not None:
setv(to_object, ["_url", "dataset_id"], getv(from_object, ["dataset_id"]))

if getv(from_object, ["operation_id"]) is not None:
setv(to_object, ["_url", "operation_id"], getv(from_object, ["operation_id"]))

if getv(from_object, ["config"]) is not None:
setv(to_object, ["config"], getv(from_object, ["config"]))

return to_object


Expand All @@ -175,12 +175,12 @@ def _GetMultimodalDatasetParameters_to_vertex(
parent_object: Optional[dict[str, Any]] = None,
) -> dict[str, Any]:
to_object: dict[str, Any] = {}
if getv(from_object, ["config"]) is not None:
setv(to_object, ["config"], getv(from_object, ["config"]))

if getv(from_object, ["name"]) is not None:
setv(to_object, ["_url", "name"], getv(from_object, ["name"]))

if getv(from_object, ["config"]) is not None:
setv(to_object, ["config"], getv(from_object, ["config"]))

return to_object


Expand Down Expand Up @@ -224,9 +224,6 @@ def _UpdateMultimodalDatasetParameters_to_vertex(
parent_object: Optional[dict[str, Any]] = None,
) -> dict[str, Any]:
to_object: dict[str, Any] = {}
if getv(from_object, ["config"]) is not None:
setv(to_object, ["config"], getv(from_object, ["config"]))

if getv(from_object, ["name"]) is not None:
setv(to_object, ["_url", "name"], getv(from_object, ["name"]))

Expand All @@ -242,6 +239,9 @@ def _UpdateMultimodalDatasetParameters_to_vertex(
if getv(from_object, ["encryption_spec"]) is not None:
setv(to_object, ["encryptionSpec"], getv(from_object, ["encryption_spec"]))

if getv(from_object, ["config"]) is not None:
setv(to_object, ["config"], getv(from_object, ["config"]))

return to_object


Expand Down Expand Up @@ -380,26 +380,26 @@ def _assess_multimodal_dataset(
def _create_multimodal_dataset(
self,
*,
config: Optional[types.CreateMultimodalDatasetConfigOrDict] = None,
name: Optional[str] = None,
display_name: Optional[str] = None,
metadata_schema_uri: Optional[str] = None,
metadata: Optional[types.SchemaTablesDatasetMetadataOrDict] = None,
description: Optional[str] = None,
encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None,
config: Optional[types.CreateMultimodalDatasetConfigOrDict] = None,
) -> types.MultimodalDatasetOperation:
"""
Creates a dataset resource to store multimodal datasets.
"""

parameter_model = types._CreateMultimodalDatasetParameters(
config=config,
name=name,
display_name=display_name,
metadata_schema_uri=metadata_schema_uri,
metadata=metadata,
description=description,
encryption_spec=encryption_spec,
config=config,
)

request_url_dict: Optional[dict[str, str]]
Expand Down Expand Up @@ -441,15 +441,15 @@ def _create_multimodal_dataset(
return return_value

def _delete_multimodal_dataset(
self, *, config: Optional[types.VertexBaseConfigOrDict] = None, name: str
self, *, name: str, config: Optional[types.VertexBaseConfigOrDict] = None
) -> types.MultimodalDatasetOperation:
"""
Deletes a multimodal dataset resource.
"""

parameter_model = types._DeleteMultimodalDatasetRequestParameters(
config=config,
name=name,
config=config,
)

request_url_dict: Optional[dict[str, str]]
Expand Down Expand Up @@ -495,16 +495,16 @@ def _delete_multimodal_dataset(
def _get_multimodal_dataset(
self,
*,
config: Optional[types.VertexBaseConfigOrDict] = None,
name: Optional[str] = None,
config: Optional[types.VertexBaseConfigOrDict] = None,
) -> types.MultimodalDataset:
"""
Gets a multimodal dataset resource.
"""

parameter_model = types._GetMultimodalDatasetParameters(
config=config,
name=name,
config=config,
)

request_url_dict: Optional[dict[str, str]]
Expand Down Expand Up @@ -548,18 +548,18 @@ def _get_multimodal_dataset(
def _get_multimodal_dataset_operation(
self,
*,
config: Optional[types.GetMultimodalDatasetOperationConfigOrDict] = None,
dataset_id: Optional[str] = None,
operation_id: Optional[str] = None,
config: Optional[types.GetMultimodalDatasetOperationConfigOrDict] = None,
) -> types.MultimodalDatasetOperation:
"""
Gets the operation from creating a multimodal dataset.
"""

parameter_model = types._GetMultimodalDatasetOperationParameters(
config=config,
dataset_id=dataset_id,
operation_id=operation_id,
config=config,
)

request_url_dict: Optional[dict[str, str]]
Expand Down Expand Up @@ -658,24 +658,24 @@ def _list_multimodal_datasets(
def _update_multimodal_dataset(
self,
*,
config: Optional[types.UpdateMultimodalDatasetConfigOrDict] = None,
name: Optional[str] = None,
display_name: Optional[str] = None,
metadata: Optional[types.SchemaTablesDatasetMetadataOrDict] = None,
description: Optional[str] = None,
encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None,
config: Optional[types.UpdateMultimodalDatasetConfigOrDict] = None,
) -> types.MultimodalDataset:
"""
Updates a multimodal dataset resource.
"""

parameter_model = types._UpdateMultimodalDatasetParameters(
config=config,
name=name,
display_name=display_name,
metadata=metadata,
description=description,
encryption_spec=encryption_spec,
config=config,
)

request_url_dict: Optional[dict[str, str]]
Expand Down Expand Up @@ -1194,26 +1194,26 @@ async def _assess_multimodal_dataset(
async def _create_multimodal_dataset(
self,
*,
config: Optional[types.CreateMultimodalDatasetConfigOrDict] = None,
name: Optional[str] = None,
display_name: Optional[str] = None,
metadata_schema_uri: Optional[str] = None,
metadata: Optional[types.SchemaTablesDatasetMetadataOrDict] = None,
description: Optional[str] = None,
encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None,
config: Optional[types.CreateMultimodalDatasetConfigOrDict] = None,
) -> types.MultimodalDatasetOperation:
"""
Creates a dataset resource to store multimodal datasets.
"""

parameter_model = types._CreateMultimodalDatasetParameters(
config=config,
name=name,
display_name=display_name,
metadata_schema_uri=metadata_schema_uri,
metadata=metadata,
description=description,
encryption_spec=encryption_spec,
config=config,
)

request_url_dict: Optional[dict[str, str]]
Expand Down Expand Up @@ -1257,15 +1257,15 @@ async def _create_multimodal_dataset(
return return_value

async def _delete_multimodal_dataset(
self, *, config: Optional[types.VertexBaseConfigOrDict] = None, name: str
self, *, name: str, config: Optional[types.VertexBaseConfigOrDict] = None
) -> types.MultimodalDatasetOperation:
"""
Deletes a multimodal dataset resource.
"""

parameter_model = types._DeleteMultimodalDatasetRequestParameters(
config=config,
name=name,
config=config,
)

request_url_dict: Optional[dict[str, str]]
Expand Down Expand Up @@ -1313,16 +1313,16 @@ async def _delete_multimodal_dataset(
async def _get_multimodal_dataset(
self,
*,
config: Optional[types.VertexBaseConfigOrDict] = None,
name: Optional[str] = None,
config: Optional[types.VertexBaseConfigOrDict] = None,
) -> types.MultimodalDataset:
"""
Gets a multimodal dataset resource.
"""

parameter_model = types._GetMultimodalDatasetParameters(
config=config,
name=name,
config=config,
)

request_url_dict: Optional[dict[str, str]]
Expand Down Expand Up @@ -1368,18 +1368,18 @@ async def _get_multimodal_dataset(
async def _get_multimodal_dataset_operation(
self,
*,
config: Optional[types.GetMultimodalDatasetOperationConfigOrDict] = None,
dataset_id: Optional[str] = None,
operation_id: Optional[str] = None,
config: Optional[types.GetMultimodalDatasetOperationConfigOrDict] = None,
) -> types.MultimodalDatasetOperation:
"""
Gets the operation from creating a multimodal dataset.
"""

parameter_model = types._GetMultimodalDatasetOperationParameters(
config=config,
dataset_id=dataset_id,
operation_id=operation_id,
config=config,
)

request_url_dict: Optional[dict[str, str]]
Expand Down Expand Up @@ -1482,24 +1482,24 @@ async def _list_multimodal_datasets(
async def _update_multimodal_dataset(
self,
*,
config: Optional[types.UpdateMultimodalDatasetConfigOrDict] = None,
name: Optional[str] = None,
display_name: Optional[str] = None,
metadata: Optional[types.SchemaTablesDatasetMetadataOrDict] = None,
description: Optional[str] = None,
encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None,
config: Optional[types.UpdateMultimodalDatasetConfigOrDict] = None,
) -> types.MultimodalDataset:
"""
Updates a multimodal dataset resource.
"""

parameter_model = types._UpdateMultimodalDatasetParameters(
config=config,
name=name,
display_name=display_name,
metadata=metadata,
description=description,
encryption_spec=encryption_spec,
config=config,
)

request_url_dict: Optional[dict[str, str]]
Expand Down
Loading
Loading