Skip to content

Fix shorthand template conditions in choose blocks crashing all automations #171018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
frenck merged 2 commits into from
May 17, 2026
Merged

Fix shorthand template conditions in choose blocks crashing all automations #171018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
630804c
Fix shorthand template conditions in choose blocks crashing all autom…
frenck May 17, 2026
cd828bd
Convert shorthand template string to Template object via cv.dynamic_t…
balloob May 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion homeassistant/helpers/condition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1748,9 +1748,14 @@ def state_validate_config(hass: HomeAssistant, config: ConfigType) -> ConfigType


async def async_validate_condition_config(
hass: HomeAssistant, config: ConfigType
hass: HomeAssistant, config: ConfigType | str
) -> ConfigType:
"""Validate config."""
if isinstance(config, str):
config = {
CONF_CONDITION: "template",
CONF_VALUE_TEMPLATE: cv.dynamic_template(config),
}
condition_key: str = config[CONF_CONDITION]

if condition_key in ("and", "not", "or"):
Expand Down
19 changes: 19 additions & 0 deletions tests/helpers/test_condition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,6 +748,25 @@ async def test_or_condition_shorthand(hass: HomeAssistant) -> None:
assert test.async_check()


async def test_shorthand_template_condition_in_or(hass: HomeAssistant) -> None:
"""Test shorthand template condition inside or block doesn't crash."""
config = {
"condition": "or",
"conditions": [
'{{ states("sensor.test") == "on" }}',
{"condition": "state", "entity_id": "sensor.other", "state": "on"},
],
}
config = await condition.async_validate_condition_config(hass, config)
assert config["conditions"][0]["condition"] == "template"

# Verify the condition can actually be evaluated at runtime
test = await condition.async_from_config(hass, config)
hass.states.async_set("sensor.test", "on")
hass.states.async_set("sensor.other", "off")
assert test.async_check()


async def test_not_condition(hass: HomeAssistant) -> None:
"""Test the 'not' condition."""
config = {
Expand Down