-
Notifications
You must be signed in to change notification settings - Fork 4
fix: add user feedback message for unsupported file type #142
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
Open
georgeRobertson
wants to merge
1
commit into
release_v010
Choose a base branch
from
bugfix/gr-ndit-1525-raise_user_feedback_message_on_invalid_filetype
base: release_v010
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
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
Some comments aren't visible on the classic Files Changed page.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,9 +11,11 @@ | |
| import dve.core_engine.backends.implementations.duckdb # pylint: disable=unused-import | ||
| import dve.core_engine.backends.implementations.spark # pylint: disable=unused-import | ||
| import dve.parser.file_handling as fh | ||
| from dve.core_engine.backends.exceptions import MessageBearingError | ||
| from dve.core_engine.backends.readers import _READER_REGISTRY | ||
| from dve.core_engine.configuration.v1 import SchemaName, V1EngineConfig, _ModelConfig | ||
| from dve.core_engine.loggers import get_logger | ||
| from dve.core_engine.message import FeedbackMessage | ||
| from dve.core_engine.type_hints import URI, SubmissionResult | ||
| from dve.metadata_parser.model_generator import JSONtoPyd | ||
|
|
||
|
|
@@ -52,11 +54,34 @@ def load_reader( | |
| backend_reader_kwargs: Optional[dict[str, Any]] = None, | ||
| ): | ||
| """Loads the readers for the diven feed, model name and file extension""" | ||
| reader_config = dataset[model_name].reader_config[f".{file_extension.lower()}"] | ||
| reader = _READER_REGISTRY[reader_config.reader]( | ||
| **reader_config.kwargs_, **backend_reader_kwargs if backend_reader_kwargs else {} | ||
| ) | ||
| return reader | ||
| try: | ||
| reader_config = dataset[model_name].reader_config[f".{file_extension.lower()}"] | ||
| reader = _READER_REGISTRY[reader_config.reader]( | ||
| **reader_config.kwargs_, **backend_reader_kwargs if backend_reader_kwargs else {} | ||
| ) | ||
| return reader | ||
| except KeyError as exc: | ||
| if file_extension: | ||
| err_msg = ( | ||
| f"The supplied file extension `{file_extension if file_extension else None}`" | ||
|
Contributor
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. already doing if check in line 64 |
||
| +f" is not a supported file format for {model_name}." | ||
| ) | ||
| else: | ||
| err_msg = "No supplied file extension. Unable to parse file without a file extension." | ||
|
|
||
| raise MessageBearingError( | ||
| "The file extension provided is not supported.", | ||
| messages=[ | ||
| FeedbackMessage( | ||
| entity=model_name, | ||
| record=None, | ||
| failure_type="submission", | ||
| error_location="Whole File", | ||
| error_code="InvalidFileExtension", | ||
| error_message=err_msg, | ||
| ) | ||
| ], | ||
| ) from exc | ||
|
|
||
|
|
||
| def unpersist_all_rdds(spark: SparkSession): | ||
|
|
||
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,36 @@ | ||
| from dve.core_engine.backends.exceptions import MessageBearingError | ||
| from dve.core_engine.configuration.v1 import _ModelConfig, _ReaderConfig | ||
| from dve.pipeline.utils import load_reader | ||
|
|
||
| import pytest | ||
|
|
||
|
|
||
| class TestLoadReader: | ||
| test_model_config = _ModelConfig( | ||
| fields={"test": "str"}, | ||
| reporting_fields=["test"], | ||
| key_field="test", | ||
| reader_config={ | ||
| ".csv": _ReaderConfig(reader="TestCsvReader"), | ||
| } | ||
| ) | ||
|
|
||
| def test_invalid_load_reader_with_file_ext(self): | ||
| with pytest.raises(MessageBearingError) as exc_info: | ||
| load_reader( | ||
| {"test": self.test_model_config}, | ||
| "test_model", | ||
| "jpeg" | ||
| ) | ||
|
|
||
| assert exc_info.value.messages[0].error_message == "The supplied file extension `jpeg` is not a supported file format for test_model." | ||
|
|
||
| def test_invalid_load_reader_missing_file_ext(self): | ||
| with pytest.raises(MessageBearingError) as exc_info: | ||
| load_reader( | ||
| {"test": self.test_model_config}, | ||
| "test_model", | ||
| "" | ||
| ) | ||
|
|
||
| assert exc_info.value.messages[0].error_message == "No supplied file extension. Unable to parse file without a file extension." |
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.
There are two possible key errors here - one to do with file extension and one to do with reader stated - how can you differentiate between the two?