-
Notifications
You must be signed in to change notification settings - Fork 408
Add marker for chained filesystems for path passthrough #1929
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,23 @@ | ||
from typing import ClassVar | ||
|
||
from fsspec import AbstractFileSystem | ||
|
||
__all__ = ("ChainedFileSystem",) | ||
|
||
|
||
class ChainedFileSystem(AbstractFileSystem): | ||
"""Chained filesystem base class. | ||
|
||
A chained filesystem is designed to be layered over another FS. | ||
This is useful to implement things like caching. | ||
|
||
This base class does very little on its own, but is used as a marker | ||
that the class is designed for chaining. | ||
|
||
Right now this is only used in `url_to_fs` to provide the path argument | ||
(`fo`) to the chained filesystem from the underlying filesystem. | ||
|
||
Additional functionality may be added in the future. | ||
""" | ||
|
||
protocol: ClassVar[str] = "chained" |
This file contains hidden or 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,39 @@ | ||
import pytest | ||
|
||
from fsspec import AbstractFileSystem, filesystem, register_implementation, url_to_fs | ||
from fsspec.implementations.cached import ChainedFileSystem | ||
|
||
|
||
class MyChainedFS(ChainedFileSystem): | ||
protocol = "mychain" | ||
|
||
def __init__(self, target_protocol="", target_options=None, **kwargs): | ||
super().__init__(**kwargs) | ||
self.fs = filesystem(target_protocol, **target_options) | ||
|
||
|
||
class MyNonChainedFS(AbstractFileSystem): | ||
protocol = "mynonchain" | ||
|
||
|
||
@pytest.fixture(scope="module") | ||
def register_fs(): | ||
register_implementation(MyChainedFS.protocol, MyChainedFS) | ||
timkpaine marked this conversation as resolved.
Show resolved
Hide resolved
|
||
register_implementation(MyNonChainedFS.protocol, MyNonChainedFS) | ||
yield | ||
|
||
|
||
def test_token_passthrough_to_chained(register_fs): | ||
# First, run a sanity check | ||
fs, rest = url_to_fs("mynonchain://path/to/file") | ||
assert isinstance(fs, MyNonChainedFS) | ||
assert fs.protocol == "mynonchain" | ||
assert rest == "path/to/file" | ||
|
||
# Now test that the chained FS works | ||
fs, rest = url_to_fs("mychain::mynonchain://path/to/file") | ||
assert isinstance(fs, MyChainedFS) | ||
assert fs.protocol == "mychain" | ||
assert rest == "path/to/file" | ||
assert isinstance(fs.fs, MyNonChainedFS) | ||
assert fs.fs.protocol == "mynonchain" |
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.
Uh oh!
There was an error while loading. Please reload this page.