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
4 changes: 2 additions & 2 deletions tests/unit/vertexai/genai/replays/test_create_multimodal.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@


def test_create_dataset(client):
create_dataset_operation = client.multimodal._create_multimodal_dataset(
create_dataset_operation = client.datasets._create_multimodal_dataset(
name="projects/vertex-sdk-dev/locations/us-central1",
display_name="test-display-name",
metadata_schema_uri=METADATA_SCHEMA_URI,
Expand All @@ -50,7 +50,7 @@ def test_create_dataset(client):

@pytest.mark.asyncio
async def test_create_dataset_async(client):
create_dataset_operation = await client.aio.multimodal._create_multimodal_dataset(
create_dataset_operation = await client.aio.datasets._create_multimodal_dataset(
name="projects/vertex-sdk-dev/locations/us-central1",
display_name="test-display-name",
metadata_schema_uri=METADATA_SCHEMA_URI,
Expand Down
100 changes: 100 additions & 0 deletions tests/unit/vertexai/genai/replays/test_create_multimodal_datasets.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
# Copyright 2025 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# pylint: disable=protected-access,bad-continuation,missing-function-docstring

from tests.unit.vertexai.genai.replays import pytest_helper
from vertexai._genai import types

import pytest

METADATA_SCHEMA_URI = (
"gs://google-cloud-aiplatform/schema/dataset/metadata/multimodal_1.0.0.yaml"
)
BIGQUERY_TABLE_NAME = "vertex-sdk-dev.multimodal_dataset.test-table"


def test_create_dataset(client):
create_dataset_operation = client.datasets._create_multimodal_dataset(
name="projects/vertex-sdk-dev/locations/us-central1",
display_name="test-display-name",
metadata_schema_uri=METADATA_SCHEMA_URI,
metadata={
"inputConfig": {
"bigquerySource": {"uri": f"bq://{BIGQUERY_TABLE_NAME}"},
},
},
)
assert isinstance(create_dataset_operation, types.MultimodalDatasetOperation)
assert create_dataset_operation


def test_create_dataset_from_bigquery(client):
dataset = client.datasets.create_multimodal_dataset_from_bigquery(
multimodal_dataset=types.MultimodalDataset(
display_name="test-from-bigquery",
bigquery_uri=BIGQUERY_TABLE_NAME,
)
)
assert isinstance(dataset, types.MultimodalDataset)
assert dataset.display_name == "test-from-bigquery"


pytestmark = pytest_helper.setup(
file=__file__,
globals_for_file=globals(),
)

pytest_plugins = ("pytest_asyncio",)


@pytest.mark.asyncio
async def test_create_dataset_async(client):
create_dataset_operation = await client.aio.datasets._create_multimodal_dataset(
name="projects/vertex-sdk-dev/locations/us-central1",
display_name="test-display-name",
metadata_schema_uri=METADATA_SCHEMA_URI,
metadata={
"inputConfig": {
"bigquerySource": {"uri": f"bq://{BIGQUERY_TABLE_NAME}"},
},
},
)
assert isinstance(create_dataset_operation, types.MultimodalDatasetOperation)
assert create_dataset_operation


@pytest.mark.asyncio
async def test_create_dataset_from_bigquery_async(client):
dataset = await client.aio.datasets.create_multimodal_dataset_from_bigquery(
multimodal_dataset=types.MultimodalDataset(
display_name="test-from-bigquery",
bigquery_uri=BIGQUERY_TABLE_NAME,
)
)
assert isinstance(dataset, types.MultimodalDataset)
assert dataset.display_name == "test-from-bigquery"


@pytest.mark.asyncio
async def test_create_dataset_from_bigquery_async_with_timeout(client):
dataset = await client.aio.datasets.create_multimodal_dataset_from_bigquery(
config=types.CreateMultimodalDatasetConfig(timeout=120),
multimodal_dataset=types.MultimodalDataset(
display_name="test-from-bigquery",
bigquery_uri=BIGQUERY_TABLE_NAME,
),
)
assert isinstance(dataset, types.MultimodalDataset)
assert dataset.display_name == "test-from-bigquery"
20 changes: 20 additions & 0 deletions vertexai/_genai/_datasets_utils.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Copyright 2025 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
"""Utility functions for multimodal dataset."""


METADATA_SCHEMA_URI = (
"gs://google-cloud-aiplatform/schema/dataset/metadata/multimodal_1.0.0.yaml"
)
28 changes: 14 additions & 14 deletions vertexai/_genai/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def __init__(self, api_client: genai_client.Client):
self._agent_engines = None
self._prompt_optimizer = None
self._prompts = None
self._multimodal = None
self._datasets = None

@property
@_common.experimental_warning(
Expand Down Expand Up @@ -121,16 +121,16 @@ def prompts(self):

@property
@_common.experimental_warning(
"The Vertex SDK GenAI async multimodal module is experimental, "
"The Vertex SDK GenAI async datasets module is experimental, "
"and may change in future versions."
)
def multimodal(self):
if self._multimodal is None:
self._multimodal = importlib.import_module(
".multimodal",
def datasets(self):
if self._datasets is None:
self._datasets = importlib.import_module(
".datasets",
__package__,
)
return self._multimodal.AsyncMultimodal(self._api_client)
return self._datasets.AsyncDatasets(self._api_client)


class Client:
Expand Down Expand Up @@ -192,7 +192,7 @@ def __init__(
self._prompt_optimizer = None
self._agent_engines = None
self._prompts = None
self._multimodal = None
self._datasets = None

@property
def evals(self) -> Any:
Expand Down Expand Up @@ -282,13 +282,13 @@ def prompts(self):

@property
@_common.experimental_warning(
"The Vertex SDK GenAI multimodal module is experimental, "
"The Vertex SDK GenAI datasets module is experimental, "
"and may change in future versions."
)
def multimodal(self):
if self._multimodal is None:
self._multimodal = importlib.import_module(
".multimodal",
def datasets(self):
if self._datasets is None:
self._datasets = importlib.import_module(
".datasets",
__package__,
)
return self._multimodal.Multimodal(self._api_client)
return self._datasets.Datasets(self._api_client)
Loading
Loading