Compare commits

...

8 Commits

Author SHA1 Message Date
Michael
24a455c436 Merge branch 'dev' into switch/add-domain-driven-triggers 2025-12-11 19:14:10 +01:00
Michael
a39b2de946 Apply suggestions from code review
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
2025-12-11 10:59:20 +01:00
mib1185
5b9240d4a4 fix strings 2025-12-10 21:47:52 +00:00
mib1185
89f8e1f648 fix strings 2025-12-10 21:17:00 +00:00
mib1185
eb1bc61cc4 add tests 2025-12-10 21:11:03 +00:00
mib1185
aca2224d2c add switch platform to expirmental automation triggers 2025-12-10 21:06:32 +00:00
mib1185
aa270a3442 re-add trigger behavior 2025-12-10 20:37:59 +00:00
mib1185
6d11c2894e add turned_off and turned_on triggers 2025-12-10 20:24:24 +00:00
6 changed files with 308 additions and 1 deletions

View File

@@ -131,6 +131,7 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
"lawn_mower",
"light",
"media_player",
"switch",
"text",
"vacuum",
}

View File

@@ -29,5 +29,13 @@
"turn_on": {
"service": "mdi:toggle-switch-variant"
}
},
"triggers": {
"turned_off": {
"trigger": "mdi:toggle-switch-variant-off"
},
"turned_on": {
"trigger": "mdi:toggle-switch-variant"
}
}
}

View File

@@ -1,4 +1,8 @@
{
"common": {
"trigger_behavior_description": "The behavior of the targeted switches to trigger on.",
"trigger_behavior_name": "Behavior"
},
"device_automation": {
"action_type": {
"toggle": "[%key:common::device_automation::action_type::toggle%]",
@@ -41,6 +45,15 @@
}
}
},
"selector": {
"trigger_behavior": {
"options": {
"any": "Any",
"first": "First",
"last": "Last"
}
}
},
"services": {
"toggle": {
"description": "Toggles a switch on/off.",
@@ -55,5 +68,27 @@
"name": "[%key:common::action::turn_on%]"
}
},
"title": "Switch"
"title": "Switch",
"triggers": {
"turned_off": {
"description": "Triggers after one or more switches turn off.",
"fields": {
"behavior": {
"description": "[%key:component::switch::common::trigger_behavior_description%]",
"name": "[%key:component::switch::common::trigger_behavior_name%]"
}
},
"name": "Switch turned off"
},
"turned_on": {
"description": "Triggers after one or more switches turn on.",
"fields": {
"behavior": {
"description": "[%key:component::switch::common::trigger_behavior_description%]",
"name": "[%key:component::switch::common::trigger_behavior_name%]"
}
},
"name": "Switch turned on"
}
}
}

View File

@@ -0,0 +1,17 @@
"""Provides triggers for switch platform."""
from homeassistant.const import STATE_OFF, STATE_ON
from homeassistant.core import HomeAssistant
from homeassistant.helpers.trigger import Trigger, make_entity_state_trigger
from .const import DOMAIN
TRIGGERS: dict[str, type[Trigger]] = {
"turned_on": make_entity_state_trigger(DOMAIN, STATE_ON),
"turned_off": make_entity_state_trigger(DOMAIN, STATE_OFF),
}
async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
"""Return the triggers for switch platform."""
return TRIGGERS

View File

@@ -0,0 +1,18 @@
.trigger_common: &trigger_common
target:
entity:
domain: switch
fields:
behavior:
required: true
default: any
selector:
select:
options:
- first
- last
- any
translation_key: trigger_behavior
turned_off: *trigger_common
turned_on: *trigger_common

View File

