Bump version to 2026.4.0b8

Co-authored-by: Martin Hjelmare <marhje52@gmail.com>

homeassistant/bootstrap.py

@@ -238,7 +238,9 @@ DEFAULT_INTEGRATIONS = {
     "timer",
     #
     # Base platforms:
-    *BASE_PLATFORMS,
+    # Note: Calendar and todo are not included to prevent them from registering
+    # their frontend panels when there are no calendar or todo integrations.
+    *(BASE_PLATFORMS - {"calendar", "todo"}),
     #
     # Integrations providing triggers and conditions for base platforms:
     "air_quality",
@@ -468,6 +470,7 @@ async def async_load_base_functionality(hass: core.HomeAssistant) -> bool:
     translation.async_setup(hass)
 
     recovery = hass.config.recovery_mode
+    device_registry.async_setup(hass)
     try:
         await asyncio.gather(
             create_eager_task(get_internal_store_manager(hass).async_initialize()),

homeassistant/components/air_quality/condition.py

@@ -13,7 +13,7 @@ from homeassistant.const import (
     STATE_ON,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
+from homeassistant.helpers.automation import DomainSpec
 from homeassistant.helpers.condition import (
     Condition,
     make_entity_numerical_condition,
@@ -59,18 +59,18 @@ CONDITIONS: dict[str, type[Condition]] = {
     "is_smoke_cleared": _make_cleared_condition(BinarySensorDeviceClass.SMOKE),
     # Numerical sensor conditions with unit conversion
     "is_co_value": make_entity_numerical_condition_with_unit(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.CO)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         CarbonMonoxideConcentrationConverter,
     ),
     "is_ozone_value": make_entity_numerical_condition_with_unit(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.OZONE)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.OZONE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         OzoneConcentrationConverter,
     ),
     "is_voc_value": make_entity_numerical_condition_with_unit(
         {
-            SENSOR_DOMAIN: NumericalDomainSpec(
+            SENSOR_DOMAIN: DomainSpec(
                 device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
             )
         },
@@ -79,7 +79,7 @@ CONDITIONS: dict[str, type[Condition]] = {
     ),
     "is_voc_ratio_value": make_entity_numerical_condition_with_unit(
         {
-            SENSOR_DOMAIN: NumericalDomainSpec(
+            SENSOR_DOMAIN: DomainSpec(
                 device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
             )
         },
@@ -87,59 +87,43 @@ CONDITIONS: dict[str, type[Condition]] = {
         UnitlessRatioConverter,
     ),
     "is_no_value": make_entity_numerical_condition_with_unit(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.NITROGEN_MONOXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_MONOXIDE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         NitrogenMonoxideConcentrationConverter,
     ),
     "is_no2_value": make_entity_numerical_condition_with_unit(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.NITROGEN_DIOXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_DIOXIDE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         NitrogenDioxideConcentrationConverter,
     ),
     "is_so2_value": make_entity_numerical_condition_with_unit(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.SULPHUR_DIOXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.SULPHUR_DIOXIDE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         SulphurDioxideConcentrationConverter,
     ),
     # Numerical sensor conditions without unit conversion (single-unit device classes)
     "is_co2_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.CO2)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO2)},
         valid_unit=CONCENTRATION_PARTS_PER_MILLION,
     ),
     "is_pm1_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM1)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM1)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "is_pm25_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM25)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM25)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "is_pm4_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM4)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM4)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "is_pm10_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM10)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM10)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "is_n2o_value": make_entity_numerical_condition(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.NITROUS_OXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROUS_OXIDE)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
 }

homeassistant/components/air_quality/conditions.yaml

@@ -10,366 +10,155 @@
         - all
         - any
 
-# --- Number or entity selectors ---
+# --- Unit lists for multi-unit pollutants ---
 
-.number_or_entity_co: &number_or_entity_co
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "ppb"
-                    - "ppm"
-                    - "mg/m³"
-                    - "μg/m³"
-                - domain: sensor
-                  device_class: carbon_monoxide
-                - domain: number
-                  device_class: carbon_monoxide
-      translation_key: number_or_entity
+.co_units: &co_units
+  - "ppb"
+  - "ppm"
+  - "mg/m³"
+  - "μg/m³"
 
-.number_or_entity_co2: &number_or_entity_co2
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-              unit_of_measurement: "ppm"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "ppm"
-                - domain: sensor
-                  device_class: carbon_dioxide
-                - domain: number
-                  device_class: carbon_dioxide
-      translation_key: number_or_entity
+.ozone_units: &ozone_units
+  - "ppb"
+  - "ppm"
+  - "μg/m³"
 
-.number_or_entity_pm1: &number_or_entity_pm1
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-              unit_of_measurement: "μg/m³"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "μg/m³"
-                - domain: sensor
-                  device_class: pm1
-                - domain: number
-                  device_class: pm1
-      translation_key: number_or_entity
+.voc_units: &voc_units
+  - "μg/m³"
+  - "mg/m³"
 
-.number_or_entity_pm25: &number_or_entity_pm25
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-              unit_of_measurement: "μg/m³"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "μg/m³"
-                - domain: sensor
-                  device_class: pm25
-                - domain: number
-                  device_class: pm25
-      translation_key: number_or_entity
+.voc_ratio_units: &voc_ratio_units
+  - "ppb"
+  - "ppm"
 
-.number_or_entity_pm4: &number_or_entity_pm4
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-              unit_of_measurement: "μg/m³"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "μg/m³"
-                - domain: sensor
-                  device_class: pm4
-                - domain: number
-                  device_class: pm4
-      translation_key: number_or_entity
+.no_units: &no_units
+  - "ppb"
+  - "μg/m³"
 
-.number_or_entity_pm10: &number_or_entity_pm10
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-              unit_of_measurement: "μg/m³"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "μg/m³"
-                - domain: sensor
-                  device_class: pm10
-                - domain: number
-                  device_class: pm10
-      translation_key: number_or_entity
+.no2_units: &no2_units
+  - "ppb"
+  - "ppm"
+  - "μg/m³"
 
-.number_or_entity_ozone: &number_or_entity_ozone
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "ppb"
-                    - "ppm"
-                    - "μg/m³"
-                - domain: sensor
-                  device_class: ozone
-                - domain: number
-                  device_class: ozone
-      translation_key: number_or_entity
+.so2_units: &so2_units
+  - "ppb"
+  - "μg/m³"
 
-.number_or_entity_voc: &number_or_entity_voc
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "μg/m³"
-                    - "mg/m³"
-                - domain: sensor
-                  device_class: volatile_organic_compounds
-                - domain: number
-                  device_class: volatile_organic_compounds
-      translation_key: number_or_entity
+# --- Entity filter anchors ---
 
-.number_or_entity_voc_ratio: &number_or_entity_voc_ratio
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "ppb"
-                    - "ppm"
-                - domain: sensor
-                  device_class: volatile_organic_compounds_parts
-                - domain: number
-                  device_class: volatile_organic_compounds_parts
-      translation_key: number_or_entity
+.co_threshold_entity: &co_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *co_units
+  - domain: sensor
+    device_class: carbon_monoxide
+  - domain: number
+    device_class: carbon_monoxide
 
-.number_or_entity_no: &number_or_entity_no
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "ppb"
-                    - "μg/m³"
-                - domain: sensor
-                  device_class: nitrogen_monoxide
-                - domain: number
-                  device_class: nitrogen_monoxide
-      translation_key: number_or_entity
+.co2_threshold_entity: &co2_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "ppm"
+  - domain: sensor
+    device_class: carbon_dioxide
+  - domain: number
+    device_class: carbon_dioxide
 
-.number_or_entity_no2: &number_or_entity_no2
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "ppb"
-                    - "ppm"
-                    - "μg/m³"
-                - domain: sensor
-                  device_class: nitrogen_dioxide
-                - domain: number
-                  device_class: nitrogen_dioxide
-      translation_key: number_or_entity
+.pm1_threshold_entity: &pm1_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm1
+  - domain: number
+    device_class: pm1
 
-.number_or_entity_n2o: &number_or_entity_n2o
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-              unit_of_measurement: "μg/m³"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "μg/m³"
-                - domain: sensor
-                  device_class: nitrous_oxide
-                - domain: number
-                  device_class: nitrous_oxide
-      translation_key: number_or_entity
+.pm25_threshold_entity: &pm25_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm25
+  - domain: number
+    device_class: pm25
 
-.number_or_entity_so2: &number_or_entity_so2
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "ppb"
-                    - "μg/m³"
-                - domain: sensor
-                  device_class: sulphur_dioxide
-                - domain: number
-                  device_class: sulphur_dioxide
-      translation_key: number_or_entity
+.pm4_threshold_entity: &pm4_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm4
+  - domain: number
+    device_class: pm4
 
-# --- Unit selectors ---
+.pm10_threshold_entity: &pm10_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: pm10
+  - domain: number
+    device_class: pm10
 
-.unit_co: &unit_co
-  required: false
-  selector:
-    select:
-      options:
-        - "ppb"
-        - "ppm"
-        - "mg/m³"
-        - "μg/m³"
+.ozone_threshold_entity: &ozone_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *ozone_units
+  - domain: sensor
+    device_class: ozone
+  - domain: number
+    device_class: ozone
 
-.unit_ozone: &unit_ozone
-  required: false
-  selector:
-    select:
-      options:
-        - "ppb"
-        - "ppm"
-        - "μg/m³"
+.voc_threshold_entity: &voc_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *voc_units
+  - domain: sensor
+    device_class: volatile_organic_compounds
+  - domain: number
+    device_class: volatile_organic_compounds
 
-.unit_no2: &unit_no2
-  required: false
-  selector:
-    select:
-      options:
-        - "ppb"
-        - "ppm"
-        - "μg/m³"
+.voc_ratio_threshold_entity: &voc_ratio_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *voc_ratio_units
+  - domain: sensor
+    device_class: volatile_organic_compounds_parts
+  - domain: number
+    device_class: volatile_organic_compounds_parts
 
-.unit_no: &unit_no
-  required: false
-  selector:
-    select:
-      options:
-        - "ppb"
-        - "μg/m³"
+.no_threshold_entity: &no_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *no_units
+  - domain: sensor
+    device_class: nitrogen_monoxide
+  - domain: number
+    device_class: nitrogen_monoxide
 
-.unit_so2: &unit_so2
-  required: false
-  selector:
-    select:
-      options:
-        - "ppb"
-        - "μg/m³"
+.no2_threshold_entity: &no2_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *no2_units
+  - domain: sensor
+    device_class: nitrogen_dioxide
+  - domain: number
+    device_class: nitrogen_dioxide
 
-.unit_voc: &unit_voc
-  required: false
-  selector:
-    select:
-      options:
-        - "μg/m³"
-        - "mg/m³"
+.n2o_threshold_entity: &n2o_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "μg/m³"
+  - domain: sensor
+    device_class: nitrous_oxide
+  - domain: number
+    device_class: nitrous_oxide
 
-.unit_voc_ratio: &unit_voc_ratio
-  required: false
-  selector:
-    select:
-      options:
-        - "ppb"
-        - "ppm"
+.so2_threshold_entity: &so2_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *so2_units
+  - domain: sensor
+    device_class: sulphur_dioxide
+  - domain: number
+    device_class: sulphur_dioxide
+
+# --- Number anchors for single-unit pollutants ---
+
+.co2_threshold_number: &co2_threshold_number
+  mode: box
+  unit_of_measurement: "ppm"
+
+.ugm3_threshold_number: &ugm3_threshold_number
+  mode: box
+  unit_of_measurement: "μg/m³"
 
 # --- Binary sensor targets ---
 
@@ -491,57 +280,99 @@ is_co_value:
   target: *target_co_sensor
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_co
-    below: *number_or_entity_co
-    unit: *unit_co
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *co_threshold_entity
+          mode: is
+          number:
+            mode: box
+          unit_of_measurement: *co_units
 
 is_ozone_value:
   target: *target_ozone
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_ozone
-    below: *number_or_entity_ozone
-    unit: *unit_ozone
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *ozone_threshold_entity
+          mode: is
+          number:
+            mode: box
+          unit_of_measurement: *ozone_units
 
 is_voc_value:
   target: *target_voc
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_voc
-    below: *number_or_entity_voc
-    unit: *unit_voc
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *voc_threshold_entity
+          mode: is
+          number:
+            mode: box
+          unit_of_measurement: *voc_units
 
 is_voc_ratio_value:
   target: *target_voc_ratio
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_voc_ratio
-    below: *number_or_entity_voc_ratio
-    unit: *unit_voc_ratio
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *voc_ratio_threshold_entity
+          mode: is
+          number:
+            mode: box
+          unit_of_measurement: *voc_ratio_units
 
 is_no_value:
   target: *target_no
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_no
-    below: *number_or_entity_no
-    unit: *unit_no
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *no_threshold_entity
+          mode: is
+          number:
+            mode: box
+          unit_of_measurement: *no_units
 
 is_no2_value:
   target: *target_no2
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_no2
-    below: *number_or_entity_no2
-    unit: *unit_no2
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *no2_threshold_entity
+          mode: is
+          number:
+            mode: box
+          unit_of_measurement: *no2_units
 
 is_so2_value:
   target: *target_so2
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_so2
-    below: *number_or_entity_so2
-    unit: *unit_so2
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *so2_threshold_entity
+          mode: is
+          number:
+            mode: box
+          unit_of_measurement: *so2_units
 
 # --- Numerical sensor conditions without unit conversion ---
 
@@ -549,40 +380,70 @@ is_co2_value:
   target: *target_co2
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_co2
-    below: *number_or_entity_co2
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *co2_threshold_entity
+          mode: is
+          number: *co2_threshold_number
 
 is_pm1_value:
   target: *target_pm1
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_pm1
-    below: *number_or_entity_pm1
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm1_threshold_entity
+          mode: is
+          number: *ugm3_threshold_number
 
 is_pm25_value:
   target: *target_pm25
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_pm25
-    below: *number_or_entity_pm25
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm25_threshold_entity
+          mode: is
+          number: *ugm3_threshold_number
 
 is_pm4_value:
   target: *target_pm4
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_pm4
-    below: *number_or_entity_pm4
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm4_threshold_entity
+          mode: is
+          number: *ugm3_threshold_number
 
 is_pm10_value:
   target: *target_pm10
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_pm10
-    below: *number_or_entity_pm10
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *pm10_threshold_entity
+          mode: is
+          number: *ugm3_threshold_number
 
 is_n2o_value:
   target: *target_n2o
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_n2o
-    below: *number_or_entity_n2o
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *n2o_threshold_entity
+          mode: is
+          number: *ugm3_threshold_number

homeassistant/components/air_quality/strings.json

@@ -1,34 +1,19 @@
 {
   "common": {
-    "condition_above_description": "Require the value to be above this value.",
-    "condition_above_name": "Above",
-    "condition_behavior_description": "How the value should match on the targeted entities.",
-    "condition_behavior_name": "Behavior",
-    "condition_below_description": "Require the value to be below this value.",
-    "condition_below_name": "Below",
-    "condition_unit_description": "All values will be converted to this unit when evaluating the condition.",
-    "condition_unit_name": "Unit of measurement",
-    "trigger_behavior_description": "The behavior of the targeted entities to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when",
+    "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
     "is_co2_value": {
       "description": "Tests the carbon dioxide level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "Carbon dioxide value"
@@ -37,7 +22,6 @@
       "description": "Tests if one or more carbon monoxide sensors are cleared.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         }
       },
@@ -47,7 +31,6 @@
       "description": "Tests if one or more carbon monoxide sensors are detecting carbon monoxide.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         }
       },
@@ -56,21 +39,11 @@
     "is_co_value": {
       "description": "Tests the carbon monoxide level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::condition_unit_description%]",
-          "name": "[%key:component::air_quality::common::condition_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "Carbon monoxide value"
@@ -79,7 +52,6 @@
       "description": "Tests if one or more gas sensors are cleared.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         }
       },
@@ -89,7 +61,6 @@
       "description": "Tests if one or more gas sensors are detecting gas.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         }
       },
@@ -98,17 +69,11 @@
     "is_n2o_value": {
       "description": "Tests the nitrous oxide level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "Nitrous oxide value"
@@ -116,21 +81,11 @@
     "is_no2_value": {
       "description": "Tests the nitrogen dioxide level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::condition_unit_description%]",
-          "name": "[%key:component::air_quality::common::condition_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "Nitrogen dioxide value"
@@ -138,21 +93,11 @@
     "is_no_value": {
       "description": "Tests the nitrogen monoxide level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::condition_unit_description%]",
-          "name": "[%key:component::air_quality::common::condition_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "Nitrogen monoxide value"
@@ -160,21 +105,11 @@
     "is_ozone_value": {
       "description": "Tests the ozone level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::condition_unit_description%]",
-          "name": "[%key:component::air_quality::common::condition_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "Ozone value"
@@ -182,17 +117,11 @@
     "is_pm10_value": {
       "description": "Tests the PM10 level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "PM10 value"
@@ -200,17 +129,11 @@
     "is_pm1_value": {
       "description": "Tests the PM1 level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "PM1 value"
@@ -218,17 +141,11 @@
     "is_pm25_value": {
       "description": "Tests the PM2.5 level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "PM2.5 value"
@@ -236,17 +153,11 @@
     "is_pm4_value": {
       "description": "Tests the PM4 level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "PM4 value"
@@ -255,7 +166,6 @@
       "description": "Tests if one or more smoke sensors are cleared.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         }
       },
@@ -265,7 +175,6 @@
       "description": "Tests if one or more smoke sensors are detecting smoke.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         }
       },
@@ -274,21 +183,11 @@
     "is_so2_value": {
       "description": "Tests the sulphur dioxide level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::condition_unit_description%]",
-          "name": "[%key:component::air_quality::common::condition_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "Sulphur dioxide value"
@@ -296,21 +195,11 @@
     "is_voc_ratio_value": {
       "description": "Tests the volatile organic compounds ratio of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::condition_unit_description%]",
-          "name": "[%key:component::air_quality::common::condition_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "Volatile organic compounds ratio value"
@@ -318,21 +207,11 @@
     "is_voc_value": {
       "description": "Tests the volatile organic compounds level of one or more entities.",
       "fields": {
-        "above": {
-          "description": "[%key:component::air_quality::common::condition_above_description%]",
-          "name": "[%key:component::air_quality::common::condition_above_name%]"
-        },
         "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
           "name": "[%key:component::air_quality::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "[%key:component::air_quality::common::condition_below_description%]",
-          "name": "[%key:component::air_quality::common::condition_below_name%]"
-        },
-        "unit": {
-          "description": "[%key:component::air_quality::common::condition_unit_description%]",
-          "name": "[%key:component::air_quality::common::condition_unit_name%]"
+        "threshold": {
+          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
         }
       },
       "name": "Volatile organic compounds value"
@@ -345,12 +224,6 @@
         "any": "Any"
       }
     },
-    "number_or_entity": {
-      "choices": {
-        "entity": "Entity",
-        "number": "Number"
-      }
-    },
     "trigger_behavior": {
       "options": {
         "any": "Any",
@@ -365,7 +238,6 @@
       "description": "Triggers after one or more carbon dioxide levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -375,11 +247,9 @@
       "description": "Triggers after one or more carbon dioxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -389,7 +259,6 @@
       "description": "Triggers after one or more carbon monoxide levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -399,7 +268,6 @@
       "description": "Triggers after one or more carbon monoxide sensors stop detecting carbon monoxide.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -409,11 +277,9 @@
       "description": "Triggers after one or more carbon monoxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -423,7 +289,6 @@
       "description": "Triggers after one or more carbon monoxide sensors start detecting carbon monoxide.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -433,7 +298,6 @@
       "description": "Triggers after one or more gas sensors stop detecting gas.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -443,7 +307,6 @@
       "description": "Triggers after one or more gas sensors start detecting gas.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -453,7 +316,6 @@
       "description": "Triggers after one or more nitrous oxide levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -463,11 +325,9 @@
       "description": "Triggers after one or more nitrous oxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -477,7 +337,6 @@
       "description": "Triggers after one or more nitrogen dioxide levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -487,11 +346,9 @@
       "description": "Triggers after one or more nitrogen dioxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -501,7 +358,6 @@
       "description": "Triggers after one or more nitrogen monoxide levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -511,11 +367,9 @@
       "description": "Triggers after one or more nitrogen monoxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -525,7 +379,6 @@
       "description": "Triggers after one or more ozone levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -535,11 +388,9 @@
       "description": "Triggers after one or more ozone levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -549,7 +400,6 @@
       "description": "Triggers after one or more PM10 levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -559,11 +409,9 @@
       "description": "Triggers after one or more PM10 levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -573,7 +421,6 @@
       "description": "Triggers after one or more PM1 levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -583,11 +430,9 @@
       "description": "Triggers after one or more PM1 levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -597,7 +442,6 @@
       "description": "Triggers after one or more PM2.5 levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -607,11 +451,9 @@
       "description": "Triggers after one or more PM2.5 levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -621,7 +463,6 @@
       "description": "Triggers after one or more PM4 levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -631,11 +472,9 @@
       "description": "Triggers after one or more PM4 levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -645,7 +484,6 @@
       "description": "Triggers after one or more smoke sensors stop detecting smoke.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -655,7 +493,6 @@
       "description": "Triggers after one or more smoke sensors start detecting smoke.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         }
       },
@@ -665,7 +502,6 @@
       "description": "Triggers after one or more sulphur dioxide levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -675,11 +511,9 @@
       "description": "Triggers after one or more sulphur dioxide levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -689,7 +523,6 @@
       "description": "Triggers after one or more volatile organic compound levels change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -699,11 +532,9 @@
       "description": "Triggers after one or more volatile organic compounds levels cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -713,7 +544,6 @@
       "description": "Triggers after one or more volatile organic compound ratios change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },
@@ -723,11 +553,9 @@
       "description": "Triggers after one or more volatile organic compounds ratios cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
           "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
         }
       },

homeassistant/components/air_quality/trigger.py

@@ -13,7 +13,7 @@ from homeassistant.const import (
     STATE_ON,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
+from homeassistant.helpers.automation import DomainSpec
 from homeassistant.helpers.trigger import (
     EntityTargetStateTriggerBase,
     Trigger,
@@ -64,28 +64,28 @@ TRIGGERS: dict[str, type[Trigger]] = {
     "smoke_cleared": _make_cleared_trigger(BinarySensorDeviceClass.SMOKE),
     # Numerical sensor triggers with unit conversion
     "co_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.CO)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         CarbonMonoxideConcentrationConverter,
     ),
     "co_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.CO)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         CarbonMonoxideConcentrationConverter,
     ),
     "ozone_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.OZONE)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.OZONE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         OzoneConcentrationConverter,
     ),
     "ozone_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.OZONE)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.OZONE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         OzoneConcentrationConverter,
     ),
     "voc_changed": make_entity_numerical_state_changed_with_unit_trigger(
         {
-            SENSOR_DOMAIN: NumericalDomainSpec(
+            SENSOR_DOMAIN: DomainSpec(
                 device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
             )
         },
@@ -94,7 +94,7 @@ TRIGGERS: dict[str, type[Trigger]] = {
     ),
     "voc_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
         {
-            SENSOR_DOMAIN: NumericalDomainSpec(
+            SENSOR_DOMAIN: DomainSpec(
                 device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
             )
         },
@@ -103,7 +103,7 @@ TRIGGERS: dict[str, type[Trigger]] = {
     ),
     "voc_ratio_changed": make_entity_numerical_state_changed_with_unit_trigger(
         {
-            SENSOR_DOMAIN: NumericalDomainSpec(
+            SENSOR_DOMAIN: DomainSpec(
                 device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
             )
         },
@@ -112,7 +112,7 @@ TRIGGERS: dict[str, type[Trigger]] = {
     ),
     "voc_ratio_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
         {
-            SENSOR_DOMAIN: NumericalDomainSpec(
+            SENSOR_DOMAIN: DomainSpec(
                 device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
             )
         },
@@ -120,114 +120,82 @@ TRIGGERS: dict[str, type[Trigger]] = {
         UnitlessRatioConverter,
     ),
     "no_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.NITROGEN_MONOXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_MONOXIDE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         NitrogenMonoxideConcentrationConverter,
     ),
     "no_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.NITROGEN_MONOXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_MONOXIDE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         NitrogenMonoxideConcentrationConverter,
     ),
     "no2_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.NITROGEN_DIOXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_DIOXIDE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         NitrogenDioxideConcentrationConverter,
     ),
     "no2_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.NITROGEN_DIOXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_DIOXIDE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         NitrogenDioxideConcentrationConverter,
     ),
     "so2_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.SULPHUR_DIOXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.SULPHUR_DIOXIDE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         SulphurDioxideConcentrationConverter,
     ),
     "so2_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.SULPHUR_DIOXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.SULPHUR_DIOXIDE)},
         CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         SulphurDioxideConcentrationConverter,
     ),
     # Numerical sensor triggers without unit conversion (single-unit device classes)
     "co2_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.CO2)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO2)},
         valid_unit=CONCENTRATION_PARTS_PER_MILLION,
     ),
     "co2_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.CO2)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO2)},
         valid_unit=CONCENTRATION_PARTS_PER_MILLION,
     ),
     "pm1_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM1)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM1)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "pm1_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM1)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM1)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "pm25_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM25)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM25)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "pm25_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM25)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM25)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "pm4_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM4)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM4)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "pm4_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM4)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM4)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "pm10_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM10)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM10)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "pm10_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.PM10)},
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM10)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "n2o_changed": make_entity_numerical_state_changed_trigger(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.NITROUS_OXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROUS_OXIDE)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
     "n2o_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {
