Add humidifier condition (#166464)

homeassistant/components/humidifier/condition.py

@@ -1,11 +1,15 @@
 """Provides conditions for humidifiers."""
 
-from homeassistant.const import STATE_OFF, STATE_ON
+from homeassistant.const import PERCENTAGE, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec
-from homeassistant.helpers.condition import Condition, make_entity_state_condition
+from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
+from homeassistant.helpers.condition import (
+    Condition,
+    make_entity_numerical_condition,
+    make_entity_state_condition,
+)
 
-from .const import ATTR_ACTION, DOMAIN, HumidifierAction
+from .const import ATTR_ACTION, ATTR_HUMIDITY, DOMAIN, HumidifierAction
 
 CONDITIONS: dict[str, type[Condition]] = {
     "is_off": make_entity_state_condition(DOMAIN, STATE_OFF),
@@ -16,6 +20,10 @@ CONDITIONS: dict[str, type[Condition]] = {
     "is_humidifying": make_entity_state_condition(
         {DOMAIN: DomainSpec(value_source=ATTR_ACTION)}, HumidifierAction.HUMIDIFYING
     ),
+    "is_target_humidity": make_entity_numerical_condition(
+        {DOMAIN: NumericalDomainSpec(value_source=ATTR_HUMIDITY)},
+        valid_unit=PERCENTAGE,
+    ),
 }
 
 

homeassistant/components/humidifier/conditions.yaml

@@ -1,9 +1,9 @@
 .condition_common: &condition_common
-  target:
+  target: &condition_humidifier_target
     entity:
       domain: humidifier
   fields:
-    behavior:
+    behavior: &condition_behavior
       required: true
       default: any
       selector:
@@ -13,7 +13,36 @@
             - all
             - any
 
+.number_or_entity: &number_or_entity
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+              unit_of_measurement: "%"
+        entity:
+          selector:
+            entity:
+              filter:
+                - domain: input_number
+                  unit_of_measurement: "%"
+                - domain: sensor
+                  device_class: humidity
+                - domain: number
+                  device_class: humidity
+      translation_key: number_or_entity
+
 is_off: *condition_common
 is_on: *condition_common
 is_drying: *condition_common
 is_humidifying: *condition_common
+
+is_target_humidity:
+  target: *condition_humidifier_target
+  fields:
+    behavior: *condition_behavior
+    above: *number_or_entity
+    below: *number_or_entity

homeassistant/components/humidifier/icons.json

@@ -11,6 +11,9 @@
     },
     "is_on": {
       "condition": "mdi:air-humidifier"
+    },
+    "is_target_humidity": {
+      "condition": "mdi:water-percent"
     }
   },
   "entity_component": {

homeassistant/components/humidifier/strings.json

@@ -45,6 +45,24 @@
         }
       },
       "name": "Humidifier is on"
+    },
+    "is_target_humidity": {
+      "description": "Tests the target humidity of one or more humidifiers.",
+      "fields": {
+        "above": {
+          "description": "Require the target humidity to be above this value.",
+          "name": "Above"
+        },
+        "behavior": {
+          "description": "[%key:component::humidifier::common::condition_behavior_description%]",
+          "name": "[%key:component::humidifier::common::condition_behavior_name%]"
+        },
+        "below": {
+          "description": "Require the target humidity to be below this value.",
+          "name": "Below"
+        }
+      },
+      "name": "Humidifier target humidity"
     }
   },
   "device_automation": {

tests/components/humidifier/test_condition.py

@@ -4,7 +4,11 @@ from typing import Any
 
 import pytest
 
-from homeassistant.components.humidifier.const import ATTR_ACTION, HumidifierAction
+from homeassistant.components.humidifier.const import (
+    ATTR_ACTION,
+    ATTR_HUMIDITY,
+    HumidifierAction,
+)
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
 
@@ -15,6 +19,8 @@ from tests.components.common import (
     assert_condition_gated_by_labs_flag,
     parametrize_condition_states_all,
     parametrize_condition_states_any,
+    parametrize_numerical_attribute_condition_above_below_all,
+    parametrize_numerical_attribute_condition_above_below_any,
     parametrize_target_entities,
     target_entities,
 )
@@ -33,6 +39,7 @@ async def target_humidifiers(hass: HomeAssistant) -> dict[str, list[str]]:
         "humidifier.is_on",
         "humidifier.is_drying",
         "humidifier.is_humidifying",
+        "humidifier.is_target_humidity",
     ],
 )
 async def test_humidifier_conditions_gated_by_labs_flag(
@@ -212,3 +219,75 @@ async def test_humidifier_attribute_condition_behavior_all(
         condition_options=condition_options,
         states=states,
     )
+
+
+@pytest.mark.usefixtures("enable_labs_preview_features")
+@pytest.mark.parametrize(
+    ("condition_target_config", "entity_id", "entities_in_target"),
+    parametrize_target_entities("humidifier"),
+)
+@pytest.mark.parametrize(
+    ("condition", "condition_options", "states"),
+    parametrize_numerical_attribute_condition_above_below_any(
+        "humidifier.is_target_humidity",
+        STATE_ON,
+        ATTR_HUMIDITY,
+    ),
+)
+async def test_humidifier_numerical_condition_behavior_any(
+    hass: HomeAssistant,
+    target_humidifiers: dict[str, 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 humidifier numerical condition with the 'any' behavior."""
+    await assert_condition_behavior_any(
+        hass,
+        target_entities=target_humidifiers,
+        condition_target_config=condition_target_config,
+        entity_id=entity_id,
+        entities_in_target=entities_in_target,
+        condition=condition,
+        condition_options=condition_options,
+        states=states,
+    )
+
+
+@pytest.mark.usefixtures("enable_labs_preview_features")
+@pytest.mark.parametrize(
+    ("condition_target_config", "entity_id", "entities_in_target"),
+    parametrize_target_entities("humidifier"),
+)
+@pytest.mark.parametrize(
+    ("condition", "condition_options", "states"),
+    parametrize_numerical_attribute_condition_above_below_all(
+        "humidifier.is_target_humidity",
+        STATE_ON,
+        ATTR_HUMIDITY,
+    ),
+)
+async def test_humidifier_numerical_condition_behavior_all(
+    hass: HomeAssistant,
+    target_humidifiers: dict[str, 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 humidifier numerical condition with the 'all' behavior."""
+    await assert_condition_behavior_all(
+        hass,
+        target_entities=target_humidifiers,
+        condition_target_config=condition_target_config,
+        entity_id=entity_id,
+        entities_in_target=entities_in_target,
+        condition=condition,
+        condition_options=condition_options,
+        states=states,
+    )