@@ -0,0 +1,228 @@
"""Test switch triggers."""
from collections.abc import Generator
from unittest.mock import patch
import pytest
from homeassistant.components.switch import DOMAIN
from homeassistant.const import ATTR_LABEL_ID, CONF_ENTITY_ID, STATE_OFF, STATE_ON
from homeassistant.core import HomeAssistant, ServiceCall
from tests.components import (
StateDescription,
arm_trigger,
parametrize_target_entities,
parametrize_trigger_states,
set_or_remove_state,
target_entities,
)
@pytest.fixture(autouse=True, name="stub_blueprint_populate")
def stub_blueprint_populate_autouse(stub_blueprint_populate: None) -> None:
"""Stub copying the blueprints to the config folder."""
@pytest.fixture(name="enable_experimental_triggers_conditions")
def enable_experimental_triggers_conditions() -> Generator[None]:
"""Enable experimental triggers and conditions."""
with patch(
"homeassistant.components.labs.async_is_preview_feature_enabled",
return_value=True,
):
yield
@pytest.fixture
async def target_switches(hass: HomeAssistant) -> list[str]:
"""Create multiple switch entities associated with different targets."""
return (await target_entities(hass, DOMAIN))["included"]
@pytest.mark.parametrize(
"trigger_key",
[
"switch.turned_off",
"switch.turned_on",
],
)
async def test_switch_triggers_gated_by_labs_flag(
hass: HomeAssistant, caplog: pytest.LogCaptureFixture, trigger_key: str
) -> None:
"""Test the switch triggers are gated by the labs flag."""
await arm_trigger(hass, trigger_key, None, {ATTR_LABEL_ID: "test_label"})
assert (
"Unnamed automation failed to setup triggers and has been disabled: Trigger "
f"'{trigger_key}' requires the experimental 'New triggers and conditions' "
"feature to be enabled in Home Assistant Labs settings (feature flag: "
"'new_triggers_conditions')"
) in caplog.text
@pytest.mark.usefixtures("enable_experimental_triggers_conditions")
@pytest.mark.parametrize(
("trigger_target_config", "entity_id", "entities_in_target"),
parametrize_target_entities(DOMAIN),
)
@pytest.mark.parametrize(
("trigger", "states"),
[
*parametrize_trigger_states(
trigger="switch.turned_off",
target_states=[STATE_OFF],
other_states=[STATE_ON],
),
*parametrize_trigger_states(
trigger="switch.turned_on",
target_states=[STATE_ON],
other_states=[STATE_OFF],
),
],
)
async def test_switch_state_trigger_behavior_any(
hass: HomeAssistant,
service_calls: list[ServiceCall],
target_switches: list[str],
trigger_target_config: dict,
entity_id: str,
entities_in_target: int,
trigger: str,
states: list[StateDescription],
) -> None:
"""Test that the switch state trigger fires when any switch state changes to a specific state."""
other_entity_ids = set(target_switches) - {entity_id}
# Set all switches, including the tested one, to the initial state
for eid in target_switches:
set_or_remove_state(hass, eid, states[0]["included"])
await hass.async_block_till_done()
await arm_trigger(hass, trigger, {}, trigger_target_config)
for state in states[1:]:
included_state = state["included"]
set_or_remove_state(hass, entity_id, included_state)
await hass.async_block_till_done()
assert len(service_calls) == state["count"]
for service_call in service_calls:
assert service_call.data[CONF_ENTITY_ID] == entity_id
service_calls.clear()
# Check if changing other switches also triggers
for other_entity_id in other_entity_ids:
set_or_remove_state(hass, other_entity_id, included_state)
await hass.async_block_till_done()
assert len(service_calls) == (entities_in_target - 1) * state["count"]
service_calls.clear()
@pytest.mark.usefixtures("enable_experimental_triggers_conditions")
@pytest.mark.parametrize(
("trigger_target_config", "entity_id", "entities_in_target"),
parametrize_target_entities(DOMAIN),
)
@pytest.mark.parametrize(
("trigger", "states"),
[
*parametrize_trigger_states(
trigger="switch.turned_off",
target_states=[STATE_OFF],
other_states=[STATE_ON],
),
*parametrize_trigger_states(
trigger="switch.turned_on",
target_states=[STATE_ON],
other_states=[STATE_OFF],
),
],
)
async def test_switch_state_trigger_behavior_first(
hass: HomeAssistant,
service_calls: list[ServiceCall],
target_switches: list[str],
trigger_target_config: dict,
entity_id: str,
entities_in_target: int,
trigger: str,
states: list[StateDescription],
) -> None:
"""Test that the switch state trigger fires when the first switch changes to a specific state."""
other_entity_ids = set(target_switches) - {entity_id}
# Set all switches, including the tested one, to the initial state
for eid in target_switches:
set_or_remove_state(hass, eid, states[0]["included"])
await hass.async_block_till_done()
await arm_trigger(hass, trigger, {"behavior": "first"}, trigger_target_config)
for state in states[1:]:
included_state = state["included"]
set_or_remove_state(hass, entity_id, included_state)
await hass.async_block_till_done()
assert len(service_calls) == state["count"]
for service_call in service_calls:
assert service_call.data[CONF_ENTITY_ID] == entity_id
service_calls.clear()
# Triggering other switches should not cause the trigger to fire again
for other_entity_id in other_entity_ids:
set_or_remove_state(hass, other_entity_id, included_state)
await hass.async_block_till_done()
assert len(service_calls) == 0
@pytest.mark.usefixtures("enable_experimental_triggers_conditions")
@pytest.mark.parametrize(
("trigger_target_config", "entity_id", "entities_in_target"),
parametrize_target_entities(DOMAIN),
)
@pytest.mark.parametrize(
("trigger", "states"),
[
*parametrize_trigger_states(
trigger="switch.turned_off",
target_states=[STATE_OFF],
other_states=[STATE_ON],
),
*parametrize_trigger_states(
trigger="switch.turned_on",
target_states=[STATE_ON],
other_states=[STATE_OFF],
),
],
)
async def test_switch_state_trigger_behavior_last(
hass: HomeAssistant,
service_calls: list[ServiceCall],
target_switches: list[str],
trigger_target_config: dict,
entity_id: str,
entities_in_target: int,
trigger: str,
states: list[StateDescription],
) -> None:
"""Test that the switch state trigger fires when the last switch changes to a specific state."""
other_entity_ids = set(target_switches) - {entity_id}
# Set all switches, including the tested one, to the initial state
for eid in target_switches:
set_or_remove_state(hass, eid, states[0]["included"])
await hass.async_block_till_done()
await arm_trigger(hass, trigger, {"behavior": "last"}, trigger_target_config)
for state in states[1:]:
included_state = state["included"]
for other_entity_id in other_entity_ids:
set_or_remove_state(hass, other_entity_id, included_state)
await hass.async_block_till_done()
assert len(service_calls) == 0
set_or_remove_state(hass, entity_id, included_state)
await hass.async_block_till_done()
assert len(service_calls) == state["count"]
for service_call in service_calls:
assert service_call.data[CONF_ENTITY_ID] == entity_id
service_calls.clear()