-            SENSOR_DOMAIN: NumericalDomainSpec(
-                device_class=SensorDeviceClass.NITROUS_OXIDE
-            )
-        },
+        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROUS_OXIDE)},
         valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
 }

homeassistant/components/alarm_control_panel/strings.json

@@ -1,16 +1,13 @@
 {
   "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"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "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%]"
         }
       },
@@ -20,7 +17,6 @@
       "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%]"
         }
       },
@@ -30,7 +26,6 @@
       "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%]"
         }
       },
@@ -40,7 +35,6 @@
       "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%]"
         }
       },
@@ -50,7 +44,6 @@
       "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%]"
         }
       },
@@ -60,7 +53,6 @@
       "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%]"
         }
       },
@@ -70,7 +62,6 @@
       "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%]"
         }
       },
@@ -242,7 +233,6 @@
       "description": "Triggers after one or more alarms become armed, regardless of the mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -252,7 +242,6 @@
       "description": "Triggers after one or more alarms become armed in away mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -262,7 +251,6 @@
       "description": "Triggers after one or more alarms become armed in home mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -272,7 +260,6 @@
       "description": "Triggers after one or more alarms become armed in night mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -282,7 +269,6 @@
       "description": "Triggers after one or more alarms become armed in vacation mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -292,7 +278,6 @@
       "description": "Triggers after one or more alarms become disarmed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },
@@ -302,7 +287,6 @@
       "description": "Triggers after one or more alarms become triggered.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
           "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/alexa_devices/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["aioamazondevices"],
   "quality_scale": "platinum",
-  "requirements": ["aioamazondevices==13.3.0"]
+  "requirements": ["aioamazondevices==13.3.1"]
 }

homeassistant/components/analytics_insights/__init__.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 
 from python_homeassistant_analytics import (
+    Environment,
     HomeassistantAnalyticsClient,
     HomeassistantAnalyticsConnectionError,
 )
@@ -38,7 +39,7 @@ async def async_setup_entry(
     client = HomeassistantAnalyticsClient(session=async_get_clientsession(hass))
 
     try:
-        integrations = await client.get_integrations()
+        integrations = await client.get_integrations(Environment.NEXT)
     except HomeassistantAnalyticsConnectionError as ex:
         raise ConfigEntryNotReady("Could not fetch integration list") from ex
 

homeassistant/components/anglian_water/manifest.json

@@ -9,5 +9,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["pyanglianwater"],
   "quality_scale": "bronze",
-  "requirements": ["pyanglianwater==3.1.1"]
+  "requirements": ["pyanglianwater==3.1.2"]
 }

homeassistant/components/assist_satellite/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted Assist satellites.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted Assist satellites to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_idle": {
       "description": "Tests if one or more Assist satellites are idle.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more Assist satellites are listening.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
         }
       },
@@ -30,7 +26,6 @@
       "description": "Tests if one or more Assist satellites are processing.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
         }
       },
@@ -40,7 +35,6 @@
       "description": "Tests if one or more Assist satellites are responding.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::condition_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::condition_behavior_name%]"
         }
       },
@@ -165,7 +159,6 @@
       "description": "Triggers after one or more voice assistant satellites become idle after having processed a command.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },
@@ -175,7 +168,6 @@
       "description": "Triggers after one or more voice assistant satellites start listening for a command from someone.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },
@@ -185,7 +177,6 @@
       "description": "Triggers after one or more voice assistant satellites start processing a command after having heard it.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },
@@ -195,7 +186,6 @@
       "description": "Triggers after one or more voice assistant satellites start responding to a command after having processed it, or start announcing something.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
           "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/automation/__init__.py

@@ -122,7 +122,9 @@ _EXPERIMENTAL_CONDITION_PLATFORMS = {
     "alarm_control_panel",
     "assist_satellite",
     "battery",
+    "calendar",
     "climate",
+    "counter",
     "cover",
     "device_tracker",
     "door",
@@ -142,11 +144,14 @@ _EXPERIMENTAL_CONDITION_PLATFORMS = {
     "person",
     "power",
     "schedule",
+    "select",
     "siren",
     "switch",
     "temperature",
     "text",
+    "timer",
     "vacuum",
+    "valve",
     "water_heater",
     "window",
 }
@@ -155,6 +160,7 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "air_quality",
     "alarm_control_panel",
     "assist_satellite",
+    "battery",
     "button",
     "climate",
     "counter",
@@ -185,8 +191,10 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "switch",
     "temperature",
     "text",
+    "todo",
     "update",
     "vacuum",
+    "valve",
     "water_heater",
     "window",
 }

homeassistant/components/automation/strings.json

@@ -78,11 +78,11 @@
   "services": {
     "reload": {
       "description": "Reloads the automation configuration.",
-      "name": "[%key:common::action::reload%]"
+      "name": "Reload automations"
     },
     "toggle": {
       "description": "Toggles (enable / disable) an automation.",
-      "name": "[%key:common::action::toggle%]"
+      "name": "Toggle automation"
     },
     "trigger": {
       "description": "Triggers the actions of an automation.",
@@ -92,7 +92,7 @@
           "name": "Skip conditions"
         }
       },
-      "name": "Trigger"
+      "name": "Trigger automation"
     },
     "turn_off": {
       "description": "Disables an automation.",
@@ -102,11 +102,11 @@
           "name": "Stop actions"
         }
       },
-      "name": "[%key:common::action::turn_off%]"
+      "name": "Turn off automation"
     },
     "turn_on": {
       "description": "Enables an automation.",
-      "name": "[%key:common::action::turn_on%]"
+      "name": "Turn on automation"
     }
   },
   "title": "Automation"

homeassistant/components/battery/__init__.py

@@ -1,4 +1,4 @@
-"""Integration for battery conditions."""
+"""Integration for battery triggers and conditions."""
 
 from __future__ import annotations
 

