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.

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

Already on GitHub? Sign in to your account

[AL-2322] Improved dataset directory validation #2459

Merged
merged 6 commits into from
Jul 6, 2023
Merged
Show file tree
Hide file tree
Changes from 4 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
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ wandb/
*Python-3.7*
*mem:/*
hub_pytest/
deeplake/test-dataset
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure why we need this


# Translations
*.mo
Expand Down Expand Up @@ -199,6 +200,7 @@ logs/
.vscode/
.creds/
.idea/
*.iml
.nvimrc
.vimrc
waymo/
Expand All @@ -213,5 +215,8 @@ benchmarks/hub_data
benchmarks/torch_data
.benchmarks/

deeplake/test-dataset
nvoxland marked this conversation as resolved.
Show resolved Hide resolved

# API docs
api_docs/

11 changes: 9 additions & 2 deletions deeplake/util/keys.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,16 @@ def get_sequence_encoder_key(key: str, commit_id: str) -> str:


def dataset_exists(storage) -> bool:
"""
Returns true if a dataset exists at the given location.
NOTE: This does not verify if it is a VALID dataset, only that it exists and is likely a deeplake directory.
To verify the content, use :func:`dataset_valid`
nvoxland marked this conversation as resolved.
Show resolved Hide resolved
"""
try:
storage[get_dataset_meta_key(FIRST_COMMIT_ID)]
return True
return (
get_dataset_meta_key(FIRST_COMMIT_ID) in storage
or get_version_control_info_key() in storage
)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just curious is it enough to check only these things? Shouldn't we also check whether chunks exists?

except S3GetAccessError as err:
raise AuthorizationException("The dataset storage cannot be accessed") from err
except (KeyError, S3GetError) as err:
Expand Down
21 changes: 21 additions & 0 deletions deeplake/util/tests/test_keys.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import deeplake
from deeplake.util.keys import dataset_exists


def test_dataset_exists():
ds = deeplake.dataset("mem://x")
assert dataset_exists(ds.storage)

# Single files missing is fine
del ds.storage["version_control_info.json"]
assert dataset_exists(ds.storage)

ds = deeplake.dataset("mem://x")
del ds.storage["dataset_meta.json"]
assert dataset_exists(ds.storage)

# Enough files are missing and it's no longer valid
ds = deeplake.dataset("mem://x")
del ds.storage["dataset_meta.json"]
del ds.storage["version_control_info.json"]
assert not dataset_exists(ds.storage)
Loading