add turned_off and turned_on triggers

homeassistant/components/automation/__init__.py

@@ -128,10 +128,10 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "climate",
     "cover",
     "fan",
+    "input_boolean",
     "lawn_mower",
     "light",
     "media_player",
-    "siren",
     "switch",
     "text",
     "vacuum",

homeassistant/components/input_boolean/icons.json

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

homeassistant/components/input_boolean/strings.json

@@ -1,4 +1,8 @@
 {
+  "common": {
+    "trigger_behavior_description": "The behavior of the targeted input booleans to trigger on.",
+    "trigger_behavior_name": "Behavior"
+  },
   "entity_component": {
     "_": {
       "name": "[%key:component::input_boolean::title%]",
@@ -17,6 +21,15 @@
       }
     }
   },
+  "selector": {
+    "trigger_behavior": {
+      "options": {
+        "any": "Any",
+        "first": "First",
+        "last": "Last"
+      }
+    }
+  },
   "services": {
     "reload": {
       "description": "Reloads helpers from the YAML-configuration.",
@@ -35,5 +48,27 @@
       "name": "[%key:common::action::turn_on%]"
     }
   },
-  "title": "Input boolean"
+  "title": "Input boolean",
+  "triggers": {
+    "turned_off": {
+      "description": "Triggers after one or more input booleans turn off.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::input_boolean::common::trigger_behavior_description%]",
+          "name": "[%key:component::input_boolean::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Input boolean turned off"
+    },
+    "turned_on": {
+      "description": "Triggers after one or more input booleans turn on.",
+      "fields": {
+        "behavior": {
+          "description": "[%key:component::input_boolean::common::trigger_behavior_description%]",
+          "name": "[%key:component::input_boolean::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Input boolean turned on"
+    }
+  }
 }

homeassistant/components/input_boolean/trigger.py

@@ -1,4 +1,4 @@
-"""Provides triggers for sirens."""
+"""Provides triggers for input booleans."""
 
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
@@ -13,5 +13,5 @@ TRIGGERS: dict[str, type[Trigger]] = {
 
 
 async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
-    """Return the triggers for sirens."""
+    """Return the triggers for input booleans."""
     return TRIGGERS

homeassistant/components/input_boolean/triggers.yaml

@@ -1,7 +1,7 @@
 .trigger_common: &trigger_common
   target:
     entity:
-      domain: siren
+      domain: input_boolean
   fields:
     behavior:
       required: true

homeassistant/components/siren/icons.json

@@ -14,13 +14,5 @@
     "turn_on": {
       "service": "mdi:bullhorn"
     }
-  },
-  "triggers": {
-    "turned_off": {
-      "trigger": "mdi:bullhorn-outline"
-    },
-    "turned_on": {
-      "trigger": "mdi:bullhorn"
-    }
   }
 }

homeassistant/components/siren/strings.json

@@ -1,8 +1,4 @@
 {
-  "common": {
-    "trigger_behavior_description": "The behavior of the targeted sirens to trigger on.",
-    "trigger_behavior_name": "Behavior"
-  },
   "entity_component": {
     "_": {
       "name": "[%key:component::siren::title%]",
@@ -17,15 +13,6 @@
       }
     }
   },
-  "selector": {
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
   "services": {
     "toggle": {
       "description": "Toggles the siren on/off.",
@@ -54,27 +41,5 @@
       "name": "[%key:common::action::turn_on%]"
     }
   },
-  "title": "Siren",
-  "triggers": {
-    "turned_off": {
-      "description": "Triggers after one or more sirens turn off.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::siren::common::trigger_behavior_description%]",
-          "name": "[%key:component::siren::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Siren turned off"
-    },
-    "turned_on": {
-      "description": "Triggers after one or more sirens turn on.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::siren::common::trigger_behavior_description%]",
-          "name": "[%key:component::siren::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Siren turned on"
-    }
-  }
+  "title": "Siren"
 }

tests/components/input_boolean/test_trigger.py

@@ -1,11 +1,11 @@
-"""Test siren triggers."""
+"""Test input boolean triggers."""
 
 from collections.abc import Generator
 from unittest.mock import patch
 
 import pytest
 
-from homeassistant.components.siren import DOMAIN
+from homeassistant.components.input_boolean import DOMAIN
 from homeassistant.const import ATTR_LABEL_ID, CONF_ENTITY_ID, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant, ServiceCall
 
@@ -35,22 +35,22 @@ def enable_experimental_triggers_conditions() -> Generator[None]:
 
 
 @pytest.fixture
-async def target_sirens(hass: HomeAssistant) -> list[str]:
-    """Create multiple siren entities associated with different targets."""
+async def target_input_booleans(hass: HomeAssistant) -> list[str]:
+    """Create multiple input_boolean entities associated with different targets."""
     return (await target_entities(hass, DOMAIN))["included"]
 
 
 @pytest.mark.parametrize(
     "trigger_key",
     [
-        "siren.turned_off",
-        "siren.turned_on",
+        "input_boolean.turned_off",
+        "input_boolean.turned_on",
     ],
 )
