Support target conditions in automation relation extraction

homeassistant/components/alarm_control_panel/condition.py

@@ -1,93 +0,0 @@
-"""Provides conditions for alarm control panels."""
-
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.condition import (
-    Condition,
-    EntityStateConditionBase,
-    make_entity_state_condition,
-)
-from homeassistant.helpers.entity import get_supported_features
-
-from .const import DOMAIN, AlarmControlPanelEntityFeature, AlarmControlPanelState
-
-
-def supports_feature(hass: HomeAssistant, entity_id: str, features: int) -> bool:
-    """Test if an entity supports the specified features."""
-    try:
-        return bool(get_supported_features(hass, entity_id) & features)
-    except HomeAssistantError:
-        return False
-
-
-class EntityStateRequiredFeaturesCondition(EntityStateConditionBase):
-    """State condition."""
-
-    _required_features: int
-
-    def entity_filter(self, entities: set[str]) -> set[str]:
-        """Filter entities of this domain with the required features."""
-        entities = super().entity_filter(entities)
-        return {
-            entity_id
-            for entity_id in entities
-            if supports_feature(self._hass, entity_id, self._required_features)
-        }
-
-
-def make_entity_state_required_features_condition(
-    domain: str, to_state: str, required_features: int
-) -> type[EntityStateRequiredFeaturesCondition]:
-    """Create an entity state condition class with required feature filtering."""
-
-    class CustomCondition(EntityStateRequiredFeaturesCondition):
-        """Condition for entity state changes."""
-
-        _domain = domain
-        _states = {to_state}
-        _required_features = required_features
-
-    return CustomCondition
-
-
-CONDITIONS: dict[str, type[Condition]] = {
-    "is_armed": make_entity_state_condition(
-        DOMAIN,
-        {
-            AlarmControlPanelState.ARMED_AWAY,
-            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-            AlarmControlPanelState.ARMED_HOME,
-            AlarmControlPanelState.ARMED_NIGHT,
-            AlarmControlPanelState.ARMED_VACATION,
-        },
-    ),
-    "is_armed_away": make_entity_state_required_features_condition(
-        DOMAIN,
-        AlarmControlPanelState.ARMED_AWAY,
-        AlarmControlPanelEntityFeature.ARM_AWAY,
-    ),
-    "is_armed_home": make_entity_state_required_features_condition(
-        DOMAIN,
-        AlarmControlPanelState.ARMED_HOME,
-        AlarmControlPanelEntityFeature.ARM_HOME,
-    ),
-    "is_armed_night": make_entity_state_required_features_condition(
-        DOMAIN,
-        AlarmControlPanelState.ARMED_NIGHT,
-        AlarmControlPanelEntityFeature.ARM_NIGHT,
-    ),
-    "is_armed_vacation": make_entity_state_required_features_condition(
-        DOMAIN,
-        AlarmControlPanelState.ARMED_VACATION,
-        AlarmControlPanelEntityFeature.ARM_VACATION,
-    ),
-    "is_disarmed": make_entity_state_condition(DOMAIN, AlarmControlPanelState.DISARMED),
-    "is_triggered": make_entity_state_condition(
-        DOMAIN, AlarmControlPanelState.TRIGGERED
-    ),
-}
-
-
-async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
-    """Return the alarm control panel conditions."""
-    return CONDITIONS

homeassistant/components/alarm_control_panel/conditions.yaml

@@ -1,52 +0,0 @@
-.condition_common: &condition_common
-  target:
-    entity:
-      domain: alarm_control_panel
-  fields: &condition_common_fields
-    behavior:
-      required: true
-      default: any
-      selector:
-        select:
-          translation_key: condition_behavior
-          options:
-            - all
-            - any
-
-is_armed: *condition_common
-
-is_armed_away:
-  fields: *condition_common_fields
-  target:
-    entity:
-      domain: alarm_control_panel
-      supported_features:
-        - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_AWAY
-
-is_armed_home:
-  fields: *condition_common_fields
-  target:
-    entity:
-      domain: alarm_control_panel
-      supported_features:
-        - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_HOME
-
-is_armed_night:
-  fields: *condition_common_fields
-  target:
-    entity:
-      domain: alarm_control_panel
-      supported_features:
-        - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_NIGHT
-
-is_armed_vacation:
-  fields: *condition_common_fields
-  target:
-    entity:
-      domain: alarm_control_panel
-      supported_features:
-        - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_VACATION
-
-is_disarmed: *condition_common
-
-is_triggered: *condition_common

