-
Notifications
You must be signed in to change notification settings - Fork 2.8k
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
Fix load_dataset for data_files with protocols other than HF #6862
Merged
albertvillanova
merged 11 commits into
huggingface:main
from
matstrand:issue-6598-load-dataset-broken-s3
Jul 23, 2024
Merged
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
ded2cac
Issue 6598: load_dataset broken for data_files on s3
matstrand 22016eb
Issue 6598: do not set DownloadConfig.storage_options[hf] for all pro…
matstrand 6a9d771
Issue 6598: ruff format
matstrand b245d00
Issue 6598: mock creds for new test, keep __post_init__ when token sp…
matstrand ab7e66e
Issue 6598: call _prepare_path_and_storage_options for remote URLs vi…
matstrand 3c4ec5f
Merge remote-tracking branch 'upstream/main' into issue-6598-load-dat…
albertvillanova 696688c
Do not set default 'hf' in DownloadConfig.storage_options
albertvillanova 1608b54
Test cached_path for different protocols
albertvillanova ddd2e74
Mark test with require_moto
albertvillanova 49ce9ff
Refactor test using fixture
albertvillanova 6541b65
Make import local
albertvillanova 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
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
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.
I was worried that removing this altogether might break functionality for someone. This still might break CI but let's see before spending more time on it.
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.
you might have to revert this, since we need the endpoint to be in the storage options even if token is None
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.
I'm trying to account for that here. This way
_prepare_path_and_storage_options
ensures that the endpoint is in the storage options without needing to populate it for all protocols in__post_init__
.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.
I think we can completely remove the default "hf" storage option from
DownloadConfig
, now that it is properly handled by the call to_prepare_path_and_storage_options
made incached_path
.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.
Do you agree, @lhoestq?
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.
yes sounds good :)