jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-13 08:17:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix entity extraction from Template conditions (#40034)

Browse Source
This commit is contained in:
Franck Nijhof 2020-09-13 22:05:45 +02:00 committed by Paulus Schoutsen
parent 30b8565548
commit afde5a7ece
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
homeassistant/helpers/condition.py
View File

@ -649,13 +649,16 @@ async def async_validate_condition_config(
@callback
def async_extract_entities(config: ConfigType) -> Set[str]:
def async_extract_entities(config: Union[ConfigType, Template]) -> Set[str]:
"""Extract entities from a condition."""
referenced: Set[str] = set()
to_process = deque([config])
while to_process:
config = to_process.popleft()
if isinstance(config, Template):
continue
condition = config[CONF_CONDITION]
if condition in ("and", "not", "or"):
@ -674,13 +677,16 @@ def async_extract_entities(config: ConfigType) -> Set[str]:
@callback
def async_extract_devices(config: ConfigType) -> Set[str]:
def async_extract_devices(config: Union[ConfigType, Template]) -> Set[str]:
"""Extract devices from a condition."""
referenced = set()
to_process = deque([config])
while to_process:
config = to_process.popleft()
if isinstance(config, Template):
continue
condition = config[CONF_CONDITION]
if condition in ("and", "not", "or"):

3
tests/helpers/test_condition.py
View File

@ -5,6 +5,7 @@ import pytest
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers import condition
from homeassistant.helpers.template import Template
from homeassistant.setup import async_setup_component
from homeassistant.util import dt
@ -807,6 +808,7 @@ async def test_extract_entities():
"entity_id": ["sensor.temperature_9", "sensor.temperature_10"],
"below": 110,
},
Template("{{ is_state('light.example', 'on') }}"),
],
}
) == {
@ -867,6 +869,7 @@ async def test_extract_devices():
},
],
},
Template("{{ is_state('light.example', 'on') }}"),
],
}
)