homeassistant/components/battery/condition.py

@@ -6,7 +6,6 @@ from homeassistant.components.binary_sensor import (
     DOMAIN as BINARY_SENSOR_DOMAIN,
     BinarySensorDeviceClass,
 )
-from homeassistant.components.number import DOMAIN as NUMBER_DOMAIN, NumberDeviceClass
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
 from homeassistant.const import PERCENTAGE, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
@@ -27,7 +26,6 @@ BATTERY_CHARGING_DOMAIN_SPECS = {
 }
 BATTERY_PERCENTAGE_DOMAIN_SPECS = {
     SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.BATTERY),
-    NUMBER_DOMAIN: DomainSpec(device_class=NumberDeviceClass.BATTERY),
 }
 
 CONDITIONS: dict[str, type[Condition]] = {

homeassistant/components/battery/conditions.yaml

@@ -14,24 +14,19 @@
             - all
             - any
 
-.number_or_entity: &number_or_entity
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              unit_of_measurement: "%"
-        entity:
-          selector:
-            entity:
-              filter:
-                domain:
-                  - input_number
-                  - number
-                  - sensor
-      translation_key: number_or_entity
+.battery_threshold_entity: &battery_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "%"
+  - domain: sensor
+    device_class: battery
+  - domain: number
+    device_class: battery
+
+.battery_threshold_number: &battery_threshold_number
+  min: 0
+  max: 100
+  mode: box
+  unit_of_measurement: "%"
 
 is_low: *condition_common
 
@@ -58,9 +53,12 @@ is_level:
     entity:
       - domain: sensor
         device_class: battery
-      - domain: number
-        device_class: battery
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity
-    below: *number_or_entity
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *battery_threshold_entity
+          mode: is
+          number: *battery_threshold_number

homeassistant/components/battery/icons.json

@@ -15,5 +15,25 @@
     "is_not_low": {
       "condition": "mdi:battery"
     }
+  },
+  "triggers": {
+    "level_changed": {
+      "trigger": "mdi:battery-unknown"
+    },
+    "level_crossed_threshold": {
+      "trigger": "mdi:battery-alert"
+    },
+    "low": {
+      "trigger": "mdi:battery-alert"
+    },
+    "not_low": {
+      "trigger": "mdi:battery"
+    },
+    "started_charging": {
+      "trigger": "mdi:battery-charging"
+    },
+    "stopped_charging": {
+      "trigger": "mdi:battery"
+    }
   }
 }

homeassistant/components/battery/strings.json

@@ -1,14 +1,15 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted batteries.",
-    "condition_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when",
+    "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
     "is_charging": {
       "description": "Tests if one or more batteries are charging.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
           "name": "[%key:component::battery::common::condition_behavior_name%]"
         }
       },
@@ -17,17 +18,11 @@
     "is_level": {
       "description": "Tests the battery level of one or more batteries.",
       "fields": {
-        "above": {
-          "description": "Require the battery percentage to be above this value.",
-          "name": "Above"
-        },
         "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
           "name": "[%key:component::battery::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "Require the battery percentage to be below this value.",
-          "name": "Below"
+        "threshold": {
+          "name": "[%key:component::battery::common::condition_threshold_name%]"
         }
       },
       "name": "Battery level"
@@ -36,7 +31,6 @@
       "description": "Tests if one or more batteries are low.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
           "name": "[%key:component::battery::common::condition_behavior_name%]"
         }
       },
@@ -46,7 +40,6 @@
       "description": "Tests if one or more batteries are not charging.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
           "name": "[%key:component::battery::common::condition_behavior_name%]"
         }
       },
@@ -56,7 +49,6 @@
       "description": "Tests if one or more batteries are not low.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
           "name": "[%key:component::battery::common::condition_behavior_name%]"
         }
       },
@@ -70,12 +62,72 @@
         "any": "Any"
       }
     },
-    "number_or_entity": {
-      "choices": {
-        "entity": "Entity",
-        "number": "Number"
+    "trigger_behavior": {
+      "options": {
+        "any": "Any",
+        "first": "First",
+        "last": "Last"
       }
     }
   },
-  "title": "Battery"
+  "title": "Battery",
+  "triggers": {
+    "level_changed": {
+      "description": "Triggers after the battery level of one or more batteries changes.",
+      "fields": {
+        "threshold": {
+          "name": "[%key:component::battery::common::trigger_threshold_name%]"
+        }
+      },
+      "name": "Battery level changed"
+    },
+    "level_crossed_threshold": {
+      "description": "Triggers after the battery level of one or more batteries crosses a threshold.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::battery::common::trigger_behavior_name%]"
+        },
+        "threshold": {
+          "name": "[%key:component::battery::common::trigger_threshold_name%]"
+        }
+      },
+      "name": "Battery level crossed threshold"
+    },
+    "low": {
+      "description": "Triggers after one or more batteries become low.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::battery::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Battery low"
+    },
+    "not_low": {
+      "description": "Triggers after one or more batteries are no longer low.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::battery::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Battery not low"
+    },
+    "started_charging": {
+      "description": "Triggers after one or more batteries start charging.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::battery::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Battery started charging"
+    },
+    "stopped_charging": {
+      "description": "Triggers after one or more batteries stop charging.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::battery::common::trigger_behavior_name%]"
+        }
+      },
+      "name": "Battery stopped charging"
+    }
+  }
 }

homeassistant/components/battery/trigger.py

@@ -0,0 +1,54 @@
+"""Provides triggers for batteries."""
+
+from __future__ import annotations
+
+from homeassistant.components.binary_sensor import (
+    DOMAIN as BINARY_SENSOR_DOMAIN,
+    BinarySensorDeviceClass,
+)
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
+from homeassistant.const import STATE_OFF, STATE_ON
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.automation import DomainSpec
+from homeassistant.helpers.trigger import (
+    Trigger,
+    make_entity_numerical_state_changed_trigger,
+    make_entity_numerical_state_crossed_threshold_trigger,
+    make_entity_target_state_trigger,
+)
+
+BATTERY_LOW_DOMAIN_SPECS: dict[str, DomainSpec] = {
+    BINARY_SENSOR_DOMAIN: DomainSpec(device_class=BinarySensorDeviceClass.BATTERY),
+}
+
+BATTERY_CHARGING_DOMAIN_SPECS: dict[str, DomainSpec] = {
+    BINARY_SENSOR_DOMAIN: DomainSpec(
+        device_class=BinarySensorDeviceClass.BATTERY_CHARGING
+    ),
+}
+
+BATTERY_PERCENTAGE_DOMAIN_SPECS: dict[str, DomainSpec] = {
+    SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.BATTERY),
+}
+
+TRIGGERS: dict[str, type[Trigger]] = {
+    "low": make_entity_target_state_trigger(BATTERY_LOW_DOMAIN_SPECS, STATE_ON),
+    "not_low": make_entity_target_state_trigger(BATTERY_LOW_DOMAIN_SPECS, STATE_OFF),
+    "started_charging": make_entity_target_state_trigger(
+        BATTERY_CHARGING_DOMAIN_SPECS, STATE_ON
+    ),
+    "stopped_charging": make_entity_target_state_trigger(
+        BATTERY_CHARGING_DOMAIN_SPECS, STATE_OFF
+    ),
+    "level_changed": make_entity_numerical_state_changed_trigger(
+        BATTERY_PERCENTAGE_DOMAIN_SPECS, valid_unit="%"
+    ),
+    "level_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
+        BATTERY_PERCENTAGE_DOMAIN_SPECS, valid_unit="%"
+    ),
+}
+
+
+async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
+    """Return the triggers for batteries."""
+    return TRIGGERS

homeassistant/components/battery/triggers.yaml

@@ -0,0 +1,83 @@
+.trigger_common_fields:
+  behavior: &trigger_behavior
+    required: true
+    default: any
+    selector:
+      select:
+        translation_key: trigger_behavior
+        options:
+          - first
+          - last
+          - any
+
+.battery_threshold_entity: &battery_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "%"
+  - domain: number
+    device_class: battery
+  - domain: sensor
+    device_class: battery
+
+.battery_threshold_number: &battery_threshold_number
+  min: 0
+  max: 100
+  mode: box
+  unit_of_measurement: "%"
+
+.trigger_target_battery: &trigger_target_battery
+  entity:
+    - domain: binary_sensor
+      device_class: battery
+
+.trigger_target_charging: &trigger_target_charging
+  entity:
+    - domain: binary_sensor
+      device_class: battery_charging
+
+.trigger_target_percentage: &trigger_target_percentage
+  entity:
+    - domain: sensor
+      device_class: battery
+
+low:
+  fields:
+    behavior: *trigger_behavior
+  target: *trigger_target_battery
+
+not_low:
+  fields:
+    behavior: *trigger_behavior
+  target: *trigger_target_battery
+
+started_charging:
+  fields:
+    behavior: *trigger_behavior
+  target: *trigger_target_charging
+
+stopped_charging:
+  fields:
+    behavior: *trigger_behavior
+  target: *trigger_target_charging
+
+level_changed:
+  target: *trigger_target_percentage
+  fields:
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *battery_threshold_entity
+          mode: changed
+          number: *battery_threshold_number
+
+level_crossed_threshold:
+  target: *trigger_target_percentage
+  fields:
+    behavior: *trigger_behavior
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *battery_threshold_entity
+          mode: crossed
+          number: *battery_threshold_number

homeassistant/components/bluesound/manifest.json