-async def test_siren_triggers_gated_by_labs_flag(
+async def test_input_boolean_triggers_gated_by_labs_flag(
     hass: HomeAssistant, caplog: pytest.LogCaptureFixture, trigger_key: str
 ) -> None:
-    """Test the siren triggers are gated by the labs flag."""
+    """Test the input_boolean 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 "
@@ -69,32 +69,32 @@ async def test_siren_triggers_gated_by_labs_flag(
     ("trigger", "states"),
     [
         *parametrize_trigger_states(
-            trigger="siren.turned_off",
+            trigger="input_boolean.turned_off",
             target_states=[STATE_OFF],
             other_states=[STATE_ON],
         ),
         *parametrize_trigger_states(
-            trigger="siren.turned_on",
+            trigger="input_boolean.turned_on",
             target_states=[STATE_ON],
             other_states=[STATE_OFF],
         ),
     ],
 )
-async def test_siren_state_trigger_behavior_any(
+async def test_input_boolean_state_trigger_behavior_any(
     hass: HomeAssistant,
     service_calls: list[ServiceCall],
-    target_sirens: list[str],
+    target_input_booleans: list[str],
     trigger_target_config: dict,
     entity_id: str,
     entities_in_target: int,
     trigger: str,
     states: list[StateDescription],
 ) -> None:
-    """Test that the siren state trigger fires when any siren state changes to a specific state."""
-    other_entity_ids = set(target_sirens) - {entity_id}
+    """Test that the input_boolean state trigger fires when any input_boolean state changes to a specific state."""
+    other_entity_ids = set(target_input_booleans) - {entity_id}
 
-    # Set all sirens, including the tested one, to the initial state
-    for eid in target_sirens:
+    # Set all input_booleans, including the tested one, to the initial state
+    for eid in target_input_booleans:
         set_or_remove_state(hass, eid, states[0]["included"])
         await hass.async_block_till_done()
 
@@ -109,7 +109,7 @@ async def test_siren_state_trigger_behavior_any(
             assert service_call.data[CONF_ENTITY_ID] == entity_id
         service_calls.clear()
 
-        # Check if changing other sirens also triggers
+        # Check if changing other input_booleans 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()
@@ -126,32 +126,32 @@ async def test_siren_state_trigger_behavior_any(
     ("trigger", "states"),
     [
         *parametrize_trigger_states(
-            trigger="siren.turned_off",
+            trigger="input_boolean.turned_off",
             target_states=[STATE_OFF],
             other_states=[STATE_ON],
         ),
         *parametrize_trigger_states(
-            trigger="siren.turned_on",
+            trigger="input_boolean.turned_on",
             target_states=[STATE_ON],
             other_states=[STATE_OFF],
         ),
     ],
 )
-async def test_siren_state_trigger_behavior_first(
+async def test_input_boolean_state_trigger_behavior_first(
     hass: HomeAssistant,
     service_calls: list[ServiceCall],
-    target_sirens: list[str],
+    target_input_booleans: list[str],
     trigger_target_config: dict,
     entity_id: str,
     entities_in_target: int,
     trigger: str,
     states: list[StateDescription],
 ) -> None:
-    """Test that the siren state trigger fires when the first siren changes to a specific state."""
-    other_entity_ids = set(target_sirens) - {entity_id}
+    """Test that the input_boolean state trigger fires when the first input_boolean changes to a specific state."""
+    other_entity_ids = set(target_input_booleans) - {entity_id}
 
-    # Set all sirens, including the tested one, to the initial state
-    for eid in target_sirens:
+    # Set all input_booleans, including the tested one, to the initial state
+    for eid in target_input_booleans:
         set_or_remove_state(hass, eid, states[0]["included"])
         await hass.async_block_till_done()
 
@@ -166,7 +166,7 @@ async def test_siren_state_trigger_behavior_first(
             assert service_call.data[CONF_ENTITY_ID] == entity_id
         service_calls.clear()
 
-        # Triggering other sirens should not cause the trigger to fire again
+        # Triggering other input_booleans 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()
@@ -182,32 +182,32 @@ async def test_siren_state_trigger_behavior_first(
     ("trigger", "states"),
     [
         *parametrize_trigger_states(
-            trigger="siren.turned_off",
+            trigger="input_boolean.turned_off",
             target_states=[STATE_OFF],
             other_states=[STATE_ON],
         ),
         *parametrize_trigger_states(
-            trigger="siren.turned_on",
+            trigger="input_boolean.turned_on",
             target_states=[STATE_ON],
             other_states=[STATE_OFF],
         ),
     ],
 )
-async def test_siren_state_trigger_behavior_last(
+async def test_input_boolean_state_trigger_behavior_last(
     hass: HomeAssistant,
     service_calls: list[ServiceCall],
-    target_sirens: list[str],
+    target_input_booleans: list[str],
     trigger_target_config: dict,
     entity_id: str,
     entities_in_target: int,
     trigger: str,
     states: list[StateDescription],
 ) -> None:
-    """Test that the siren state trigger fires when the last siren changes to a specific state."""
-    other_entity_ids = set(target_sirens) - {entity_id}
+    """Test that the input_boolean state trigger fires when the last input_boolean changes to a specific state."""
+    other_entity_ids = set(target_input_booleans) - {entity_id}
 
-    # Set all sirens, including the tested one, to the initial state
-    for eid in target_sirens:
+    # Set all input_booleans, including the tested one, to the initial state
+    for eid in target_input_booleans:
         set_or_remove_state(hass, eid, states[0]["included"])
         await hass.async_block_till_done()