-
Notifications
You must be signed in to change notification settings - Fork 6
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 Driver imports #74
Merged
Merged
Changes from all commits
Commits
Show all changes
3 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 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
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 |
---|---|---|
@@ -1 +1 @@ | ||
__version__ = "0.1.13" | ||
__version__ = "0.2.0" |
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 |
---|---|---|
@@ -1,6 +0,0 @@ | ||
from squirrel_datasets_core.driver.huggingface import HuggingfaceDriver | ||
from squirrel_datasets_core.driver.torchvision import TorchvisionDriver | ||
from squirrel_datasets_core.driver.hub import HubDriver | ||
from squirrel_datasets_core.driver.deeplake import DeeplakeDriver | ||
|
||
__all__ = ["HuggingfaceDriver", "TorchvisionDriver", "HubDriver", "DeeplakeDriver"] | ||
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 |
---|---|---|
@@ -1,3 +1,4 @@ | ||
import contextlib | ||
import importlib | ||
import pkgutil | ||
from typing import List, Tuple, Type | ||
|
@@ -14,6 +15,13 @@ def get_hub_driver() -> Driver: | |
return HubDriver | ||
|
||
|
||
def get_deeplake_driver() -> Driver: | ||
"""Imports and returns the deeplake driver class""" | ||
from squirrel_datasets_core.driver.deeplake import DeeplakeDriver | ||
|
||
return DeeplakeDriver | ||
|
||
|
||
def get_huggingface_driver() -> Driver: | ||
"""Imports and returns the huggingface driver class""" | ||
from squirrel_datasets_core.driver.huggingface import HuggingfaceDriver | ||
|
@@ -36,6 +44,7 @@ def squirrel_drivers() -> List[Type[Driver]]: | |
drivers = [] | ||
add_drivers = { | ||
"hub": get_hub_driver, | ||
"deeplake": get_deeplake_driver, | ||
"huggingface": get_huggingface_driver, | ||
"torchvision": get_torchvision_driver, | ||
} | ||
|
@@ -70,10 +79,7 @@ def squirrel_sources() -> List[Tuple[CatalogKey, Source]]: | |
import squirrel_datasets_core.datasets as ds | ||
|
||
for m in pkgutil.iter_modules(ds.__path__): | ||
try: | ||
with contextlib.suppress(AttributeError): | ||
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. my IDE suggested this change, I think it's much cleaner that way. https://docs.python.org/3/library/contextlib.html 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. agreed |
||
d = importlib.import_module(f"{ds.__package__}.{m.name}").SOURCES | ||
datasets += d | ||
except AttributeError: | ||
pass | ||
|
||
return datasets |
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.
Can we also wrap this in a try/except block like below and catch any import errors? This would prevent squirrel from crashing when datasets is installed and some requirements are missing
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.
are you referring to line 42?
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.
Ah sorry, I got confused, please ignore this comment :)