-
Notifications
You must be signed in to change notification settings - Fork 605
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
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
14a672d
- Make dataset_exists be more resilient to missing files in an otherw…
nvoxland 3fe8baa
No need for the new dataset_validate function.
nvoxland abb9b40
Added test for test_dataset_exists
nvoxland a3f49a0
Fixed formatting
nvoxland 40494cc
Removed invalid docs
nvoxland 91d4883
Merge branch 'main' into improve_dataset_exists
nvoxland File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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