Support shorthand templates in condition actions #61177
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
balloob
reviewed
Dec 7, 2021
|
|
||
| def dynamic_template_condition_action(config: dict) -> dict: | ||
| """Validate and convert a shorthand template condition to a template condition.""" | ||
| schema = vol.Schema( |
There was a problem hiding this comment.
Define this outside of this function.
balloob
reviewed
Dec 7, 2021
| @@ -1207,6 +1207,40 @@ def STATE_CONDITION_SCHEMA(value: Any) -> dict: # pylint: disable=invalid-name | |||
| ) | |||
| ) | |||
|
|
|||
|
|
|||
| def dynamic_template_condition_action(config: dict) -> dict: | |||
There was a problem hiding this comment.
Alternative:
dynamic_template_condition_action = vol.All(
vol.Schema(…),
lambda config: {
**config,
CONF_VALUE_TEMPLATE: config[CONF_CONDITION],
CONF_CONDITION: "template"
}
)
balloob
reviewed
Dec 7, 2021
| "zone": ZONE_CONDITION_SCHEMA, | ||
| }, | ||
| ), | ||
| dynamic_template_condition_action, |
There was a problem hiding this comment.
Based on the broken test this breaks the validation message.
balloob
approved these changes
Dec 7, 2021
emontnemery
commented
Dec 8, 2021
Comment on lines
+882
to
+884
| if default_schema: | ||
| with contextlib.suppress(vol.Invalid): | ||
| return cast(Dict[Hashable, Any], default_schema(value)) |
There was a problem hiding this comment.
This will hide error messages from the default validator, not sure if that's acceptable?
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Proposed change
Support shorthand templates in condition actions
Type of change
Additional information
Checklist
black --fast homeassistant tests)If user exposed functionality or configuration variables are added/changed:
If the code communicates with devices, web services, or third-party tools:
Updated and included derived files by running:
python3 -m script.hassfest.requirements_all.txt.Updated by running
python3 -m script.gen_requirements_all..coveragerc.The integration reached or maintains the following Integration Quality Scale:
To help with the load of incoming pull requests: