[DRAFT] - Refactor the OmegaConfigLoader load_and_merge_dir_config method #2591
Conversation
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
Signed-off-by: Nok Chan <[email protected]>
Signed-off-by: Nok Chan <[email protected]>
Signed-off-by: Nok Chan <[email protected]>
Signed-off-by: Nok Chan <[email protected]>
Signed-off-by: Nok Chan <[email protected]>
Signed-off-by: Nok Chan <[email protected]>
Signed-off-by: Nok Chan <[email protected]>
Signed-off-by: Nok Chan <[email protected]>
Signed-off-by: Nok Chan <[email protected]>
Signed-off-by: Nok Chan <[email protected]>
Signed-off-by: Nok Chan <[email protected]>
noklam
changed the title
noklam
commented
May 18, 2023
Comment on lines
+296
to
+313
| def _build_conf_paths(self, conf_path, patterns): | ||
| if not self._fs.isdir(Path(conf_path).as_posix()): | ||
| raise MissingConfigException( | ||
| f"Given configuration path either does not exist " | ||
| f"or is not a valid directory: {conf_path}" | ||
| ) | ||
|
|
||
| paths = [ | ||
| Path(each) | ||
| for pattern in patterns | ||
| for each in self._fs.glob(Path(f"{str(conf_path)}/{pattern}").as_posix()) | ||
| ] | ||
| deduplicated_paths = set(paths) | ||
| config_files_filtered = [ | ||
| path for path in deduplicated_paths if self._is_valid_config_path(path) | ||
| ] | ||
|
|
||
| return config_files_filtered |
There was a problem hiding this comment.
I am happy with this as this is quite clean already
Signed-off-by: Nok Chan <[email protected]>
noklam
changed the title
|
This is only for demonstration purpose and is not ready to be merged. |
8 tasks
|
Leave this for reference but I will close the PR to clean up tickets |
|
Since you're here - with #2821 in mind, please think about how to track the line number references of YAML declarations |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
The OCL has a big function
load_and_merge_dir_configwhich does a lot of things. It makes it hard to reason about and write test for it.We can simplify the test and extend the class by breaking it down. The PR is a quick effort of #2584 @ankatiyar as we keep adding arguments to this function, making it hard to maintain. I think it's easier to have a draft PR to show what I mean, ultimately the PR should also update the test and
__getitem__will be orchestrating the logic which simply call these functions (Not done in this draft).Development notes
It may be helpful to see each refactoring steps.
Checklist
RELEASE.mdfile