homeassistant/components/alarm_control_panel/icons.json

@@ -1,27 +1,4 @@
 {
-  "conditions": {
-    "is_armed": {
-      "condition": "mdi:shield"
-    },
-    "is_armed_away": {
-      "condition": "mdi:shield-lock"
-    },
-    "is_armed_home": {
-      "condition": "mdi:shield-home"
-    },
-    "is_armed_night": {
-      "condition": "mdi:shield-moon"
-    },
-    "is_armed_vacation": {
-      "condition": "mdi:shield-airplane"
-    },
-    "is_disarmed": {
-      "condition": "mdi:shield-off"
-    },
-    "is_triggered": {
-      "condition": "mdi:bell-ring"
-    }
-  },
   "entity_component": {
     "_": {
       "default": "mdi:shield",

homeassistant/components/alarm_control_panel/strings.json

@@ -1,82 +1,8 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted alarms.",
-    "condition_behavior_name": "Behavior",
     "trigger_behavior_description": "The behavior of the targeted alarms to trigger on.",
     "trigger_behavior_name": "Behavior"
   },
-  "conditions": {
-    "is_armed": {
-      "description": "Tests if one or more alarms are armed.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
-          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
-        }
-      },
-      "name": "If an alarm is armed"
-    },
-    "is_armed_away": {
-      "description": "Tests if one or more alarms are armed in away mode.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
-          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
-        }
-      },
-      "name": "If an alarm is armed away"
-    },
-    "is_armed_home": {
-      "description": "Tests if one or more alarms are armed in home mode.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
-          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
-        }
-      },
-      "name": "If an alarm is armed home"
-    },
-    "is_armed_night": {
-      "description": "Tests if one or more alarms are armed in night mode.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
-          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
-        }
-      },
-      "name": "If an alarm is armed night"
-    },
-    "is_armed_vacation": {
-      "description": "Tests if one or more alarms are armed in vacation mode.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
-          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
-        }
-      },
-      "name": "If an alarm is armed vacation"
-    },
-    "is_disarmed": {
-      "description": "Tests if one or more alarms are disarmed.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
-          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
-        }
-      },
-      "name": "If an alarm is disarmed"
-    },
-    "is_triggered": {
-      "description": "Tests if one or more alarms are triggered.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::condition_behavior_description%]",
-          "name": "[%key:component::alarm_control_panel::common::condition_behavior_name%]"
-        }
-      },
-      "name": "If an alarm is triggered"
-    }
-  },
   "device_automation": {
     "action_type": {
       "arm_away": "Arm {entity_name} away",
@@ -150,12 +76,6 @@
     }
   },
   "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
     "trigger_behavior": {
       "options": {
         "any": "Any",

homeassistant/components/automation/__init__.py

@@ -123,7 +123,6 @@ SERVICE_TRIGGER = "trigger"
 NEW_TRIGGERS_CONDITIONS_FEATURE_FLAG = "new_triggers_conditions"
 
 _EXPERIMENTAL_CONDITION_PLATFORMS = {
-    "alarm_control_panel",
     "fan",
     "light",
 }
@@ -600,6 +599,10 @@ class AutomationEntity(BaseAutomationEntity, RestoreEntity):
         """Return a set of referenced labels."""
         referenced = self.action_script.referenced_labels
 
+        if self._cond_func is not None:
+            for conf in self._cond_func.config:
+                referenced |= condition.async_extract_labels(conf)
+
         for conf in self._trigger_config:
             referenced |= set(_get_targets_from_trigger_config(conf, ATTR_LABEL_ID))
         return referenced
@@ -609,6 +612,10 @@ class AutomationEntity(BaseAutomationEntity, RestoreEntity):
         """Return a set of referenced floors."""
         referenced = self.action_script.referenced_floors
 
+        if self._cond_func is not None:
+            for conf in self._cond_func.config:
+                referenced |= condition.async_extract_floors(conf)
+
         for conf in self._trigger_config:
             referenced |= set(_get_targets_from_trigger_config(conf, ATTR_FLOOR_ID))
         return referenced
@@ -618,6 +625,10 @@ class AutomationEntity(BaseAutomationEntity, RestoreEntity):
         """Return a set of referenced areas."""
         referenced = self.action_script.referenced_areas
 
+        if self._cond_func is not None:
+            for conf in self._cond_func.config:
+                referenced |= condition.async_extract_areas(conf)
+
         for conf in self._trigger_config:
             referenced |= set(_get_targets_from_trigger_config(conf, ATTR_AREA_ID))
         return referenced

homeassistant/components/essent/const.py

@@ -7,7 +7,7 @@ from enum import StrEnum
 from typing import Final
 
 DOMAIN: Final = "essent"
-UPDATE_INTERVAL: Final = timedelta(hours=1)
+UPDATE_INTERVAL: Final = timedelta(hours=12)
 ATTRIBUTION: Final = "Data provided by Essent"
 
 

homeassistant/helpers/condition.py

@@ -17,6 +17,7 @@ from typing import (
     TYPE_CHECKING,
     Any,
     Final,
+    Literal,
     Protocol,
     TypedDict,
     Unpack,
@@ -28,7 +29,10 @@ from typing import (
 import voluptuous as vol
 
 from homeassistant.const import (
+    ATTR_AREA_ID,
     ATTR_DEVICE_CLASS,
+    ATTR_FLOOR_ID,
+    ATTR_LABEL_ID,
     CONF_ABOVE,
     CONF_AFTER,
     CONF_ATTRIBUTE,
@@ -1346,13 +1350,18 @@ def async_extract_entities(config: ConfigType | Template) -> set[str]:
         if entity_ids is not None:
             referenced.update(entity_ids)
 
+        if target_entities := _get_targets_from_condition_config(
+            config, CONF_ENTITY_ID
+        ):
+            referenced.update(target_entities)
+
     return referenced
 
 
 @callback
 def async_extract_devices(config: ConfigType | Template) -> set[str]:
     """Extract devices from a condition."""
-    referenced = set()
+    referenced: set[str] = set()
     to_process = deque([config])
 
     while to_process:
@@ -1366,15 +1375,75 @@ def async_extract_devices(config: ConfigType | Template) -> set[str]:
             to_process.extend(config["conditions"])
             continue
 
-        if condition != "device":
+        if condition == "device":
+            if (device_id := config.get(CONF_DEVICE_ID)) is not None:
+                referenced.add(device_id)
             continue
 
-        if (device_id := config.get(CONF_DEVICE_ID)) is not None:
-            referenced.add(device_id)
+        if target_devices := _get_targets_from_condition_config(config, CONF_DEVICE_ID):
+            referenced.update(target_devices)
 
     return referenced
 
 
+@callback
+def async_extract_areas(config: ConfigType | Template) -> set[str]:
+    """Extract areas from a condition."""
+    return _async_extract_targets(config, ATTR_AREA_ID)
+
+
+@callback
+def async_extract_floors(config: ConfigType | Template) -> set[str]:
+    """Extract floors from a condition."""
+    return _async_extract_targets(config, ATTR_FLOOR_ID)
+
+
+@callback
+def async_extract_labels(config: ConfigType | Template) -> set[str]:
+    """Extract labels from a condition."""
+    return _async_extract_targets(config, ATTR_LABEL_ID)
+
+
+@callback
+def _async_extract_targets(
+    config: ConfigType | Template,
+    target: Literal["entity_id", "device_id", "area_id", "floor_id", "label_id"],
+) -> set[str]:
+    """Extract targets 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"):
+            to_process.extend(config["conditions"])
+            continue
+
+        if target_labels := _get_targets_from_condition_config(config, target):
+            referenced.update(target_labels)
+
+    return referenced
+
+
+@callback
+def _get_targets_from_condition_config(
+    config: ConfigType,
+    target: Literal["entity_id", "device_id", "area_id", "floor_id", "label_id"],
+) -> list[str]:
+    """Extract targets from a condition target config."""
+    if not (target_conf := config.get(CONF_TARGET)):
+        return []
+    if not (targets := target_conf.get(target)):
+        return []
+
+    return [targets] if isinstance(targets, str) else targets
+
+
 def _load_conditions_file(integration: Integration) -> dict[str, Any]:
     """Load conditions file for an integration."""
     try:

tests/components/__init__.py

@@ -254,21 +254,13 @@ def parametrize_condition_states(
                         state_with_attributes(other_state, False, True)
                         for other_state in other_states
                     ),
-                ),
+                    (
+                        state_with_attributes(target_state, True, True)
+                        for target_state in target_states
+                    ),
+                )
             ),
         ),
-        # Test each target state individually to isolate condition_true expectations
-        *(
-            (
-                condition,
-                condition_options,
-                [
-                    state_with_attributes(other_states[0], False, True),
-                    state_with_attributes(target_state, True, True),
-                ],
-            )
-            for target_state in target_states
-        ),
     ]
 
 

tests/components/alarm_control_panel/test_condition.py

@@ -1,275 +0,0 @@
-"""Test alarm_control_panel conditions."""
-
-from typing import Any
-
-import pytest
-
-from homeassistant.components.alarm_control_panel import (
-    AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
-)
-from homeassistant.const import ATTR_SUPPORTED_FEATURES
-from homeassistant.core import HomeAssistant
-
-from tests.components import (
-    ConditionStateDescription,
-    assert_condition_gated_by_labs_flag,
-    create_target_condition,
-    other_states,
-    parametrize_condition_states,
-    parametrize_target_entities,
-    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
-async def target_alarm_control_panels(hass: HomeAssistant) -> list[str]:
-    """Create multiple alarm_control_panel entities associated with different targets."""
-    return (await target_entities(hass, "alarm_control_panel"))["included"]
-
-
-@pytest.mark.parametrize(
-    "condition",
-    [
-        "alarm_control_panel.is_armed",
-        "alarm_control_panel.is_armed_away",
-        "alarm_control_panel.is_armed_home",
-        "alarm_control_panel.is_armed_night",
-        "alarm_control_panel.is_armed_vacation",
-        "alarm_control_panel.is_disarmed",
-        "alarm_control_panel.is_triggered",
-    ],
-)
-async def test_alarm_control_panel_conditions_gated_by_labs_flag(
-    hass: HomeAssistant, caplog: pytest.LogCaptureFixture, condition: str
-) -> None:
-    """Test the alarm_control_panel conditions are gated by the labs flag."""
-    await assert_condition_gated_by_labs_flag(hass, caplog, condition)
-
-
-@pytest.mark.usefixtures("enable_labs_preview_features")
-@pytest.mark.parametrize(
-    ("condition_target_config", "entity_id", "entities_in_target"),
-    parametrize_target_entities("alarm_control_panel"),
-)
-@pytest.mark.parametrize(
-    ("condition", "condition_options", "states"),
-    [
-        *parametrize_condition_states(
-            condition="alarm_control_panel.is_armed",
-            target_states=[
-                AlarmControlPanelState.ARMED_AWAY,
-                AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-                AlarmControlPanelState.ARMED_HOME,
-                AlarmControlPanelState.ARMED_NIGHT,
-                AlarmControlPanelState.ARMED_VACATION,
-            ],
-            other_states=[
-                AlarmControlPanelState.ARMING,
-                AlarmControlPanelState.DISARMED,
-                AlarmControlPanelState.DISARMING,
-                AlarmControlPanelState.PENDING,
-                AlarmControlPanelState.TRIGGERED,
-            ],
-        ),
-        *parametrize_condition_states(
-            condition="alarm_control_panel.is_armed_away",
-            target_states=[AlarmControlPanelState.ARMED_AWAY],
-            other_states=other_states(AlarmControlPanelState.ARMED_AWAY),
-            additional_attributes={
-                ATTR_SUPPORTED_FEATURES: AlarmControlPanelEntityFeature.ARM_AWAY
-            },
-        ),
-        *parametrize_condition_states(
-            condition="alarm_control_panel.is_armed_home",
-            target_states=[AlarmControlPanelState.ARMED_HOME],
-            other_states=other_states(AlarmControlPanelState.ARMED_HOME),
-            additional_attributes={
-                ATTR_SUPPORTED_FEATURES: AlarmControlPanelEntityFeature.ARM_HOME
-            },
-        ),
-        *parametrize_condition_states(
-            condition="alarm_control_panel.is_armed_night",
-            target_states=[AlarmControlPanelState.ARMED_NIGHT],
-            other_states=other_states(AlarmControlPanelState.ARMED_NIGHT),
-            additional_attributes={
-                ATTR_SUPPORTED_FEATURES: AlarmControlPanelEntityFeature.ARM_NIGHT
-            },
-        ),
-        *parametrize_condition_states(
-            condition="alarm_control_panel.is_armed_vacation",
-            target_states=[AlarmControlPanelState.ARMED_VACATION],
-            other_states=other_states(AlarmControlPanelState.ARMED_VACATION),
-            additional_attributes={
-                ATTR_SUPPORTED_FEATURES: AlarmControlPanelEntityFeature.ARM_VACATION
-            },
-        ),
-        *parametrize_condition_states(
-            condition="alarm_control_panel.is_disarmed",
-            target_states=[AlarmControlPanelState.DISARMED],
-            other_states=other_states(AlarmControlPanelState.DISARMED),
-        ),
-        *parametrize_condition_states(
-            condition="alarm_control_panel.is_triggered",
-            target_states=[AlarmControlPanelState.TRIGGERED],
-            other_states=other_states(AlarmControlPanelState.TRIGGERED),
-        ),
-    ],
-)
-async def test_alarm_control_panel_state_condition_behavior_any(
-    hass: HomeAssistant,
-    target_alarm_control_panels: list[str],
-    condition_target_config: dict,
-    entity_id: str,
-    entities_in_target: int,
-    condition: str,
-    condition_options: dict[str, Any],
-    states: list[ConditionStateDescription],
-) -> None:
-    """Test the alarm_control_panel state condition with the 'any' behavior."""
-    other_entity_ids = set(target_alarm_control_panels) - {entity_id}
-
-    # Set all alarm_control_panels, including the tested alarm_control_panel, to the initial state
-    for eid in target_alarm_control_panels:
-        set_or_remove_state(hass, eid, states[0]["included"])
-        await hass.async_block_till_done()
-
-    condition = await create_target_condition(
-        hass,
-        condition=condition,
-        target=condition_target_config,
-        behavior="any",
-    )
-
-    for state in states:
-        included_state = state["included"]
-        set_or_remove_state(hass, entity_id, included_state)
-        await hass.async_block_till_done()
-        assert condition(hass) == state["condition_true"]
-
-        # Check if changing other alarm_control_panels also passes the condition
-        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 condition(hass) == state["condition_true"]
-
-
-@pytest.mark.usefixtures("enable_labs_preview_features")
-@pytest.mark.parametrize(
-    ("condition_target_config", "entity_id", "entities_in_target"),
-    parametrize_target_entities("alarm_control_panel"),
-)
-@pytest.mark.parametrize(
-    ("condition", "condition_options", "states"),
-    [
-        *parametrize_condition_states(
-            condition="alarm_control_panel.is_armed",
-            target_states=[
-                AlarmControlPanelState.ARMED_AWAY,
-                AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-                AlarmControlPanelState.ARMED_HOME,
-                AlarmControlPanelState.ARMED_NIGHT,
-                AlarmControlPanelState.ARMED_VACATION,
-            ],
-            other_states=[
-                AlarmControlPanelState.ARMING,
-                AlarmControlPanelState.DISARMED,
-                AlarmControlPanelState.DISARMING,
-                AlarmControlPanelState.PENDING,
-                AlarmControlPanelState.TRIGGERED,
-            ],
-        ),
-        *parametrize_condition_states(
-            condition="alarm_control_panel.is_armed_away",
-            target_states=[AlarmControlPanelState.ARMED_AWAY],
-            other_states=other_states(AlarmControlPanelState.ARMED_AWAY),
-            additional_attributes={
-                ATTR_SUPPORTED_FEATURES: AlarmControlPanelEntityFeature.ARM_AWAY
-            },
-        ),
-        *parametrize_condition_states(
-            condition="alarm_control_panel.is_armed_home",
-            target_states=[AlarmControlPanelState.ARMED_HOME],
-            other_states=other_states(AlarmControlPanelState.ARMED_HOME),
-            additional_attributes={
-                ATTR_SUPPORTED_FEATURES: AlarmControlPanelEntityFeature.ARM_HOME
-            },
-        ),
-        *parametrize_condition_states(
-            condition="alarm_control_panel.is_armed_night",
-            target_states=[AlarmControlPanelState.ARMED_NIGHT],
-            other_states=other_states(AlarmControlPanelState.ARMED_NIGHT),
-            additional_attributes={
-                ATTR_SUPPORTED_FEATURES: AlarmControlPanelEntityFeature.ARM_NIGHT
-            },
-        ),
-        *parametrize_condition_states(
-            condition="alarm_control_panel.is_armed_vacation",
-            target_states=[AlarmControlPanelState.ARMED_VACATION],
-            other_states=other_states(AlarmControlPanelState.ARMED_VACATION),
-            additional_attributes={
-                ATTR_SUPPORTED_FEATURES: AlarmControlPanelEntityFeature.ARM_VACATION
-            },
-        ),
-        *parametrize_condition_states(
-            condition="alarm_control_panel.is_disarmed",
-            target_states=[AlarmControlPanelState.DISARMED],
-            other_states=other_states(AlarmControlPanelState.DISARMED),
-        ),
-        *parametrize_condition_states(
-            condition="alarm_control_panel.is_triggered",
-            target_states=[AlarmControlPanelState.TRIGGERED],
-            other_states=other_states(AlarmControlPanelState.TRIGGERED),
-        ),
-    ],
-)
-async def test_alarm_control_panel_state_condition_behavior_all(
-    hass: HomeAssistant,
-    target_alarm_control_panels: list[str],
-    condition_target_config: dict,
-    entity_id: str,
-    entities_in_target: int,
-    condition: str,
-    condition_options: dict[str, Any],
-    states: list[ConditionStateDescription],
-) -> None:
-    """Test the alarm_control_panel state condition with the 'all' behavior."""
-    other_entity_ids = set(target_alarm_control_panels) - {entity_id}
-
-    # Set all alarm_control_panels, including the tested alarm_control_panel, to the initial state
-    for eid in target_alarm_control_panels:
-        set_or_remove_state(hass, eid, states[0]["included"])
-        await hass.async_block_till_done()
-
-    condition = await create_target_condition(
-        hass,
-        condition=condition,
-        target=condition_target_config,
-        behavior="all",
-    )
-
-    for state in states:
-        included_state = state["included"]
-
-        set_or_remove_state(hass, entity_id, included_state)
-        await hass.async_block_till_done()
-        # The condition passes if all entities are either in a target state or invalid
-        assert condition(hass) == (
-            (not state["state_valid"])
-            or (state["condition_true"] and entities_in_target == 1)
-        )
-
-        for other_entity_id in other_entity_ids:
-            set_or_remove_state(hass, other_entity_id, included_state)
-            await hass.async_block_till_done()
-
-        # The condition passes if all entities are either in a target state or invalid
-        assert condition(hass) == (
-            (not state["state_valid"]) or state["condition_true"]
-        )

tests/components/automation/test_init.py

@@ -2232,7 +2232,7 @@ async def test_extraction_functions(
     assert automation.blueprint_in_automation(hass, "automation.test3") is None
 
 
-async def test_extraction_functions_with_targets(
+async def test_extraction_functions_with_trigger_targets(
     hass: HomeAssistant,
     device_registry: dr.DeviceRegistry,
     hass_ws_client: WebSocketGenerator,
@@ -2428,6 +2428,211 @@ async def test_extraction_functions_with_targets(
     }
 
 
+async def test_extraction_functions_with_condition_targets(
+    hass: HomeAssistant,
+    device_registry: dr.DeviceRegistry,
+    hass_ws_client: WebSocketGenerator,
+) -> None:
+    """Test extraction functions with targets in conditions."""
+    config_entry = MockConfigEntry(domain="fake_integration", data={})
+    config_entry.mock_state(hass, ConfigEntryState.LOADED)
+    config_entry.add_to_hass(hass)
+
+    condition_device = device_registry.async_get_or_create(
+        config_entry_id=config_entry.entry_id,
+        connections={(dr.CONNECTION_NETWORK_MAC, "00:00:00:00:00:02")},
+    )
+
+    await async_setup_component(hass, "homeassistant", {})
+    await async_setup_component(hass, "light", {"light": {"platform": "demo"}})
+    await hass.async_block_till_done()
+
+    # Enable the new_triggers_conditions feature flag to allow new-style conditions
+    assert await async_setup_component(hass, "labs", {})
+    ws_client = await hass_ws_client(hass)
+    await ws_client.send_json_auto_id(
+        {
+            "type": "labs/update",
+            "domain": "automation",
+            "preview_feature": "new_triggers_conditions",
+            "enabled": True,
+        }
+    )
+    msg = await ws_client.receive_json()
+    assert msg["success"]
+    await hass.async_block_till_done()
+
+    assert await async_setup_component(
+        hass,
+        DOMAIN,
+        {
+            DOMAIN: [
+                {
+                    "alias": "test1",
+                    "triggers": [
+                        {"trigger": "state", "entity_id": "sensor.trigger_state"},
+                    ],
+                    "conditions": [
+                        # Single entity_id in target
+                        {
+                            "condition": "light.is_on",
+                            "target": {"entity_id": "light.condition_entity"},
+                            "options": {"behavior": "any"},
+                        },
+                        # Multiple entity_ids in target
+                        {
+                            "condition": "light.is_on",
+                            "target": {
+                                "entity_id": [
+                                    "light.condition_entity_list1",
+                                    "light.condition_entity_list2",
+                                ]
+                            },
+                            "options": {"behavior": "any"},
+                        },
+                        # Single device_id in target
+                        {
+                            "condition": "light.is_on",
+                            "target": {"device_id": condition_device.id},
+                            "options": {"behavior": "any"},
+                        },
+                        # Multiple device_ids in target
+                        {
+                            "condition": "light.is_on",
+                            "target": {
+                                "device_id": [
+                                    "target-device-1",
+                                    "target-device-2",
+                                ]
+                            },
+                            "options": {"behavior": "any"},
+                        },
+                        # Single area_id in target
+                        {
+                            "condition": "light.is_on",
+                            "target": {"area_id": "area-condition-single"},
+                            "options": {"behavior": "any"},
+                        },
+                        # Multiple area_ids in target
+                        {
+                            "condition": "light.is_on",
+                            "target": {
+                                "area_id": ["area-condition-1", "area-condition-2"]
+                            },
+                            "options": {"behavior": "any"},
+                        },
+                        # Single floor_id in target
+                        {
+                            "condition": "light.is_on",
+                            "target": {"floor_id": "floor-condition-single"},
+                            "options": {"behavior": "any"},
+                        },
+                        # Multiple floor_ids in target
+                        {
+                            "condition": "light.is_on",
+                            "target": {
+                                "floor_id": ["floor-condition-1", "floor-condition-2"]
+                            },
+                            "options": {"behavior": "any"},
+                        },
+                        # Single label_id in target
+                        {
+                            "condition": "light.is_on",
+                            "target": {"label_id": "label-condition-single"},
+                            "options": {"behavior": "any"},
+                        },
+                        # Multiple label_ids in target
+                        {
+                            "condition": "light.is_on",
+                            "target": {
+                                "label_id": ["label-condition-1", "label-condition-2"]
+                            },
+                            "options": {"behavior": "any"},
+                        },
+                        # Combined targets
+                        {
+                            "condition": "light.is_on",
+                            "target": {
+                                "entity_id": "light.combined_entity",
+                                "device_id": "combined-device",
+                                "area_id": "combined-area",
+                                "floor_id": "combined-floor",
+                                "label_id": "combined-label",
+                            },
+                            "options": {"behavior": "any"},
+                        },
+                    ],
+                    "actions": [
+                        {
+                            "action": "test.script",
+                            "data": {"entity_id": "light.action_entity"},
+                        },
+                    ],
+                },
+            ]
+        },
+    )
+
+    # Test entity extraction from condition targets
+    assert set(automation.entities_in_automation(hass, "automation.test1")) == {
+        "sensor.trigger_state",
+        "light.condition_entity",
+        "light.condition_entity_list1",
+        "light.condition_entity_list2",
+        "light.combined_entity",
+        "light.action_entity",
+    }
+
+    # Test device extraction from condition targets
+    assert set(automation.devices_in_automation(hass, "automation.test1")) == {
+        condition_device.id,
+        "target-device-1",
+        "target-device-2",
+        "combined-device",
+    }
+
+    # Test area extraction from condition targets
+    assert set(automation.areas_in_automation(hass, "automation.test1")) == {
+        "area-condition-single",
+        "area-condition-1",
+        "area-condition-2",
+        "combined-area",
+    }
+
+    # Test floor extraction from condition targets
+    assert set(automation.floors_in_automation(hass, "automation.test1")) == {
+        "floor-condition-single",
+        "floor-condition-1",
+        "floor-condition-2",
+        "combined-floor",
+    }
+
+    # Test label extraction from condition targets
+    assert set(automation.labels_in_automation(hass, "automation.test1")) == {
+        "label-condition-single",
+        "label-condition-1",
+        "label-condition-2",
+        "combined-label",
+    }
+
+    # Test automations_with_* functions
+    assert set(automation.automations_with_entity(hass, "light.condition_entity")) == {
+        "automation.test1"
+    }
+    assert set(automation.automations_with_device(hass, condition_device.id)) == {
+        "automation.test1"
+    }
+    assert set(automation.automations_with_area(hass, "area-condition-single")) == {
+        "automation.test1"
+    }
+    assert set(automation.automations_with_floor(hass, "floor-condition-single")) == {
+        "automation.test1"
+    }
+    assert set(automation.automations_with_label(hass, "label-condition-single")) == {
+        "automation.test1"
+    }
+
+
 async def test_logbook_humanify_automation_triggered_event(hass: HomeAssistant) -> None:
     """Test humanifying Automation Trigger event."""
     hass.config.components.add("recorder")

tests/components/essent/test_sensor.py

@@ -74,5 +74,5 @@ async def test_sensor_updates_on_hour_tick(
 
     assert (
         hass.states.get("sensor.essent_current_electricity_market_price").state
-        == "0.24535"
+        == "0.10417"
     )