@@ -7,7 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/bluesound",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "requirements": ["pyblu==2.0.5"],
+  "requirements": ["pyblu==2.0.6"],
   "zeroconf": [
     {
       "type": "_musc._tcp.local."

homeassistant/components/calendar/condition.py

@@ -0,0 +1,16 @@
+"""Provides conditions for calendars."""
+
+from homeassistant.const import STATE_ON
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.condition import Condition, make_entity_state_condition
+
+from .const import DOMAIN
+
+CONDITIONS: dict[str, type[Condition]] = {
+    "is_event_active": make_entity_state_condition(DOMAIN, STATE_ON),
+}
+
+
+async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
+    """Return the calendar conditions."""
+    return CONDITIONS

homeassistant/components/calendar/conditions.yaml

@@ -0,0 +1,14 @@
+is_event_active:
+  target:
+    entity:
+      - domain: calendar
+  fields:
+    behavior:
+      required: true
+      default: any
+      selector:
+        select:
+          translation_key: condition_behavior
+          options:
+            - all
+            - any

homeassistant/components/calendar/icons.json

@@ -1,4 +1,9 @@
 {
+  "conditions": {
+    "is_event_active": {
+      "condition": "mdi:calendar-check"
+    }
+  },
   "entity_component": {
     "_": {
       "default": "mdi:calendar",

homeassistant/components/calendar/strings.json

@@ -1,4 +1,18 @@
 {
+  "common": {
+    "condition_behavior_name": "Condition passes if"
+  },
+  "conditions": {
+    "is_event_active": {
+      "description": "Tests if one or more calendars have an active event.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::calendar::common::condition_behavior_name%]"
+        }
+      },
+      "name": "Calendar event is active"
+    }
+  },
   "entity_component": {
     "_": {
       "name": "[%key:component::calendar::title%]",
@@ -46,6 +60,12 @@
     }
   },
   "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
     "trigger_offset_type": {
       "options": {
         "after": "After",

homeassistant/components/climate/condition.py

@@ -1,10 +1,18 @@
 """Provides conditions for climates."""
 
-from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
+from typing import TYPE_CHECKING
+
+import voluptuous as vol
+
+from homeassistant.const import ATTR_TEMPERATURE, CONF_OPTIONS, UnitOfTemperature
 from homeassistant.core import HomeAssistant, State
-from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.automation import DomainSpec
 from homeassistant.helpers.condition import (
+    ENTITY_STATE_CONDITION_SCHEMA_ANY_ALL,
     Condition,
+    ConditionConfig,
+    EntityConditionBase,
     EntityNumericalConditionWithUnitBase,
     make_entity_numerical_condition,
     make_entity_state_condition,
@@ -13,12 +21,42 @@ from homeassistant.util.unit_conversion import TemperatureConverter
 
 from .const import ATTR_HUMIDITY, ATTR_HVAC_ACTION, DOMAIN, HVACAction, HVACMode
 
+CONF_HVAC_MODE = "hvac_mode"
+
+_HVAC_MODE_CONDITION_SCHEMA = ENTITY_STATE_CONDITION_SCHEMA_ANY_ALL.extend(
+    {
+        vol.Required(CONF_OPTIONS): {
+            vol.Required(CONF_HVAC_MODE): vol.All(
+                cv.ensure_list, vol.Length(min=1), [vol.Coerce(HVACMode)]
+            ),
+        },
+    }
+)
+
+
+class ClimateHVACModeCondition(EntityConditionBase):
+    """Condition for climate HVAC mode."""
+
+    _domain_specs = {DOMAIN: DomainSpec()}
+    _schema = _HVAC_MODE_CONDITION_SCHEMA
+
+    def __init__(self, hass: HomeAssistant, config: ConditionConfig) -> None:
+        """Initialize the HVAC mode condition."""
+        super().__init__(hass, config)
+        if TYPE_CHECKING:
+            assert config.options is not None
+        self._hvac_modes: set[str] = set(config.options[CONF_HVAC_MODE])
+
+    def is_valid_state(self, entity_state: State) -> bool:
+        """Check if the state matches any of the expected HVAC modes."""
+        return entity_state.state in self._hvac_modes
+
 
 class ClimateTargetTemperatureCondition(EntityNumericalConditionWithUnitBase):
     """Mixin for climate target temperature conditions with unit conversion."""
 
     _base_unit = UnitOfTemperature.CELSIUS
-    _domain_specs = {DOMAIN: NumericalDomainSpec(value_source=ATTR_TEMPERATURE)}
+    _domain_specs = {DOMAIN: DomainSpec(value_source=ATTR_TEMPERATURE)}
     _unit_converter = TemperatureConverter
 
     def _get_entity_unit(self, entity_state: State) -> str | None:
@@ -28,6 +66,7 @@ class ClimateTargetTemperatureCondition(EntityNumericalConditionWithUnitBase):
 
 
 CONDITIONS: dict[str, type[Condition]] = {
+    "is_hvac_mode": ClimateHVACModeCondition,
     "is_off": make_entity_state_condition(DOMAIN, HVACMode.OFF),
     "is_on": make_entity_state_condition(
         DOMAIN,
@@ -50,7 +89,7 @@ CONDITIONS: dict[str, type[Condition]] = {
         {DOMAIN: DomainSpec(value_source=ATTR_HVAC_ACTION)}, HVACAction.HEATING
     ),
     "target_humidity": make_entity_numerical_condition(
-        {DOMAIN: NumericalDomainSpec(value_source=ATTR_HUMIDITY)},
+        {DOMAIN: DomainSpec(value_source=ATTR_HUMIDITY)},
         valid_unit="%",
     ),
     "target_temperature": ClimateTargetTemperatureCondition,

homeassistant/components/climate/conditions.yaml

@@ -13,58 +13,31 @@
             - all
             - any
 
-.number_or_entity_humidity: &number_or_entity_humidity
-  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
+.humidity_threshold_entity: &humidity_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "%"
+  - domain: sensor
+    device_class: humidity
+  - domain: number
+    device_class: humidity
 
-.number_or_entity_temperature: &number_or_entity_temperature
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              mode: box
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement:
-                    - "°C"
-                    - "°F"
-                - domain: sensor
-                  device_class: temperature
-                - domain: number
-                  device_class: temperature
-      translation_key: number_or_entity
+.humidity_threshold_number: &humidity_threshold_number
+  min: 0
+  max: 100
+  mode: box
+  unit_of_measurement: "%"
 
-.condition_unit_temperature: &condition_unit_temperature
-  required: false
-  selector:
-    select:
-      options:
-        - "°C"
-        - "°F"
+.temperature_units: &temperature_units
+  - "°C"
+  - "°F"
+
+.temperature_threshold_entity: &temperature_threshold_entity
+  - domain: input_number
+    unit_of_measurement: *temperature_units
+  - domain: sensor
+    device_class: temperature
+  - domain: number
+    device_class: temperature
 
 is_off: *condition_common
 is_on: *condition_common
@@ -72,17 +45,43 @@ is_cooling: *condition_common
 is_drying: *condition_common
 is_heating: *condition_common
 
+is_hvac_mode:
+  target: *condition_climate_target
+  fields:
+    behavior: *condition_behavior
+    hvac_mode:
+      context:
+        filter_target: target
+      required: true
+      selector:
+        state:
+          hide_states:
+            - unavailable
+            - unknown
+          multiple: true
+
 target_humidity:
   target: *condition_climate_target
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_humidity
-    below: *number_or_entity_humidity
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *humidity_threshold_entity
+          mode: is
+          number: *humidity_threshold_number
 
 target_temperature:
   target: *condition_climate_target
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity_temperature
-    below: *number_or_entity_temperature
-    unit: *condition_unit_temperature
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *temperature_threshold_entity
+          mode: is
+          number:
+            mode: box
+          unit_of_measurement: *temperature_units

homeassistant/components/climate/icons.json

@@ -9,6 +9,9 @@
     "is_heating": {
       "condition": "mdi:fire"
     },
+    "is_hvac_mode": {
+      "condition": "mdi:thermostat"
+    },
     "is_off": {
       "condition": "mdi:power-off"
     },

homeassistant/components/climate/strings.json

@@ -1,19 +1,15 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted climate-control devices.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted climates to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when",
+    "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
     "is_cooling": {
       "description": "Tests if one or more climate-control devices are cooling.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         }
       },
@@ -23,7 +19,6 @@
       "description": "Tests if one or more climate-control devices are drying.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         }
       },
@@ -33,17 +28,28 @@
       "description": "Tests if one or more climate-control devices are heating.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         }
       },
       "name": "Climate-control device is heating"
     },
+    "is_hvac_mode": {
+      "description": "Tests if one or more climate-control devices are set to a specific HVAC mode.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::climate::common::condition_behavior_name%]"
+        },
+        "hvac_mode": {
+          "description": "The HVAC modes to test for.",
+          "name": "Modes"
+        }
+      },
+      "name": "Climate-control device HVAC mode"
+    },
     "is_off": {
       "description": "Tests if one or more climate-control devices are off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         }
       },
@@ -53,7 +59,6 @@
       "description": "Tests if one or more climate-control devices are on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         }
       },
@@ -62,17 +67,11 @@
     "target_humidity": {
       "description": "Tests the humidity setpoint of one or more climate-control devices.",
       "fields": {
-        "above": {
-          "description": "Require the target humidity to be above this value.",
-          "name": "Above"
-        },
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "Require the target humidity to be below this value.",
-          "name": "Below"
+        "threshold": {
+          "name": "[%key:component::climate::common::condition_threshold_name%]"
         }
       },
       "name": "Climate-control device target humidity"
@@ -80,21 +79,11 @@
     "target_temperature": {
       "description": "Tests the temperature setpoint of one or more climate-control devices.",
       "fields": {
-        "above": {
-          "description": "Require the target temperature to be above this value.",
-          "name": "Above"
-        },
         "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
           "name": "[%key:component::climate::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "Require the target temperature to be below this value.",
-          "name": "Below"
-        },
-        "unit": {
-          "description": "All values will be converted to this unit when evaluating the condition.",
-          "name": "Unit of measurement"
+        "threshold": {
+          "name": "[%key:component::climate::common::condition_threshold_name%]"
         }
       },
       "name": "Climate-control device target temperature"
@@ -284,12 +273,6 @@
         "any": "Any"
       }
     },
-    "number_or_entity": {
-      "choices": {
-        "entity": "Entity",
-        "number": "Number"
-      }
-    },
     "trigger_behavior": {
       "options": {
         "any": "Any",
@@ -400,7 +383,6 @@
       "description": "Triggers after the mode of one or more climate-control devices changes.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
         "hvac_mode": {
@@ -414,7 +396,6 @@
       "description": "Triggers after one or more climate-control devices start cooling.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
@@ -424,7 +405,6 @@
       "description": "Triggers after one or more climate-control devices start drying.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
@@ -434,7 +414,6 @@
       "description": "Triggers after one or more climate-control devices start heating.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
@@ -444,7 +423,6 @@
       "description": "Triggers after the humidity setpoint of one or more climate-control devices changes.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
       },
@@ -454,11 +432,9 @@
       "description": "Triggers after the humidity setpoint of one or more climate-control devices crosses a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
       },
@@ -468,7 +444,6 @@
       "description": "Triggers after the temperature setpoint of one or more climate-control devices changes.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
       },
@@ -478,11 +453,9 @@
       "description": "Triggers after the temperature setpoint of one or more climate-control devices crosses a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::climate::common::trigger_threshold_name%]"
         }
       },
@@ -492,7 +465,6 @@
       "description": "Triggers after one or more climate-control devices turn off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },
@@ -502,7 +474,6 @@
       "description": "Triggers after one or more climate-control devices turn on, regardless of the mode.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/climate/trigger.py

@@ -5,7 +5,7 @@ import voluptuous as vol
 from homeassistant.const import ATTR_TEMPERATURE, CONF_OPTIONS, UnitOfTemperature
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
+from homeassistant.helpers.automation import DomainSpec
 from homeassistant.helpers.trigger import (
     ENTITY_STATE_TRIGGER_SCHEMA_FIRST_LAST,
     EntityNumericalStateChangedTriggerWithUnitBase,
@@ -52,7 +52,7 @@ class _ClimateTargetTemperatureTriggerMixin(EntityNumericalStateTriggerWithUnitB
     """Mixin for climate target temperature triggers with unit conversion."""
 
     _base_unit = UnitOfTemperature.CELSIUS
-    _domain_specs = {DOMAIN: NumericalDomainSpec(value_source=ATTR_TEMPERATURE)}
+    _domain_specs = {DOMAIN: DomainSpec(value_source=ATTR_TEMPERATURE)}
     _unit_converter = TemperatureConverter
 
     def _get_entity_unit(self, state: State) -> str | None:
@@ -84,11 +84,11 @@ TRIGGERS: dict[str, type[Trigger]] = {
         {DOMAIN: DomainSpec(value_source=ATTR_HVAC_ACTION)}, HVACAction.DRYING
     ),
     "target_humidity_changed": make_entity_numerical_state_changed_trigger(
-        {DOMAIN: NumericalDomainSpec(value_source=ATTR_HUMIDITY)},
+        {DOMAIN: DomainSpec(value_source=ATTR_HUMIDITY)},
         valid_unit="%",
     ),
     "target_humidity_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {DOMAIN: NumericalDomainSpec(value_source=ATTR_HUMIDITY)},
+        {DOMAIN: DomainSpec(value_source=ATTR_HUMIDITY)},
         valid_unit="%",
     ),
     "target_temperature_changed": ClimateTargetTemperatureChangedTrigger,

homeassistant/components/cloud/strings.json

@@ -75,11 +75,11 @@
   "services": {
     "remote_connect": {
       "description": "Makes the instance UI accessible from outside of the local network by enabling your Home Assistant Cloud connection.",
-      "name": "Enable remote access"
+      "name": "Enable Home Assistant Cloud remote access"
     },
     "remote_disconnect": {
       "description": "Disconnects the instance UI from Home Assistant Cloud. This disables access to it from outside your local network.",
-      "name": "Disable remote access"
+      "name": "Disable Home Assistant Cloud remote access"
     }
   },
   "system_health": {

homeassistant/components/conversation/strings.json

@@ -6,7 +6,7 @@
   },
   "services": {
     "process": {
-      "description": "Launches a conversation from a transcribed text.",
+      "description": "Sends text to a conversation agent for processing.",
       "fields": {
         "agent_id": {
           "description": "Conversation agent to process your request. The conversation agent is the brains of your assistant. It processes the incoming text commands.",
@@ -25,10 +25,10 @@
           "name": "Text"
         }
       },
-      "name": "Process"
+      "name": "Process conversation"
     },
     "reload": {
-      "description": "Reloads the intent configuration.",
+      "description": "Reloads the intent configuration of conversation agents.",
       "fields": {
         "agent_id": {
           "description": "Conversation agent to reload.",
@@ -39,7 +39,7 @@
           "name": "[%key:common::config_flow::data::language%]"
         }
       },
-      "name": "[%key:common::action::reload%]"
+      "name": "Reload conversation agents"
     }
   },
   "title": "Conversation"

homeassistant/components/counter/condition.py

@@ -0,0 +1,15 @@
+"""Provides conditions for counters."""
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.condition import Condition, make_entity_numerical_condition
+
+DOMAIN = "counter"
+
+CONDITIONS: dict[str, type[Condition]] = {
+    "is_value": make_entity_numerical_condition(DOMAIN),
+}
+
+
+async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
+    """Return the conditions for counters."""
+    return CONDITIONS

homeassistant/components/counter/conditions.yaml

@@ -0,0 +1,25 @@
+is_value:
+  target:
+    entity:
+      - domain: counter
+  fields:
+    behavior:
+      required: true
+      default: any
+      selector:
+        select:
+          translation_key: condition_behavior
+          options:
+            - all
+            - any
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity:
+            - domain: counter
+            - domain: input_number
+            - domain: number
+          mode: is
+          number:
+            mode: box

homeassistant/components/counter/icons.json

@@ -1,4 +1,9 @@
 {
+  "conditions": {
+    "is_value": {
+      "condition": "mdi:counter"
+    }
+  },
   "services": {
     "decrement": {
       "service": "mdi:numeric-negative-1"

homeassistant/components/counter/strings.json

@@ -1,7 +1,20 @@
 {
   "common": {
-    "trigger_behavior_description": "The behavior of the targeted counters to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "trigger_behavior_name": "Trigger when"
+  },
+  "conditions": {
+    "is_value": {
+      "description": "Tests the value of one or more counters.",
+      "fields": {
+        "behavior": {
+          "name": "Condition passes if"
+        },
+        "threshold": {
+          "name": "Threshold type"
+        }
+      },
+      "name": "Counter value"
+    }
   },
   "entity_component": {
     "_": {
@@ -30,6 +43,12 @@
     }
   },
   "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
     "trigger_behavior": {
       "options": {
         "any": "Any",
@@ -41,25 +60,25 @@
   "services": {
     "decrement": {
       "description": "Decrements a counter by its step size.",
-      "name": "Decrement"
+      "name": "Decrement counter"
     },
     "increment": {
       "description": "Increments a counter by its step size.",
-      "name": "Increment"
+      "name": "Increment counter"
     },
     "reset": {
       "description": "Resets a counter to its initial value.",
-      "name": "Reset"
+      "name": "Reset counter"
     },
     "set_value": {
-      "description": "Sets the counter to a specific value.",
+      "description": "Sets a counter to a specific value.",
       "fields": {
         "value": {
           "description": "The new counter value the entity should be set to.",
           "name": "Value"
         }
       },
-      "name": "Set"
+      "name": "Set counter value"
     }
   },
   "title": "Counter",
@@ -76,7 +95,6 @@
       "description": "Triggers after one or more counters reach their maximum value.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::counter::common::trigger_behavior_description%]",
           "name": "[%key:component::counter::common::trigger_behavior_name%]"
         }
       },
@@ -86,7 +104,6 @@
       "description": "Triggers after one or more counters reach their minimum value.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::counter::common::trigger_behavior_description%]",
           "name": "[%key:component::counter::common::trigger_behavior_name%]"
         }
       },
@@ -96,7 +113,6 @@
       "description": "Triggers after one or more counters are reset.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::counter::common::trigger_behavior_description%]",
           "name": "[%key:component::counter::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/cover/condition.py

@@ -1,5 +1,7 @@
 """Provides conditions for covers."""
 
+from collections.abc import Mapping
+
 from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers.condition import Condition, EntityConditionBase
@@ -8,9 +10,11 @@ from .const import ATTR_IS_CLOSED, DOMAIN, CoverDeviceClass
 from .models import CoverDomainSpec
 
 
-class CoverConditionBase(EntityConditionBase[CoverDomainSpec]):
+class CoverConditionBase(EntityConditionBase):
     """Base condition for cover state checks."""
 
+    _domain_specs: Mapping[str, CoverDomainSpec]
+
     def is_valid_state(self, entity_state: State) -> bool:
         """Check if the state matches the expected cover state."""
         domain_spec = self._domain_specs[entity_state.domain]

homeassistant/components/cover/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted covers.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted covers to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "awning_is_closed": {
       "description": "Tests if one or more awnings are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more awnings are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -30,7 +26,6 @@
       "description": "Tests if one or more blinds are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -40,7 +35,6 @@
       "description": "Tests if one or more blinds are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -50,7 +44,6 @@
       "description": "Tests if one or more curtains are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -60,7 +53,6 @@
       "description": "Tests if one or more curtains are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -70,7 +62,6 @@
       "description": "Tests if one or more shades are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -80,7 +71,6 @@
       "description": "Tests if one or more shades are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -90,7 +80,6 @@
       "description": "Tests if one or more shutters are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -100,7 +89,6 @@
       "description": "Tests if one or more shutters are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::condition_behavior_description%]",
           "name": "[%key:component::cover::common::condition_behavior_name%]"
         }
       },
@@ -265,7 +253,6 @@
       "description": "Triggers after one or more awnings close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -275,7 +262,6 @@
       "description": "Triggers after one or more awnings open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -285,7 +271,6 @@
       "description": "Triggers after one or more blinds close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -295,7 +280,6 @@
       "description": "Triggers after one or more blinds open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -305,7 +289,6 @@
       "description": "Triggers after one or more curtains close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -315,7 +298,6 @@
       "description": "Triggers after one or more curtains open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -325,7 +307,6 @@
       "description": "Triggers after one or more shades close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -335,7 +316,6 @@
       "description": "Triggers after one or more shades open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -345,7 +325,6 @@
       "description": "Triggers after one or more shutters close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },
@@ -355,7 +334,6 @@
       "description": "Triggers after one or more shutters open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::cover::common::trigger_behavior_description%]",
           "name": "[%key:component::cover::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/cover/trigger.py

@@ -1,5 +1,7 @@
 """Provides triggers for covers."""
 
+from collections.abc import Mapping
+
 from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE, STATE_UNKNOWN
 from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers.trigger import EntityTriggerBase, Trigger
@@ -8,9 +10,11 @@ from .const import ATTR_IS_CLOSED, DOMAIN, CoverDeviceClass
 from .models import CoverDomainSpec
 
 
-class CoverTriggerBase(EntityTriggerBase[CoverDomainSpec]):
+class CoverTriggerBase(EntityTriggerBase):
     """Base trigger for cover state changes."""
 
+    _domain_specs: Mapping[str, CoverDomainSpec]
+
     def _get_value(self, state: State) -> str | bool | None:
         """Extract the relevant value from state based on domain spec."""
         domain_spec = self._domain_specs[state.domain]

homeassistant/components/date/strings.json

@@ -6,7 +6,7 @@
   },
   "services": {
     "set_value": {
-      "description": "Sets the date.",
+      "description": "Sets the value of a date.",
       "fields": {
         "date": {
           "description": "The date to set.",

homeassistant/components/datetime/strings.json

@@ -6,7 +6,7 @@
   },
   "services": {
     "set_value": {
-      "description": "Sets the date/time for a datetime entity.",
+      "description": "Sets the value of a date/time.",
       "fields": {
         "datetime": {
           "description": "The date/time to set. The time zone of the Home Assistant instance is assumed.",

homeassistant/components/device_tracker/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted device trackers.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted device trackers to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_home": {
       "description": "Tests if one or more device trackers are home.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::device_tracker::common::condition_behavior_description%]",
           "name": "[%key:component::device_tracker::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more device trackers are not home.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::device_tracker::common::condition_behavior_description%]",
           "name": "[%key:component::device_tracker::common::condition_behavior_name%]"
         }
       },
@@ -120,7 +116,7 @@
           "name": "MAC address"
         }
       },
-      "name": "See"
+      "name": "See device tracker"
     }
   },
   "title": "Device tracker",
@@ -129,7 +125,6 @@
       "description": "Triggers when one or more device trackers enter home.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::device_tracker::common::trigger_behavior_description%]",
           "name": "[%key:component::device_tracker::common::trigger_behavior_name%]"
         }
       },
@@ -139,7 +134,6 @@
       "description": "Triggers when one or more device trackers leave home.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::device_tracker::common::trigger_behavior_description%]",
           "name": "[%key:component::device_tracker::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/diagnostics/util.py

@@ -51,7 +51,6 @@ def _entity_entry_filter(a: attr.Attribute, _: Any) -> bool:
     return a.name not in (
         "_cache",
         "compat_aliases",
-        "compat_name",
         "original_name_unprefixed",
     )
 

homeassistant/components/door/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted doors.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted doors to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_closed": {
       "description": "Tests if one or more doors are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::door::common::condition_behavior_description%]",
           "name": "[%key:component::door::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more doors are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::door::common::condition_behavior_description%]",
           "name": "[%key:component::door::common::condition_behavior_name%]"
         }
       },
