Skip to content

Commit 650793c

Browse files
cleop-googlecopybara-github
authored andcommitted
fix: GenAI SDK client(multimodal) - Change dataset "name" to refer to resource name instead of dataset ID.
PiperOrigin-RevId: 896997282
1 parent 2f2a211 commit 650793c

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

tests/unit/vertexai/genai/replays/test_assemble_multimodal_datasets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"gs://google-cloud-aiplatform/schema/dataset/metadata/multimodal_1.0.0.yaml"
2424
)
2525
BIGQUERY_TABLE_NAME = "vertex-sdk-dev.multimodal_dataset.test-table"
26-
DATASET = "8810841321427173376"
26+
DATASET = "projects/vertex-sdk-dev/locations/us-central1/datasets/8810841321427173376"
2727

2828

2929
def test_assemble_dataset(client):

vertexai/_genai/datasets.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,9 @@ def _assemble_multimodal_dataset(
274274
request_dict = _AssembleDatasetParameters_to_vertex(parameter_model)
275275
request_url_dict = request_dict.get("_url")
276276
if request_url_dict:
277-
path = "datasets/{name}:assemble".format_map(request_url_dict)
277+
path = "{name}:assemble".format_map(request_url_dict)
278278
else:
279-
path = "datasets/{name}:assemble"
279+
path = "{name}:assemble"
280280

281281
query_params = request_dict.get("_query")
282282
if query_params:
@@ -364,9 +364,9 @@ def _assess_multimodal_dataset(
364364
request_dict = _AssessDatasetParameters_to_vertex(parameter_model)
365365
request_url_dict = request_dict.get("_url")
366366
if request_url_dict:
367-
path = "datasets/{name}:assess".format_map(request_url_dict)
367+
path = "{name}:assess".format_map(request_url_dict)
368368
else:
369-
path = "datasets/{name}:assess"
369+
path = "{name}:assess"
370370

371371
query_params = request_dict.get("_query")
372372
if query_params:
@@ -513,9 +513,9 @@ def _delete_multimodal_dataset(
513513
)
514514
request_url_dict = request_dict.get("_url")
515515
if request_url_dict:
516-
path = "datasets/{name}".format_map(request_url_dict)
516+
path = "{name}".format_map(request_url_dict)
517517
else:
518-
path = "datasets/{name}"
518+
path = "{name}"
519519

520520
query_params = request_dict.get("_query")
521521
if query_params:
@@ -583,9 +583,9 @@ def _get_multimodal_dataset(
583583
request_dict = _GetMultimodalDatasetParameters_to_vertex(parameter_model)
584584
request_url_dict = request_dict.get("_url")
585585
if request_url_dict:
586-
path = "datasets/{name}".format_map(request_url_dict)
586+
path = "{name}".format_map(request_url_dict)
587587
else:
588-
path = "datasets/{name}"
588+
path = "{name}"
589589

590590
query_params = request_dict.get("_query")
591591
if query_params:
@@ -805,9 +805,9 @@ def _update_multimodal_dataset(
805805
request_dict = _UpdateMultimodalDatasetParameters_to_vertex(parameter_model)
806806
request_url_dict = request_dict.get("_url")
807807
if request_url_dict:
808-
path = "datasets/{name}".format_map(request_url_dict)
808+
path = "{name}".format_map(request_url_dict)
809809
else:
810-
path = "datasets/{name}"
810+
path = "{name}"
811811

812812
query_params = request_dict.get("_query")
813813
if query_params:
@@ -1475,9 +1475,9 @@ async def _assemble_multimodal_dataset(
14751475
request_dict = _AssembleDatasetParameters_to_vertex(parameter_model)
14761476
request_url_dict = request_dict.get("_url")
14771477
if request_url_dict:
1478-
path = "datasets/{name}:assemble".format_map(request_url_dict)
1478+
path = "{name}:assemble".format_map(request_url_dict)
14791479
else:
1480-
path = "datasets/{name}:assemble"
1480+
path = "{name}:assemble"
14811481

14821482
query_params = request_dict.get("_query")
14831483
if query_params:
@@ -1567,9 +1567,9 @@ async def _assess_multimodal_dataset(
15671567
request_dict = _AssessDatasetParameters_to_vertex(parameter_model)
15681568
request_url_dict = request_dict.get("_url")
15691569
if request_url_dict:
1570-
path = "datasets/{name}:assess".format_map(request_url_dict)
1570+
path = "{name}:assess".format_map(request_url_dict)
15711571
else:
1572-
path = "datasets/{name}:assess"
1572+
path = "{name}:assess"
15731573

15741574
query_params = request_dict.get("_query")
15751575
if query_params:
@@ -1720,9 +1720,9 @@ async def _delete_multimodal_dataset(
17201720
)
17211721
request_url_dict = request_dict.get("_url")
17221722
if request_url_dict:
1723-
path = "datasets/{name}".format_map(request_url_dict)
1723+
path = "{name}".format_map(request_url_dict)
17241724
else:
1725-
path = "datasets/{name}"
1725+
path = "{name}"
17261726

17271727
query_params = request_dict.get("_query")
17281728
if query_params:
@@ -1792,9 +1792,9 @@ async def _get_multimodal_dataset(
17921792
request_dict = _GetMultimodalDatasetParameters_to_vertex(parameter_model)
17931793
request_url_dict = request_dict.get("_url")
17941794
if request_url_dict:
1795-
path = "datasets/{name}".format_map(request_url_dict)
1795+
path = "{name}".format_map(request_url_dict)
17961796
else:
1797-
path = "datasets/{name}"
1797+
path = "{name}"
17981798

17991799
query_params = request_dict.get("_query")
18001800
if query_params:
@@ -2020,9 +2020,9 @@ async def _update_multimodal_dataset(
20202020
request_dict = _UpdateMultimodalDatasetParameters_to_vertex(parameter_model)
20212021
request_url_dict = request_dict.get("_url")
20222022
if request_url_dict:
2023-
path = "datasets/{name}".format_map(request_url_dict)
2023+
path = "{name}".format_map(request_url_dict)
20242024
else:
2025-
path = "datasets/{name}"
2025+
path = "{name}"
20262026

20272027
query_params = request_dict.get("_query")
20282028
if query_params:

0 commit comments

Comments
 (0)