Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Make aiplatform.Dataset private #296

Merged
merged 8 commits into from Apr 11, 2021
Merged

feat: Make aiplatform.Dataset private #296

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
682aedd
Remove all use of aiplatform.datasets.Dataset
vinnysenthil Apr 7, 2021
3cce5ea
Update doc strings to drop aiplatform.Dataset
vinnysenthil Apr 7, 2021
347a321
Fix Dataset system tests
vinnysenthil Apr 7, 2021
ce1d19c
Address review comments, drop TypeVar union for clarity
vinnysenthil Apr 9, 2021
5f83b49
Merge branch 'dev' into mb-ds-private
vinnysenthil Apr 9, 2021
312e91d
Merge branch 'dev' into mb-ds-private
sasha-gitg Apr 9, 2021
c1da7cb
Merge branch 'dev' into mb-ds-private
vinnysenthil Apr 11, 2021
b48ffb8
Update merged tests to use private Dataset class
vinnysenthil Apr 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions google/cloud/aiplatform/__init__.py
View file
Open in desktop
Expand Up @@ -20,9 +20,8 @@

from google.cloud.aiplatform import initializer
from google.cloud.aiplatform.datasets import (
Dataset,
TabularDataset,
ImageDataset,
TabularDataset,
TextDataset,
VideoDataset,
)
Expand Down Expand Up @@ -59,7 +58,6 @@
"CustomTrainingJob",
"CustomContainerTrainingJob",
"CustomPythonPackageTrainingJob",
"Dataset",
"Endpoint",
"ImageDataset",
"Model",
Expand Down
10 changes: 8 additions & 2 deletions google/cloud/aiplatform/datasets/__init__.py
View file
Open in desktop
Expand Up @@ -15,14 +15,20 @@
# limitations under the License.
#

from google.cloud.aiplatform.datasets.dataset import Dataset
from typing import TypeVar

from google.cloud.aiplatform.datasets.dataset import _Dataset
from google.cloud.aiplatform.datasets.tabular_dataset import TabularDataset
from google.cloud.aiplatform.datasets.image_dataset import ImageDataset
from google.cloud.aiplatform.datasets.text_dataset import TextDataset
from google.cloud.aiplatform.datasets.video_dataset import VideoDataset

SupportedDatasets = TypeVar(
"SupportedDatasets", ImageDataset, TabularDataset, TextDataset, VideoDataset,
)

__all__ = (
"Dataset",
"_Dataset",
"TabularDataset",
"ImageDataset",
"TextDataset",
Expand Down
8 changes: 4 additions & 4 deletions google/cloud/aiplatform/datasets/dataset.py
View file
Open in desktop
Expand Up @@ -33,7 +33,7 @@
from google.cloud.aiplatform.datasets import _datasources


class Dataset(base.AiPlatformResourceNounWithFutureManager):
class _Dataset(base.AiPlatformResourceNounWithFutureManager):
"""Managed dataset resource for AI Platform"""

client_class = utils.DatasetClientWithOverride
Expand Down Expand Up @@ -111,7 +111,7 @@ def create(
request_metadata: Optional[Sequence[Tuple[str, str]]] = (),
encryption_spec_key_name: Optional[str] = None,
sync: bool = True,
) -> "Dataset":
) -> "_Dataset":
"""Creates a new dataset and optionally imports data into dataset when
source and import_schema_uri are passed.

Expand Down Expand Up @@ -237,7 +237,7 @@ def _create_and_import(
request_metadata: Optional[Sequence[Tuple[str, str]]] = (),
encryption_spec: Optional[gca_encryption_spec.EncryptionSpec] = None,
sync: bool = True,
) -> "Dataset":
) -> "_Dataset":
"""Creates a new dataset and optionally imports data into dataset when
source and import_schema_uri are passed.

Expand Down Expand Up @@ -396,7 +396,7 @@ def import_data(
import_schema_uri: str,
data_item_labels: Optional[Dict] = None,
sync: bool = True,
) -> "Dataset":
) -> "_Dataset":
"""Upload data to existing managed dataset.

Args:
Expand Down
2 changes: 1 addition & 1 deletion google/cloud/aiplatform/datasets/image_dataset.py
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@
from google.cloud.aiplatform import utils


class ImageDataset(datasets.Dataset):
class ImageDataset(datasets._Dataset):
"""Managed image dataset resource for AI Platform"""

_supported_metadata_schema_uris: Optional[Tuple[str]] = (
Expand Down
2 changes: 1 addition & 1 deletion google/cloud/aiplatform/datasets/tabular_dataset.py
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@
from google.cloud.aiplatform import utils


class TabularDataset(datasets.Dataset):
class TabularDataset(datasets._Dataset):
"""Managed tabular dataset resource for AI Platform"""

_supported_metadata_schema_uris: Optional[Tuple[str]] = (
Expand Down
2 changes: 1 addition & 1 deletion google/cloud/aiplatform/datasets/text_dataset.py
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@
from google.cloud.aiplatform import utils


class TextDataset(datasets.Dataset):
class TextDataset(datasets._Dataset):
"""Managed text dataset resource for AI Platform"""

_supported_metadata_schema_uris: Optional[Tuple[str]] = (
Expand Down
2 changes: 1 addition & 1 deletion google/cloud/aiplatform/datasets/video_dataset.py
View file
Open in desktop
Expand Up @@ -26,7 +26,7 @@
from google.cloud.aiplatform import utils


class VideoDataset(datasets.Dataset):
class VideoDataset(datasets._Dataset):
"""Managed video dataset resource for AI Platform"""

_supported_metadata_schema_uris: Optional[Tuple[str]] = (
Expand Down