@@ -48,7 +44,6 @@
       "description": "Triggers after one or more doors close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::door::common::trigger_behavior_description%]",
           "name": "[%key:component::door::common::trigger_behavior_name%]"
         }
       },
@@ -58,7 +53,6 @@
       "description": "Triggers after one or more doors open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::door::common::trigger_behavior_description%]",
           "name": "[%key:component::door::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/econet/water_heater.py

@@ -45,6 +45,13 @@ SUPPORT_FLAGS_HEATER = (
 )
 
 
+def _operation_mode_to_ha(mode: WaterHeaterOperationMode | None) -> str:
+    """Translate an EcoNet operation mode to a Home Assistant state."""
+    if mode in (None, WaterHeaterOperationMode.VACATION):
+        return STATE_OFF
+    return ECONET_STATE_TO_HA[mode]
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: EconetConfigEntry,
@@ -80,26 +87,22 @@ class EcoNetWaterHeater(EcoNetEntity[WaterHeater], WaterHeaterEntity):
     @property
     def current_operation(self) -> str:
         """Return current operation."""
-        econet_mode = self.water_heater.mode
-        _current_op = STATE_OFF
-        if econet_mode is not None:
-            _current_op = ECONET_STATE_TO_HA[econet_mode]
-
-        return _current_op
+        return _operation_mode_to_ha(self.water_heater.mode)
 
     @property
     def operation_list(self) -> list[str]:
         """List of available operation modes."""
-        econet_modes = self.water_heater.modes
-        operation_modes = set()
-        for mode in econet_modes:
-            if (
-                mode is not WaterHeaterOperationMode.UNKNOWN
-                and mode is not WaterHeaterOperationMode.VACATION
-            ):
-                ha_mode = ECONET_STATE_TO_HA[mode]
-                operation_modes.add(ha_mode)
-        return list(operation_modes)
+        return list(
+            dict.fromkeys(
+                ECONET_STATE_TO_HA[mode]
+                for mode in self.water_heater.modes
+                if mode
+                not in (
+                    WaterHeaterOperationMode.UNKNOWN,
+                    WaterHeaterOperationMode.VACATION,
+                )
+            )
+        )
 
     @property
     def supported_features(self) -> WaterHeaterEntityFeature:

homeassistant/components/emulated_kasa/manifest.json

@@ -6,5 +6,5 @@
   "iot_class": "local_push",
   "loggers": ["sense_energy"],
   "quality_scale": "internal",
-  "requirements": ["sense-energy==0.13.8"]
+  "requirements": ["sense-energy==0.14.0"]
 }

homeassistant/components/fan/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted fans.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted fans to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_off": {
       "description": "Tests if one or more fans are off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::fan::common::condition_behavior_description%]",
           "name": "[%key:component::fan::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more fans are on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::fan::common::condition_behavior_description%]",
           "name": "[%key:component::fan::common::condition_behavior_name%]"
         }
       },
@@ -199,7 +195,6 @@
       "description": "Triggers after one or more fans turn off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::fan::common::trigger_behavior_description%]",
           "name": "[%key:component::fan::common::trigger_behavior_name%]"
         }
       },
@@ -209,7 +204,6 @@
       "description": "Triggers after one or more fans turn on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::fan::common::trigger_behavior_description%]",
           "name": "[%key:component::fan::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/fing/config_flow.py

@@ -10,6 +10,7 @@ import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_API_KEY, CONF_IP_ADDRESS, CONF_PORT
+from homeassistant.helpers.httpx_client import get_async_client
 
 from .const import DOMAIN, UPNP_AVAILABLE
 
@@ -40,6 +41,7 @@ class FingConfigFlow(ConfigFlow, domain=DOMAIN):
                 ip=user_input[CONF_IP_ADDRESS],
                 port=int(user_input[CONF_PORT]),
                 key=user_input[CONF_API_KEY],
+                client=get_async_client(self.hass),
             )
 
             try:

homeassistant/components/fing/coordinator.py

@@ -11,6 +11,7 @@ import httpx
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_IP_ADDRESS, CONF_PORT
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.httpx_client import get_async_client
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN, UPNP_AVAILABLE
@@ -38,6 +39,7 @@ class FingDataUpdateCoordinator(DataUpdateCoordinator[FingDataObject]):
             ip=config_entry.data[CONF_IP_ADDRESS],
             port=int(config_entry.data[CONF_PORT]),
             key=config_entry.data[CONF_API_KEY],
+            client=get_async_client(hass),
         )
         self._upnp_available = config_entry.data[UPNP_AVAILABLE]
         update_interval = timedelta(seconds=30)

homeassistant/components/fing/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "local_polling",
   "quality_scale": "bronze",
-  "requirements": ["fing_agent_api==1.0.3"]
+  "requirements": ["fing_agent_api==1.1.0"]
 }

homeassistant/components/fing/quality_scale.yaml

@@ -68,5 +68,5 @@ rules:
 
   # Platinum
   async-dependency: todo
-  inject-websession: todo
+  inject-websession: done
   strict-typing: todo

homeassistant/components/frontend/manifest.json

@@ -21,5 +21,5 @@
   "integration_type": "system",
   "preview_features": { "winter_mode": {} },
   "quality_scale": "internal",
-  "requirements": ["home-assistant-frontend==20260325.0"]
+  "requirements": ["home-assistant-frontend==20260325.4"]
 }

homeassistant/components/garage_door/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted garage doors.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted garage doors to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_closed": {
       "description": "Tests if one or more garage doors are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::garage_door::common::condition_behavior_description%]",
           "name": "[%key:component::garage_door::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more garage doors are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::garage_door::common::condition_behavior_description%]",
           "name": "[%key:component::garage_door::common::condition_behavior_name%]"
         }
       },
@@ -48,7 +44,6 @@
       "description": "Triggers after one or more garage doors close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::garage_door::common::trigger_behavior_description%]",
           "name": "[%key:component::garage_door::common::trigger_behavior_name%]"
         }
       },
@@ -58,7 +53,6 @@
       "description": "Triggers after one or more garage doors open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::garage_door::common::trigger_behavior_description%]",
           "name": "[%key:component::garage_door::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/gate/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted gates.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted gates to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_closed": {
       "description": "Tests if one or more gates are closed.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::gate::common::condition_behavior_description%]",
           "name": "[%key:component::gate::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more gates are open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::gate::common::condition_behavior_description%]",
           "name": "[%key:component::gate::common::condition_behavior_name%]"
         }
       },
@@ -48,7 +44,6 @@
       "description": "Triggers after one or more gates close.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::gate::common::trigger_behavior_description%]",
           "name": "[%key:component::gate::common::trigger_behavior_name%]"
         }
       },
@@ -58,7 +53,6 @@
       "description": "Triggers after one or more gates open.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::gate::common::trigger_behavior_description%]",
           "name": "[%key:component::gate::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/gentex_homelink/__init__.py

@@ -7,7 +7,7 @@ from homelink.mqtt_provider import MQTTProvider
 
 from homeassistant.const import EVENT_HOMEASSISTANT_STOP, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import aiohttp_client, config_entry_oauth2_flow
 
 from . import oauth2
@@ -29,11 +29,17 @@ async def async_setup_entry(hass: HomeAssistant, entry: HomeLinkConfigEntry) ->
         hass, DOMAIN, auth_implementation
     )
 
-    implementation = (
-        await config_entry_oauth2_flow.async_get_config_entry_implementation(
-            hass, entry
+    try:
+        implementation = (
+            await config_entry_oauth2_flow.async_get_config_entry_implementation(
+                hass, entry
+            )
         )
-    )
+    except config_entry_oauth2_flow.ImplementationUnavailableError as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="oauth2_implementation_unavailable",
+        ) from err
 
     session = config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation)
     authenticated_session = oauth2.AsyncConfigEntryAuth(

homeassistant/components/gentex_homelink/strings.json

@@ -49,5 +49,10 @@
         }
       }
     }
+  },
+  "exceptions": {
+    "oauth2_implementation_unavailable": {
+      "message": "[%key:common::exceptions::oauth2_implementation_unavailable::message%]"
+    }
   }
 }

homeassistant/components/geocaching/__init__.py

@@ -2,11 +2,14 @@
 
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.config_entry_oauth2_flow import (
+    ImplementationUnavailableError,
     OAuth2Session,
     async_get_config_entry_implementation,
 )
 
+from .const import DOMAIN
 from .coordinator import GeocachingConfigEntry, GeocachingDataUpdateCoordinator
 
 PLATFORMS = [Platform.SENSOR]
@@ -14,7 +17,13 @@ PLATFORMS = [Platform.SENSOR]
 
 async def async_setup_entry(hass: HomeAssistant, entry: GeocachingConfigEntry) -> bool:
     """Set up Geocaching from a config entry."""
-    implementation = await async_get_config_entry_implementation(hass, entry)
+    try:
+        implementation = await async_get_config_entry_implementation(hass, entry)
+    except ImplementationUnavailableError as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="oauth2_implementation_unavailable",
+        ) from err
 
     oauth_session = OAuth2Session(hass, entry, implementation)
     coordinator = GeocachingDataUpdateCoordinator(

homeassistant/components/geocaching/strings.json

@@ -65,5 +65,10 @@
         "unit_of_measurement": "souvenirs"
       }
     }
+  },
+  "exceptions": {
+    "oauth2_implementation_unavailable": {
+      "message": "[%key:common::exceptions::oauth2_implementation_unavailable::message%]"
+    }
   }
 }

homeassistant/components/google_assistant_sdk/__init__.py

@@ -12,6 +12,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import config_validation as cv, discovery, intent
 from homeassistant.helpers.config_entry_oauth2_flow import (
+    ImplementationUnavailableError,
     OAuth2Session,
     async_get_config_entry_implementation,
 )
@@ -47,7 +48,13 @@ async def async_setup_entry(
     hass: HomeAssistant, entry: GoogleAssistantSDKConfigEntry
 ) -> bool:
     """Set up Google Assistant SDK from a config entry."""
-    implementation = await async_get_config_entry_implementation(hass, entry)
+    try:
+        implementation = await async_get_config_entry_implementation(hass, entry)
+    except ImplementationUnavailableError as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="oauth2_implementation_unavailable",
+        ) from err
     session = OAuth2Session(hass, entry, implementation)
     try:
         await session.async_ensure_token_valid()

homeassistant/components/google_assistant_sdk/strings.json

@@ -48,6 +48,9 @@
     "grpc_error": {
       "message": "Failed to communicate with Google Assistant"
     },
+    "oauth2_implementation_unavailable": {
+      "message": "[%key:common::exceptions::oauth2_implementation_unavailable::message%]"
+    },
     "reauth_required": {
       "message": "Credentials are invalid, re-authentication required"
     }

homeassistant/components/google_drive/backup.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import AsyncIterator, Callable, Coroutine
+from functools import wraps
 import logging
 from typing import Any
 
