diff --git a/vertexai/_genai/datasets.py b/vertexai/_genai/datasets.py index ae5fb24f62..b1be300c15 100644 --- a/vertexai/_genai/datasets.py +++ b/vertexai/_genai/datasets.py @@ -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"])) @@ -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 @@ -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 @@ -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 @@ -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 @@ -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"])) @@ -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 @@ -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]] @@ -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]] @@ -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]] @@ -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]] @@ -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]] @@ -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]] @@ -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]] @@ -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]] @@ -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]] @@ -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]] diff --git a/vertexai/_genai/prompts.py b/vertexai/_genai/prompts.py index 58d2f554a8..58d0e1a430 100644 --- a/vertexai/_genai/prompts.py +++ b/vertexai/_genai/prompts.py @@ -42,9 +42,6 @@ def _CreateDatasetParameters_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"])) @@ -68,6 +65,9 @@ def _CreateDatasetParameters_to_vertex( if getv(from_object, ["model_reference"]) is not None: setv(to_object, ["modelReference"], getv(from_object, ["model_reference"])) + if getv(from_object, ["config"]) is not None: + setv(to_object, ["config"], getv(from_object, ["config"])) + return to_object @@ -76,9 +76,6 @@ def _CreateDatasetVersionParameters_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_name"]) is not None: setv(to_object, ["_url", "name"], getv(from_object, ["dataset_name"])) @@ -94,6 +91,9 @@ def _CreateDatasetVersionParameters_to_vertex( if getv(from_object, ["display_name"]) is not None: setv(to_object, ["displayName"], getv(from_object, ["display_name"])) + if getv(from_object, ["config"]) is not None: + setv(to_object, ["config"], getv(from_object, ["config"])) + return to_object @@ -133,15 +133,15 @@ def _GetDatasetOperationParameters_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 @@ -150,12 +150,12 @@ def _GetDatasetParameters_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 @@ -164,9 +164,6 @@ def _GetDatasetVersionParameters_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"])) @@ -177,6 +174,9 @@ def _GetDatasetVersionParameters_to_vertex( getv(from_object, ["dataset_version_id"]), ) + if getv(from_object, ["config"]) is not None: + setv(to_object, ["config"], getv(from_object, ["config"])) + return to_object @@ -185,6 +185,12 @@ def _ListDatasetVersionsRequestParameters_to_vertex( parent_object: Optional[dict[str, Any]] = None, ) -> dict[str, Any]: to_object: dict[str, Any] = {} + if getv(from_object, ["read_mask"]) is not None: + setv(to_object, ["_url", "read_mask"], getv(from_object, ["read_mask"])) + + if getv(from_object, ["dataset_id"]) is not None: + setv(to_object, ["_url", "dataset_id"], getv(from_object, ["dataset_id"])) + if getv(from_object, ["config"]) is not None: setv( to_object, @@ -192,12 +198,6 @@ def _ListDatasetVersionsRequestParameters_to_vertex( _ListPromptsConfig_to_vertex(getv(from_object, ["config"]), to_object), ) - if getv(from_object, ["read_mask"]) is not None: - setv(to_object, ["_url", "read_mask"], getv(from_object, ["read_mask"])) - - if getv(from_object, ["dataset_id"]) is not None: - setv(to_object, ["_url", "dataset_id"], getv(from_object, ["dataset_id"])) - return to_object @@ -239,15 +239,15 @@ def _RestoreVersionRequestParameters_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, ["version_id"]) is not None: setv(to_object, ["_url", "version_id"], getv(from_object, ["version_id"])) + if getv(from_object, ["config"]) is not None: + setv(to_object, ["config"], getv(from_object, ["config"])) + return to_object @@ -256,9 +256,6 @@ def _UpdateDatasetParameters_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"])) @@ -280,6 +277,9 @@ def _UpdateDatasetParameters_to_vertex( if getv(from_object, ["model_reference"]) is not None: setv(to_object, ["modelReference"], getv(from_object, ["model_reference"])) + if getv(from_object, ["config"]) is not None: + setv(to_object, ["config"], getv(from_object, ["config"])) + return to_object @@ -288,7 +288,6 @@ class Prompts(_api_module.BaseModule): def _create_dataset_resource( self, *, - config: Optional[types.CreateDatasetConfigOrDict] = None, name: Optional[str] = None, display_name: Optional[str] = None, metadata_schema_uri: Optional[str] = None, @@ -296,13 +295,13 @@ def _create_dataset_resource( description: Optional[str] = None, encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None, model_reference: Optional[str] = None, + config: Optional[types.CreateDatasetConfigOrDict] = None, ) -> types.DatasetOperation: """ Creates a dataset resource to store prompts. """ parameter_model = types._CreateDatasetParameters( - config=config, name=name, display_name=display_name, metadata_schema_uri=metadata_schema_uri, @@ -310,6 +309,7 @@ def _create_dataset_resource( description=description, encryption_spec=encryption_spec, model_reference=model_reference, + config=config, ) request_url_dict: Optional[dict[str, str]] @@ -353,24 +353,24 @@ def _create_dataset_resource( def _create_dataset_version_resource( self, *, - config: Optional[types.CreateDatasetVersionConfigOrDict] = None, dataset_name: Optional[str] = None, metadata: Optional[types.SchemaTextPromptDatasetMetadataOrDict] = None, model_reference: Optional[str] = None, parent: Optional[str] = None, display_name: Optional[str] = None, + config: Optional[types.CreateDatasetVersionConfigOrDict] = None, ) -> types.DatasetOperation: """ Creates a dataset version resource to store prompts. """ parameter_model = types._CreateDatasetVersionParameters( - config=config, dataset_name=dataset_name, metadata=metadata, model_reference=model_reference, parent=parent, display_name=display_name, + config=config, ) request_url_dict: Optional[dict[str, str]] @@ -414,16 +414,16 @@ def _create_dataset_version_resource( def _get_dataset_resource( self, *, - config: Optional[types.VertexBaseConfigOrDict] = None, name: Optional[str] = None, + config: Optional[types.VertexBaseConfigOrDict] = None, ) -> types.Dataset: """ Gets a dataset resource to store prompts. """ parameter_model = types._GetDatasetParameters( - config=config, name=name, + config=config, ) request_url_dict: Optional[dict[str, str]] @@ -467,18 +467,18 @@ def _get_dataset_resource( def _get_dataset_version_resource( self, *, - config: Optional[types.VertexBaseConfigOrDict] = None, dataset_id: Optional[str] = None, dataset_version_id: Optional[str] = None, + config: Optional[types.VertexBaseConfigOrDict] = None, ) -> types.DatasetVersion: """ Gets a dataset version resource to store prompts. """ parameter_model = types._GetDatasetVersionParameters( - config=config, dataset_id=dataset_id, dataset_version_id=dataset_version_id, + config=config, ) request_url_dict: Optional[dict[str, str]] @@ -524,18 +524,18 @@ def _get_dataset_version_resource( def _get_dataset_operation( self, *, - config: Optional[types.GetDatasetOperationConfigOrDict] = None, dataset_id: Optional[str] = None, operation_id: Optional[str] = None, + config: Optional[types.GetDatasetOperationConfigOrDict] = None, ) -> types.DatasetOperation: """ Gets the operation from creating a dataset. """ parameter_model = types._GetDatasetOperationParameters( - config=config, dataset_id=dataset_id, operation_id=operation_id, + config=config, ) request_url_dict: Optional[dict[str, str]] @@ -630,18 +630,18 @@ def _list_prompts( def _list_versions( self, *, - config: Optional[types.ListPromptsConfigOrDict] = None, read_mask: Optional[str] = None, dataset_id: Optional[str] = None, + config: Optional[types.ListPromptsConfigOrDict] = None, ) -> types.ListDatasetVersionsResponse: """ Lists Agent Engines. """ parameter_model = types._ListDatasetVersionsRequestParameters( - config=config, read_mask=read_mask, dataset_id=dataset_id, + config=config, ) request_url_dict: Optional[dict[str, str]] @@ -790,18 +790,18 @@ def _delete_dataset_version( def _restore_version( self, *, - config: Optional[types.RestoreVersionConfigOrDict] = None, dataset_id: str, version_id: str, + config: Optional[types.RestoreVersionConfigOrDict] = None, ) -> types.RestoreVersionOperation: """ Restores the provided prompt version to the latest version. """ parameter_model = types._RestoreVersionRequestParameters( - config=config, dataset_id=dataset_id, version_id=version_id, + config=config, ) request_url_dict: Optional[dict[str, str]] @@ -847,7 +847,6 @@ def _restore_version( def _update_dataset_resource( self, *, - config: Optional[types.UpdateDatasetConfigOrDict] = None, name: Optional[str] = None, dataset_id: Optional[str] = None, display_name: Optional[str] = None, @@ -855,13 +854,13 @@ def _update_dataset_resource( description: Optional[str] = None, encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None, model_reference: Optional[str] = None, + config: Optional[types.UpdateDatasetConfigOrDict] = None, ) -> types.Dataset: """ Creates a dataset resource to store prompts. """ parameter_model = types._UpdateDatasetParameters( - config=config, name=name, dataset_id=dataset_id, display_name=display_name, @@ -869,6 +868,7 @@ def _update_dataset_resource( description=description, encryption_spec=encryption_spec, model_reference=model_reference, + config=config, ) request_url_dict: Optional[dict[str, str]] @@ -1425,7 +1425,6 @@ class AsyncPrompts(_api_module.BaseModule): async def _create_dataset_resource( self, *, - config: Optional[types.CreateDatasetConfigOrDict] = None, name: Optional[str] = None, display_name: Optional[str] = None, metadata_schema_uri: Optional[str] = None, @@ -1433,13 +1432,13 @@ async def _create_dataset_resource( description: Optional[str] = None, encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None, model_reference: Optional[str] = None, + config: Optional[types.CreateDatasetConfigOrDict] = None, ) -> types.DatasetOperation: """ Creates a dataset resource to store prompts. """ parameter_model = types._CreateDatasetParameters( - config=config, name=name, display_name=display_name, metadata_schema_uri=metadata_schema_uri, @@ -1447,6 +1446,7 @@ async def _create_dataset_resource( description=description, encryption_spec=encryption_spec, model_reference=model_reference, + config=config, ) request_url_dict: Optional[dict[str, str]] @@ -1492,24 +1492,24 @@ async def _create_dataset_resource( async def _create_dataset_version_resource( self, *, - config: Optional[types.CreateDatasetVersionConfigOrDict] = None, dataset_name: Optional[str] = None, metadata: Optional[types.SchemaTextPromptDatasetMetadataOrDict] = None, model_reference: Optional[str] = None, parent: Optional[str] = None, display_name: Optional[str] = None, + config: Optional[types.CreateDatasetVersionConfigOrDict] = None, ) -> types.DatasetOperation: """ Creates a dataset version resource to store prompts. """ parameter_model = types._CreateDatasetVersionParameters( - config=config, dataset_name=dataset_name, metadata=metadata, model_reference=model_reference, parent=parent, display_name=display_name, + config=config, ) request_url_dict: Optional[dict[str, str]] @@ -1555,16 +1555,16 @@ async def _create_dataset_version_resource( async def _get_dataset_resource( self, *, - config: Optional[types.VertexBaseConfigOrDict] = None, name: Optional[str] = None, + config: Optional[types.VertexBaseConfigOrDict] = None, ) -> types.Dataset: """ Gets a dataset resource to store prompts. """ parameter_model = types._GetDatasetParameters( - config=config, name=name, + config=config, ) request_url_dict: Optional[dict[str, str]] @@ -1610,18 +1610,18 @@ async def _get_dataset_resource( async def _get_dataset_version_resource( self, *, - config: Optional[types.VertexBaseConfigOrDict] = None, dataset_id: Optional[str] = None, dataset_version_id: Optional[str] = None, + config: Optional[types.VertexBaseConfigOrDict] = None, ) -> types.DatasetVersion: """ Gets a dataset version resource to store prompts. """ parameter_model = types._GetDatasetVersionParameters( - config=config, dataset_id=dataset_id, dataset_version_id=dataset_version_id, + config=config, ) request_url_dict: Optional[dict[str, str]] @@ -1669,18 +1669,18 @@ async def _get_dataset_version_resource( async def _get_dataset_operation( self, *, - config: Optional[types.GetDatasetOperationConfigOrDict] = None, dataset_id: Optional[str] = None, operation_id: Optional[str] = None, + config: Optional[types.GetDatasetOperationConfigOrDict] = None, ) -> types.DatasetOperation: """ Gets the operation from creating a dataset. """ parameter_model = types._GetDatasetOperationParameters( - config=config, dataset_id=dataset_id, operation_id=operation_id, + config=config, ) request_url_dict: Optional[dict[str, str]] @@ -1779,18 +1779,18 @@ async def _list_prompts( async def _list_versions( self, *, - config: Optional[types.ListPromptsConfigOrDict] = None, read_mask: Optional[str] = None, dataset_id: Optional[str] = None, + config: Optional[types.ListPromptsConfigOrDict] = None, ) -> types.ListDatasetVersionsResponse: """ Lists Agent Engines. """ parameter_model = types._ListDatasetVersionsRequestParameters( - config=config, read_mask=read_mask, dataset_id=dataset_id, + config=config, ) request_url_dict: Optional[dict[str, str]] @@ -1945,18 +1945,18 @@ async def _delete_dataset_version( async def _restore_version( self, *, - config: Optional[types.RestoreVersionConfigOrDict] = None, dataset_id: str, version_id: str, + config: Optional[types.RestoreVersionConfigOrDict] = None, ) -> types.RestoreVersionOperation: """ Restores the provided prompt version to the latest version. """ parameter_model = types._RestoreVersionRequestParameters( - config=config, dataset_id=dataset_id, version_id=version_id, + config=config, ) request_url_dict: Optional[dict[str, str]] @@ -2004,7 +2004,6 @@ async def _restore_version( async def _update_dataset_resource( self, *, - config: Optional[types.UpdateDatasetConfigOrDict] = None, name: Optional[str] = None, dataset_id: Optional[str] = None, display_name: Optional[str] = None, @@ -2012,13 +2011,13 @@ async def _update_dataset_resource( description: Optional[str] = None, encryption_spec: Optional[genai_types.EncryptionSpecOrDict] = None, model_reference: Optional[str] = None, + config: Optional[types.UpdateDatasetConfigOrDict] = None, ) -> types.Dataset: """ Creates a dataset resource to store prompts. """ parameter_model = types._UpdateDatasetParameters( - config=config, name=name, dataset_id=dataset_id, display_name=display_name, @@ -2026,6 +2025,7 @@ async def _update_dataset_resource( description=description, encryption_spec=encryption_spec, model_reference=model_reference, + config=config, ) request_url_dict: Optional[dict[str, str]] diff --git a/vertexai/_genai/types/__init__.py b/vertexai/_genai/types/__init__.py index 32c5be73a2..8582001816 100644 --- a/vertexai/_genai/types/__init__.py +++ b/vertexai/_genai/types/__init__.py @@ -1658,9 +1658,6 @@ "BatchPredictionValidationAssessmentConfig", "BatchPredictionValidationAssessmentConfigDict", "BatchPredictionValidationAssessmentConfigOrDict", - "CreateMultimodalDatasetConfig", - "CreateMultimodalDatasetConfigDict", - "CreateMultimodalDatasetConfigOrDict", "SchemaTablesDatasetMetadataBigQuerySource", "SchemaTablesDatasetMetadataBigQuerySourceDict", "SchemaTablesDatasetMetadataBigQuerySourceOrDict", @@ -1670,6 +1667,9 @@ "SchemaTablesDatasetMetadata", "SchemaTablesDatasetMetadataDict", "SchemaTablesDatasetMetadataOrDict", + "CreateMultimodalDatasetConfig", + "CreateMultimodalDatasetConfigDict", + "CreateMultimodalDatasetConfigOrDict", "MultimodalDataset", "MultimodalDatasetDict", "MultimodalDatasetOrDict", @@ -1685,9 +1685,6 @@ "UpdateMultimodalDatasetConfig", "UpdateMultimodalDatasetConfigDict", "UpdateMultimodalDatasetConfigOrDict", - "CreateDatasetConfig", - "CreateDatasetConfigDict", - "CreateDatasetConfigOrDict", "SchemaPredictParamsGroundingConfigSourceEntry", "SchemaPredictParamsGroundingConfigSourceEntryDict", "SchemaPredictParamsGroundingConfigSourceEntryOrDict", @@ -1739,6 +1736,9 @@ "SchemaTextPromptDatasetMetadata", "SchemaTextPromptDatasetMetadataDict", "SchemaTextPromptDatasetMetadataOrDict", + "CreateDatasetConfig", + "CreateDatasetConfigDict", + "CreateDatasetConfigOrDict", "DatasetOperation", "DatasetOperationDict", "DatasetOperationOrDict", diff --git a/vertexai/_genai/types/common.py b/vertexai/_genai/types/common.py index 7010b2e9d5..b7e4c058f5 100644 --- a/vertexai/_genai/types/common.py +++ b/vertexai/_genai/types/common.py @@ -10113,35 +10113,6 @@ class _AssessDatasetParametersDict(TypedDict, total=False): ] -class CreateMultimodalDatasetConfig(_common.BaseModel): - """Config for creating a dataset resource to store multimodal dataset.""" - - http_options: Optional[genai_types.HttpOptions] = Field( - default=None, description="""Used to override HTTP request options.""" - ) - timeout: Optional[int] = Field( - default=90, - description="""The timeout for the create dataset request in seconds. If not set, - the default timeout is 90 seconds.""", - ) - - -class CreateMultimodalDatasetConfigDict(TypedDict, total=False): - """Config for creating a dataset resource to store multimodal dataset.""" - - http_options: Optional[genai_types.HttpOptionsDict] - """Used to override HTTP request options.""" - - timeout: Optional[int] - """The timeout for the create dataset request in seconds. If not set, - the default timeout is 90 seconds.""" - - -CreateMultimodalDatasetConfigOrDict = Union[ - CreateMultimodalDatasetConfig, CreateMultimodalDatasetConfigDict -] - - class SchemaTablesDatasetMetadataBigQuerySource(_common.BaseModel): """Represents the BigQuery source for multimodal dataset metadata.""" @@ -10206,12 +10177,38 @@ class SchemaTablesDatasetMetadataDict(TypedDict, total=False): ] +class CreateMultimodalDatasetConfig(_common.BaseModel): + """Config for creating a dataset resource to store multimodal dataset.""" + + http_options: Optional[genai_types.HttpOptions] = Field( + default=None, description="""Used to override HTTP request options.""" + ) + timeout: Optional[int] = Field( + default=90, + description="""The timeout for the create dataset request in seconds. If not set, + the default timeout is 90 seconds.""", + ) + + +class CreateMultimodalDatasetConfigDict(TypedDict, total=False): + """Config for creating a dataset resource to store multimodal dataset.""" + + http_options: Optional[genai_types.HttpOptionsDict] + """Used to override HTTP request options.""" + + timeout: Optional[int] + """The timeout for the create dataset request in seconds. If not set, + the default timeout is 90 seconds.""" + + +CreateMultimodalDatasetConfigOrDict = Union[ + CreateMultimodalDatasetConfig, CreateMultimodalDatasetConfigDict +] + + class _CreateMultimodalDatasetParameters(_common.BaseModel): """Parameters for creating a dataset resource to store multimodal dataset.""" - config: Optional[CreateMultimodalDatasetConfig] = Field( - default=None, description="""""" - ) name: Optional[str] = Field(default=None, description="""""") display_name: Optional[str] = Field(default=None, description="""""") metadata_schema_uri: Optional[str] = Field(default=None, description="""""") @@ -10222,14 +10219,14 @@ class _CreateMultimodalDatasetParameters(_common.BaseModel): encryption_spec: Optional[genai_types.EncryptionSpec] = Field( default=None, description="""""" ) + config: Optional[CreateMultimodalDatasetConfig] = Field( + default=None, description="""""" + ) class _CreateMultimodalDatasetParametersDict(TypedDict, total=False): """Parameters for creating a dataset resource to store multimodal dataset.""" - config: Optional[CreateMultimodalDatasetConfigDict] - """""" - name: Optional[str] """""" @@ -10248,6 +10245,9 @@ class _CreateMultimodalDatasetParametersDict(TypedDict, total=False): encryption_spec: Optional[genai_types.EncryptionSpecDict] """""" + config: Optional[CreateMultimodalDatasetConfigDict] + """""" + _CreateMultimodalDatasetParametersOrDict = Union[ _CreateMultimodalDatasetParameters, _CreateMultimodalDatasetParametersDict @@ -10257,21 +10257,21 @@ class _CreateMultimodalDatasetParametersDict(TypedDict, total=False): class _DeleteMultimodalDatasetRequestParameters(_common.BaseModel): """Parameters for deleting a multimodal dataset.""" - config: Optional[VertexBaseConfig] = Field(default=None, description="""""") name: Optional[str] = Field( default=None, description="""ID of the dataset to be deleted.""" ) + config: Optional[VertexBaseConfig] = Field(default=None, description="""""") class _DeleteMultimodalDatasetRequestParametersDict(TypedDict, total=False): """Parameters for deleting a multimodal dataset.""" - config: Optional[VertexBaseConfigDict] - """""" - name: Optional[str] """ID of the dataset to be deleted.""" + config: Optional[VertexBaseConfigDict] + """""" + _DeleteMultimodalDatasetRequestParametersOrDict = Union[ _DeleteMultimodalDatasetRequestParameters, @@ -10282,17 +10282,17 @@ class _DeleteMultimodalDatasetRequestParametersDict(TypedDict, total=False): class _GetMultimodalDatasetParameters(_common.BaseModel): """Parameters for getting a multimodal dataset resource.""" - config: Optional[VertexBaseConfig] = Field(default=None, description="""""") name: Optional[str] = Field(default=None, description="""""") + config: Optional[VertexBaseConfig] = Field(default=None, description="""""") class _GetMultimodalDatasetParametersDict(TypedDict, total=False): """Parameters for getting a multimodal dataset resource.""" - config: Optional[VertexBaseConfigDict] + name: Optional[str] """""" - name: Optional[str] + config: Optional[VertexBaseConfigDict] """""" @@ -10360,25 +10360,25 @@ class GetMultimodalDatasetOperationConfigDict(TypedDict, total=False): class _GetMultimodalDatasetOperationParameters(_common.BaseModel): """Parameters for getting a dataset operation.""" + dataset_id: Optional[str] = Field(default=None, description="""""") + operation_id: Optional[str] = Field(default=None, description="""""") config: Optional[GetMultimodalDatasetOperationConfig] = Field( default=None, description="""""" ) - dataset_id: Optional[str] = Field(default=None, description="""""") - operation_id: Optional[str] = Field(default=None, description="""""") class _GetMultimodalDatasetOperationParametersDict(TypedDict, total=False): """Parameters for getting a dataset operation.""" - config: Optional[GetMultimodalDatasetOperationConfigDict] - """""" - dataset_id: Optional[str] """""" operation_id: Optional[str] """""" + config: Optional[GetMultimodalDatasetOperationConfigDict] + """""" + _GetMultimodalDatasetOperationParametersOrDict = Union[ _GetMultimodalDatasetOperationParameters, @@ -10518,9 +10518,6 @@ class UpdateMultimodalDatasetConfigDict(TypedDict, total=False): class _UpdateMultimodalDatasetParameters(_common.BaseModel): """Parameters for updating a multimodal dataset resource.""" - config: Optional[UpdateMultimodalDatasetConfig] = Field( - default=None, description="""""" - ) name: Optional[str] = Field(default=None, description="""""") display_name: Optional[str] = Field(default=None, description="""""") metadata: Optional[SchemaTablesDatasetMetadata] = Field( @@ -10530,14 +10527,14 @@ class _UpdateMultimodalDatasetParameters(_common.BaseModel): encryption_spec: Optional[genai_types.EncryptionSpec] = Field( default=None, description="""""" ) + config: Optional[UpdateMultimodalDatasetConfig] = Field( + default=None, description="""""" + ) class _UpdateMultimodalDatasetParametersDict(TypedDict, total=False): """Parameters for updating a multimodal dataset resource.""" - config: Optional[UpdateMultimodalDatasetConfigDict] - """""" - name: Optional[str] """""" @@ -10553,30 +10550,15 @@ class _UpdateMultimodalDatasetParametersDict(TypedDict, total=False): encryption_spec: Optional[genai_types.EncryptionSpecDict] """""" + config: Optional[UpdateMultimodalDatasetConfigDict] + """""" + _UpdateMultimodalDatasetParametersOrDict = Union[ _UpdateMultimodalDatasetParameters, _UpdateMultimodalDatasetParametersDict ] -class CreateDatasetConfig(_common.BaseModel): - """Config for creating a dataset resource to store prompts.""" - - http_options: Optional[genai_types.HttpOptions] = Field( - default=None, description="""Used to override HTTP request options.""" - ) - - -class CreateDatasetConfigDict(TypedDict, total=False): - """Config for creating a dataset resource to store prompts.""" - - http_options: Optional[genai_types.HttpOptionsDict] - """Used to override HTTP request options.""" - - -CreateDatasetConfigOrDict = Union[CreateDatasetConfig, CreateDatasetConfigDict] - - class SchemaPredictParamsGroundingConfigSourceEntry(_common.BaseModel): """Single source entry for the grounding checking.""" @@ -11236,10 +11218,27 @@ class SchemaTextPromptDatasetMetadataDict(TypedDict, total=False): ] +class CreateDatasetConfig(_common.BaseModel): + """Config for creating a dataset resource to store prompts.""" + + http_options: Optional[genai_types.HttpOptions] = Field( + default=None, description="""Used to override HTTP request options.""" + ) + + +class CreateDatasetConfigDict(TypedDict, total=False): + """Config for creating a dataset resource to store prompts.""" + + http_options: Optional[genai_types.HttpOptionsDict] + """Used to override HTTP request options.""" + + +CreateDatasetConfigOrDict = Union[CreateDatasetConfig, CreateDatasetConfigDict] + + class _CreateDatasetParameters(_common.BaseModel): """Parameters for creating a dataset resource to store prompts.""" - config: Optional[CreateDatasetConfig] = Field(default=None, description="""""") name: Optional[str] = Field(default=None, description="""""") display_name: Optional[str] = Field(default=None, description="""""") metadata_schema_uri: Optional[str] = Field(default=None, description="""""") @@ -11251,14 +11250,12 @@ class _CreateDatasetParameters(_common.BaseModel): default=None, description="""""" ) model_reference: Optional[str] = Field(default=None, description="""""") + config: Optional[CreateDatasetConfig] = Field(default=None, description="""""") class _CreateDatasetParametersDict(TypedDict, total=False): """Parameters for creating a dataset resource to store prompts.""" - config: Optional[CreateDatasetConfigDict] - """""" - name: Optional[str] """""" @@ -11280,6 +11277,9 @@ class _CreateDatasetParametersDict(TypedDict, total=False): model_reference: Optional[str] """""" + config: Optional[CreateDatasetConfigDict] + """""" + _CreateDatasetParametersOrDict = Union[ _CreateDatasetParameters, _CreateDatasetParametersDict @@ -11355,9 +11355,6 @@ class CreateDatasetVersionConfigDict(TypedDict, total=False): class _CreateDatasetVersionParameters(_common.BaseModel): """Represents the create dataset version parameters.""" - config: Optional[CreateDatasetVersionConfig] = Field( - default=None, description="""""" - ) dataset_name: Optional[str] = Field(default=None, description="""""") metadata: Optional[SchemaTextPromptDatasetMetadata] = Field( default=None, description="""""" @@ -11365,14 +11362,14 @@ class _CreateDatasetVersionParameters(_common.BaseModel): model_reference: Optional[str] = Field(default=None, description="""""") parent: Optional[str] = Field(default=None, description="""""") display_name: Optional[str] = Field(default=None, description="""""") + config: Optional[CreateDatasetVersionConfig] = Field( + default=None, description="""""" + ) class _CreateDatasetVersionParametersDict(TypedDict, total=False): """Represents the create dataset version parameters.""" - config: Optional[CreateDatasetVersionConfigDict] - """""" - dataset_name: Optional[str] """""" @@ -11388,6 +11385,9 @@ class _CreateDatasetVersionParametersDict(TypedDict, total=False): display_name: Optional[str] """""" + config: Optional[CreateDatasetVersionConfigDict] + """""" + _CreateDatasetVersionParametersOrDict = Union[ _CreateDatasetVersionParameters, _CreateDatasetVersionParametersDict @@ -11397,17 +11397,17 @@ class _CreateDatasetVersionParametersDict(TypedDict, total=False): class _GetDatasetParameters(_common.BaseModel): """Parameters for getting a dataset resource to store prompts.""" - config: Optional[VertexBaseConfig] = Field(default=None, description="""""") name: Optional[str] = Field(default=None, description="""""") + config: Optional[VertexBaseConfig] = Field(default=None, description="""""") class _GetDatasetParametersDict(TypedDict, total=False): """Parameters for getting a dataset resource to store prompts.""" - config: Optional[VertexBaseConfigDict] + name: Optional[str] """""" - name: Optional[str] + config: Optional[VertexBaseConfigDict] """""" @@ -11634,23 +11634,23 @@ class DatasetDict(TypedDict, total=False): class _GetDatasetVersionParameters(_common.BaseModel): """Parameters for getting a dataset resource to store prompts.""" - config: Optional[VertexBaseConfig] = Field(default=None, description="""""") dataset_id: Optional[str] = Field(default=None, description="""""") dataset_version_id: Optional[str] = Field(default=None, description="""""") + config: Optional[VertexBaseConfig] = Field(default=None, description="""""") class _GetDatasetVersionParametersDict(TypedDict, total=False): """Parameters for getting a dataset resource to store prompts.""" - config: Optional[VertexBaseConfigDict] - """""" - dataset_id: Optional[str] """""" dataset_version_id: Optional[str] """""" + config: Optional[VertexBaseConfigDict] + """""" + _GetDatasetVersionParametersOrDict = Union[ _GetDatasetVersionParameters, _GetDatasetVersionParametersDict @@ -11775,25 +11775,25 @@ class GetDatasetOperationConfigDict(TypedDict, total=False): class _GetDatasetOperationParameters(_common.BaseModel): """Parameters for getting a dataset operation.""" + dataset_id: Optional[str] = Field(default=None, description="""""") + operation_id: Optional[str] = Field(default=None, description="""""") config: Optional[GetDatasetOperationConfig] = Field( default=None, description="""""" ) - dataset_id: Optional[str] = Field(default=None, description="""""") - operation_id: Optional[str] = Field(default=None, description="""""") class _GetDatasetOperationParametersDict(TypedDict, total=False): """Parameters for getting a dataset operation.""" - config: Optional[GetDatasetOperationConfigDict] - """""" - dataset_id: Optional[str] """""" operation_id: Optional[str] """""" + config: Optional[GetDatasetOperationConfigDict] + """""" + _GetDatasetOperationParametersOrDict = Union[ _GetDatasetOperationParameters, _GetDatasetOperationParametersDict @@ -11902,23 +11902,23 @@ class ListDatasetsResponseDict(TypedDict, total=False): class _ListDatasetVersionsRequestParameters(_common.BaseModel): """Parameters for listing dataset versions.""" - config: Optional[ListPromptsConfig] = Field(default=None, description="""""") read_mask: Optional[str] = Field(default=None, description="""""") dataset_id: Optional[str] = Field(default=None, description="""""") + config: Optional[ListPromptsConfig] = Field(default=None, description="""""") class _ListDatasetVersionsRequestParametersDict(TypedDict, total=False): """Parameters for listing dataset versions.""" - config: Optional[ListPromptsConfigDict] - """""" - read_mask: Optional[str] """""" dataset_id: Optional[str] """""" + config: Optional[ListPromptsConfigDict] + """""" + _ListDatasetVersionsRequestParametersOrDict = Union[ _ListDatasetVersionsRequestParameters, _ListDatasetVersionsRequestParametersDict @@ -12156,27 +12156,27 @@ class RestoreVersionConfigDict(TypedDict, total=False): class _RestoreVersionRequestParameters(_common.BaseModel): """Parameters for restoring a prompt version.""" - config: Optional[RestoreVersionConfig] = Field(default=None, description="""""") dataset_id: Optional[str] = Field( default=None, description="""ID of the prompt dataset to be restored.""" ) version_id: Optional[str] = Field( default=None, description="""ID of the prompt dataset version to be restored.""" ) + config: Optional[RestoreVersionConfig] = Field(default=None, description="""""") class _RestoreVersionRequestParametersDict(TypedDict, total=False): """Parameters for restoring a prompt version.""" - config: Optional[RestoreVersionConfigDict] - """""" - dataset_id: Optional[str] """ID of the prompt dataset to be restored.""" version_id: Optional[str] """ID of the prompt dataset version to be restored.""" + config: Optional[RestoreVersionConfigDict] + """""" + _RestoreVersionRequestParametersOrDict = Union[ _RestoreVersionRequestParameters, _RestoreVersionRequestParametersDict @@ -12246,7 +12246,6 @@ class UpdateDatasetConfigDict(TypedDict, total=False): class _UpdateDatasetParameters(_common.BaseModel): """Parameters for creating a dataset resource to store prompts.""" - config: Optional[UpdateDatasetConfig] = Field(default=None, description="""""") name: Optional[str] = Field(default=None, description="""""") dataset_id: Optional[str] = Field(default=None, description="""""") display_name: Optional[str] = Field(default=None, description="""""") @@ -12258,14 +12257,12 @@ class _UpdateDatasetParameters(_common.BaseModel): default=None, description="""""" ) model_reference: Optional[str] = Field(default=None, description="""""") + config: Optional[UpdateDatasetConfig] = Field(default=None, description="""""") class _UpdateDatasetParametersDict(TypedDict, total=False): """Parameters for creating a dataset resource to store prompts.""" - config: Optional[UpdateDatasetConfigDict] - """""" - name: Optional[str] """""" @@ -12287,6 +12284,9 @@ class _UpdateDatasetParametersDict(TypedDict, total=False): model_reference: Optional[str] """""" + config: Optional[UpdateDatasetConfigDict] + """""" + _UpdateDatasetParametersOrDict = Union[ _UpdateDatasetParameters, _UpdateDatasetParametersDict