LIU-251 Automatically Parse App Args to Params #159
Merged
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
# Conflicts: # daliuge-engine/dlg/drop.py
calgray
commented
May 20, 2022
daliuge-engine/dlg/drop.py
Outdated
Comment on lines
397
to
411
| def get_param_value(attr_name, default_value): | ||
| has_component_param = attr_name in kwargs | ||
| has_app_param = hasattr(self, 'parameters') \ | ||
| and 'applicationArgs' in self.parameters \ | ||
| and attr_name in self.parameters['applicationArgs'] | ||
|
|
||
| if has_component_param and has_app_param: | ||
| logger.warning(f"Drop has both component and app param {attr_name}. Using component param.") | ||
| if has_component_param: | ||
| param = kwargs.get(attr_name) | ||
| elif has_app_param: | ||
| param = self.parameters['applicationArgs'].get(attr_name).value | ||
| else: | ||
| param = default_value | ||
| return param |
There was a problem hiding this comment.
This block controls the priority between component params and app params.
There is some complication where I can't find a reason to load applicationArgs['name'].default_value since I'd expect eagle to populate an appropriate applicationArgs['name'].value, if the key is missing the app default is used.
calgray
changed the title
james-strauss-uwa
approved these changes
May 24, 2022
|
just noticed the cause of test change after realizing |
Merged
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.
This change combines drop app params with dlg_x_param() definitions. Params can now be either defined as component params or app params and AbstractDrop will give priority loading to component params then app params. This was done for backwards compatibility as well as supporting tests that don't write to 'applicationArgs'.