@@ -84,8 +85,22 @@ class GoogleDriveBackupAgent(BackupAgent):
         :param open_stream: A function returning an async iterator that yields bytes.
         :param backup: Metadata about the backup that should be uploaded.
         """
+
+        @wraps(open_stream)
+        async def wrapped_open_stream() -> AsyncIterator[bytes]:
+            stream = await open_stream()
+
+            async def _progress_stream() -> AsyncIterator[bytes]:
+                bytes_uploaded = 0
+                async for chunk in stream:
+                    yield chunk
+                    bytes_uploaded += len(chunk)
+                    on_progress(bytes_uploaded=bytes_uploaded)
+
+            return _progress_stream()
+
         try:
-            await self._client.async_upload_backup(open_stream, backup)
+            await self._client.async_upload_backup(wrapped_open_stream, backup)
         except (GoogleDriveApiError, HomeAssistantError, TimeoutError) as err:
             raise BackupAgentError(f"Failed to upload backup: {err}") from err
 

homeassistant/components/google_mail/__init__.py

@@ -5,8 +5,10 @@ from __future__ import annotations
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import config_validation as cv, discovery
 from homeassistant.helpers.config_entry_oauth2_flow import (
+    ImplementationUnavailableError,
     OAuth2Session,
     async_get_config_entry_implementation,
 )
@@ -34,7 +36,13 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
 async def async_setup_entry(hass: HomeAssistant, entry: GoogleMailConfigEntry) -> bool:
     """Set up Google Mail from a config entry."""
-    implementation = await async_get_config_entry_implementation(hass, entry)
+    try:
+        implementation = await async_get_config_entry_implementation(hass, entry)
+    except ImplementationUnavailableError as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="oauth2_implementation_unavailable",
+        ) from err
     session = OAuth2Session(hass, entry, implementation)
     auth = AsyncConfigEntryAuth(hass, session)
     await auth.check_and_refresh_token()

homeassistant/components/google_mail/strings.json

@@ -51,6 +51,9 @@
   "exceptions": {
     "missing_from_for_alias": {
       "message": "Missing 'from' email when setting an alias to show. You have to provide a 'from' email"
+    },
+    "oauth2_implementation_unavailable": {
+      "message": "[%key:common::exceptions::oauth2_implementation_unavailable::message%]"
     }
   },
   "services": {

homeassistant/components/google_sheets/__init__.py

@@ -15,6 +15,7 @@ from homeassistant.exceptions import (
 )
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.config_entry_oauth2_flow import (
+    ImplementationUnavailableError,
     OAuth2Session,
     async_get_config_entry_implementation,
 )
@@ -40,7 +41,13 @@ async def async_setup_entry(
     hass: HomeAssistant, entry: GoogleSheetsConfigEntry
 ) -> bool:
     """Set up Google Sheets from a config entry."""
-    implementation = await async_get_config_entry_implementation(hass, entry)
+    try:
+        implementation = await async_get_config_entry_implementation(hass, entry)
+    except ImplementationUnavailableError as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="oauth2_implementation_unavailable",
+        ) from err
     session = OAuth2Session(hass, entry, implementation)
     try:
         await session.async_ensure_token_valid()

homeassistant/components/google_sheets/strings.json

@@ -42,6 +42,11 @@
       }
     }
   },
+  "exceptions": {
+    "oauth2_implementation_unavailable": {
+      "message": "[%key:common::exceptions::oauth2_implementation_unavailable::message%]"
+    }
+  },
   "services": {
     "append_sheet": {
       "description": "Appends data to a worksheet in Google Sheets.",

homeassistant/components/google_tasks/__init__.py

@@ -25,11 +25,17 @@ PLATFORMS: list[Platform] = [Platform.TODO]
 
 async def async_setup_entry(hass: HomeAssistant, entry: GoogleTasksConfigEntry) -> bool:
     """Set up Google Tasks from a config entry."""
-    implementation = (
-        await config_entry_oauth2_flow.async_get_config_entry_implementation(
-            hass, entry
+    try:
+        implementation = (
+            await config_entry_oauth2_flow.async_get_config_entry_implementation(
+                hass, entry
+            )
         )
-    )
+    except config_entry_oauth2_flow.ImplementationUnavailableError as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="oauth2_implementation_unavailable",
+        ) from err
     session = config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation)
     auth = api.AsyncConfigEntryAuth(hass, session)
     try:

homeassistant/components/google_tasks/strings.json

@@ -42,5 +42,10 @@
         "title": "[%key:common::config_flow::title::reauth%]"
       }
     }
+  },
+  "exceptions": {
+    "oauth2_implementation_unavailable": {
+      "message": "[%key:common::exceptions::oauth2_implementation_unavailable::message%]"
+    }
   }
 }

homeassistant/components/group/strings.json

@@ -296,7 +296,7 @@
   "services": {
     "reload": {
       "description": "Reloads group configuration, entities, and notify services from YAML-configuration.",
-      "name": "[%key:common::action::reload%]"
+      "name": "Reload groups"
     },
     "remove": {
       "description": "Removes a group.",
@@ -306,10 +306,10 @@
           "name": "[%key:component::group::services::set::fields::object_id::name%]"
         }
       },
-      "name": "Remove"
+      "name": "Remove group"
     },
     "set": {
-      "description": "Creates/Updates a group.",
+      "description": "Creates or updates a group.",
       "fields": {
         "add_entities": {
           "description": "List of members to be added to the group. Cannot be used in combination with `Entities` or `Remove entities`.",
@@ -340,7 +340,7 @@
           "name": "Remove entities"
         }
       },
-      "name": "Set"
+      "name": "Set group"
     }
   },
   "title": "Group"

homeassistant/components/growatt_server/services.py

@@ -87,22 +87,26 @@ def _get_coordinator(
     return coordinators[serial_number]
 
 
-def _parse_time_str(time_str: str, field_name: str) -> time:
+def _parse_time_str(
+    time_str: str,
+    translation_key: str,
+    translation_placeholders: dict[str, str] | None = None,
+) -> time:
     """Parse a time string (HH:MM or HH:MM:SS) to a datetime.time object."""
     parts = time_str.split(":")
     if len(parts) not in (2, 3):
         raise ServiceValidationError(
             translation_domain=DOMAIN,
-            translation_key="invalid_time_format",
-            translation_placeholders={"field_name": field_name},
+            translation_key=translation_key,
+            translation_placeholders=translation_placeholders or {},
         )
     try:
         return datetime.strptime(f"{parts[0]}:{parts[1]}", "%H:%M").time()
     except (ValueError, IndexError) as err:
         raise ServiceValidationError(
             translation_domain=DOMAIN,
-            translation_key="invalid_time_format",
-            translation_placeholders={"field_name": field_name},
+            translation_key=translation_key,
+            translation_placeholders=translation_placeholders or {},
         ) from err
 
 
@@ -142,8 +146,8 @@ def async_setup_services(hass: HomeAssistant) -> None:
             )
         batt_mode: int = valid_modes[batt_mode_str]
 
-        start_time = _parse_time_str(start_time_str, "start_time")
-        end_time = _parse_time_str(end_time_str, "end_time")
+        start_time = _parse_time_str(start_time_str, "invalid_time_format_start_time")
+        end_time = _parse_time_str(end_time_str, "invalid_time_format_end_time")
 
         coordinator: GrowattCoordinator = _get_coordinator(hass, device_id, "min")
         await coordinator.update_time_segment(
@@ -192,11 +196,13 @@ def async_setup_services(hass: HomeAssistant) -> None:
             cached = current["periods"][i - 1]
             start = _parse_time_str(
                 call.data.get(f"period_{i}_start", cached["start_time"]),
-                f"period_{i}_start",
+                "invalid_time_format_period_start",
+                {"period": str(i)},
             )
             end = _parse_time_str(
                 call.data.get(f"period_{i}_end", cached["end_time"]),
-                f"period_{i}_end",
+                "invalid_time_format_period_end",
+                {"period": str(i)},
             )
             enabled: bool = call.data.get(f"period_{i}_enabled", cached["enabled"])
             periods.append({"start_time": start, "end_time": end, "enabled": enabled})
@@ -238,11 +244,13 @@ def async_setup_services(hass: HomeAssistant) -> None:
             cached = current["periods"][i - 1]
             start = _parse_time_str(
                 call.data.get(f"period_{i}_start", cached["start_time"]),
-                f"period_{i}_start",
+                "invalid_time_format_period_start",
+                {"period": str(i)},
             )
             end = _parse_time_str(
                 call.data.get(f"period_{i}_end", cached["end_time"]),
-                f"period_{i}_end",
+                "invalid_time_format_period_end",
+                {"period": str(i)},
             )
             enabled: bool = call.data.get(f"period_{i}_enabled", cached["enabled"])
             periods.append({"start_time": start, "end_time": end, "enabled": enabled})

homeassistant/components/growatt_server/strings.json

@@ -579,7 +579,7 @@
       "message": "Growatt API error: {error}"
     },
     "device_not_configured": {
-      "message": "{device_type} device {serial_number} is not configured for services."
+      "message": "{device_type} device {serial_number} is not configured for actions."
     },
     "device_not_found": {
       "message": "Device {device_id} not found in the device registry."
@@ -591,22 +591,31 @@
       "message": "{batt_mode} is not a valid battery mode. Allowed values: {allowed_modes}."
     },
     "invalid_charge_power": {
-      "message": "charge_power must be between 0 and 100, got {value}."
+      "message": "'Charge power' must be between 0 and 100, got {value}."
     },
     "invalid_charge_stop_soc": {
-      "message": "charge_stop_soc must be between 0 and 100, got {value}."
+      "message": "'Charge stop SOC' must be between 0 and 100, got {value}."
     },
     "invalid_discharge_power": {
-      "message": "discharge_power must be between 0 and 100, got {value}."
+      "message": "'Discharge power' must be between 0 and 100, got {value}."
     },
     "invalid_discharge_stop_soc": {
-      "message": "discharge_stop_soc must be between 0 and 100, got {value}."
+      "message": "'Discharge stop SOC' must be between 0 and 100, got {value}."
     },
     "invalid_segment_id": {
-      "message": "segment_id must be between 1 and 9, got {segment_id}."
+      "message": "'Segment ID' must be between 1 and 9, got {segment_id}."
     },
-    "invalid_time_format": {
-      "message": "{field_name} must be in HH:MM or HH:MM:SS format."
+    "invalid_time_format_end_time": {
+      "message": "'End time' must be in HH:MM or HH:MM:SS format."
+    },
+    "invalid_time_format_period_end": {
+      "message": "'Period {period} end' must be in HH:MM or HH:MM:SS format."
+    },
+    "invalid_time_format_period_start": {
+      "message": "'Period {period} start' must be in HH:MM or HH:MM:SS format."
+    },
+    "invalid_time_format_start_time": {
+      "message": "'Start time' must be in HH:MM or HH:MM:SS format."
     },
     "no_devices_configured": {
       "message": "No {device_type} devices with token authentication are configured. Actions require {device_type} devices with V1 API access."
@@ -636,27 +645,27 @@
   },
   "services": {
     "read_ac_charge_times": {
-      "description": "Read AC charge time periods from an SPH device.",
+      "description": "Reads AC charge time periods from an SPH device.",
       "fields": {
         "device_id": {
-          "description": "The Growatt SPH device to read from.",
-          "name": "Device"
+          "description": "[%key:component::growatt_server::services::read_time_segments::fields::device_id::description%]",
+          "name": "[%key:component::growatt_server::services::read_time_segments::fields::device_id::name%]"
         }
       },
       "name": "Read AC charge times"
     },
     "read_ac_discharge_times": {
-      "description": "Read AC discharge time periods from an SPH device.",
+      "description": "Reads AC discharge time periods from an SPH device.",
       "fields": {
         "device_id": {
-          "description": "[%key:component::growatt_server::services::read_ac_charge_times::fields::device_id::description%]",
-          "name": "[%key:component::growatt_server::services::read_ac_charge_times::fields::device_id::name%]"
+          "description": "[%key:component::growatt_server::services::read_time_segments::fields::device_id::description%]",
+          "name": "[%key:component::growatt_server::services::read_time_segments::fields::device_id::name%]"
         }
       },
       "name": "Read AC discharge times"
     },
     "read_time_segments": {
-      "description": "Read all time segments from a supported inverter.",
+      "description": "Reads all time segments from a supported inverter.",
       "fields": {
         "device_id": {
           "description": "The Growatt device to perform the action on.",
@@ -666,7 +675,7 @@
       "name": "Read time segments"
     },
     "update_time_segment": {
-      "description": "Update a time segment for supported inverters.",
+      "description": "Updates a time segment for supported inverters.",
       "fields": {
         "batt_mode": {
           "description": "Battery operation mode for this time segment.",
@@ -696,7 +705,7 @@
       "name": "Update time segment"
     },
     "write_ac_charge_times": {
-      "description": "Write AC charge time periods to an SPH device.",
+      "description": "Writes AC charge time periods to an SPH device.",
       "fields": {
         "charge_power": {
           "description": "Charge power limit (%).",
@@ -707,8 +716,8 @@
           "name": "Charge stop SOC"
         },
         "device_id": {
-          "description": "[%key:component::growatt_server::services::read_ac_charge_times::fields::device_id::description%]",
-          "name": "[%key:component::growatt_server::services::read_ac_charge_times::fields::device_id::name%]"
+          "description": "[%key:component::growatt_server::services::read_time_segments::fields::device_id::description%]",
+          "name": "[%key:component::growatt_server::services::read_time_segments::fields::device_id::name%]"
         },
         "mains_enabled": {
           "description": "Enable AC (mains) charging.",
@@ -754,11 +763,11 @@
       "name": "Write AC charge times"
     },
     "write_ac_discharge_times": {
-      "description": "Write AC discharge time periods to an SPH device.",
+      "description": "Writes AC discharge time periods to an SPH device.",
       "fields": {
         "device_id": {
-          "description": "[%key:component::growatt_server::services::read_ac_charge_times::fields::device_id::description%]",
-          "name": "[%key:component::growatt_server::services::read_ac_charge_times::fields::device_id::name%]"
+          "description": "[%key:component::growatt_server::services::read_time_segments::fields::device_id::description%]",
+          "name": "[%key:component::growatt_server::services::read_time_segments::fields::device_id::name%]"
         },
         "discharge_power": {
           "description": "Discharge power limit (%).",

homeassistant/components/habitica/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["habiticalib"],
   "quality_scale": "platinum",
-  "requirements": ["habiticalib==0.4.6"]
+  "requirements": ["habiticalib==0.4.7"]
 }

homeassistant/components/humidifier/condition.py

@@ -1,15 +1,73 @@
 """Provides conditions for humidifiers."""
 
-from homeassistant.const import PERCENTAGE, STATE_OFF, STATE_ON
+from typing import TYPE_CHECKING
+
+import voluptuous as vol
+
+from homeassistant.const import ATTR_MODE, CONF_OPTIONS, PERCENTAGE, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.automation import DomainSpec
 from homeassistant.helpers.condition import (
+    ENTITY_STATE_CONDITION_SCHEMA_ANY_ALL,
     Condition,
+    ConditionConfig,
+    EntityStateConditionBase,
     make_entity_numerical_condition,
     make_entity_state_condition,
 )
+from homeassistant.helpers.entity import get_supported_features
+
+from .const import (
+    ATTR_ACTION,
+    ATTR_HUMIDITY,
+    DOMAIN,
+    HumidifierAction,
+    HumidifierEntityFeature,
+)
+
+CONF_MODE = "mode"
+
+IS_MODE_CONDITION_SCHEMA = ENTITY_STATE_CONDITION_SCHEMA_ANY_ALL.extend(
+    {
+        vol.Required(CONF_OPTIONS): {
+            vol.Required(CONF_MODE): vol.All(cv.ensure_list, vol.Length(min=1), [str]),
+        },
+    }
+)
+
+
+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 IsModeCondition(EntityStateConditionBase):
+    """Condition for humidifier mode."""
+
+    _domain_specs = {DOMAIN: DomainSpec(value_source=ATTR_MODE)}
+    _schema = IS_MODE_CONDITION_SCHEMA
+
+    def __init__(self, hass: HomeAssistant, config: ConditionConfig) -> None:
+        """Initialize the mode condition."""
+        super().__init__(hass, config)
+        if TYPE_CHECKING:
+            assert config.options is not None
+        self._states = set(config.options[CONF_MODE])
+
+    def entity_filter(self, entities: set[str]) -> set[str]:
+        """Filter entities of this domain."""
+        entities = super().entity_filter(entities)
+        return {
+            entity_id
+            for entity_id in entities
+            if _supports_feature(self._hass, entity_id, HumidifierEntityFeature.MODES)
+        }
 
-from .const import ATTR_ACTION, ATTR_HUMIDITY, DOMAIN, HumidifierAction
 
 CONDITIONS: dict[str, type[Condition]] = {
     "is_off": make_entity_state_condition(DOMAIN, STATE_OFF),
@@ -20,8 +78,9 @@ CONDITIONS: dict[str, type[Condition]] = {
     "is_humidifying": make_entity_state_condition(
         {DOMAIN: DomainSpec(value_source=ATTR_ACTION)}, HumidifierAction.HUMIDIFYING
     ),
+    "is_mode": IsModeCondition,
     "is_target_humidity": make_entity_numerical_condition(
-        {DOMAIN: NumericalDomainSpec(value_source=ATTR_HUMIDITY)},
+        {DOMAIN: DomainSpec(value_source=ATTR_HUMIDITY)},
         valid_unit=PERCENTAGE,
     ),
 }

homeassistant/components/humidifier/conditions.yaml

@@ -13,36 +13,46 @@
             - 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
+.humidity_threshold_entity: &humidity_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "%"
+  - domain: sensor
+    device_class: humidity
+  - domain: number
+    device_class: humidity
+
+.humidity_threshold_number: &humidity_threshold_number
+  min: 0
+  max: 100
+  mode: box
+  unit_of_measurement: "%"
 
 is_off: *condition_common
 is_on: *condition_common
 is_drying: *condition_common
 is_humidifying: *condition_common
 
+is_mode:
+  target: *condition_humidifier_target
+  fields:
+    behavior: *condition_behavior
+    mode:
+      context:
+        filter_target: target
+      required: true
+      selector:
+        state:
+          attribute: available_modes
+          multiple: true
+
 is_target_humidity:
   target: *condition_humidifier_target
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity
-    below: *number_or_entity
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *humidity_threshold_entity
+          mode: is
+          number: *humidity_threshold_number

homeassistant/components/humidifier/icons.json

@@ -6,6 +6,9 @@
     "is_humidifying": {
       "condition": "mdi:arrow-up-bold"
     },
+    "is_mode": {
+      "condition": "mdi:air-humidifier"
+    },
     "is_off": {
       "condition": "mdi:air-humidifier-off"
     },
@@ -67,6 +70,9 @@
     }
   },
   "triggers": {
+    "mode_changed": {
+      "trigger": "mdi:air-humidifier"
+    },
     "started_drying": {
       "trigger": "mdi:arrow-down-bold"
     },

homeassistant/components/humidifier/strings.json

@@ -1,16 +1,14 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted humidifiers.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted humidifiers to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_drying": {
       "description": "Tests if one or more humidifiers are drying.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidifier::common::condition_behavior_description%]",
           "name": "[%key:component::humidifier::common::condition_behavior_name%]"
         }
       },
@@ -20,17 +18,28 @@
       "description": "Tests if one or more humidifiers are humidifying.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidifier::common::condition_behavior_description%]",
           "name": "[%key:component::humidifier::common::condition_behavior_name%]"
         }
       },
       "name": "Humidifier is humidifying"
     },
+    "is_mode": {
+      "description": "Tests if one or more humidifiers are set to a specific mode.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::humidifier::common::condition_behavior_name%]"
+        },
+        "mode": {
+          "description": "The operation modes to check for.",
+          "name": "Mode"
+        }
+      },
+      "name": "Humidifier is in mode"
+    },
     "is_off": {
       "description": "Tests if one or more humidifiers are off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidifier::common::condition_behavior_description%]",
           "name": "[%key:component::humidifier::common::condition_behavior_name%]"
         }
       },
@@ -40,7 +49,6 @@
       "description": "Tests if one or more humidifiers are on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidifier::common::condition_behavior_description%]",
           "name": "[%key:component::humidifier::common::condition_behavior_name%]"
         }
       },
@@ -49,17 +57,11 @@
     "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"
+        "threshold": {
+          "name": "[%key:component::humidifier::common::condition_threshold_name%]"
         }
       },
       "name": "Humidifier target humidity"
@@ -159,12 +161,6 @@
         "any": "Any"
       }
     },
-    "number_or_entity": {
-      "choices": {
-        "entity": "Entity",
-        "number": "Number"
-      }
-    },
     "trigger_behavior": {
       "options": {
         "any": "Any",
@@ -175,45 +171,57 @@
   },
   "services": {
     "set_humidity": {
-      "description": "Sets the target humidity.",
+      "description": "Sets the target humidity of a humidifier.",
       "fields": {
         "humidity": {
           "description": "Target humidity.",
           "name": "Humidity"
         }
       },
-      "name": "Set humidity"
+      "name": "Set humidifier target humidity"
     },
     "set_mode": {
-      "description": "Sets the humidifier operation mode.",
+      "description": "Sets the mode of a humidifier.",
       "fields": {
         "mode": {
           "description": "Operation mode. For example, \"normal\", \"eco\", or \"away\". For a list of possible values, refer to the integration documentation.",
           "name": "Mode"
         }
       },
-      "name": "Set mode"
+      "name": "Set humidifier mode"
     },
     "toggle": {
-      "description": "Toggles the humidifier on/off.",
-      "name": "[%key:common::action::toggle%]"
+      "description": "Toggles a humidifier on/off.",
+      "name": "Toggle humidifier"
     },
     "turn_off": {
-      "description": "Turns the humidifier off.",
-      "name": "[%key:common::action::turn_off%]"
+      "description": "Turns off a humidifier.",
+      "name": "Turn off humidifier"
     },
     "turn_on": {
-      "description": "Turns the humidifier on.",
-      "name": "[%key:common::action::turn_on%]"
+      "description": "Turns on a humidifier.",
+      "name": "Turn on humidifier"
     }
   },
   "title": "Humidifier",
   "triggers": {
+    "mode_changed": {
+      "description": "Triggers after the operation mode of one or more humidifiers changes.",
+      "fields": {
+        "behavior": {
+          "name": "[%key:component::humidifier::common::trigger_behavior_name%]"
+        },
+        "mode": {
+          "description": "The operation modes to trigger on.",
+          "name": "Mode"
+        }
+      },
+      "name": "Humidifier mode changed"
+    },
     "started_drying": {
       "description": "Triggers after one or more humidifiers start drying.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidifier::common::trigger_behavior_description%]",
           "name": "[%key:component::humidifier::common::trigger_behavior_name%]"
         }
       },
@@ -223,7 +231,6 @@
       "description": "Triggers after one or more humidifiers start humidifying.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidifier::common::trigger_behavior_description%]",
           "name": "[%key:component::humidifier::common::trigger_behavior_name%]"
         }
       },
@@ -233,7 +240,6 @@
       "description": "Triggers after one or more humidifiers turn off.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidifier::common::trigger_behavior_description%]",
           "name": "[%key:component::humidifier::common::trigger_behavior_name%]"
         }
       },
@@ -243,7 +249,6 @@
       "description": "Triggers after one or more humidifiers turn on.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidifier::common::trigger_behavior_description%]",
           "name": "[%key:component::humidifier::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/humidifier/trigger.py

@@ -1,13 +1,65 @@
 """Provides triggers for humidifiers."""
 
-from homeassistant.const import STATE_OFF, STATE_ON
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec
-from homeassistant.helpers.trigger import Trigger, make_entity_target_state_trigger
+import voluptuous as vol
+
+from homeassistant.const import ATTR_MODE, CONF_OPTIONS, STATE_OFF, STATE_ON
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.automation import DomainSpec
+from homeassistant.helpers.entity import get_supported_features
+from homeassistant.helpers.trigger import (
+    ENTITY_STATE_TRIGGER_SCHEMA_FIRST_LAST,
+    EntityTargetStateTriggerBase,
+    Trigger,
+    TriggerConfig,
+    make_entity_target_state_trigger,
+)
+
+from .const import ATTR_ACTION, DOMAIN, HumidifierAction, HumidifierEntityFeature
+
+CONF_MODE = "mode"
+
+MODE_CHANGED_TRIGGER_SCHEMA = ENTITY_STATE_TRIGGER_SCHEMA_FIRST_LAST.extend(
+    {
+        vol.Required(CONF_OPTIONS): {
+            vol.Required(CONF_MODE): vol.All(cv.ensure_list, vol.Length(min=1), [str]),
+        },
+    }
+)
+
+
+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 ModeChangedTrigger(EntityTargetStateTriggerBase):
+    """Trigger for humidifier mode changes."""
+
+    _domain_specs = {DOMAIN: DomainSpec(value_source=ATTR_MODE)}
+    _schema = MODE_CHANGED_TRIGGER_SCHEMA
+
+    def __init__(self, hass: HomeAssistant, config: TriggerConfig) -> None:
+        """Initialize the mode trigger."""
+        super().__init__(hass, config)
+        self._to_states = set(self._options[CONF_MODE])
+
+    def entity_filter(self, entities: set[str]) -> set[str]:
+        """Filter entities of this domain."""
+        entities = super().entity_filter(entities)
+        return {
+            entity_id
+            for entity_id in entities
+            if _supports_feature(self._hass, entity_id, HumidifierEntityFeature.MODES)
+        }
 
-from .const import ATTR_ACTION, DOMAIN, HumidifierAction
 
 TRIGGERS: dict[str, type[Trigger]] = {
+    "mode_changed": ModeChangedTrigger,
     "started_drying": make_entity_target_state_trigger(
         {DOMAIN: DomainSpec(value_source=ATTR_ACTION)}, HumidifierAction.DRYING
     ),

homeassistant/components/humidifier/triggers.yaml

@@ -1,9 +1,9 @@
 .trigger_common: &trigger_common
-  target:
+  target: &trigger_humidifier_target
     entity:
       domain: humidifier
   fields:
-    behavior:
+    behavior: &trigger_behavior
       required: true
       default: any
       selector:
@@ -18,3 +18,16 @@ started_drying: *trigger_common
 started_humidifying: *trigger_common
 turned_on: *trigger_common
 turned_off: *trigger_common
+
+mode_changed:
+  target: *trigger_humidifier_target
+  fields:
+    behavior: *trigger_behavior
+    mode:
+      context:
+        filter_target: target
+      required: true
+      selector:
+        state:
+          attribute: available_modes
+          multiple: true

homeassistant/components/humidity/condition.py

@@ -10,22 +10,27 @@ from homeassistant.components.humidifier import (
     ATTR_CURRENT_HUMIDITY as HUMIDIFIER_ATTR_CURRENT_HUMIDITY,
     DOMAIN as HUMIDIFIER_DOMAIN,
 )
-from homeassistant.components.number import DOMAIN as NUMBER_DOMAIN, NumberDeviceClass
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
+from homeassistant.components.weather import (
+    ATTR_WEATHER_HUMIDITY,
+    DOMAIN as WEATHER_DOMAIN,
+)
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
+from homeassistant.helpers.automation import DomainSpec
 from homeassistant.helpers.condition import Condition, make_entity_numerical_condition
 
 HUMIDITY_DOMAIN_SPECS = {
-    CLIMATE_DOMAIN: NumericalDomainSpec(
+    CLIMATE_DOMAIN: DomainSpec(
         value_source=CLIMATE_ATTR_CURRENT_HUMIDITY,
     ),
-    HUMIDIFIER_DOMAIN: NumericalDomainSpec(
+    HUMIDIFIER_DOMAIN: DomainSpec(
         value_source=HUMIDIFIER_ATTR_CURRENT_HUMIDITY,
     ),
     SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.HUMIDITY),
-    NUMBER_DOMAIN: DomainSpec(device_class=NumberDeviceClass.HUMIDITY),
+    WEATHER_DOMAIN: DomainSpec(
+        value_source=ATTR_WEATHER_HUMIDITY,
+    ),
 }
 
 CONDITIONS: dict[str, type[Condition]] = {

homeassistant/components/humidity/conditions.yaml

@@ -1,34 +1,25 @@
-.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: number
-                  device_class: humidity
-                - domain: sensor
-                  device_class: humidity
-      translation_key: number_or_entity
+.humidity_threshold_entity: &humidity_threshold_entity
+  - domain: input_number
+    unit_of_measurement: "%"
+  - domain: sensor
+    device_class: humidity
+  - domain: number
+    device_class: humidity
+
+.humidity_threshold_number: &humidity_threshold_number
+  min: 0
+  max: 100
+  mode: box
+  unit_of_measurement: "%"
 
 is_value:
   target:
     entity:
       - domain: sensor
         device_class: humidity
-      - domain: number
-        device_class: humidity
       - domain: climate
       - domain: humidifier
+      - domain: weather
   fields:
     behavior:
       required: true
@@ -39,5 +30,10 @@ is_value:
           options:
             - all
             - any
-    above: *number_or_entity
-    below: *number_or_entity
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity: *humidity_threshold_entity
+          mode: is
+          number: *humidity_threshold_number

homeassistant/components/humidity/strings.json

@@ -1,28 +1,19 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted entities.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted entities to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when",
+    "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
     "is_value": {
       "description": "Tests if a relative humidity value is above a threshold, below a threshold, or in a range of values.",
       "fields": {
-        "above": {
-          "description": "Require the relative humidity to be above this value.",
-          "name": "Above"
-        },
         "behavior": {
-          "description": "[%key:component::humidity::common::condition_behavior_description%]",
           "name": "[%key:component::humidity::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "Require the relative humidity to be below this value.",
-          "name": "Below"
+        "threshold": {
+          "name": "[%key:component::humidity::common::condition_threshold_name%]"
         }
       },
       "name": "Relative humidity"
@@ -35,12 +26,6 @@
         "any": "Any"
       }
     },
-    "number_or_entity": {
-      "choices": {
-        "entity": "Entity",
-        "number": "Number"
-      }
-    },
     "trigger_behavior": {
       "options": {
         "any": "Any",
@@ -55,7 +40,6 @@
       "description": "Triggers after one or more relative humidity values change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::humidity::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::humidity::common::trigger_threshold_name%]"
         }
       },
@@ -65,11 +49,9 @@
       "description": "Triggers after one or more relative humidity values cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::humidity::common::trigger_behavior_description%]",
           "name": "[%key:component::humidity::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::humidity::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::humidity::common::trigger_threshold_name%]"
         }
       },

homeassistant/components/humidity/trigger.py

@@ -16,24 +16,24 @@ from homeassistant.components.weather import (
     DOMAIN as WEATHER_DOMAIN,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import NumericalDomainSpec
+from homeassistant.helpers.automation import DomainSpec
 from homeassistant.helpers.trigger import (
     Trigger,
     make_entity_numerical_state_changed_trigger,
     make_entity_numerical_state_crossed_threshold_trigger,
 )
 
-HUMIDITY_DOMAIN_SPECS: dict[str, NumericalDomainSpec] = {
-    CLIMATE_DOMAIN: NumericalDomainSpec(
+HUMIDITY_DOMAIN_SPECS: dict[str, DomainSpec] = {
+    CLIMATE_DOMAIN: DomainSpec(
         value_source=CLIMATE_ATTR_CURRENT_HUMIDITY,
     ),
-    HUMIDIFIER_DOMAIN: NumericalDomainSpec(
+    HUMIDIFIER_DOMAIN: DomainSpec(
         value_source=HUMIDIFIER_ATTR_CURRENT_HUMIDITY,
     ),
-    SENSOR_DOMAIN: NumericalDomainSpec(
+    SENSOR_DOMAIN: DomainSpec(
         device_class=SensorDeviceClass.HUMIDITY,
     ),
-    WEATHER_DOMAIN: NumericalDomainSpec(
+    WEATHER_DOMAIN: DomainSpec(
         value_source=ATTR_WEATHER_HUMIDITY,
     ),
 }

homeassistant/components/husqvarna_automower/__init__.py

@@ -11,6 +11,9 @@ from homeassistant.helpers import (
     config_entry_oauth2_flow,
     config_validation as cv,
 )
+from homeassistant.helpers.config_entry_oauth2_flow import (
+    ImplementationUnavailableError,
+)
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import dt as dt_util
 
@@ -42,11 +45,17 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
 async def async_setup_entry(hass: HomeAssistant, entry: AutomowerConfigEntry) -> bool:
     """Set up this integration using UI."""
-    implementation = (
-        await config_entry_oauth2_flow.async_get_config_entry_implementation(
-            hass, entry
+    try:
+        implementation = (
+            await config_entry_oauth2_flow.async_get_config_entry_implementation(
+                hass, entry
+            )
         )
-    )
+    except ImplementationUnavailableError as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="oauth2_implementation_unavailable",
+        ) from err
     session = config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation)
     api_api = api.AsyncConfigEntryAuth(
         aiohttp_client.async_get_clientsession(hass),

homeassistant/components/husqvarna_automower/strings.json

@@ -491,6 +491,9 @@
     "command_send_failed": {
       "message": "Failed to send command: {exception}"
     },
+    "oauth2_implementation_unavailable": {
+      "message": "[%key:common::exceptions::oauth2_implementation_unavailable::message%]"
+    },
     "work_area_not_existing": {
       "message": "The selected work area does not exist."
     },

homeassistant/components/hydrawise/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_polling",
   "loggers": ["pydrawise"],
-  "requirements": ["pydrawise==2025.9.0"]
+  "requirements": ["pydrawise==2026.3.0"]
 }

homeassistant/components/idasen_desk/manifest.json

@@ -13,5 +13,5 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "quality_scale": "bronze",
-  "requirements": ["idasen-ha==2.6.4"]
+  "requirements": ["idasen-ha==2.6.5"]
 }

homeassistant/components/illuminance/condition.py

@@ -6,7 +6,6 @@ from homeassistant.components.binary_sensor import (
     DOMAIN as BINARY_SENSOR_DOMAIN,
     BinarySensorDeviceClass,
 )
-from homeassistant.components.number import DOMAIN as NUMBER_DOMAIN, NumberDeviceClass
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
 from homeassistant.const import LIGHT_LUX, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
@@ -22,7 +21,6 @@ ILLUMINANCE_DETECTED_DOMAIN_SPECS = {
 }
 ILLUMINANCE_VALUE_DOMAIN_SPECS = {
     SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.ILLUMINANCE),
-    NUMBER_DOMAIN: DomainSpec(device_class=NumberDeviceClass.ILLUMINANCE),
 }
 
 CONDITIONS: dict[str, type[Condition]] = {

homeassistant/components/illuminance/conditions.yaml

@@ -14,27 +14,6 @@
             - all
             - any
 
-.number_or_entity: &number_or_entity
-  required: false
-  selector:
-    choose:
-      choices:
-        number:
-          selector:
-            number:
-              unit_of_measurement: "lx"
-        entity:
-          selector:
-            entity:
-              filter:
-                - domain: input_number
-                  unit_of_measurement: "lx"
-                - domain: number
-                  device_class: illuminance
-                - domain: sensor
-                  device_class: illuminance
-      translation_key: number_or_entity
-
 is_detected: *detected_condition_common
 
 is_not_detected: *detected_condition_common
@@ -44,9 +23,21 @@ is_value:
     entity:
       - domain: sensor
         device_class: illuminance
-      - domain: number
-        device_class: illuminance
   fields:
     behavior: *condition_behavior
-    above: *number_or_entity
-    below: *number_or_entity
+    threshold:
+      required: true
+      selector:
+        numeric_threshold:
+          entity:
+            - domain: input_number
+              unit_of_measurement: "lx"
+            - domain: sensor
+              device_class: illuminance
+            - domain: number
+              device_class: illuminance
+          mode: is
+          number:
+            min: 0
+            mode: box
+            unit_of_measurement: "lx"

homeassistant/components/illuminance/strings.json

@@ -1,19 +1,15 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted entities.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted entities to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
+    "condition_behavior_name": "Condition passes if",
+    "condition_threshold_name": "Threshold type",
+    "trigger_behavior_name": "Trigger when",
+    "trigger_threshold_name": "Threshold type"
   },
   "conditions": {
     "is_detected": {
       "description": "Tests if light is currently detected.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::illuminance::common::condition_behavior_description%]",
           "name": "[%key:component::illuminance::common::condition_behavior_name%]"
         }
       },
@@ -23,7 +19,6 @@
       "description": "Tests if light is currently not detected.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::illuminance::common::condition_behavior_description%]",
           "name": "[%key:component::illuminance::common::condition_behavior_name%]"
         }
       },
@@ -32,17 +27,11 @@
     "is_value": {
       "description": "Tests the illuminance value.",
       "fields": {
-        "above": {
-          "description": "Require the illuminance to be above this value.",
-          "name": "Above"
-        },
         "behavior": {
-          "description": "[%key:component::illuminance::common::condition_behavior_description%]",
           "name": "[%key:component::illuminance::common::condition_behavior_name%]"
         },
-        "below": {
-          "description": "Require the illuminance to be below this value.",
-          "name": "Below"
+        "threshold": {
+          "name": "[%key:component::illuminance::common::condition_threshold_name%]"
         }
       },
       "name": "Illuminance"
@@ -55,12 +44,6 @@
         "any": "Any"
       }
     },
-    "number_or_entity": {
-      "choices": {
-        "entity": "Entity",
-        "number": "Number"
-      }
-    },
     "trigger_behavior": {
       "options": {
         "any": "Any",
@@ -75,7 +58,6 @@
       "description": "Triggers after one or more illuminance values change.",
       "fields": {
         "threshold": {
-          "description": "[%key:component::illuminance::common::trigger_threshold_changed_description%]",
           "name": "[%key:component::illuminance::common::trigger_threshold_name%]"
         }
       },
@@ -85,7 +67,6 @@
       "description": "Triggers after one or more light sensors stop detecting light.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::illuminance::common::trigger_behavior_description%]",
           "name": "[%key:component::illuminance::common::trigger_behavior_name%]"
         }
       },
@@ -95,11 +76,9 @@
       "description": "Triggers after one or more illuminance values cross a threshold.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::illuminance::common::trigger_behavior_description%]",
           "name": "[%key:component::illuminance::common::trigger_behavior_name%]"
         },
         "threshold": {
-          "description": "[%key:component::illuminance::common::trigger_threshold_crossed_description%]",
           "name": "[%key:component::illuminance::common::trigger_threshold_name%]"
         }
       },
@@ -109,7 +88,6 @@
       "description": "Triggers after one or more light sensors start detecting light.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::illuminance::common::trigger_behavior_description%]",
           "name": "[%key:component::illuminance::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/illuminance/trigger.py

@@ -6,11 +6,10 @@ from homeassistant.components.binary_sensor import (
     DOMAIN as BINARY_SENSOR_DOMAIN,
     BinarySensorDeviceClass,
 )
-from homeassistant.components.number import DOMAIN as NUMBER_DOMAIN, NumberDeviceClass
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
 from homeassistant.const import LIGHT_LUX, STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
+from homeassistant.helpers.automation import DomainSpec
 from homeassistant.helpers.trigger import (
     Trigger,
     make_entity_numerical_state_changed_trigger,
@@ -18,9 +17,8 @@ from homeassistant.helpers.trigger import (
     make_entity_target_state_trigger,
 )
 
-ILLUMINANCE_DOMAIN_SPECS: dict[str, NumericalDomainSpec] = {
-    NUMBER_DOMAIN: NumericalDomainSpec(device_class=NumberDeviceClass.ILLUMINANCE),
-    SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.ILLUMINANCE),
+ILLUMINANCE_DOMAIN_SPECS: dict[str, DomainSpec] = {
+    SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.ILLUMINANCE),
 }
 
 TRIGGERS: dict[str, type[Trigger]] = {

homeassistant/components/illuminance/triggers.yaml

@@ -29,8 +29,6 @@
 
 .trigger_numerical_target: &trigger_numerical_target
   entity:
-    - domain: number
-      device_class: illuminance
     - domain: sensor
       device_class: illuminance
 

homeassistant/components/image/strings.json

@@ -13,7 +13,7 @@
           "name": "Filename"
         }
       },
-      "name": "Take snapshot"
+      "name": "Take image snapshot"
     }
   },
   "title": "Image"

homeassistant/components/immich/manifest.json

@@ -9,5 +9,5 @@
   "iot_class": "local_polling",
   "loggers": ["aioimmich"],
   "quality_scale": "platinum",
-  "requirements": ["aioimmich==0.12.0"]
+  "requirements": ["aioimmich==0.12.1"]
 }

homeassistant/components/iotty/__init__.py

@@ -6,11 +6,14 @@ import logging
 
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.config_entry_oauth2_flow import (
+    ImplementationUnavailableError,
     OAuth2Session,
     async_get_config_entry_implementation,
 )
 
+from .const import DOMAIN
 from .coordinator import (
     IottyConfigEntry,
     IottyConfigEntryData,
@@ -26,7 +29,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: IottyConfigEntry) -> boo
     """Set up iotty from a config entry."""
     _LOGGER.debug("async_setup_entry entry_id=%s", entry.entry_id)
 
-    implementation = await async_get_config_entry_implementation(hass, entry)
+    try:
+        implementation = await async_get_config_entry_implementation(hass, entry)
+    except ImplementationUnavailableError as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="oauth2_implementation_unavailable",
+        ) from err
     session = OAuth2Session(hass, entry, implementation)
 
     data_update_coordinator = IottyDataUpdateCoordinator(hass, entry, session)

homeassistant/components/iotty/strings.json

@@ -25,5 +25,10 @@
         "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]"
       }
     }
+  },
+  "exceptions": {
+    "oauth2_implementation_unavailable": {
+      "message": "[%key:common::exceptions::oauth2_implementation_unavailable::message%]"
+    }
   }
 }

homeassistant/components/ista_ecotrend/__init__.py

@@ -23,7 +23,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: IstaConfigEntry) -> bool
     ista = PyEcotrendIsta(
         entry.data[CONF_EMAIL],
         entry.data[CONF_PASSWORD],
-        _LOGGER,
     )
 
     coordinator = IstaCoordinator(hass, entry, ista)

homeassistant/components/ista_ecotrend/config_flow.py

@@ -51,7 +51,6 @@ class IstaConfigFlow(ConfigFlow, domain=DOMAIN):
             ista = PyEcotrendIsta(
                 user_input[CONF_EMAIL],
                 user_input[CONF_PASSWORD],
-                _LOGGER,
             )
             try:
                 await self.hass.async_add_executor_job(ista.login)
@@ -102,7 +101,6 @@ class IstaConfigFlow(ConfigFlow, domain=DOMAIN):
             ista = PyEcotrendIsta(
                 user_input[CONF_EMAIL],
                 user_input[CONF_PASSWORD],
-                _LOGGER,
             )
 
             def get_consumption_units() -> set[str]:

homeassistant/components/ista_ecotrend/coordinator.py

@@ -94,10 +94,8 @@ class IstaCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         result = self.ista.get_consumption_unit_details()
 
         return {
-            consumption_unit: next(
-                details
-                for details in result["consumptionUnits"]
-                if details["id"] == consumption_unit
-            )
+            consumption_unit: details
             for consumption_unit in self.ista.get_uuids()
+            for details in result["consumptionUnits"]
+            if details["id"] == consumption_unit
         }

homeassistant/components/knx/manifest.json

@@ -13,7 +13,7 @@
   "requirements": [
     "xknx==3.15.0",
     "xknxproject==3.8.2",
-    "knx-frontend==2026.3.2.183756"
+    "knx-frontend==2026.3.28.223133"
   ],
   "single_config_entry": true
 }

homeassistant/components/lacrosse_view/coordinator.py

@@ -73,31 +73,45 @@ class LaCrosseUpdateCoordinator(DataUpdateCoordinator[list[Sensor]]):
             except HTTPError as error:
                 raise UpdateFailed from error
 
-        try:
-            # Fetch last hour of data
-            for sensor in self.devices:
+        # Fetch last hour of data
+        for sensor in self.devices:
+            try:
                 data = await self.api.get_sensor_status(
                     sensor=sensor,
                     tz=self.hass.config.time_zone,
                 )
-                _LOGGER.debug("Got data: %s", data)
+            except HTTPError as error:
+                error_data = error.args[1] if len(error.args) > 1 else None
+                if (
+                    isinstance(error_data, dict)
+                    and error_data.get("error") == "no_readings"
+                ):
+                    sensor.data = None
+                    _LOGGER.debug("No readings for %s", sensor.name)
+                    continue
+                raise UpdateFailed(
+                    translation_domain=DOMAIN, translation_key="update_error"
+                ) from error
 
-                if data_error := data.get("error"):
-                    if data_error == "no_readings":
-                        sensor.data = None
-                        _LOGGER.debug("No readings for %s", sensor.name)
-                        continue
-                    _LOGGER.debug("Error: %s", data_error)
-                    raise UpdateFailed(
-                        translation_domain=DOMAIN, translation_key="update_error"
-                    )
+            _LOGGER.debug("Got data: %s", data)
 
-                sensor.data = data["data"]["current"]
+            if data_error := data.get("error"):
+                if data_error == "no_readings":
+                    sensor.data = None
+                    _LOGGER.debug("No readings for %s", sensor.name)
+                    continue
+                _LOGGER.debug("Error: %s", data_error)
+                raise UpdateFailed(
+                    translation_domain=DOMAIN, translation_key="update_error"
+                )
 
-        except HTTPError as error:
-            raise UpdateFailed(
-                translation_domain=DOMAIN, translation_key="update_error"
-            ) from error
+            current_data = data.get("data", {}).get("current")
+            if current_data is None:
+                sensor.data = None
+                _LOGGER.debug("No current data payload for %s", sensor.name)
+                continue
+
+            sensor.data = current_data
 
         # Verify that we have permission to read the sensors
         for sensor in self.devices:

homeassistant/components/lawn_mower/strings.json

@@ -1,16 +1,13 @@
 {
   "common": {
-    "condition_behavior_description": "How the state should match on the targeted lawn mowers.",
-    "condition_behavior_name": "Behavior",
-    "trigger_behavior_description": "The behavior of the targeted lawn mowers to trigger on.",
-    "trigger_behavior_name": "Behavior"
+    "condition_behavior_name": "Condition passes if",
+    "trigger_behavior_name": "Trigger when"
   },
   "conditions": {
     "is_docked": {
       "description": "Tests if one or more lawn mowers are docked.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::condition_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::condition_behavior_name%]"
         }
       },
@@ -20,7 +17,6 @@
       "description": "Tests if one or more lawn mowers are encountering an error.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::condition_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::condition_behavior_name%]"
         }
       },
@@ -30,7 +26,6 @@
       "description": "Tests if one or more lawn mowers are mowing.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::condition_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::condition_behavior_name%]"
         }
       },
@@ -40,7 +35,6 @@
       "description": "Tests if one or more lawn mowers are paused.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::condition_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::condition_behavior_name%]"
         }
       },
@@ -50,7 +44,6 @@
       "description": "Tests if one or more lawn mowers are returning to the dock.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::condition_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::condition_behavior_name%]"
         }
       },
@@ -104,7 +97,6 @@
       "description": "Triggers after one or more lawn mowers have returned to dock.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::trigger_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::trigger_behavior_name%]"
         }
       },
@@ -114,7 +106,6 @@
       "description": "Triggers after one or more lawn mowers encounter an error.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::trigger_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::trigger_behavior_name%]"
         }
       },
@@ -124,7 +115,6 @@
       "description": "Triggers after one or more lawn mowers pause mowing.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::trigger_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::trigger_behavior_name%]"
         }
       },
@@ -134,7 +124,6 @@
       "description": "Triggers after one or more lawn mowers start mowing.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::trigger_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::trigger_behavior_name%]"
         }
       },
@@ -144,7 +133,6 @@
       "description": "Triggers after one or more lawn mowers start returning to dock.",
       "fields": {
         "behavior": {
-          "description": "[%key:component::lawn_mower::common::trigger_behavior_description%]",
           "name": "[%key:component::lawn_mower::common::trigger_behavior_name%]"
         }
       },

homeassistant/components/light/condition.py

@@ -1,12 +1,43 @@
 """Provides conditions for lights."""
 
-from homeassistant.const import STATE_OFF, STATE_ON
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.condition import Condition, make_entity_state_condition
+from typing import Any
 
+from homeassistant.const import STATE_OFF, STATE_ON
+from homeassistant.core import HomeAssistant, State
+from homeassistant.helpers.automation import DomainSpec
+from homeassistant.helpers.condition import (
+    Condition,
+    EntityNumericalConditionBase,
+    make_entity_state_condition,
+)
+
+from . import ATTR_BRIGHTNESS
 from .const import DOMAIN
 
+BRIGHTNESS_DOMAIN_SPECS = {
+    DOMAIN: DomainSpec(value_source=ATTR_BRIGHTNESS),
+}
+
+
+class BrightnessCondition(EntityNumericalConditionBase):
+    """Condition for light brightness with uint8 to percentage conversion."""
+
+    _domain_specs = BRIGHTNESS_DOMAIN_SPECS
+    _valid_unit = "%"
+
+    def _get_tracked_value(self, entity_state: State) -> Any:
+        """Get the brightness value converted from uint8 (0-255) to percentage (0-100)."""
+        raw = super()._get_tracked_value(entity_state)
+        if raw is None:
+            return None
+        try:
+            return (float(raw) / 255.0) * 100.0
+        except TypeError, ValueError:
+            return None
+
+
 CONDITIONS: dict[str, type[Condition]] = {
+    "is_brightness": BrightnessCondition,
     "is_off": make_entity_state_condition(DOMAIN, STATE_OFF),
     "is_on": make_entity_state_condition(DOMAIN, STATE_ON),
 }