evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add a syntax for merging lists of triggers (#117698)

Browse source 
* Add a syntax for merging lists of triggers

* Updating to the new syntax

* Update homeassistant/helpers/config_validation.py

Co-authored-by: Erik Montnemery <erik@montnemery.com>

* fix suggestion

* update test and add comments

* not actually json

* move test to new file

* update tests

---------

Co-authored-by: Erik Montnemery <erik@montnemery.com>
This commit is contained in:
karwosts 2024-09-09 04:51:32 -07:00 • committed by GitHub
parent 06e876aee0
commit 056e6eae82
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 159 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

18
homeassistant/helpers/config_validation.py
View file

@ -81,6 +81,7 @@ from homeassistant.const import (
CONF_TARGET,
CONF_THEN,
CONF_TIMEOUT,
CONF_TRIGGERS,
CONF_UNTIL,
CONF_VALUE_TEMPLATE,
CONF_VARIABLES,
@ -1781,6 +1782,19 @@ TRIGGER_BASE_SCHEMA = vol.Schema(
_base_trigger_validator_schema = TRIGGER_BASE_SCHEMA.extend({}, extra=vol.ALLOW_EXTRA)
def _base_trigger_list_flatten(triggers: list[Any]) -> list[Any]:
"""Flatten trigger arrays containing 'triggers:' sublists into a single list of triggers."""
flatlist = []
for t in triggers:
if CONF_TRIGGERS in t and len(t.keys()) == 1:
triggerlist = ensure_list(t[CONF_TRIGGERS])
flatlist.extend(triggerlist)
else:
flatlist.append(t)
return flatlist
# This is first round of validation, we don't want to process the config here already,
# just ensure basics as platform and ID are there.
def _base_trigger_validator(value: Any) -> Any:
@ -1788,7 +1802,9 @@ def _base_trigger_validator(value: Any) -> Any:
return value
TRIGGER_SCHEMA = vol.All(ensure_list, [_base_trigger_validator])
TRIGGER_SCHEMA = vol.All(
ensure_list, _base_trigger_list_flatten, [_base_trigger_validator]
)
_SCRIPT_DELAY_SCHEMA = vol.Schema(
{