Support shorthand logical operators in script sequences #71022
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
Apr 28, 2022
| @@ -1599,7 +1599,7 @@ def determine_script_action(action: dict[str, Any]) -> str: | |||
| if CONF_WAIT_TEMPLATE in action: | |||
| return SCRIPT_ACTION_WAIT_TEMPLATE | |||
|
|
|||
| if CONF_CONDITION in action: | |||
| if any(key in action for key in (CONF_CONDITION, "and", "or", "not")): | |||
There was a problem hiding this comment.
This means that none of the schemas below can have and, or, not as config parameters or else it will be marked as a condition.
There was a problem hiding this comment.
Yes 🤷
As they are logical operators already present in conditions now, I think that is OK. There are no current conflicts and worst case, if needed, the logic determining this can be extended/refined in the future to support cases otherwise (e.g., by changing detection order).
|
This also needs special consideration in the frontend. Automation editor and trace graphs. |
balloob
approved these changes
Apr 28, 2022
|
I'll try to take a look at it tomorrow. |
- id: '1649679845278'
alias: UI Shorthand tests
description: ''
trigger:
- platform: event
event_type: test
condition: []
action:
or:
- and:
not: '{{ False }}'
mode: single
|
9 tasks
|
just let me add this, as said in Dm: thanks to the team for fixing this! so appreciated. |
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 logical conditions support in script sequences/automation actions.
Frontend PR: home-assistant/frontend#12509
closes #70947
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: