Use state selector for climate service mode fields (#166486)

Co-authored-by: crash0verride11 <3526616+crash0verride11@users.noreply.github.com>
Co-authored-by: jtjart <80978647+jtjart@users.noreply.github.com>
Co-authored-by: Joostlek <joostlek@outlook.com>

.github/workflows/builder.yml

@@ -224,7 +224,6 @@ jobs:
       matrix:
         machine:
           - generic-x86-64
-          - intel-nuc
           - khadas-vim3
           - odroid-c2
           - odroid-c4
@@ -248,10 +247,6 @@ jobs:
           - machine: qemux86-64
             arch: amd64
             runs-on: ubuntu-24.04
-          # TODO: remove, intel-nuc is a legacy name for x86-64, renamed in 2021
-          - machine: intel-nuc
-            arch: amd64
-            runs-on: ubuntu-24.04
     steps:
       - name: Checkout the repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.strict-typing

@@ -274,10 +274,12 @@ homeassistant.components.homekit_controller.storage
 homeassistant.components.homekit_controller.utils
 homeassistant.components.homewizard.*
 homeassistant.components.homeworks.*
+homeassistant.components.hr_energy_qube.*
 homeassistant.components.http.*
 homeassistant.components.huawei_lte.*
 homeassistant.components.humidifier.*
 homeassistant.components.husqvarna_automower.*
+homeassistant.components.huum.*
 homeassistant.components.hydrawise.*
 homeassistant.components.hyperion.*
 homeassistant.components.hypontech.*
@@ -327,6 +329,7 @@ homeassistant.components.ld2410_ble.*
 homeassistant.components.led_ble.*
 homeassistant.components.lektrico.*
 homeassistant.components.letpot.*
+homeassistant.components.lg_infrared.*
 homeassistant.components.libre_hardware_monitor.*
 homeassistant.components.lidarr.*
 homeassistant.components.lifx.*

CODEOWNERS

@@ -214,6 +214,8 @@ build.json @home-assistant/supervisor
 /tests/components/balboa/ @garbled1 @natekspencer
 /homeassistant/components/bang_olufsen/ @mj23000
 /tests/components/bang_olufsen/ @mj23000
+/homeassistant/components/battery/ @home-assistant/core
+/tests/components/battery/ @home-assistant/core
 /homeassistant/components/bayesian/ @HarvsG
 /tests/components/bayesian/ @HarvsG
 /homeassistant/components/beewi_smartclim/ @alemuro
@@ -737,6 +739,8 @@ build.json @home-assistant/supervisor
 /tests/components/homewizard/ @DCSBL
 /homeassistant/components/honeywell/ @rdfurman @mkmer
 /tests/components/honeywell/ @rdfurman @mkmer
+/homeassistant/components/hr_energy_qube/ @MattieGit
+/tests/components/hr_energy_qube/ @MattieGit
 /homeassistant/components/html5/ @alexyao2015
 /tests/components/html5/ @alexyao2015
 /homeassistant/components/http/ @home-assistant/core
@@ -784,6 +788,8 @@ build.json @home-assistant/supervisor
 /tests/components/igloohome/ @keithle888
 /homeassistant/components/ign_sismologia/ @exxamalte
 /tests/components/ign_sismologia/ @exxamalte
+/homeassistant/components/illuminance/ @home-assistant/core
+/tests/components/illuminance/ @home-assistant/core
 /homeassistant/components/image/ @home-assistant/core
 /tests/components/image/ @home-assistant/core
 /homeassistant/components/image_processing/ @home-assistant/core
@@ -943,6 +949,8 @@ build.json @home-assistant/supervisor
 /tests/components/lektrico/ @lektrico
 /homeassistant/components/letpot/ @jpelgrom
 /tests/components/letpot/ @jpelgrom
+/homeassistant/components/lg_infrared/ @home-assistant/core
+/tests/components/lg_infrared/ @home-assistant/core
 /homeassistant/components/lg_netcast/ @Drafteed @splinter98
 /tests/components/lg_netcast/ @Drafteed @splinter98
 /homeassistant/components/lg_thinq/ @LG-ThinQ-Integration
@@ -1071,6 +1079,8 @@ build.json @home-assistant/supervisor
 /tests/components/modern_forms/ @wonderslug
 /homeassistant/components/moehlenhoff_alpha2/ @j-a-n
 /tests/components/moehlenhoff_alpha2/ @j-a-n
+/homeassistant/components/moisture/ @home-assistant/core
+/tests/components/moisture/ @home-assistant/core
 /homeassistant/components/monarch_money/ @jeeftor
 /tests/components/monarch_money/ @jeeftor
 /homeassistant/components/monoprice/ @etsinko @OnFreund
@@ -1309,6 +1319,8 @@ build.json @home-assistant/supervisor
 /tests/components/poolsense/ @haemishkyd
 /homeassistant/components/portainer/ @erwindouna
 /tests/components/portainer/ @erwindouna
+/homeassistant/components/power/ @home-assistant/core
+/tests/components/power/ @home-assistant/core
 /homeassistant/components/powerfox/ @klaasnicolaas
 /tests/components/powerfox/ @klaasnicolaas
 /homeassistant/components/powerfox_local/ @klaasnicolaas
@@ -1594,6 +1606,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/solaredge_local/ @drobtravels @scheric
 /homeassistant/components/solarlog/ @Ernst79 @dontinelli
 /tests/components/solarlog/ @Ernst79 @dontinelli
+/homeassistant/components/solarman/ @solarmanpv
+/tests/components/solarman/ @solarmanpv
 /homeassistant/components/solax/ @squishykid @Darsstar
 /tests/components/solax/ @squishykid @Darsstar
 /homeassistant/components/soma/ @ratsept
@@ -1750,6 +1764,8 @@ build.json @home-assistant/supervisor
 /tests/components/tomorrowio/ @raman325 @lymanepp
 /homeassistant/components/totalconnect/ @austinmroczek
 /tests/components/totalconnect/ @austinmroczek
+/homeassistant/components/touchline/ @mnordseth
+/tests/components/touchline/ @mnordseth
 /homeassistant/components/touchline_sl/ @jnsgruk
 /tests/components/touchline_sl/ @jnsgruk
 /homeassistant/components/tplink/ @rytilahti @bdraco @sdb9696

Dockerfile

@@ -29,7 +29,7 @@ RUN \
     # Verify go2rtc can be executed
     go2rtc --version \
     # Install uv
-    && pip3 install uv==0.10.6
+    && pip3 install uv==0.11.1
 
 WORKDIR /usr/src
 

homeassistant/bootstrap.py

@@ -241,12 +241,17 @@ DEFAULT_INTEGRATIONS = {
     *BASE_PLATFORMS,
     #
     # Integrations providing triggers and conditions for base platforms:
+    "air_quality",
+    "battery",
     "door",
     "garage_door",
     "gate",
     "humidity",
+    "illuminance",
+    "moisture",
     "motion",
     "occupancy",
+    "power",
     "temperature",
     "window",
 }

homeassistant/brands/lg.json

@@ -1,5 +1,11 @@
 {
   "domain": "lg",
   "name": "LG",
-  "integrations": ["lg_netcast", "lg_soundbar", "lg_thinq", "webostv"]
+  "integrations": [
+    "lg_infrared",
+    "lg_netcast",
+    "lg_soundbar",
+    "lg_thinq",
+    "webostv"
+  ]
 }

homeassistant/components/abode/manifest.json

@@ -9,6 +9,6 @@
   },
   "iot_class": "cloud_push",
   "loggers": ["jaraco.abode", "lomond"],
-  "requirements": ["jaraco.abode==6.2.1"],
+  "requirements": ["jaraco.abode==6.4.0"],
   "single_config_entry": true
 }

homeassistant/components/abode/sensor.py

@@ -12,6 +12,7 @@ from homeassistant.components.sensor import (
     SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
+    SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import LIGHT_LUX, PERCENTAGE, UnitOfTemperature
@@ -40,6 +41,7 @@ SENSOR_TYPES: tuple[AbodeSensorDescription, ...] = (
     AbodeSensorDescription(
         key="temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
+        state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement_fn=lambda device: ABODE_TEMPERATURE_UNIT_HA_UNIT[
             device.temp_unit
         ],
@@ -48,12 +50,14 @@ SENSOR_TYPES: tuple[AbodeSensorDescription, ...] = (
     AbodeSensorDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
+        state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement_fn=lambda _: PERCENTAGE,
         value_fn=lambda device: cast(float, device.humidity),
     ),
     AbodeSensorDescription(
         key="lux",
         device_class=SensorDeviceClass.ILLUMINANCE,
+        state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement_fn=lambda _: LIGHT_LUX,
         value_fn=lambda device: cast(float, device.lux),
     ),

homeassistant/components/air_quality/condition.py

@@ -0,0 +1,150 @@
+"""Provides conditions for air quality."""
+
+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 (
+    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    CONCENTRATION_PARTS_PER_BILLION,
+    CONCENTRATION_PARTS_PER_MILLION,
+    STATE_OFF,
+    STATE_ON,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
+from homeassistant.helpers.condition import (
+    Condition,
+    make_entity_numerical_condition,
+    make_entity_numerical_condition_with_unit,
+    make_entity_state_condition,
+)
+from homeassistant.util.unit_conversion import (
+    CarbonMonoxideConcentrationConverter,
+    MassVolumeConcentrationConverter,
+    NitrogenDioxideConcentrationConverter,
+    NitrogenMonoxideConcentrationConverter,
+    OzoneConcentrationConverter,
+    SulphurDioxideConcentrationConverter,
+    UnitlessRatioConverter,
+)
+
+
+def _make_detected_condition(
+    device_class: BinarySensorDeviceClass,
+) -> type[Condition]:
+    """Create a detected condition for a binary sensor device class."""
+    return make_entity_state_condition(
+        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_ON
+    )
+
+
+def _make_cleared_condition(
+    device_class: BinarySensorDeviceClass,
+) -> type[Condition]:
+    """Create a cleared condition for a binary sensor device class."""
+    return make_entity_state_condition(
+        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_OFF
+    )
+
+
+CONDITIONS: dict[str, type[Condition]] = {
+    # Binary sensor conditions (detected/cleared)
+    "is_gas_detected": _make_detected_condition(BinarySensorDeviceClass.GAS),
+    "is_gas_cleared": _make_cleared_condition(BinarySensorDeviceClass.GAS),
+    "is_co_detected": _make_detected_condition(BinarySensorDeviceClass.CO),
+    "is_co_cleared": _make_cleared_condition(BinarySensorDeviceClass.CO),
+    "is_smoke_detected": _make_detected_condition(BinarySensorDeviceClass.SMOKE),
+    "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)},
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        CarbonMonoxideConcentrationConverter,
+    ),
+    "is_ozone_value": make_entity_numerical_condition_with_unit(
+        {SENSOR_DOMAIN: NumericalDomainSpec(device_class=SensorDeviceClass.OZONE)},
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        OzoneConcentrationConverter,
+    ),
+    "is_voc_value": make_entity_numerical_condition_with_unit(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
+            )
+        },
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        MassVolumeConcentrationConverter,
+    ),
+    "is_voc_ratio_value": make_entity_numerical_condition_with_unit(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
+            )
+        },
+        CONCENTRATION_PARTS_PER_BILLION,
+        UnitlessRatioConverter,
+    ),
+    "is_no_value": make_entity_numerical_condition_with_unit(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                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
+            )
+        },
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        NitrogenDioxideConcentrationConverter,
+    ),
+    "is_so2_value": make_entity_numerical_condition_with_unit(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                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)},
+        valid_unit=CONCENTRATION_PARTS_PER_MILLION,
+    ),
+    "is_pm1_value": make_entity_numerical_condition(
+        {SENSOR_DOMAIN: NumericalDomainSpec(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)},
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+    "is_pm4_value": make_entity_numerical_condition(
+        {SENSOR_DOMAIN: NumericalDomainSpec(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)},
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+    "is_n2o_value": make_entity_numerical_condition(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                device_class=SensorDeviceClass.NITROUS_OXIDE
+            )
+        },
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+}
+
+
+async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
+    """Return the air quality conditions."""
+    return CONDITIONS

homeassistant/components/air_quality/conditions.yaml

@@ -0,0 +1,588 @@
+# --- Common condition fields ---
+
+.condition_behavior: &condition_behavior
+  required: true
+  default: any
+  selector:
+    select:
+      translation_key: condition_behavior
+      options:
+        - all
+        - any
+
+# --- Number or entity selectors ---
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+# --- Unit selectors ---
+
+.unit_co: &unit_co
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "ppm"
+        - "mg/m³"
+        - "μg/m³"
+
+.unit_ozone: &unit_ozone
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "ppm"
+        - "μg/m³"
+
+.unit_no2: &unit_no2
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "ppm"
+        - "μg/m³"
+
+.unit_no: &unit_no
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "μg/m³"
+
+.unit_so2: &unit_so2
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "μg/m³"
+
+.unit_voc: &unit_voc
+  required: false
+  selector:
+    select:
+      options:
+        - "μg/m³"
+        - "mg/m³"
+
+.unit_voc_ratio: &unit_voc_ratio
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "ppm"
+
+# --- Binary sensor targets ---
+
+.target_gas: &target_gas
+  entity:
+    - domain: binary_sensor
+      device_class: gas
+
+.target_co_binary: &target_co_binary
+  entity:
+    - domain: binary_sensor
+      device_class: carbon_monoxide
+
+.target_smoke: &target_smoke
+  entity:
+    - domain: binary_sensor
+      device_class: smoke
+
+# --- Sensor targets ---
+
+.target_co_sensor: &target_co_sensor
+  entity:
+    - domain: sensor
+      device_class: carbon_monoxide
+
+.target_co2: &target_co2
+  entity:
+    - domain: sensor
+      device_class: carbon_dioxide
+
+.target_pm1: &target_pm1
+  entity:
+    - domain: sensor
+      device_class: pm1
+
+.target_pm25: &target_pm25
+  entity:
+    - domain: sensor
+      device_class: pm25
+
+.target_pm4: &target_pm4
+  entity:
+    - domain: sensor
+      device_class: pm4
+
+.target_pm10: &target_pm10
+  entity:
+    - domain: sensor
+      device_class: pm10
+
+.target_ozone: &target_ozone
+  entity:
+    - domain: sensor
+      device_class: ozone
+
+.target_voc: &target_voc
+  entity:
+    - domain: sensor
+      device_class: volatile_organic_compounds
+
+.target_voc_ratio: &target_voc_ratio
+  entity:
+    - domain: sensor
+      device_class: volatile_organic_compounds_parts
+
+.target_no: &target_no
+  entity:
+    - domain: sensor
+      device_class: nitrogen_monoxide
+
+.target_no2: &target_no2
+  entity:
+    - domain: sensor
+      device_class: nitrogen_dioxide
+
+.target_n2o: &target_n2o
+  entity:
+    - domain: sensor
+      device_class: nitrous_oxide
+
+.target_so2: &target_so2
+  entity:
+    - domain: sensor
+      device_class: sulphur_dioxide
+
+# --- Binary sensor conditions ---
+
+.condition_binary_common: &condition_binary_common
+  fields:
+    behavior: *condition_behavior
+
+is_gas_detected:
+  <<: *condition_binary_common
+  target: *target_gas
+
+is_gas_cleared:
+  <<: *condition_binary_common
+  target: *target_gas
+
+is_co_detected:
+  <<: *condition_binary_common
+  target: *target_co_binary
+
+is_co_cleared:
+  <<: *condition_binary_common
+  target: *target_co_binary
+
+is_smoke_detected:
+  <<: *condition_binary_common
+  target: *target_smoke
+
+is_smoke_cleared:
+  <<: *condition_binary_common
+  target: *target_smoke
+
+# --- Numerical sensor conditions with unit conversion ---
+
+is_co_value:
+  target: *target_co_sensor
+  fields:
+    behavior: *condition_behavior
+    above: *number_or_entity_co
+    below: *number_or_entity_co
+    unit: *unit_co
+
+is_ozone_value:
+  target: *target_ozone
+  fields:
+    behavior: *condition_behavior
+    above: *number_or_entity_ozone
+    below: *number_or_entity_ozone
+    unit: *unit_ozone
+
+is_voc_value:
+  target: *target_voc
+  fields:
+    behavior: *condition_behavior
+    above: *number_or_entity_voc
+    below: *number_or_entity_voc
+    unit: *unit_voc
+
+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
+
+is_no_value:
+  target: *target_no
+  fields:
+    behavior: *condition_behavior
+    above: *number_or_entity_no
+    below: *number_or_entity_no
+    unit: *unit_no
+
+is_no2_value:
+  target: *target_no2
+  fields:
+    behavior: *condition_behavior
+    above: *number_or_entity_no2
+    below: *number_or_entity_no2
+    unit: *unit_no2
+
+is_so2_value:
+  target: *target_so2
+  fields:
+    behavior: *condition_behavior
+    above: *number_or_entity_so2
+    below: *number_or_entity_so2
+    unit: *unit_so2
+
+# --- Numerical sensor conditions without unit conversion ---
+
+is_co2_value:
+  target: *target_co2
+  fields:
+    behavior: *condition_behavior
+    above: *number_or_entity_co2
+    below: *number_or_entity_co2
+
+is_pm1_value:
+  target: *target_pm1
+  fields:
+    behavior: *condition_behavior
+    above: *number_or_entity_pm1
+    below: *number_or_entity_pm1
+
+is_pm25_value:
+  target: *target_pm25
+  fields:
+    behavior: *condition_behavior
+    above: *number_or_entity_pm25
+    below: *number_or_entity_pm25
+
+is_pm4_value:
+  target: *target_pm4
+  fields:
+    behavior: *condition_behavior
+    above: *number_or_entity_pm4
+    below: *number_or_entity_pm4
+
+is_pm10_value:
+  target: *target_pm10
+  fields:
+    behavior: *condition_behavior
+    above: *number_or_entity_pm10
+    below: *number_or_entity_pm10
+
+is_n2o_value:
+  target: *target_n2o
+  fields:
+    behavior: *condition_behavior
+    above: *number_or_entity_n2o
+    below: *number_or_entity_n2o

homeassistant/components/air_quality/icons.json

@@ -1,7 +1,164 @@
 {
+  "conditions": {
+    "is_co2_value": {
+      "condition": "mdi:molecule-co2"
+    },
+    "is_co_cleared": {
+      "condition": "mdi:check-circle"
+    },
+    "is_co_detected": {
+      "condition": "mdi:molecule-co"
+    },
+    "is_co_value": {
+      "condition": "mdi:molecule-co"
+    },
+    "is_gas_cleared": {
+      "condition": "mdi:check-circle"
+    },
+    "is_gas_detected": {
+      "condition": "mdi:gas-cylinder"
+    },
+    "is_n2o_value": {
+      "condition": "mdi:factory"
+    },
+    "is_no2_value": {
+      "condition": "mdi:factory"
+    },
+    "is_no_value": {
+      "condition": "mdi:factory"
+    },
+    "is_ozone_value": {
+      "condition": "mdi:weather-sunny-alert"
+    },
+    "is_pm10_value": {
+      "condition": "mdi:blur"
+    },
+    "is_pm1_value": {
+      "condition": "mdi:blur"
+    },
+    "is_pm25_value": {
+      "condition": "mdi:blur"
+    },
+    "is_pm4_value": {
+      "condition": "mdi:blur"
+    },
+    "is_smoke_cleared": {
+      "condition": "mdi:check-circle"
+    },
+    "is_smoke_detected": {
+      "condition": "mdi:smoke-detector-variant"
+    },
+    "is_so2_value": {
+      "condition": "mdi:factory"
+    },
+    "is_voc_ratio_value": {
+      "condition": "mdi:air-filter"
+    },
+    "is_voc_value": {
+      "condition": "mdi:air-filter"
+    }
+  },
   "entity_component": {
     "_": {
       "default": "mdi:air-filter"
     }
+  },
+  "triggers": {
+    "co2_changed": {
+      "trigger": "mdi:molecule-co2"
+    },
+    "co2_crossed_threshold": {
+      "trigger": "mdi:molecule-co2"
+    },
+    "co_changed": {
+      "trigger": "mdi:molecule-co"
+    },
+    "co_cleared": {
+      "trigger": "mdi:check-circle"
+    },
+    "co_crossed_threshold": {
+      "trigger": "mdi:molecule-co"
+    },
+    "co_detected": {
+      "trigger": "mdi:molecule-co"
+    },
+    "gas_cleared": {
+      "trigger": "mdi:check-circle"
+    },
+    "gas_detected": {
+      "trigger": "mdi:gas-cylinder"
+    },
+    "n2o_changed": {
+      "trigger": "mdi:factory"
+    },
+    "n2o_crossed_threshold": {
+      "trigger": "mdi:factory"
+    },
+    "no2_changed": {
+      "trigger": "mdi:factory"
+    },
+    "no2_crossed_threshold": {
+      "trigger": "mdi:factory"
+    },
+    "no_changed": {
+      "trigger": "mdi:factory"
+    },
+    "no_crossed_threshold": {
+      "trigger": "mdi:factory"
+    },
+    "ozone_changed": {
+      "trigger": "mdi:weather-sunny-alert"
+    },
+    "ozone_crossed_threshold": {
+      "trigger": "mdi:weather-sunny-alert"
+    },
+    "pm10_changed": {
+      "trigger": "mdi:blur"
+    },
+    "pm10_crossed_threshold": {
+      "trigger": "mdi:blur"
+    },
+    "pm1_changed": {
+      "trigger": "mdi:blur"
+    },
+    "pm1_crossed_threshold": {
+      "trigger": "mdi:blur"
+    },
+    "pm25_changed": {
+      "trigger": "mdi:blur"
+    },
+    "pm25_crossed_threshold": {
+      "trigger": "mdi:blur"
+    },
+    "pm4_changed": {
+      "trigger": "mdi:blur"
+    },
+    "pm4_crossed_threshold": {
+      "trigger": "mdi:blur"
+    },
+    "smoke_cleared": {
+      "trigger": "mdi:check-circle"
+    },
+    "smoke_detected": {
+      "trigger": "mdi:smoke-detector-variant"
+    },
+    "so2_changed": {
+      "trigger": "mdi:factory"
+    },
+    "so2_crossed_threshold": {
+      "trigger": "mdi:factory"
+    },
+    "voc_changed": {
+      "trigger": "mdi:air-filter"
+    },
+    "voc_crossed_threshold": {
+      "trigger": "mdi:air-filter"
+    },
+    "voc_ratio_changed": {
+      "trigger": "mdi:air-filter"
+    },
+    "voc_ratio_crossed_threshold": {
+      "trigger": "mdi:air-filter"
+    }
   }
 }

homeassistant/components/air_quality/strings.json

@@ -0,0 +1,964 @@
+{
+  "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_changed_above_name": "Above",
+    "trigger_changed_below_name": "Below",
+    "trigger_threshold_lower_limit_description": "The lower limit of the threshold.",
+    "trigger_threshold_lower_limit_name": "Lower limit",
+    "trigger_threshold_type_description": "The type of threshold to use.",
+    "trigger_threshold_type_name": "Threshold type",
+    "trigger_threshold_upper_limit_description": "The upper limit of the threshold.",
+    "trigger_threshold_upper_limit_name": "Upper limit",
+    "trigger_unit_description": "All values will be converted to this unit when evaluating the trigger.",
+    "trigger_unit_name": "Unit of measurement"
+  },
+  "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%]"
+        }
+      },
+      "name": "Carbon dioxide value"
+    },
+    "is_co_cleared": {
+      "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%]"
+        }
+      },
+      "name": "Carbon monoxide cleared"
+    },
+    "is_co_detected": {
+      "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%]"
+        }
+      },
+      "name": "Carbon monoxide detected"
+    },
+    "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%]"
+        }
+      },
+      "name": "Carbon monoxide value"
+    },
+    "is_gas_cleared": {
+      "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%]"
+        }
+      },
+      "name": "Gas cleared"
+    },
+    "is_gas_detected": {
+      "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%]"
+        }
+      },
+      "name": "Gas detected"
+    },
+    "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%]"
+        }
+      },
+      "name": "Nitrous oxide value"
+    },
+    "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%]"
+        }
+      },
+      "name": "Nitrogen dioxide value"
+    },
+    "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%]"
+        }
+      },
+      "name": "Nitrogen monoxide value"
+    },
+    "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%]"
+        }
+      },
+      "name": "Ozone value"
+    },
+    "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%]"
+        }
+      },
+      "name": "PM10 value"
+    },
+    "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%]"
+        }
+      },
+      "name": "PM1 value"
+    },
+    "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%]"
+        }
+      },
+      "name": "PM2.5 value"
+    },
+    "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%]"
+        }
+      },
+      "name": "PM4 value"
+    },
+    "is_smoke_cleared": {
+      "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%]"
+        }
+      },
+      "name": "Smoke cleared"
+    },
+    "is_smoke_detected": {
+      "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%]"
+        }
+      },
+      "name": "Smoke detected"
+    },
+    "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%]"
+        }
+      },
+      "name": "Sulphur dioxide value"
+    },
+    "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%]"
+        }
+      },
+      "name": "Volatile organic compounds ratio value"
+    },
+    "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%]"
+        }
+      },
+      "name": "Volatile organic compounds value"
+    }
+  },
+  "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
+    "number_or_entity": {
+      "choices": {
+        "entity": "Entity",
+        "number": "Number"
+      }
+    },
+    "trigger_behavior": {
+      "options": {
+        "any": "Any",
+        "first": "First",
+        "last": "Last"
+      }
+    },
+    "trigger_threshold_type": {
+      "options": {
+        "above": "Above",
+        "below": "Below",
+        "between": "Between",
+        "outside": "Outside"
+      }
+    }
+  },
+  "title": "Air Quality",
+  "triggers": {
+    "co2_changed": {
+      "description": "Triggers after one or more carbon dioxide levels change.",
+      "fields": {
+        "above": {
+          "description": "Only trigger when carbon dioxide level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when carbon dioxide level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        }
+      },
+      "name": "Carbon dioxide level changed"
+    },
+    "co2_crossed_threshold": {
+      "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%]"
+        },
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        }
+      },
+      "name": "Carbon dioxide level crossed threshold"
+    },
+    "co_changed": {
+      "description": "Triggers after one or more carbon monoxide levels change.",
+      "fields": {
+        "above": {
+          "description": "Only trigger when carbon monoxide level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when carbon monoxide level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        }
+      },
+      "name": "Carbon monoxide level changed"
+    },
+    "co_cleared": {
+      "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%]"
+        }
+      },
+      "name": "Carbon monoxide cleared"
+    },
+    "co_crossed_threshold": {
+      "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%]"
+        },
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        }
+      },
+      "name": "Carbon monoxide level crossed threshold"
+    },
+    "co_detected": {
+      "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%]"
+        }
+      },
+      "name": "Carbon monoxide detected"
+    },
+    "gas_cleared": {
+      "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%]"
+        }
+      },
+      "name": "Gas cleared"
+    },
+    "gas_detected": {
+      "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%]"
+        }
+      },
+      "name": "Gas detected"
+    },
+    "n2o_changed": {
+      "description": "Triggers after one or more nitrous oxide levels change.",
+      "fields": {
+        "above": {
+          "description": "Only trigger when nitrous oxide level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when nitrous oxide level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        }
+      },
+      "name": "Nitrous oxide level changed"
+    },
+    "n2o_crossed_threshold": {
+      "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%]"
+        },
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        }
+      },
+      "name": "Nitrous oxide level crossed threshold"
+    },
+    "no2_changed": {
+      "description": "Triggers after one or more nitrogen dioxide levels change.",
+      "fields": {
+        "above": {
+          "description": "Only trigger when nitrogen dioxide level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when nitrogen dioxide level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        }
+      },
+      "name": "Nitrogen dioxide level changed"
+    },
+    "no2_crossed_threshold": {
+      "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%]"
+        },
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        }
+      },
+      "name": "Nitrogen dioxide level crossed threshold"
+    },
+    "no_changed": {
+      "description": "Triggers after one or more nitrogen monoxide levels change.",
+      "fields": {
+        "above": {
+          "description": "Only trigger when nitrogen monoxide level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when nitrogen monoxide level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        }
+      },
+      "name": "Nitrogen monoxide level changed"
+    },
+    "no_crossed_threshold": {
+      "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%]"
+        },
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        }
+      },
+      "name": "Nitrogen monoxide level crossed threshold"
+    },
+    "ozone_changed": {
+      "description": "Triggers after one or more ozone levels change.",
+      "fields": {
+        "above": {
+          "description": "Only trigger when ozone level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when ozone level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        }
+      },
+      "name": "Ozone level changed"
+    },
+    "ozone_crossed_threshold": {
+      "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%]"
+        },
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        }
+      },
+      "name": "Ozone level crossed threshold"
+    },
+    "pm10_changed": {
+      "description": "Triggers after one or more PM10 levels change.",
+      "fields": {
+        "above": {
+          "description": "Only trigger when PM10 level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when PM10 level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        }
+      },
+      "name": "PM10 level changed"
+    },
+    "pm10_crossed_threshold": {
+      "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%]"
+        },
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        }
+      },
+      "name": "PM10 level crossed threshold"
+    },
+    "pm1_changed": {
+      "description": "Triggers after one or more PM1 levels change.",
+      "fields": {
+        "above": {
+          "description": "Only trigger when PM1 level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when PM1 level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        }
+      },
+      "name": "PM1 level changed"
+    },
+    "pm1_crossed_threshold": {
+      "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%]"
+        },
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        }
+      },
+      "name": "PM1 level crossed threshold"
+    },
+    "pm25_changed": {
+      "description": "Triggers after one or more PM2.5 levels change.",
+      "fields": {
+        "above": {
+          "description": "Only trigger when PM2.5 level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when PM2.5 level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        }
+      },
+      "name": "PM2.5 level changed"
+    },
+    "pm25_crossed_threshold": {
+      "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%]"
+        },
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        }
+      },
+      "name": "PM2.5 level crossed threshold"
+    },
+    "pm4_changed": {
+      "description": "Triggers after one or more PM4 levels change.",
+      "fields": {
+        "above": {
+          "description": "Only trigger when PM4 level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when PM4 level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        }
+      },
+      "name": "PM4 level changed"
+    },
+    "pm4_crossed_threshold": {
+      "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%]"
+        },
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        }
+      },
+      "name": "PM4 level crossed threshold"
+    },
+    "smoke_cleared": {
+      "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%]"
+        }
+      },
+      "name": "Smoke cleared"
+    },
+    "smoke_detected": {
+      "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%]"
+        }
+      },
+      "name": "Smoke detected"
+    },
+    "so2_changed": {
+      "description": "Triggers after one or more sulphur dioxide levels change.",
+      "fields": {
+        "above": {
+          "description": "Only trigger when sulphur dioxide level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when sulphur dioxide level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        }
+      },
+      "name": "Sulphur dioxide level changed"
+    },
+    "so2_crossed_threshold": {
+      "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%]"
+        },
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        }
+      },
+      "name": "Sulphur dioxide level crossed threshold"
+    },
+    "voc_changed": {
+      "description": "Triggers after one or more volatile organic compound levels change.",
+      "fields": {
+        "above": {
+          "description": "Only trigger when volatile organic compounds level is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when volatile organic compounds level is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        }
+      },
+      "name": "Volatile organic compounds level changed"
+    },
+    "voc_crossed_threshold": {
+      "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%]"
+        },
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        }
+      },
+      "name": "Volatile organic compounds level crossed threshold"
+    },
+    "voc_ratio_changed": {
+      "description": "Triggers after one or more volatile organic compound ratios change.",
+      "fields": {
+        "above": {
+          "description": "Only trigger when volatile organic compounds ratio is above this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_above_name%]"
+        },
+        "below": {
+          "description": "Only trigger when volatile organic compounds ratio is below this value.",
+          "name": "[%key:component::air_quality::common::trigger_changed_below_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        }
+      },
+      "name": "Volatile organic compounds ratio changed"
+    },
+    "voc_ratio_crossed_threshold": {
+      "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%]"
+        },
+        "lower_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_lower_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_lower_limit_name%]"
+        },
+        "threshold_type": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_type_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_type_name%]"
+        },
+        "unit": {
+          "description": "[%key:component::air_quality::common::trigger_unit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_unit_name%]"
+        },
+        "upper_limit": {
+          "description": "[%key:component::air_quality::common::trigger_threshold_upper_limit_description%]",
+          "name": "[%key:component::air_quality::common::trigger_threshold_upper_limit_name%]"
+        }
+      },
+      "name": "Volatile organic compounds ratio crossed threshold"
+    }
+  }
+}

homeassistant/components/air_quality/trigger.py

@@ -0,0 +1,238 @@
+"""Provides triggers for air quality."""
+
+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 (
+    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    CONCENTRATION_PARTS_PER_BILLION,
+    CONCENTRATION_PARTS_PER_MILLION,
+    STATE_OFF,
+    STATE_ON,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
+from homeassistant.helpers.trigger import (
+    EntityTargetStateTriggerBase,
+    Trigger,
+    make_entity_numerical_state_changed_trigger,
+    make_entity_numerical_state_changed_with_unit_trigger,
+    make_entity_numerical_state_crossed_threshold_trigger,
+    make_entity_numerical_state_crossed_threshold_with_unit_trigger,
+    make_entity_target_state_trigger,
+)
+from homeassistant.util.unit_conversion import (
+    CarbonMonoxideConcentrationConverter,
+    MassVolumeConcentrationConverter,
+    NitrogenDioxideConcentrationConverter,
+    NitrogenMonoxideConcentrationConverter,
+    OzoneConcentrationConverter,
+    SulphurDioxideConcentrationConverter,
+    UnitlessRatioConverter,
+)
+
+
+def _make_detected_trigger(
+    device_class: BinarySensorDeviceClass,
+) -> type[EntityTargetStateTriggerBase]:
+    """Create a detected trigger for a binary sensor device class."""
+
+    return make_entity_target_state_trigger(
+        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_ON
+    )
+
+
+def _make_cleared_trigger(
+    device_class: BinarySensorDeviceClass,
+) -> type[EntityTargetStateTriggerBase]:
+    """Create a cleared trigger for a binary sensor device class."""
+
+    return make_entity_target_state_trigger(
+        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_OFF
+    )
+
+
+TRIGGERS: dict[str, type[Trigger]] = {
+    # Binary sensor triggers (detected/cleared)
+    "gas_detected": _make_detected_trigger(BinarySensorDeviceClass.GAS),
+    "gas_cleared": _make_cleared_trigger(BinarySensorDeviceClass.GAS),
+    "co_detected": _make_detected_trigger(BinarySensorDeviceClass.CO),
+    "co_cleared": _make_cleared_trigger(BinarySensorDeviceClass.CO),
+    "smoke_detected": _make_detected_trigger(BinarySensorDeviceClass.SMOKE),
+    "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)},
+        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)},
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        CarbonMonoxideConcentrationConverter,
+    ),
+    "ozone_changed": make_entity_numerical_state_changed_with_unit_trigger(
+        {SENSOR_DOMAIN: NumericalDomainSpec(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)},
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        OzoneConcentrationConverter,
+    ),
+    "voc_changed": make_entity_numerical_state_changed_with_unit_trigger(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
+            )
+        },
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        MassVolumeConcentrationConverter,
+    ),
+    "voc_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
+            )
+        },
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        MassVolumeConcentrationConverter,
+    ),
+    "voc_ratio_changed": make_entity_numerical_state_changed_with_unit_trigger(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
+            )
+        },
+        CONCENTRATION_PARTS_PER_BILLION,
+        UnitlessRatioConverter,
+    ),
+    "voc_ratio_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
+            )
+        },
+        CONCENTRATION_PARTS_PER_BILLION,
+        UnitlessRatioConverter,
+    ),
+    "no_changed": make_entity_numerical_state_changed_with_unit_trigger(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                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
+            )
+        },
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        NitrogenMonoxideConcentrationConverter,
+    ),
+    "no2_changed": make_entity_numerical_state_changed_with_unit_trigger(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                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
+            )
+        },
+        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        NitrogenDioxideConcentrationConverter,
+    ),
+    "so2_changed": make_entity_numerical_state_changed_with_unit_trigger(
+        {
+            SENSOR_DOMAIN: NumericalDomainSpec(
+                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
+            )
+        },
+        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)},
+        valid_unit=CONCENTRATION_PARTS_PER_MILLION,
+    ),
+    "co2_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
+        {SENSOR_DOMAIN: NumericalDomainSpec(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)},
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+    "pm1_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
+        {SENSOR_DOMAIN: NumericalDomainSpec(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)},
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+    "pm25_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
+        {SENSOR_DOMAIN: NumericalDomainSpec(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)},
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+    "pm4_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
+        {SENSOR_DOMAIN: NumericalDomainSpec(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)},
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+    "pm10_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
+        {SENSOR_DOMAIN: NumericalDomainSpec(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
+            )
+        },
+        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
+            )
+        },
+        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+}
+
+
+async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
+    """Return the triggers for air quality."""
+    return TRIGGERS

homeassistant/components/air_quality/triggers.yaml

@@ -0,0 +1,692 @@
+.trigger_common_fields:
+  behavior: &trigger_behavior
+    required: true
+    default: any
+    selector:
+      select:
+        translation_key: trigger_behavior
+        options:
+          - first
+          - last
+          - any
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+.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
+
+.unit_co: &unit_co
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "ppm"
+        - "mg/m³"
+        - "μg/m³"
+
+.unit_ozone: &unit_ozone
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "ppm"
+        - "μg/m³"
+
+.unit_no2: &unit_no2
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "ppm"
+        - "μg/m³"
+
+.unit_no: &unit_no
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "μg/m³"
+
+.unit_so2: &unit_so2
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "μg/m³"
+
+.unit_voc: &unit_voc
+  required: false
+  selector:
+    select:
+      options:
+        - "μg/m³"
+        - "mg/m³"
+
+.unit_voc_ratio: &unit_voc_ratio
+  required: false
+  selector:
+    select:
+      options:
+        - "ppb"
+        - "ppm"
+
+.trigger_threshold_type: &trigger_threshold_type
+  required: true
+  default: above
+  selector:
+    select:
+      options:
+        - above
+        - below
+        - between
+        - outside
+      translation_key: trigger_threshold_type
+
+# Binary sensor detected/cleared trigger fields
+.trigger_binary_fields: &trigger_binary_fields
+  behavior: *trigger_behavior
+
+# --- Binary sensor targets ---
+
+.target_gas: &target_gas
+  entity:
+    - domain: binary_sensor
+      device_class: gas
+
+.target_co_binary: &target_co_binary
+  entity:
+    - domain: binary_sensor
+      device_class: carbon_monoxide
+
+.target_smoke: &target_smoke
+  entity:
+    - domain: binary_sensor
+      device_class: smoke
+
+# --- Sensor targets ---
+
+.target_co_sensor: &target_co_sensor
+  entity:
+    - domain: sensor
+      device_class: carbon_monoxide
+
+.target_co2: &target_co2
+  entity:
+    - domain: sensor
+      device_class: carbon_dioxide
+
+.target_pm1: &target_pm1
+  entity:
+    - domain: sensor
+      device_class: pm1
+
+.target_pm25: &target_pm25
+  entity:
+    - domain: sensor
+      device_class: pm25
+
+.target_pm4: &target_pm4
+  entity:
+    - domain: sensor
+      device_class: pm4
+
+.target_pm10: &target_pm10
+  entity:
+    - domain: sensor
+      device_class: pm10
+
+.target_ozone: &target_ozone
+  entity:
+    - domain: sensor
+      device_class: ozone
+
+.target_voc: &target_voc
+  entity:
+    - domain: sensor
+      device_class: volatile_organic_compounds
+
+.target_voc_ratio: &target_voc_ratio
+  entity:
+    - domain: sensor
+      device_class: volatile_organic_compounds_parts
+
+.target_no: &target_no
+  entity:
+    - domain: sensor
+      device_class: nitrogen_monoxide
+
+.target_no2: &target_no2
+  entity:
+    - domain: sensor
+      device_class: nitrogen_dioxide
+
+.target_n2o: &target_n2o
+  entity:
+    - domain: sensor
+      device_class: nitrous_oxide
+
+.target_so2: &target_so2
+  entity:
+    - domain: sensor
+      device_class: sulphur_dioxide
+
+# --- Binary sensor triggers ---
+
+gas_detected:
+  fields: *trigger_binary_fields
+  target: *target_gas
+
+gas_cleared:
+  fields: *trigger_binary_fields
+  target: *target_gas
+
+co_detected:
+  fields: *trigger_binary_fields
+  target: *target_co_binary
+
+co_cleared:
+  fields: *trigger_binary_fields
+  target: *target_co_binary
+
+smoke_detected:
+  fields: *trigger_binary_fields
+  target: *target_smoke
+
+smoke_cleared:
+  fields: *trigger_binary_fields
+  target: *target_smoke
+
+# --- Numerical sensor triggers ---
+
+co_changed:
+  target: *target_co_sensor
+  fields:
+    above: *number_or_entity_co
+    below: *number_or_entity_co
+    unit: *unit_co
+
+co_crossed_threshold:
+  target: *target_co_sensor
+  fields:
+    behavior: *trigger_behavior
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_co
+    upper_limit: *number_or_entity_co
+    unit: *unit_co
+
+co2_changed:
+  target: *target_co2
+  fields:
+    above: *number_or_entity_co2
+    below: *number_or_entity_co2
+
+co2_crossed_threshold:
+  target: *target_co2
+  fields:
+    behavior: *trigger_behavior
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_co2
+    upper_limit: *number_or_entity_co2
+
+pm1_changed:
+  target: *target_pm1
+  fields:
+    above: *number_or_entity_pm1
+    below: *number_or_entity_pm1
+
+pm1_crossed_threshold:
+  target: *target_pm1
+  fields:
+    behavior: *trigger_behavior
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_pm1
+    upper_limit: *number_or_entity_pm1
+
+pm25_changed:
+  target: *target_pm25
+  fields:
+    above: *number_or_entity_pm25
+    below: *number_or_entity_pm25
+
+pm25_crossed_threshold:
+  target: *target_pm25
+  fields:
+    behavior: *trigger_behavior
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_pm25
+    upper_limit: *number_or_entity_pm25
+
+pm4_changed:
+  target: *target_pm4
+  fields:
+    above: *number_or_entity_pm4
+    below: *number_or_entity_pm4
+
+pm4_crossed_threshold:
+  target: *target_pm4
+  fields:
+    behavior: *trigger_behavior
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_pm4
+    upper_limit: *number_or_entity_pm4
+
+pm10_changed:
+  target: *target_pm10
+  fields:
+    above: *number_or_entity_pm10
+    below: *number_or_entity_pm10
+
+pm10_crossed_threshold:
+  target: *target_pm10
+  fields:
+    behavior: *trigger_behavior
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_pm10
+    upper_limit: *number_or_entity_pm10
+
+ozone_changed:
+  target: *target_ozone
+  fields:
+    above: *number_or_entity_ozone
+    below: *number_or_entity_ozone
+    unit: *unit_ozone
+
+ozone_crossed_threshold:
+  target: *target_ozone
+  fields:
+    behavior: *trigger_behavior
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_ozone
+    upper_limit: *number_or_entity_ozone
+    unit: *unit_ozone
+
+voc_changed:
+  target: *target_voc
+  fields:
+    above: *number_or_entity_voc
+    below: *number_or_entity_voc
+    unit: *unit_voc
+
+voc_crossed_threshold:
+  target: *target_voc
+  fields:
+    behavior: *trigger_behavior
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_voc
+    upper_limit: *number_or_entity_voc
+    unit: *unit_voc
+
+voc_ratio_changed:
+  target: *target_voc_ratio
+  fields:
+    above: *number_or_entity_voc_ratio
+    below: *number_or_entity_voc_ratio
+    unit: *unit_voc_ratio
+
+voc_ratio_crossed_threshold:
+  target: *target_voc_ratio
+  fields:
+    behavior: *trigger_behavior
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_voc_ratio
+    upper_limit: *number_or_entity_voc_ratio
+    unit: *unit_voc_ratio
+
+no_changed:
+  target: *target_no
+  fields:
+    above: *number_or_entity_no
+    below: *number_or_entity_no
+    unit: *unit_no
+
+no_crossed_threshold:
+  target: *target_no
+  fields:
+    behavior: *trigger_behavior
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_no
+    upper_limit: *number_or_entity_no
+    unit: *unit_no
+
+no2_changed:
+  target: *target_no2
+  fields:
+    above: *number_or_entity_no2
+    below: *number_or_entity_no2
+    unit: *unit_no2
+
+no2_crossed_threshold:
+  target: *target_no2
+  fields:
+    behavior: *trigger_behavior
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_no2
+    upper_limit: *number_or_entity_no2
+    unit: *unit_no2
+
+n2o_changed:
+  target: *target_n2o
+  fields:
+    above: *number_or_entity_n2o
+    below: *number_or_entity_n2o
+
+n2o_crossed_threshold:
+  target: *target_n2o
+  fields:
+    behavior: *trigger_behavior
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_n2o
+    upper_limit: *number_or_entity_n2o
+
+so2_changed:
+  target: *target_so2
+  fields:
+    above: *number_or_entity_so2
+    below: *number_or_entity_so2
+    unit: *unit_so2
+
+so2_crossed_threshold:
+  target: *target_so2
+  fields:
+    behavior: *trigger_behavior
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity_so2
+    upper_limit: *number_or_entity_so2
+    unit: *unit_so2

homeassistant/components/airq/config_flow.py

@@ -87,7 +87,7 @@ class AirQConfigFlow(ConfigFlow, domain=DOMAIN):
             _LOGGER.debug("Successfully connected to %s", user_input[CONF_IP_ADDRESS])
 
             device_info = await airq.fetch_device_info()
-            await self.async_set_unique_id(device_info["id"])
+            await self.async_set_unique_id(device_info["id"], raise_on_progress=False)
             self._abort_if_unique_id_configured()
 
             _LOGGER.debug("Creating an entry for %s", device_info["name"])

homeassistant/components/airq/strings.json

@@ -2,6 +2,7 @@
   "config": {
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "incomplete_discovery": "The discovered air-Q device did not provide a device ID. Ensure the firmware is up to date."
     },
     "error": {

homeassistant/components/alarm_control_panel/strings.json

@@ -173,7 +173,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm away"
+      "name": "Arm alarm away"
     },
     "alarm_arm_custom_bypass": {
       "description": "Arms an alarm while allowing to bypass a custom area.",
@@ -183,7 +183,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm with custom bypass"
+      "name": "Arm alarm with custom bypass"
     },
     "alarm_arm_home": {
       "description": "Arms an alarm in the home mode.",
@@ -193,7 +193,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm home"
+      "name": "Arm alarm home"
     },
     "alarm_arm_night": {
       "description": "Arms an alarm in the night mode.",
@@ -203,7 +203,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm night"
+      "name": "Arm alarm night"
     },
     "alarm_arm_vacation": {
       "description": "Arms an alarm in the vacation mode.",
@@ -213,7 +213,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm vacation"
+      "name": "Arm alarm vacation"
     },
     "alarm_disarm": {
       "description": "Disarms an alarm.",
@@ -223,7 +223,7 @@
           "name": "Code"
         }
       },
-      "name": "Disarm"
+      "name": "Disarm alarm"
     },
     "alarm_trigger": {
       "description": "Triggers an alarm manually.",
@@ -233,7 +233,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Trigger"
+      "name": "Trigger alarm"
     }
   },
   "title": "Alarm control panel",

homeassistant/components/alexa_devices/manifest.json

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

homeassistant/components/assist_pipeline/__init__.py

@@ -137,5 +137,4 @@ async def async_pipeline_from_audio_stream(
                 audio_settings=audio_settings or AudioSettings(),
             ),
         )
-        await pipeline_input.validate()
-        await pipeline_input.execute()
+        await pipeline_input.execute(validate=True)

homeassistant/components/assist_pipeline/error.py

@@ -1,7 +1,14 @@
 """Assist pipeline errors."""
 
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
 from homeassistant.exceptions import HomeAssistantError
 
+if TYPE_CHECKING:
+    from .pipeline import PipelineStage
+
 
 class PipelineError(HomeAssistantError):
     """Base class for pipeline errors."""
@@ -55,3 +62,25 @@ class IntentRecognitionError(PipelineError):
 
 class TextToSpeechError(PipelineError):
     """Error in text-to-speech portion of pipeline."""
+
+
+class PipelineRunValidationError(PipelineError):
+    """Error when a pipeline run is not valid."""
+
+    def __init__(self, message: str) -> None:
+        """Set error message."""
+        super().__init__("validation-error", message)
+
+
+class InvalidPipelineStagesError(PipelineRunValidationError):
+    """Error when given an invalid combination of start/end stages."""
+
+    def __init__(
+        self,
+        start_stage: PipelineStage,
+        end_stage: PipelineStage,
+    ) -> None:
+        """Set error message."""
+        super().__init__(
+            f"Invalid stage combination: start={start_stage}, end={end_stage}"
+        )

homeassistant/components/assist_pipeline/pipeline.py

@@ -73,8 +73,10 @@ from .const import (
 from .error import (
     DuplicateWakeUpDetectedError,
     IntentRecognitionError,
+    InvalidPipelineStagesError,
     PipelineError,
     PipelineNotFound,
+    PipelineRunValidationError,
     SpeechToTextError,
     TextToSpeechError,
     WakeWordDetectionAborted,
@@ -492,24 +494,6 @@ PIPELINE_STAGE_ORDER = [
 ]
 
 
-class PipelineRunValidationError(Exception):
-    """Error when a pipeline run is not valid."""
-
-
-class InvalidPipelineStagesError(PipelineRunValidationError):
-    """Error when given an invalid combination of start/end stages."""
-
-    def __init__(
-        self,
-        start_stage: PipelineStage,
-        end_stage: PipelineStage,
-    ) -> None:
-        """Set error message."""
-        super().__init__(
-            f"Invalid stage combination: start={start_stage}, end={end_stage}"
-        )
-
-
 @dataclass(frozen=True)
 class WakeWordSettings:
     """Settings for wake word detection."""
@@ -1680,26 +1664,39 @@ class PipelineInput:
     satellite_id: str | None = None
     """Identifier of the satellite that is processing the input/output of the pipeline."""
 
-    async def execute(self) -> None:
+    async def execute(self, validate: bool = False) -> None:
         """Run pipeline."""
+        validation_error: PipelineError | None = None
+        if validate:
+            try:
+                await self.validate()
+            except PipelineError as err:
+                validation_error = err
+
         self.run.start(
             conversation_id=self.session.conversation_id,
             device_id=self.device_id,
             satellite_id=self.satellite_id,
         )
         current_stage: PipelineStage | None = self.run.start_stage
-        stt_audio_buffer: list[EnhancedAudioChunk] = []
-        stt_processed_stream: AsyncIterable[EnhancedAudioChunk] | None = None
-
-        if self.stt_stream is not None:
-            if self.run.audio_settings.needs_processor:
-                # VAD/noise suppression/auto gain/volume
-                stt_processed_stream = self.run.process_enhance_audio(self.stt_stream)
-            else:
-                # Volume multiplier only
-                stt_processed_stream = self.run.process_volume_only(self.stt_stream)
 
         try:
+            if validation_error is not None:
+                raise validation_error
+
+            stt_audio_buffer: list[EnhancedAudioChunk] = []
+            stt_processed_stream: AsyncIterable[EnhancedAudioChunk] | None = None
+
+            if self.stt_stream is not None:
+                if self.run.audio_settings.needs_processor:
+                    # VAD/noise suppression/auto gain/volume
+                    stt_processed_stream = self.run.process_enhance_audio(
+                        self.stt_stream
+                    )
+                else:
+                    # Volume multiplier only
+                    stt_processed_stream = self.run.process_volume_only(self.stt_stream)
+
             if current_stage == PipelineStage.WAKE_WORD:
                 # wake-word-detection
                 assert stt_processed_stream is not None

homeassistant/components/auth/__init__.py

@@ -626,7 +626,7 @@ def websocket_delete_all_refresh_tokens(
     hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]
 ) -> None:
     """Handle delete all refresh tokens request."""
-    current_refresh_token: RefreshToken
+    current_refresh_token: RefreshToken | None = None
     remove_failed = False
     token_type = msg.get("token_type")
     delete_current_token = msg.get("delete_current_token")
@@ -654,7 +654,7 @@ def websocket_delete_all_refresh_tokens(
     else:
         connection.send_result(msg["id"], {})
 
-    async def _delete_current_token_soon() -> None:
+    async def _delete_current_token_soon(current_refresh_token: RefreshToken) -> None:
         """Delete the current token after a delay.
 
         We do not want to delete the current token immediately as it will
@@ -675,13 +675,15 @@ def websocket_delete_all_refresh_tokens(
             # the token right away.
             hass.auth.async_remove_refresh_token(current_refresh_token)
 
-    if delete_current_token and (
-        not limit_token_types or current_refresh_token.token_type == token_type
+    if (
+        delete_current_token
+        and current_refresh_token
+        and (not limit_token_types or current_refresh_token.token_type == token_type)
     ):
         # Deleting the token will close the connection so we need
         # to do it with a delay in a tracked task to ensure it still
         # happens if Home Assistant is shutting down.
-        hass.async_create_task(_delete_current_token_soon())
+        hass.async_create_task(_delete_current_token_soon(current_refresh_token))
 
 
 @websocket_api.websocket_command(

homeassistant/components/auth/login_flow.py

@@ -115,6 +115,7 @@ def async_setup(
 ) -> None:
     """Component to allow users to login."""
     hass.http.register_view(WellKnownOAuthInfoView)
+    hass.http.register_view(WellKnownProtectedResourceView)
     hass.http.register_view(AuthProvidersView)
     hass.http.register_view(LoginFlowIndexView(hass.auth.login_flow, store_result))
     hass.http.register_view(LoginFlowResourceView(hass.auth.login_flow, store_result))
@@ -154,6 +155,32 @@ class WellKnownOAuthInfoView(HomeAssistantView):
         return self.json(metadata)
 
 
+class WellKnownProtectedResourceView(HomeAssistantView):
+    """View to host the OAuth2 Protected Resource Metadata per RFC9728."""
+
+    requires_auth = False
+    url = "/.well-known/oauth-protected-resource"
+    name = "well-known/oauth-protected-resource"
+
+    async def get(self, request: web.Request) -> web.Response:
+        """Return the protected resource metadata."""
+        hass = request.app[KEY_HASS]
+        try:
+            url_prefix = get_url(hass, require_current_request=True)
+        except NoURLAvailableError:
+            return self.json_message("No URL available", HTTPStatus.NOT_FOUND)
+
+        return self.json(
+            {
+                "resource": url_prefix,
+                "authorization_servers": [url_prefix],
+                "resource_documentation": (
+                    "https://developers.home-assistant.io/docs/auth_api"
+                ),
+            }
+        )
+
+
 class AuthProvidersView(HomeAssistantView):
     """View to get available auth providers."""
 

homeassistant/components/automation/__init__.py

@@ -118,34 +118,10 @@ SERVICE_TRIGGER = "trigger"
 NEW_TRIGGERS_CONDITIONS_FEATURE_FLAG = "new_triggers_conditions"
 
 _EXPERIMENTAL_CONDITION_PLATFORMS = {
+    "air_quality",
     "alarm_control_panel",
     "assist_satellite",
-    "climate",
-    "cover",
-    "device_tracker",
-    "door",
-    "fan",
-    "garage_door",
-    "gate",
-    "humidifier",
-    "lawn_mower",
-    "light",
-    "lock",
-    "media_player",
-    "motion",
-    "occupancy",
-    "person",
-    "schedule",
-    "siren",
-    "switch",
-    "vacuum",
-    "window",
-}
-
-_EXPERIMENTAL_TRIGGER_PLATFORMS = {
-    "alarm_control_panel",
-    "assist_satellite",
-    "button",
+    "battery",
     "climate",
     "cover",
     "device_tracker",
@@ -155,6 +131,7 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "gate",
     "humidifier",
     "humidity",
+    "illuminance",
     "lawn_mower",
     "light",
     "lock",
@@ -162,6 +139,42 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "motion",
     "occupancy",
     "person",
+    "power",
+    "schedule",
+    "siren",
+    "switch",
+    "text",
+    "vacuum",
+    "water_heater",
+    "window",
+}
+
+_EXPERIMENTAL_TRIGGER_PLATFORMS = {
+    "air_quality",
+    "alarm_control_panel",
+    "assist_satellite",
+    "button",
+    "climate",
+    "counter",
+    "cover",
+    "device_tracker",
+    "door",
+    "event",
+    "fan",
+    "garage_door",
+    "gate",
+    "humidifier",
+    "humidity",
+    "illuminance",
+    "lawn_mower",
+    "light",
+    "lock",
+    "media_player",
+    "moisture",
+    "motion",
+    "occupancy",
+    "person",
+    "power",
     "remote",
     "scene",
     "schedule",
@@ -172,6 +185,7 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "text",
     "update",
     "vacuum",
+    "water_heater",
     "window",
 }
 

homeassistant/components/aws_s3/backup.py

@@ -147,7 +147,7 @@ class S3BackupAgent(BackupAgent):
             if backup.size < MULTIPART_MIN_PART_SIZE_BYTES:
                 await self._upload_simple(tar_filename, open_stream)
             else:
-                await self._upload_multipart(tar_filename, open_stream)
+                await self._upload_multipart(tar_filename, open_stream, on_progress)
 
             # Upload the metadata file
             metadata_content = json.dumps(backup.as_dict())
@@ -188,11 +188,13 @@ class S3BackupAgent(BackupAgent):
         self,
         tar_filename: str,
         open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
-    ):
+        on_progress: OnProgressCallback,
+    ) -> None:
         """Upload a large file using multipart upload.
 
         :param tar_filename: The target filename for the backup.
         :param open_stream: A function returning an async iterator that yields bytes.
+        :param on_progress: A callback to report the number of uploaded bytes.
         """
         _LOGGER.debug("Starting multipart upload for %s", tar_filename)
         multipart_upload = await self._client.create_multipart_upload(
@@ -205,6 +207,7 @@ class S3BackupAgent(BackupAgent):
             part_number = 1
             buffer = bytearray()  # bytes buffer to store the data
             offset = 0  # start index of unread data inside buffer
+            bytes_uploaded = 0
 
             stream = await open_stream()
             async for chunk in stream:
@@ -233,6 +236,8 @@ class S3BackupAgent(BackupAgent):
                             Body=part_data.tobytes(),
                         )
                         parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
+                        bytes_uploaded += len(part_data)
+                        on_progress(bytes_uploaded=bytes_uploaded)
                         part_number += 1
                 finally:
                     view.release()
@@ -261,6 +266,8 @@ class S3BackupAgent(BackupAgent):
                     Body=remaining_data.tobytes(),
                 )
                 parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
+                bytes_uploaded += len(remaining_data)
+                on_progress(bytes_uploaded=bytes_uploaded)
 
             await cast(Any, self._client).complete_multipart_upload(
                 Bucket=self._bucket,

homeassistant/components/backup/const.py

@@ -34,4 +34,4 @@ EXCLUDE_DATABASE_FROM_BACKUP = [
     "home-assistant_v2.db-wal",
 ]
 
-SECURETAR_CREATE_VERSION = 3
+SECURETAR_CREATE_VERSION = 2

homeassistant/components/battery/__init__.py

@@ -0,0 +1,17 @@
+"""Integration for battery conditions."""
+
+from __future__ import annotations
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.typing import ConfigType
+
+DOMAIN = "battery"
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
+__all__ = []
+
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the component."""
+    return True

homeassistant/components/battery/condition.py

@@ -0,0 +1,48 @@
+"""Provides conditions for batteries."""
+
+from __future__ import annotations
+
+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
+from homeassistant.helpers.automation import DomainSpec
+from homeassistant.helpers.condition import (
+    Condition,
+    make_entity_numerical_condition,
+    make_entity_state_condition,
+)
+
+BATTERY_DOMAIN_SPECS = {
+    BINARY_SENSOR_DOMAIN: DomainSpec(device_class=BinarySensorDeviceClass.BATTERY)
+}
+BATTERY_CHARGING_DOMAIN_SPECS = {
+    BINARY_SENSOR_DOMAIN: DomainSpec(
+        device_class=BinarySensorDeviceClass.BATTERY_CHARGING
+    )
+}
+BATTERY_PERCENTAGE_DOMAIN_SPECS = {
+    SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.BATTERY),
+    NUMBER_DOMAIN: DomainSpec(device_class=NumberDeviceClass.BATTERY),
+}
+
+CONDITIONS: dict[str, type[Condition]] = {
+    "is_low": make_entity_state_condition(BATTERY_DOMAIN_SPECS, STATE_ON),
+    "is_not_low": make_entity_state_condition(BATTERY_DOMAIN_SPECS, STATE_OFF),
+    "is_charging": make_entity_state_condition(BATTERY_CHARGING_DOMAIN_SPECS, STATE_ON),
+    "is_not_charging": make_entity_state_condition(
+        BATTERY_CHARGING_DOMAIN_SPECS, STATE_OFF
+    ),
+    "is_level": make_entity_numerical_condition(
+        BATTERY_PERCENTAGE_DOMAIN_SPECS, PERCENTAGE
+    ),
+}
+
+
+async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
+    """Return the conditions for batteries."""
+    return CONDITIONS

homeassistant/components/battery/conditions.yaml

@@ -0,0 +1,66 @@
+.condition_common: &condition_common
+  target: &target_battery_binary_sensor
+    entity:
+      - domain: binary_sensor
+        device_class: battery
+  fields:
+    behavior: &condition_behavior
+      required: true
+      default: any
+      selector:
+        select:
+          translation_key: condition_behavior
+          options:
+            - 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
+
+is_low: *condition_common
+
+is_not_low: *condition_common
+
+is_charging:
+  target:
+    entity:
+      - domain: binary_sensor
+        device_class: battery_charging
+  fields:
+    behavior: *condition_behavior
+
+is_not_charging:
+  target:
+    entity:
+      - domain: binary_sensor
+        device_class: battery_charging
+  fields:
+    behavior: *condition_behavior
+
+is_level:
+  target:
+    entity:
+      - domain: sensor
+        device_class: battery
+      - domain: number
+        device_class: battery
+  fields:
+    behavior: *condition_behavior
+    above: *number_or_entity
+    below: *number_or_entity

homeassistant/components/battery/icons.json

@@ -0,0 +1,19 @@
+{
+  "conditions": {
+    "is_charging": {
+      "condition": "mdi:battery-charging"
+    },
+    "is_level": {
+      "condition": "mdi:battery-unknown"
+    },
+    "is_low": {
+      "condition": "mdi:battery-alert"
+    },
+    "is_not_charging": {
+      "condition": "mdi:battery"
+    },
+    "is_not_low": {
+      "condition": "mdi:battery"
+    }
+  }
+}

homeassistant/components/battery/manifest.json

@@ -0,0 +1,8 @@
+{
+  "domain": "battery",
+  "name": "Battery",
+  "codeowners": ["@home-assistant/core"],
+  "documentation": "https://www.home-assistant.io/integrations/battery",
+  "integration_type": "system",
+  "quality_scale": "internal"
+}

homeassistant/components/battery/strings.json

@@ -0,0 +1,81 @@
+{
+  "common": {
+    "condition_behavior_description": "How the state should match on the targeted batteries.",
+    "condition_behavior_name": "Behavior"
+  },
+  "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%]"
+        }
+      },
+      "name": "Battery is charging"
+    },
+    "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"
+        }
+      },
+      "name": "Battery level"
+    },
+    "is_low": {
+      "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%]"
+        }
+      },
+      "name": "Battery is low"
+    },
+    "is_not_charging": {
+      "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%]"
+        }
+      },
+      "name": "Battery is not charging"
+    },
+    "is_not_low": {
+      "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%]"
+        }
+      },
+      "name": "Battery is not low"
+    }
+  },
+  "selector": {
+    "condition_behavior": {
+      "options": {
+        "all": "All",
+        "any": "Any"
+      }
+    },
+    "number_or_entity": {
+      "choices": {
+        "entity": "Entity",
+        "number": "Number"
+      }
+    }
+  },
+  "title": "Battery"
+}

homeassistant/components/bsblan/manifest.json

@@ -8,7 +8,7 @@
   "iot_class": "local_polling",
   "loggers": ["bsblan"],
   "quality_scale": "silver",
-  "requirements": ["python-bsblan==5.1.2"],
+  "requirements": ["python-bsblan==5.1.3"],
   "zeroconf": [
     {
       "name": "bsb-lan*",

homeassistant/components/button/strings.json

@@ -23,8 +23,8 @@
   },
   "services": {
     "press": {
-      "description": "Presses a button entity.",
-      "name": "Press"
+      "description": "Presses a button.",
+      "name": "Press button"
     }
   },
   "title": "Button",

homeassistant/components/calendar/strings.json

@@ -90,7 +90,7 @@
           "name": "Summary"
         }
       },
-      "name": "Create event"
+      "name": "Create calendar event"
     },
     "get_events": {
       "description": "Retrieves events on a calendar within a time range.",
@@ -108,7 +108,7 @@
           "name": "Start time"
         }
       },
-      "name": "Get events"
+      "name": "Get calendar events"
     }
   },
   "title": "Calendar",

homeassistant/components/camera/__init__.py

@@ -432,6 +432,7 @@ class Camera(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
     )
 
     # Entity Properties
+    entity_description: CameraEntityDescription
     _attr_brand: str | None = None
     _attr_frame_interval: float = MIN_STREAM_INTERVAL
     _attr_is_on: bool = True

homeassistant/components/camera/strings.json

@@ -51,11 +51,11 @@
   "services": {
     "disable_motion_detection": {
       "description": "Disables the motion detection of a camera.",
-      "name": "Disable motion detection"
+      "name": "Disable camera motion detection"
     },
     "enable_motion_detection": {
       "description": "Enables the motion detection of a camera.",
-      "name": "Enable motion detection"
+      "name": "Enable camera motion detection"
     },
     "play_stream": {
       "description": "Plays a camera stream on a supported media player.",
@@ -69,7 +69,7 @@
           "name": "Media player"
         }
       },
-      "name": "Play stream"
+      "name": "Play camera stream"
     },
     "record": {
       "description": "Creates a recording of a live camera feed.",
@@ -87,7 +87,7 @@
           "name": "Lookback"
         }
       },
-      "name": "Record"
+      "name": "Record camera feed"
     },
     "snapshot": {
       "description": "Takes a snapshot from a camera.",
@@ -97,15 +97,15 @@
           "name": "Filename"
         }
       },
-      "name": "Take snapshot"
+      "name": "Take camera snapshot"
     },
     "turn_off": {
       "description": "Turns off a camera.",
-      "name": "[%key:common::action::turn_off%]"
+      "name": "Turn off camera"
     },
     "turn_on": {
       "description": "Turns on a camera.",
-      "name": "[%key:common::action::turn_on%]"
+      "name": "Turn on camera"
     }
   },
   "title": "Camera"

homeassistant/components/casper_glow/__init__.py

@@ -11,7 +11,7 @@ from homeassistant.exceptions import ConfigEntryNotReady
 
 from .coordinator import CasperGlowConfigEntry, CasperGlowCoordinator
 
-PLATFORMS: list[Platform] = [Platform.LIGHT]
+PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.BUTTON, Platform.LIGHT]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: CasperGlowConfigEntry) -> bool:

homeassistant/components/casper_glow/binary_sensor.py

@@ -0,0 +1,51 @@
+"""Casper Glow integration binary sensor platform."""
+
+from __future__ import annotations
+
+from pycasperglow import GlowState
+
+from homeassistant.components.binary_sensor import BinarySensorEntity
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.device_registry import format_mac
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import CasperGlowConfigEntry, CasperGlowCoordinator
+from .entity import CasperGlowEntity
+
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: CasperGlowConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the binary sensor platform for Casper Glow."""
+    async_add_entities([CasperGlowPausedBinarySensor(entry.runtime_data)])
+
+
+class CasperGlowPausedBinarySensor(CasperGlowEntity, BinarySensorEntity):
+    """Binary sensor indicating whether the Casper Glow dimming is paused."""
+
+    _attr_translation_key = "paused"
+
+    def __init__(self, coordinator: CasperGlowCoordinator) -> None:
+        """Initialize the paused binary sensor."""
+        super().__init__(coordinator)
+        self._attr_unique_id = f"{format_mac(coordinator.device.address)}_paused"
+        if coordinator.device.state.is_paused is not None:
+            self._attr_is_on = coordinator.device.state.is_paused
+
+    async def async_added_to_hass(self) -> None:
+        """Register state update callback when entity is added."""
+        await super().async_added_to_hass()
+        self.async_on_remove(
+            self._device.register_callback(self._async_handle_state_update)
+        )
+
+    @callback
+    def _async_handle_state_update(self, state: GlowState) -> None:
+        """Handle a state update from the device."""
+        if state.is_paused is not None:
+            self._attr_is_on = state.is_paused
+        self.async_write_ha_state()

homeassistant/components/casper_glow/button.py

@@ -0,0 +1,73 @@
+"""Casper Glow integration button platform."""
+
+from __future__ import annotations
+
+from collections.abc import Awaitable, Callable
+from dataclasses import dataclass
+
+from pycasperglow import CasperGlow
+
+from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import format_mac
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import CasperGlowConfigEntry, CasperGlowCoordinator
+from .entity import CasperGlowEntity
+
+PARALLEL_UPDATES = 1
+
+
+@dataclass(frozen=True, kw_only=True)
+class CasperGlowButtonEntityDescription(ButtonEntityDescription):
+    """Describe a Casper Glow button entity."""
+
+    press_fn: Callable[[CasperGlow], Awaitable[None]]
+
+
+BUTTON_DESCRIPTIONS: tuple[CasperGlowButtonEntityDescription, ...] = (
+    CasperGlowButtonEntityDescription(
+        key="pause",
+        translation_key="pause",
+        press_fn=lambda device: device.pause(),
+    ),
+    CasperGlowButtonEntityDescription(
+        key="resume",
+        translation_key="resume",
+        press_fn=lambda device: device.resume(),
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: CasperGlowConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the button platform for Casper Glow."""
+    async_add_entities(
+        CasperGlowButton(entry.runtime_data, description)
+        for description in BUTTON_DESCRIPTIONS
+    )
+
+
+class CasperGlowButton(CasperGlowEntity, ButtonEntity):
+    """A Casper Glow button entity."""
+
+    entity_description: CasperGlowButtonEntityDescription
+
+    def __init__(
+        self,
+        coordinator: CasperGlowCoordinator,
+        description: CasperGlowButtonEntityDescription,
+    ) -> None:
+        """Initialize a Casper Glow button."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._attr_unique_id = (
+            f"{format_mac(coordinator.device.address)}_{description.key}"
+        )
+
+    async def async_press(self) -> None:
+        """Press the button."""
+        await self._async_command(self.entity_description.press_fn(self._device))

homeassistant/components/casper_glow/icons.json

@@ -0,0 +1,17 @@
+{
+  "entity": {
+    "binary_sensor": {
+      "paused": {
+        "default": "mdi:timer-pause"
+      }
+    },
+    "button": {
+      "pause": {
+        "default": "mdi:pause"
+      },
+      "resume": {
+        "default": "mdi:play"
+      }
+    }
+  }
+}

homeassistant/components/casper_glow/manifest.json

@@ -14,6 +14,6 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["pycasperglow"],
-  "quality_scale": "bronze",
+  "quality_scale": "silver",
   "requirements": ["pycasperglow==1.1.0"]
 }

homeassistant/components/casper_glow/quality_scale.yaml

@@ -32,7 +32,9 @@ rules:
   integration-owner: done
   log-when-unavailable: done
   parallel-updates: done
-  reauthentication-flow: todo
+  reauthentication-flow:
+    status: exempt
+    comment: Bluetooth device with no authentication credentials.
   test-coverage: done
 
   # Gold
@@ -53,15 +55,9 @@ rules:
   entity-category: todo
   entity-device-class: todo
   entity-disabled-by-default: todo
-  entity-translations:
-    status: exempt
-    comment: No entity translations needed.
-  exception-translations:
-    status: exempt
-    comment: No custom services that raise exceptions.
-  icon-translations:
-    status: exempt
-    comment: No icon translations needed.
+  entity-translations: done
+  exception-translations: done
+  icon-translations: done
   reconfiguration-flow: todo
   repair-issues: todo
   stale-devices: todo

homeassistant/components/casper_glow/strings.json

@@ -26,6 +26,21 @@
       }
     }
   },
+  "entity": {
+    "binary_sensor": {
+      "paused": {
+        "name": "Dimming paused"
+      }
+    },
+    "button": {
+      "pause": {
+        "name": "Pause dimming"
+      },
+      "resume": {
+        "name": "Resume dimming"
+      }
+    }
+  },
   "exceptions": {
     "communication_error": {
       "message": "An error occurred while communicating with the Casper Glow: {error}"

homeassistant/components/chess_com/icons.json

@@ -1,20 +1,68 @@
 {
   "entity": {
     "sensor": {
+      "chess960_daily_draw": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess960_daily_lost": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess960_daily_rating": {
+        "default": "mdi:chart-line"
+      },
+      "chess960_daily_won": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_blitz_draw": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_blitz_lost": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_blitz_rating": {
+        "default": "mdi:chart-line"
+      },
+      "chess_blitz_won": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_bullet_draw": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_bullet_lost": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_bullet_rating": {
+        "default": "mdi:chart-line"
+      },
+      "chess_bullet_won": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_daily_draw": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_daily_lost": {
+        "default": "mdi:chess-pawn"
+      },
       "chess_daily_rating": {
         "default": "mdi:chart-line"
       },
+      "chess_daily_won": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_rapid_draw": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_rapid_lost": {
+        "default": "mdi:chess-pawn"
+      },
+      "chess_rapid_rating": {
+        "default": "mdi:chart-line"
+      },
+      "chess_rapid_won": {
+        "default": "mdi:chess-pawn"
+      },
       "followers": {
         "default": "mdi:account-multiple"
-      },
-      "total_daily_draw": {
-        "default": "mdi:chess-pawn"
-      },
-      "total_daily_lost": {
-        "default": "mdi:chess-pawn"
-      },
-      "total_daily_won": {
-        "default": "mdi:chess-pawn"
       }
     }
   }

homeassistant/components/chess_com/sensor.py

@@ -2,6 +2,9 @@
 
 from collections.abc import Callable
 from dataclasses import dataclass
+from typing import TYPE_CHECKING, Any
+
+from chess_com_api import PlayerStats
 
 from homeassistant.components.sensor import (
     SensorEntity,
@@ -24,7 +27,14 @@ class ChessEntityDescription(SensorEntityDescription):
     value_fn: Callable[[ChessData], float]
 
 
-SENSORS: tuple[ChessEntityDescription, ...] = (
+@dataclass(kw_only=True, frozen=True)
+class ChessModeEntityDescription(SensorEntityDescription):
+    """Sensor description for a Chess.com game mode."""
+
+    value_fn: Callable[[dict[str, Any]], float]
+
+
+PLAYER_SENSORS: tuple[ChessEntityDescription, ...] = (
     ChessEntityDescription(
         key="followers",
         translation_key="followers",
@@ -33,35 +43,46 @@ SENSORS: tuple[ChessEntityDescription, ...] = (
         value_fn=lambda state: state.player.followers,
         entity_registry_enabled_default=False,
     ),
-    ChessEntityDescription(
-        key="chess_daily_rating",
-        translation_key="chess_daily_rating",
+)
+
+GAME_MODE_SENSORS: tuple[ChessModeEntityDescription, ...] = (
+    ChessModeEntityDescription(
+        key="rating",
+        translation_key="rating",
         state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda state: state.stats.chess_daily["last"]["rating"],
+        value_fn=lambda mode: mode["last"]["rating"],
     ),
-    ChessEntityDescription(
-        key="total_daily_won",
-        translation_key="total_daily_won",
+    ChessModeEntityDescription(
+        key="won",
+        translation_key="won",
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda state: state.stats.chess_daily["record"]["win"],
+        value_fn=lambda mode: mode["record"]["win"],
     ),
-    ChessEntityDescription(
-        key="total_daily_lost",
-        translation_key="total_daily_lost",
+    ChessModeEntityDescription(
+        key="lost",
+        translation_key="lost",
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda state: state.stats.chess_daily["record"]["loss"],
+        value_fn=lambda mode: mode["record"]["loss"],
     ),
-    ChessEntityDescription(
-        key="total_daily_draw",
-        translation_key="total_daily_draw",
+    ChessModeEntityDescription(
+        key="draw",
+        translation_key="draw",
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda state: state.stats.chess_daily["record"]["draw"],
+        value_fn=lambda mode: mode["record"]["draw"],
     ),
 )
 
+GAME_MODES: dict[str, Callable[[PlayerStats], dict[str, Any] | None]] = {
+    "chess_daily": lambda stats: stats.chess_daily,
+    "chess_rapid": lambda stats: stats.chess_rapid,
+    "chess_bullet": lambda stats: stats.chess_bullet,
+    "chess_blitz": lambda stats: stats.chess_blitz,
+    "chess960_daily": lambda stats: stats.chess960_daily,
+}
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -71,13 +92,22 @@ async def async_setup_entry(
     """Initialize the entries."""
     coordinator = entry.runtime_data
 
-    async_add_entities(
-        ChessPlayerSensor(coordinator, description) for description in SENSORS
-    )
+    entities: list[SensorEntity] = [
+        ChessPlayerSensor(coordinator, description) for description in PLAYER_SENSORS
+    ]
+
+    for game_mode, stats_fn in GAME_MODES.items():
+        if stats_fn(coordinator.data.stats) is not None:
+            entities.extend(
+                ChessGameModeSensor(coordinator, description, game_mode, stats_fn)
+                for description in GAME_MODE_SENSORS
+            )
+
+    async_add_entities(entities)
 
 
 class ChessPlayerSensor(ChessEntity, SensorEntity):
-    """Chess.com sensor."""
+    """Chess.com player sensor."""
 
     entity_description: ChessEntityDescription
 
@@ -95,3 +125,33 @@ class ChessPlayerSensor(ChessEntity, SensorEntity):
     def native_value(self) -> float:
         """Return the state of the sensor."""
         return self.entity_description.value_fn(self.coordinator.data)
+
+
+class ChessGameModeSensor(ChessEntity, SensorEntity):
+    """Chess.com game mode sensor."""
+
+    entity_description: ChessModeEntityDescription
+
+    def __init__(
+        self,
+        coordinator: ChessCoordinator,
+        description: ChessModeEntityDescription,
+        game_mode: str,
+        stats_fn: Callable[[PlayerStats], dict[str, Any] | None],
+    ) -> None:
+        """Initialize the sensor."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._stats_fn = stats_fn
+        self._attr_unique_id = (
+            f"{coordinator.config_entry.unique_id}.{game_mode}.{description.key}"
+        )
+        self._attr_translation_key = f"{game_mode}_{description.translation_key}"
+
+    @property
+    def native_value(self) -> float:
+        """Return the state of the sensor."""
+        mode_data = self._stats_fn(self.coordinator.data.stats)
+        if TYPE_CHECKING:
+            assert mode_data is not None
+        return self.entity_description.value_fn(mode_data)

homeassistant/components/chess_com/strings.json

@@ -23,24 +23,84 @@
   },
   "entity": {
     "sensor": {
+      "chess960_daily_draw": {
+        "name": "Total daily Chess960 games drawn",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess960_daily_lost": {
+        "name": "Total daily Chess960 games lost",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess960_daily_rating": {
+        "name": "Daily Chess960 rating"
+      },
+      "chess960_daily_won": {
+        "name": "Total daily Chess960 games won",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_blitz_draw": {
+        "name": "Total blitz chess games drawn",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_blitz_lost": {
+        "name": "Total blitz chess games lost",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_blitz_rating": {
+        "name": "Blitz chess rating"
+      },
+      "chess_blitz_won": {
+        "name": "Total blitz chess games won",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_bullet_draw": {
+        "name": "Total bullet chess games drawn",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_bullet_lost": {
+        "name": "Total bullet chess games lost",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_bullet_rating": {
+        "name": "Bullet chess rating"
+      },
+      "chess_bullet_won": {
+        "name": "Total bullet chess games won",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_daily_draw": {
+        "name": "Total daily chess games drawn",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_daily_lost": {
+        "name": "Total daily chess games lost",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
       "chess_daily_rating": {
         "name": "Daily chess rating"
       },
+      "chess_daily_won": {
+        "name": "Total daily chess games won",
+        "unit_of_measurement": "games"
+      },
+      "chess_rapid_draw": {
+        "name": "Total rapid chess games drawn",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_rapid_lost": {
+        "name": "Total rapid chess games lost",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
+      "chess_rapid_rating": {
+        "name": "Rapid chess rating"
+      },
+      "chess_rapid_won": {
+        "name": "Total rapid chess games won",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
+      },
       "followers": {
         "name": "Followers",
         "unit_of_measurement": "followers"
-      },
-      "total_daily_draw": {
-        "name": "Total chess games drawn",
-        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::total_daily_won::unit_of_measurement%]"
-      },
-      "total_daily_lost": {
-        "name": "Total chess games lost",
-        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::total_daily_won::unit_of_measurement%]"
-      },
-      "total_daily_won": {
-        "name": "Total chess games won",
-        "unit_of_measurement": "games"
       }
     }
   }

homeassistant/components/climate/condition.py

@@ -1,10 +1,31 @@
 """Provides conditions for climates."""
 
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec
-from homeassistant.helpers.condition import Condition, make_entity_state_condition
+from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
+from homeassistant.core import HomeAssistant, State
+from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
+from homeassistant.helpers.condition import (
+    Condition,
+    EntityNumericalConditionWithUnitBase,
+    make_entity_numerical_condition,
+    make_entity_state_condition,
+)
+from homeassistant.util.unit_conversion import TemperatureConverter
+
+from .const import ATTR_HUMIDITY, ATTR_HVAC_ACTION, DOMAIN, HVACAction, HVACMode
+
+
+class ClimateTargetTemperatureCondition(EntityNumericalConditionWithUnitBase):
+    """Mixin for climate target temperature conditions with unit conversion."""
+
+    _base_unit = UnitOfTemperature.CELSIUS
+    _domain_specs = {DOMAIN: NumericalDomainSpec(value_source=ATTR_TEMPERATURE)}
+    _unit_converter = TemperatureConverter
+
+    def _get_entity_unit(self, entity_state: State) -> str | None:
+        """Get the temperature unit of a climate entity from its state."""
+        # Climate entities convert temperatures to the system unit via show_temp
+        return self._hass.config.units.temperature_unit
 
-from .const import ATTR_HVAC_ACTION, DOMAIN, HVACAction, HVACMode
 
 CONDITIONS: dict[str, type[Condition]] = {
     "is_off": make_entity_state_condition(DOMAIN, HVACMode.OFF),
@@ -28,6 +49,11 @@ CONDITIONS: dict[str, type[Condition]] = {
     "is_heating": make_entity_state_condition(
         {DOMAIN: DomainSpec(value_source=ATTR_HVAC_ACTION)}, HVACAction.HEATING
     ),
+    "target_humidity": make_entity_numerical_condition(
+        {DOMAIN: NumericalDomainSpec(value_source=ATTR_HUMIDITY)},
+        valid_unit="%",
+    ),
+    "target_temperature": ClimateTargetTemperatureCondition,
 }
 
 

homeassistant/components/climate/conditions.yaml

@@ -1,9 +1,9 @@
 .condition_common: &condition_common
-  target:
+  target: &condition_climate_target
     entity:
       domain: climate
   fields:
-    behavior:
+    behavior: &condition_behavior
       required: true
       default: any
       selector:
@@ -13,8 +13,76 @@
             - 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
+
+.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
+
+.condition_unit_temperature: &condition_unit_temperature
+  required: false
+  selector:
+    select:
+      options:
+        - "°C"
+        - "°F"
+
 is_off: *condition_common
 is_on: *condition_common
 is_cooling: *condition_common
 is_drying: *condition_common
 is_heating: *condition_common
+
+target_humidity:
+  target: *condition_climate_target
+  fields:
+    behavior: *condition_behavior
+    above: *number_or_entity_humidity
+    below: *number_or_entity_humidity
+
+target_temperature:
+  target: *condition_climate_target
+  fields:
+    behavior: *condition_behavior
+    above: *number_or_entity_temperature
+    below: *number_or_entity_temperature
+    unit: *condition_unit_temperature

homeassistant/components/climate/icons.json

@@ -14,6 +14,12 @@
     },
     "is_on": {
       "condition": "mdi:power-on"
+    },
+    "target_humidity": {
+      "condition": "mdi:water-percent"
+    },
+    "target_temperature": {
+      "condition": "mdi:thermometer"
     }
   },
   "entity_component": {

homeassistant/components/climate/services.yaml

@@ -11,7 +11,8 @@ set_preset_mode:
       required: true
       example: "away"
       selector:
-        text:
+        state:
+          attribute: preset_mode
 
 set_temperature:
   target:
@@ -55,16 +56,10 @@ set_temperature:
           mode: box
     hvac_mode:
       selector:
-        select:
-          options:
-            - "off"
-            - "auto"
-            - "cool"
-            - "dry"
-            - "fan_only"
-            - "heat_cool"
-            - "heat"
-          translation_key: hvac_mode
+        state:
+          hide_states:
+            - unavailable
+            - unknown
 set_humidity:
   target:
     entity:
@@ -91,7 +86,8 @@ set_fan_mode:
       required: true
       example: "low"
       selector:
-        text:
+        state:
+          attribute: fan_mode
 
 set_hvac_mode:
   target:
@@ -115,7 +111,8 @@ set_swing_mode:
       required: true
       example: "on"
       selector:
-        text:
+        state:
+          attribute: swing_mode
 
 set_swing_horizontal_mode:
   target:
@@ -128,7 +125,8 @@ set_swing_horizontal_mode:
       required: true
       example: "on"
       selector:
-        text:
+        state:
+          attribute: swing_horizontal_mode
 
 turn_on:
   target:

homeassistant/components/climate/strings.json

@@ -55,6 +55,46 @@
         }
       },
       "name": "Climate-control device is on"
+    },
+    "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"
+        }
+      },
+      "name": "Climate-control device target humidity"
+    },
+    "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"
+        }
+      },
+      "name": "Climate-control device target temperature"
     }
   },
   "device_automation": {
@@ -241,17 +281,6 @@
         "any": "Any"
       }
     },
-    "hvac_mode": {
-      "options": {
-        "auto": "[%key:common::state::auto%]",
-        "cool": "Cool",
-        "dry": "Dry",
-        "fan_only": "Fan only",
-        "heat": "Heat",
-        "heat_cool": "Heat/cool",
-        "off": "[%key:common::state::off%]"
-      }
-    },
     "number_or_entity": {
       "choices": {
         "entity": "Entity",
@@ -276,67 +305,67 @@
   },
   "services": {
     "set_fan_mode": {
-      "description": "Sets fan operation mode.",
+      "description": "Sets the fan mode of a climate-control device.",
       "fields": {
         "fan_mode": {
           "description": "Fan operation mode.",
           "name": "Fan mode"
         }
       },
-      "name": "Set fan mode"
+      "name": "Set climate-control device fan mode"
     },
     "set_humidity": {
-      "description": "Sets target humidity.",
+      "description": "Sets the target humidity of a climate-control device.",
       "fields": {
         "humidity": {
           "description": "Target humidity.",
           "name": "Humidity"
         }
       },
-      "name": "Set target humidity"
+      "name": "Set climate-control device target humidity"
     },
     "set_hvac_mode": {
-      "description": "Sets HVAC operation mode.",
+      "description": "Sets the HVAC mode of a climate-control device.",
       "fields": {
         "hvac_mode": {
           "description": "HVAC operation mode.",
           "name": "HVAC mode"
         }
       },
-      "name": "Set HVAC mode"
+      "name": "Set climate-control device HVAC mode"
     },
     "set_preset_mode": {
-      "description": "Sets preset mode.",
+      "description": "Sets the preset mode of a climate-control device.",
       "fields": {
         "preset_mode": {
           "description": "Preset mode.",
           "name": "Preset mode"
         }
       },
-      "name": "Set preset mode"
+      "name": "Set climate-control device preset mode"
     },
     "set_swing_horizontal_mode": {
-      "description": "Sets horizontal swing operation mode.",
+      "description": "Sets the horizontal swing mode of a climate-control device.",
       "fields": {
         "swing_horizontal_mode": {
           "description": "Horizontal swing operation mode.",
           "name": "Horizontal swing mode"
         }
       },
-      "name": "Set horizontal swing mode"
+      "name": "Set climate-control device horizontal swing mode"
     },
     "set_swing_mode": {
-      "description": "Sets swing operation mode.",
+      "description": "Sets the swing mode of a climate-control device.",
       "fields": {
         "swing_mode": {
           "description": "Swing operation mode.",
           "name": "Swing mode"
         }
       },
-      "name": "Set swing mode"
+      "name": "Set climate-control device swing mode"
     },
     "set_temperature": {
-      "description": "Sets the temperature setpoint.",
+      "description": "Sets the target temperature of a climate-control device.",
       "fields": {
         "hvac_mode": {
           "description": "HVAC operation mode.",
@@ -355,19 +384,19 @@
           "name": "Target temperature"
         }
       },
-      "name": "Set target temperature"
+      "name": "Set climate-control device target temperature"
     },
     "toggle": {
-      "description": "Toggles climate device, from on to off, or off to on.",
-      "name": "[%key:common::action::toggle%]"
+      "description": "Toggles a climate-control device on/off.",
+      "name": "Toggle climate-control device"
     },
     "turn_off": {
-      "description": "Turns climate device off.",
-      "name": "[%key:common::action::turn_off%]"
+      "description": "Turns off a climate-control device.",
+      "name": "Turn off climate-control device"
     },
     "turn_on": {
-      "description": "Turns climate device on.",
-      "name": "[%key:common::action::turn_on%]"
+      "description": "Turns on a climate-control device.",
+      "name": "Turn on climate-control device"
     }
   },
   "title": "Climate",

homeassistant/components/cloud/backup.py

@@ -138,6 +138,7 @@ class CloudBackupAgent(BackupAgent):
                     base64md5hash=base64md5hash,
                     metadata=metadata,
                     size=size,
+                    on_progress=on_progress,
                 )
                 break
             except CloudApiNonRetryableError as err:

homeassistant/components/cloud/manifest.json

@@ -13,6 +13,6 @@
   "integration_type": "system",
   "iot_class": "cloud_push",
   "loggers": ["acme", "hass_nabucasa", "snitun"],
-  "requirements": ["hass-nabucasa==2.0.0", "openai==2.21.0"],
+  "requirements": ["hass-nabucasa==2.2.0", "openai==2.21.0"],
   "single_config_entry": true
 }

homeassistant/components/cloudflare_r2/backup.py

@@ -144,7 +144,7 @@ class R2BackupAgent(BackupAgent):
             if backup.size < MULTIPART_MIN_PART_SIZE_BYTES:
                 await self._upload_simple(tar_filename, open_stream)
             else:
-                await self._upload_multipart(tar_filename, open_stream)
+                await self._upload_multipart(tar_filename, open_stream, on_progress)
 
             # Upload the metadata file
             metadata_content = json.dumps(backup.as_dict())
@@ -185,11 +185,13 @@ class R2BackupAgent(BackupAgent):
         self,
         tar_filename: str,
         open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
-    ):
+        on_progress: OnProgressCallback,
+    ) -> None:
         """Upload a large file using multipart upload.
 
         :param tar_filename: The target filename for the backup.
         :param open_stream: A function returning an async iterator that yields bytes.
+        :param on_progress: A callback to report the number of uploaded bytes.
         """
         _LOGGER.debug("Starting multipart upload for %s", tar_filename)
         key = self._with_prefix(tar_filename)
@@ -203,6 +205,7 @@ class R2BackupAgent(BackupAgent):
             part_number = 1
             buffer = bytearray()  # bytes buffer to store the data
             offset = 0  # start index of unread data inside buffer
+            bytes_uploaded = 0
 
             stream = await open_stream()
             async for chunk in stream:
@@ -231,6 +234,8 @@ class R2BackupAgent(BackupAgent):
                             Body=part_data.tobytes(),
                         )
                         parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
+                        bytes_uploaded += len(part_data)
+                        on_progress(bytes_uploaded=bytes_uploaded)
                         part_number += 1
                 finally:
                     view.release()
@@ -259,6 +264,8 @@ class R2BackupAgent(BackupAgent):
                     Body=remaining_data.tobytes(),
                 )
                 parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
+                bytes_uploaded += len(remaining_data)
+                on_progress(bytes_uploaded=bytes_uploaded)
 
             await cast(Any, self._client).complete_multipart_upload(
                 Bucket=self._bucket,

homeassistant/components/conversation/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/conversation",
   "integration_type": "entity",
   "quality_scale": "internal",
-  "requirements": ["hassil==3.5.0", "home-assistant-intents==2026.3.3"]
+  "requirements": ["hassil==3.5.0", "home-assistant-intents==2026.3.24"]
 }

homeassistant/components/counter/icons.json

@@ -12,5 +12,22 @@
     "set_value": {
       "service": "mdi:counter"
     }
+  },
+  "triggers": {
+    "decremented": {
+      "trigger": "mdi:numeric-negative-1"
+    },
+    "incremented": {
+      "trigger": "mdi:numeric-positive-1"
+    },
+    "maximum_reached": {
+      "trigger": "mdi:sort-numeric-ascending-variant"
+    },
+    "minimum_reached": {
+      "trigger": "mdi:sort-numeric-descending-variant"
+    },
+    "reset": {
+      "trigger": "mdi:refresh"
+    }
   }
 }

homeassistant/components/counter/strings.json

@@ -1,4 +1,8 @@
 {
+  "common": {
+    "trigger_behavior_description": "The behavior of the targeted counters to trigger on.",
+    "trigger_behavior_name": "Behavior"
+  },
   "entity_component": {
     "_": {
       "name": "[%key:component::counter::title%]",
@@ -25,6 +29,15 @@
       }
     }
   },
+  "selector": {
+    "trigger_behavior": {
+      "options": {
+        "any": "Any",
+        "first": "First",
+        "last": "Last"
+      }
+    }
+  },
   "services": {
     "decrement": {
       "description": "Decrements a counter by its step size.",
@@ -49,5 +62,45 @@
       "name": "Set"
     }
   },
-  "title": "Counter"
+  "title": "Counter",
+  "triggers": {
+    "decremented": {
+      "description": "Triggers after one or more counters decrement.",
+      "name": "Counter decremented"
+    },
+    "incremented": {
+      "description": "Triggers after one or more counters increment.",
+      "name": "Counter incremented"
+    },
+    "maximum_reached": {
+      "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%]"
+        }
+      },
+      "name": "Counter reached maximum"
+    },
+    "minimum_reached": {
+      "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%]"
+        }
+      },
+      "name": "Counter reached minimum"
+    },
+    "reset": {
+      "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%]"
+        }
+      },
+      "name": "Counter reset"
+    }
+  }
 }

homeassistant/components/counter/trigger.py

@@ -0,0 +1,113 @@
+"""Provides triggers for counters."""
+
+from homeassistant.const import (
+    CONF_MAXIMUM,
+    CONF_MINIMUM,
+    STATE_UNAVAILABLE,
+    STATE_UNKNOWN,
+)
+from homeassistant.core import HomeAssistant, State
+from homeassistant.helpers.automation import DomainSpec
+from homeassistant.helpers.trigger import (
+    ENTITY_STATE_TRIGGER_SCHEMA,
+    EntityTriggerBase,
+    Trigger,
+)
+
+from . import CONF_INITIAL, DOMAIN
+
+
+def _is_integer_state(state: State) -> bool:
+    """Return True if the state's value can be interpreted as an integer."""
+    try:
+        int(state.state)
+    except TypeError, ValueError:
+        return False
+    return True
+
+
+class CounterBaseIntegerTrigger(EntityTriggerBase):
+    """Base trigger for valid counter integer states."""
+
+    _domain_specs = {DOMAIN: DomainSpec()}
+    _schema = ENTITY_STATE_TRIGGER_SCHEMA
+
+    def is_valid_state(self, state: State) -> bool:
+        """Check if the new state is valid."""
+        return _is_integer_state(state)
+
+
+class CounterDecrementedTrigger(CounterBaseIntegerTrigger):
+    """Trigger for when a counter is decremented."""
+
+    def is_valid_transition(self, from_state: State, to_state: State) -> bool:
+        """Check if the origin state is valid and the state has changed."""
+        if from_state.state in (STATE_UNAVAILABLE, STATE_UNKNOWN):
+            return False
+        return int(from_state.state) > int(to_state.state)
+
+
+class CounterIncrementedTrigger(CounterBaseIntegerTrigger):
+    """Trigger for when a counter is incremented."""
+
+    def is_valid_transition(self, from_state: State, to_state: State) -> bool:
+        """Check if the origin state is valid and the state has changed."""
+        if from_state.state in (STATE_UNAVAILABLE, STATE_UNKNOWN):
+            return False
+        return int(from_state.state) < int(to_state.state)
+
+
+class CounterValueBaseTrigger(EntityTriggerBase):
+    """Base trigger for counter value changes."""
+
+    _domain_specs = {DOMAIN: DomainSpec()}
+
+    def is_valid_transition(self, from_state: State, to_state: State) -> bool:
+        """Check if the origin state is valid and the state has changed."""
+        if from_state.state in (STATE_UNAVAILABLE, STATE_UNKNOWN):
+            return False
+        return from_state.state != to_state.state
+
+
+class CounterMaxReachedTrigger(CounterValueBaseTrigger):
+    """Trigger for when a counter reaches its maximum value."""
+
+    def is_valid_state(self, state: State) -> bool:
+        """Check if the new state matches the expected state(s)."""
+        if (max_value := state.attributes.get(CONF_MAXIMUM)) is None:
+            return False
+        return state.state == str(max_value)
+
+
+class CounterMinReachedTrigger(CounterValueBaseTrigger):
+    """Trigger for when a counter reaches its minimum value."""
+
+    def is_valid_state(self, state: State) -> bool:
+        """Check if the new state matches the expected state(s)."""
+        if (min_value := state.attributes.get(CONF_MINIMUM)) is None:
+            return False
+        return state.state == str(min_value)
+
+
+class CounterResetTrigger(CounterValueBaseTrigger):
+    """Trigger for reset of counter entities."""
+
+    def is_valid_state(self, state: State) -> bool:
+        """Check if the new state matches the expected state(s)."""
+        if (init_state := state.attributes.get(CONF_INITIAL)) is None:
+            return False
+        return state.state == str(init_state)
+
+
+TRIGGERS: dict[str, type[Trigger]] = {
+    "decremented": CounterDecrementedTrigger,
+    "incremented": CounterIncrementedTrigger,
+    "maximum_reached": CounterMaxReachedTrigger,
+    "minimum_reached": CounterMinReachedTrigger,
+    "reset": CounterResetTrigger,
+}
+
+
+async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
+    """Return the triggers for counters."""
+    return TRIGGERS

homeassistant/components/counter/triggers.yaml

@@ -0,0 +1,27 @@
+.trigger_common: &trigger_common
+  target:
+    entity:
+      domain: counter
+  fields:
+    behavior:
+      required: true
+      default: any
+      selector:
+        select:
+          translation_key: trigger_behavior
+          options:
+            - first
+            - last
+            - any
+
+incremented:
+  target:
+    entity:
+      domain: counter
+decremented:
+  target:
+    entity:
+      domain: counter
+maximum_reached: *trigger_common
+minimum_reached: *trigger_common
+reset: *trigger_common

homeassistant/components/cover/condition.py

@@ -1,7 +1,7 @@
 """Provides conditions for covers."""
 
 from homeassistant.const import STATE_OFF, STATE_ON
-from homeassistant.core import HomeAssistant, State, split_entity_id
+from homeassistant.core import HomeAssistant, State
 from homeassistant.helpers.condition import Condition, EntityConditionBase
 
 from .const import ATTR_IS_CLOSED, DOMAIN, CoverDeviceClass
@@ -13,7 +13,7 @@ class CoverConditionBase(EntityConditionBase[CoverDomainSpec]):
 
     def is_valid_state(self, entity_state: State) -> bool:
         """Check if the state matches the expected cover state."""
-        domain_spec = self._domain_specs[split_entity_id(entity_state.entity_id)[0]]
+        domain_spec = self._domain_specs[entity_state.domain]
         if domain_spec.value_source is not None:
             return (
                 entity_state.attributes.get(domain_spec.value_source)

homeassistant/components/cover/strings.json

@@ -208,19 +208,19 @@
   "services": {
     "close_cover": {
       "description": "Closes a cover.",
-      "name": "[%key:common::action::close%]"
+      "name": "Close cover"
     },
     "close_cover_tilt": {
       "description": "Tilts a cover to close.",
-      "name": "Close tilt"
+      "name": "Close cover tilt"
     },
     "open_cover": {
       "description": "Opens a cover.",
-      "name": "[%key:common::action::open%]"
+      "name": "Open cover"
     },
     "open_cover_tilt": {
       "description": "Tilts a cover open.",
-      "name": "Open tilt"
+      "name": "Open cover tilt"
     },
     "set_cover_position": {
       "description": "Moves a cover to a specific position.",
@@ -230,7 +230,7 @@
           "name": "Position"
         }
       },
-      "name": "Set position"
+      "name": "Set cover position"
     },
     "set_cover_tilt_position": {
       "description": "Moves a cover tilt to a specific position.",
@@ -240,23 +240,23 @@
           "name": "Tilt position"
         }
       },
-      "name": "Set tilt position"
+      "name": "Set cover tilt position"
     },
     "stop_cover": {
-      "description": "Stops the cover movement.",
-      "name": "[%key:common::action::stop%]"
+      "description": "Stops a cover's movement.",
+      "name": "Stop cover"
     },
     "stop_cover_tilt": {
       "description": "Stops a tilting cover movement.",
-      "name": "Stop tilt"
+      "name": "Stop cover tilt"
     },
     "toggle": {
       "description": "Toggles a cover open/closed.",
-      "name": "[%key:common::action::toggle%]"
+      "name": "Toggle cover"
     },
     "toggle_cover_tilt": {
       "description": "Toggles a cover tilt open/closed.",
-      "name": "Toggle tilt"
+      "name": "Toggle cover tilt"
     }
   },
   "title": "Cover",

homeassistant/components/derivative/strings.json

@@ -61,7 +61,7 @@
   "services": {
     "reload": {
       "description": "Reloads derivative sensors from the YAML-configuration.",
-      "name": "[%key:common::action::reload%]"
+      "name": "Reload derivative sensors"
     }
   },
   "title": "Derivative sensor"

homeassistant/components/diagnostics/util.py

@@ -48,7 +48,12 @@ def async_redact_data[_T](data: _T, to_redact: Iterable[Any]) -> _T:
 
 
 def _entity_entry_filter(a: attr.Attribute, _: Any) -> bool:
-    return a.name not in ("_cache", "compat_aliases", "compat_name")
+    return a.name not in (
+        "_cache",
+        "compat_aliases",
+        "compat_name",
+        "original_name_unprefixed",
+    )
 
 
 @callback

homeassistant/components/esphome/config_flow.py

@@ -28,6 +28,7 @@ from homeassistant.config_entries import (
     SOURCE_REAUTH,
     SOURCE_RECONFIGURE,
     ConfigEntry,
+    ConfigEntryState,
     ConfigFlow,
     ConfigFlowResult,
     FlowType,
@@ -363,6 +364,11 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
             # Don't probe to verify the mac is correct since
             # the host matches (and port matches if provided).
             raise AbortFlow("already_configured")
+        # If the entry is loaded and the device is currently connected,
+        # don't update the host. This prevents transient mDNS announcements
+        # (e.g., during WiFi mesh roaming) from overwriting a working connection.
+        if entry.state is ConfigEntryState.LOADED and entry.runtime_data.available:
+            raise AbortFlow("already_configured")
         configured_psk: str | None = entry.data.get(CONF_NOISE_PSK)
         await self._fetch_device_info(host, port or configured_port, configured_psk)
         updates: dict[str, Any] = {}

homeassistant/components/esphome/ffmpeg_proxy.py

@@ -1,10 +1,12 @@
 """HTTP view that converts audio from a URL to a preferred format."""
 
 import asyncio
-from collections import defaultdict
+from collections import defaultdict, deque
+import contextlib
 from dataclasses import dataclass, field
 from http import HTTPStatus
 import logging
+import re
 import secrets
 from typing import Final
 
@@ -22,6 +24,12 @@ from .const import DOMAIN
 _LOGGER = logging.getLogger(__name__)
 
 _MAX_CONVERSIONS_PER_DEVICE: Final[int] = 2
+_MAX_STDERR_LINES: Final[int] = 64
+_PROC_WAIT_TIMEOUT: Final[int] = 5
+_STDERR_DRAIN_TIMEOUT: Final[int] = 1
+_SENSITIVE_QUERY_PARAMS: Final[re.Pattern[str]] = re.compile(
+    r"(?<=[?&])(authSig|token|key|password|secret)=[^&\s]+", re.IGNORECASE
+)
 
 
 @callback
@@ -215,8 +223,10 @@ class FFmpegConvertResponse(web.StreamResponse):
         assert proc.stdout is not None
         assert proc.stderr is not None
 
+        stderr_lines: deque[str] = deque(maxlen=_MAX_STDERR_LINES)
         stderr_task = self.hass.async_create_background_task(
-            self._dump_ffmpeg_stderr(proc), "ESPHome media proxy dump stderr"
+            self._collect_ffmpeg_stderr(proc, stderr_lines),
+            "ESPHome media proxy dump stderr",
         )
 
         try:
@@ -235,33 +245,80 @@ class FFmpegConvertResponse(web.StreamResponse):
             if request.transport:
                 request.transport.abort()
             raise  # don't log error
-        except:
+        except Exception:
             _LOGGER.exception("Unexpected error during ffmpeg conversion")
             raise
         finally:
             # Allow conversion info to be removed
             self.convert_info.is_finished = True
 
-            # stop dumping ffmpeg stderr task
-            stderr_task.cancel()
+            # Ensure subprocess and stderr cleanup run even if this task
+            # is cancelled (e.g., during shutdown)
+            try:
+                # Terminate hangs, so kill is used
+                if proc.returncode is None:
+                    proc.kill()
 
-            # Terminate hangs, so kill is used
-            if proc.returncode is None:
-                proc.kill()
+                # Wait for process to exit so returncode is set
+                await asyncio.wait_for(proc.wait(), timeout=_PROC_WAIT_TIMEOUT)
+
+                # Let stderr collector finish draining
+                if not stderr_task.done():
+                    try:
+                        await asyncio.wait_for(
+                            stderr_task, timeout=_STDERR_DRAIN_TIMEOUT
+                        )
+                    except TimeoutError:
+                        stderr_task.cancel()
+                        with contextlib.suppress(asyncio.CancelledError):
+                            await stderr_task
+            except TimeoutError:
+                _LOGGER.warning(
+                    "Timed out waiting for ffmpeg process to exit for device %s",
+                    self.device_id,
+                )
+                stderr_task.cancel()
+                with contextlib.suppress(asyncio.CancelledError):
+                    await stderr_task
+            except asyncio.CancelledError:
+                # Kill the process if we were interrupted
+                if proc.returncode is None:
+                    proc.kill()
+                stderr_task.cancel()
+                raise
+
+            if proc.returncode is not None and proc.returncode > 0:
+                _LOGGER.error(
+                    "FFmpeg conversion failed for device %s (return code %s):\n%s",
+                    self.device_id,
+                    proc.returncode,
+                    "\n".join(
+                        _SENSITIVE_QUERY_PARAMS.sub(r"\1=REDACTED", line)
+                        for line in stderr_lines
+                    ),
+                )
 
             # Close connection by writing EOF unless already closing
             if request.transport and not request.transport.is_closing():
-                await writer.write_eof()
+                with contextlib.suppress(ConnectionResetError, RuntimeError, OSError):
+                    await writer.write_eof()
 
-    async def _dump_ffmpeg_stderr(
+    async def _collect_ffmpeg_stderr(
         self,
         proc: asyncio.subprocess.Process,
+        stderr_lines: deque[str],
     ) -> None:
-        assert proc.stdout is not None
+        """Collect stderr output from ffmpeg for error reporting."""
         assert proc.stderr is not None
 
         while self.hass.is_running and (chunk := await proc.stderr.readline()):
-            _LOGGER.debug("ffmpeg[%s] output: %s", proc.pid, chunk.decode().rstrip())
+            line = chunk.decode(errors="replace").rstrip()
+            stderr_lines.append(line)
+            _LOGGER.debug(
+                "ffmpeg[%s] output: %s",
+                proc.pid,
+                _SENSITIVE_QUERY_PARAMS.sub(r"\1=REDACTED", line),
+            )
 
 
 class FFmpegProxyView(HomeAssistantView):

homeassistant/components/event/icons.json

@@ -12,5 +12,10 @@
     "motion": {
       "default": "mdi:motion-sensor"
     }
+  },
+  "triggers": {
+    "received": {
+      "trigger": "mdi:eye-check"
+    }
   }
 }

homeassistant/components/event/strings.json

@@ -21,5 +21,17 @@
       "name": "Motion"
     }
   },
-  "title": "Event"
+  "title": "Event",
+  "triggers": {
+    "received": {
+      "description": "Triggers after one or more event entities receive a matching event.",
+      "fields": {
+        "event_type": {
+          "description": "The event types to trigger on.",
+          "name": "Event type"
+        }
+      },
+      "name": "Event received"
+    }
+  }
 }

homeassistant/components/event/trigger.py

@@ -0,0 +1,67 @@
+"""Provides triggers for events."""
+
+import voluptuous as vol
+
+from homeassistant.const import CONF_OPTIONS, STATE_UNAVAILABLE, STATE_UNKNOWN
+from homeassistant.core import HomeAssistant, State
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.automation import DomainSpec
+from homeassistant.helpers.trigger import (
+    ENTITY_STATE_TRIGGER_SCHEMA,
+    EntityTriggerBase,
+    Trigger,
+    TriggerConfig,
+)
+
+from .const import ATTR_EVENT_TYPE, DOMAIN
+
+CONF_EVENT_TYPE = "event_type"
+
+EVENT_RECEIVED_TRIGGER_SCHEMA = ENTITY_STATE_TRIGGER_SCHEMA.extend(
+    {
+        vol.Required(CONF_OPTIONS): {
+            vol.Required(CONF_EVENT_TYPE): vol.All(
+                cv.ensure_list, vol.Length(min=1), [cv.string]
+            ),
+        },
+    }
+)
+
+
+class EventReceivedTrigger(EntityTriggerBase):
+    """Trigger for event entity when it receives a matching event."""
+
+    _domain_specs = {DOMAIN: DomainSpec()}
+    _schema = EVENT_RECEIVED_TRIGGER_SCHEMA
+
+    def __init__(self, hass: HomeAssistant, config: TriggerConfig) -> None:
+        """Initialize the event received trigger."""
+        super().__init__(hass, config)
+        self._event_types = set(self._options[CONF_EVENT_TYPE])
+
+    def is_valid_transition(self, from_state: State, to_state: State) -> bool:
+        """Check if the origin state is valid and different from the current state."""
+
+        # UNKNOWN is a valid from_state, otherwise the first time the event is received
+        # would not trigger
+        if from_state.state == STATE_UNAVAILABLE:
+            return False
+
+        return from_state.state != to_state.state
+
+    def is_valid_state(self, state: State) -> bool:
+        """Check if the event type is valid and matches one of the configured types."""
+        return (
+            state.state not in (STATE_UNAVAILABLE, STATE_UNKNOWN)
+            and state.attributes.get(ATTR_EVENT_TYPE) in self._event_types
+        )
+
+
+TRIGGERS: dict[str, type[Trigger]] = {
+    "received": EventReceivedTrigger,
+}
+
+
+async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
+    """Return the triggers for events."""
+    return TRIGGERS

homeassistant/components/event/triggers.yaml

@@ -0,0 +1,16 @@
+received:
+  target:
+    entity:
+      domain: event
+  fields:
+    event_type:
+      context:
+        filter_target: target
+      required: true
+      selector:
+        state:
+          attribute: event_type
+          hide_states:
+            - unavailable
+            - unknown
+          multiple: true

homeassistant/components/fan/services.yaml

@@ -10,7 +10,8 @@ set_preset_mode:
       required: true
       example: "auto"
       selector:
-        text:
+        state:
+          attribute: preset_mode
 
 set_percentage:
   target:
@@ -49,7 +50,8 @@ turn_on:
         supported_features:
           - fan.FanEntityFeature.PRESET_MODE
       selector:
-        text:
+        state:
+          attribute: preset_mode
 
 turn_off:
   target:

homeassistant/components/fan/strings.json

@@ -118,7 +118,7 @@
           "name": "Decrement"
         }
       },
-      "name": "Decrease speed"
+      "name": "Decrease fan speed"
     },
     "increase_speed": {
       "description": "Increases the speed of a fan.",
@@ -128,7 +128,7 @@
           "name": "Increment"
         }
       },
-      "name": "Increase speed"
+      "name": "Increase fan speed"
     },
     "oscillate": {
       "description": "Controls the oscillation of a fan.",
@@ -138,7 +138,7 @@
           "name": "Oscillating"
         }
       },
-      "name": "Oscillate"
+      "name": "Oscillate fan"
     },
     "set_direction": {
       "description": "Sets a fan's rotation direction.",
@@ -148,7 +148,7 @@
           "name": "Direction"
         }
       },
-      "name": "Set direction"
+      "name": "Set fan direction"
     },
     "set_percentage": {
       "description": "Sets the speed of a fan.",
@@ -158,28 +158,28 @@
           "name": "Percentage"
         }
       },
-      "name": "Set speed"
+      "name": "Set fan speed"
     },
     "set_preset_mode": {
-      "description": "Sets preset fan mode.",
+      "description": "Sets the preset mode of a fan.",
       "fields": {
         "preset_mode": {
           "description": "Preset fan mode.",
           "name": "Preset mode"
         }
       },
-      "name": "Set preset mode"
+      "name": "Set fan preset mode"
     },
     "toggle": {
       "description": "Toggles a fan on/off.",
-      "name": "[%key:common::action::toggle%]"
+      "name": "Toggle fan"
     },
     "turn_off": {
-      "description": "Turns fan off.",
-      "name": "[%key:common::action::turn_off%]"
+      "description": "Turns off a fan.",
+      "name": "Turn off fan"
     },
     "turn_on": {
-      "description": "Turns fan on.",
+      "description": "Turns on a fan.",
       "fields": {
         "percentage": {
           "description": "[%key:component::fan::services::set_percentage::fields::percentage::description%]",
@@ -190,7 +190,7 @@
           "name": "[%key:component::fan::services::set_preset_mode::fields::preset_mode::name%]"
         }
       },
-      "name": "[%key:common::action::turn_on%]"
+      "name": "Turn on fan"
     }
   },
   "title": "Fan",

homeassistant/components/filter/strings.json

@@ -242,7 +242,7 @@
   "services": {
     "reload": {
       "description": "Reloads filters from the YAML-configuration.",
-      "name": "[%key:common::action::reload%]"
+      "name": "Reload filters"
     }
   },
   "title": "Filter"

homeassistant/components/firefly_iii/coordinator.py

@@ -36,10 +36,10 @@ DEFAULT_SCAN_INTERVAL = timedelta(minutes=5)
 class FireflyCoordinatorData:
     """Data structure for Firefly III coordinator data."""
 
-    accounts: list[Account]
+    accounts: dict[str, Account]
     categories: list[Category]
-    category_details: list[Category]
-    budgets: list[Budget]
+    category_details: dict[str, Category]
+    budgets: dict[str, Budget]
     bills: list[Bill]
     primary_currency: Currency
 
@@ -142,10 +142,10 @@ class FireflyDataUpdateCoordinator(DataUpdateCoordinator[FireflyCoordinatorData]
             ) from err
 
         return FireflyCoordinatorData(
-            accounts=accounts,
+            accounts={account.id: account for account in accounts},
             categories=categories,
-            category_details=category_details,
-            budgets=budgets,
+            category_details={category.id: category for category in category_details},
+            budgets={budget.id: budget for budget in budgets},
             bills=bills,
             primary_currency=primary_currency,
         )

homeassistant/components/firefly_iii/entity.py

@@ -44,7 +44,7 @@ class FireflyAccountBaseEntity(FireflyBaseEntity):
     ) -> None:
         """Initialize a Firefly account entity."""
         super().__init__(coordinator)
-        self._account = account
+        self._account_id = account.id
         self._attr_device_info = DeviceInfo(
             entry_type=DeviceEntryType.SERVICE,
             manufacturer=MANUFACTURER,
@@ -58,6 +58,10 @@ class FireflyAccountBaseEntity(FireflyBaseEntity):
             f"{coordinator.config_entry.unique_id}_account_{account.id}_{key}"
         )
 
+    @property
+    def _account(self) -> Account:
+        return self.coordinator.data.accounts[self._account_id]
+
 
 class FireflyCategoryBaseEntity(FireflyBaseEntity):
     """Base class for Firefly III category entity."""
@@ -70,7 +74,7 @@ class FireflyCategoryBaseEntity(FireflyBaseEntity):
     ) -> None:
         """Initialize a Firefly category entity."""
         super().__init__(coordinator)
-        self._category = category
+        self._category_id = category.id
         self._attr_device_info = DeviceInfo(
             entry_type=DeviceEntryType.SERVICE,
             manufacturer=MANUFACTURER,
@@ -84,6 +88,10 @@ class FireflyCategoryBaseEntity(FireflyBaseEntity):
             f"{coordinator.config_entry.unique_id}_category_{category.id}_{key}"
         )
 
+    @property
+    def _category(self) -> Category:
+        return self.coordinator.data.category_details[self._category_id]
+
 
 class FireflyBudgetBaseEntity(FireflyBaseEntity):
     """Base class for Firefly III budget entity."""
@@ -96,7 +104,7 @@ class FireflyBudgetBaseEntity(FireflyBaseEntity):
     ) -> None:
         """Initialize a Firefly budget entity."""
         super().__init__(coordinator)
-        self._budget = budget
+        self._budget_id = budget.id
         self._attr_device_info = DeviceInfo(
             entry_type=DeviceEntryType.SERVICE,
             manufacturer=MANUFACTURER,
@@ -109,3 +117,7 @@ class FireflyBudgetBaseEntity(FireflyBaseEntity):
         self._attr_unique_id = (
             f"{coordinator.config_entry.unique_id}_budget_{budget.id}_{key}"
         )
+
+    @property
+    def _budget(self) -> Budget:
+        return self.coordinator.data.budgets[self._budget_id]

homeassistant/components/firefly_iii/sensor.py

@@ -51,7 +51,7 @@ async def async_setup_entry(
     coordinator = entry.runtime_data
     entities: list[SensorEntity] = []
 
-    for account in coordinator.data.accounts:
+    for account in coordinator.data.accounts.values():
         entities.append(
             FireflyAccountBalanceSensor(coordinator, account, ACCOUNT_BALANCE)
         )
@@ -61,14 +61,14 @@ async def async_setup_entry(
     entities.extend(
         [
             FireflyCategorySensor(coordinator, category, CATEGORY)
-            for category in coordinator.data.category_details
+            for category in coordinator.data.category_details.values()
         ]
     )
 
     entities.extend(
         [
             FireflyBudgetSensor(coordinator, budget, BUDGET)
-            for budget in coordinator.data.budgets
+            for budget in coordinator.data.budgets.values()
         ]
     )
 
@@ -90,7 +90,6 @@ class FireflyAccountBalanceSensor(FireflyAccountBaseEntity, SensorEntity):
     ) -> None:
         """Initialize the account balance sensor."""
         super().__init__(coordinator, account, key)
-        self._account = account
         self._attr_native_unit_of_measurement = (
             coordinator.data.primary_currency.attributes.code
         )
@@ -108,16 +107,6 @@ class FireflyAccountRoleSensor(FireflyAccountBaseEntity, SensorEntity):
     _attr_entity_category = EntityCategory.DIAGNOSTIC
     _attr_entity_registry_enabled_default = True
 
-    def __init__(
-        self,
-        coordinator: FireflyDataUpdateCoordinator,
-        account: Account,
-        key: str,
-    ) -> None:
-        """Initialize the account role sensor."""
-        super().__init__(coordinator, account, key)
-        self._account = account
-
     @property
     def native_value(self) -> StateType:
         """Return account role."""
@@ -173,7 +162,6 @@ class FireflyCategorySensor(FireflyCategoryBaseEntity, SensorEntity):
     ) -> None:
         """Initialize the category sensor."""
         super().__init__(coordinator, category, key)
-        self._category = category
         self._attr_native_unit_of_measurement = (
             coordinator.data.primary_currency.attributes.code
         )
@@ -205,7 +193,6 @@ class FireflyBudgetSensor(FireflyBudgetBaseEntity, SensorEntity):
     ) -> None:
         """Initialize the budget sensor."""
         super().__init__(coordinator, budget, key)
-        self._budget = budget
         self._attr_native_unit_of_measurement = (
             coordinator.data.primary_currency.attributes.code
         )

homeassistant/components/forecast_solar/energy.py

@@ -20,5 +20,7 @@ async def async_get_solar_forecast(
         "wh_hours": {
             timestamp.isoformat(): val
             for timestamp, val in entry.runtime_data.data.wh_period.items()
+            if val != 0
+            or (timestamp.hour, timestamp.minute, timestamp.second) != (0, 0, 0)
         }
     }

homeassistant/components/fritz/switch.py

@@ -26,7 +26,7 @@ from .const import (
     MeshRoles,
 )
 from .coordinator import FRITZ_DATA_KEY, AvmWrapper, FritzConfigEntry, FritzData
-from .entity import FritzBoxBaseEntity, FritzDeviceBase
+from .entity import FritzBoxBaseEntity
 from .helpers import device_filter_out_from_trackers
 from .models import FritzDevice, SwitchInfo
 
@@ -332,7 +332,7 @@ class FritzBoxBaseSwitch(FritzBoxBaseEntity, SwitchEntity):
 
     @property
     def icon(self) -> str:
-        """Return name."""
+        """Return icon."""
         return self._icon
 
     @property
@@ -485,42 +485,51 @@ class FritzBoxDeflectionSwitch(FritzBoxBaseCoordinatorSwitch):
         self.async_write_ha_state()
 
 
-class FritzBoxProfileSwitch(FritzDeviceBase, SwitchEntity):
+class FritzBoxProfileSwitch(FritzBoxBaseCoordinatorSwitch):
     """Defines a FRITZ!Box Tools DeviceProfile switch."""
 
     _attr_translation_key = "internet_access"
+    _attr_entity_category = EntityCategory.CONFIG
 
     def __init__(self, avm_wrapper: AvmWrapper, device: FritzDevice) -> None:
         """Init Fritz profile."""
-        super().__init__(avm_wrapper, device)
-        self._attr_is_on: bool = False
+        self._mac = device.mac_address
+        description = SwitchEntityDescription(
+            key=f"{self._mac}_internet_access",
+        )
+        super().__init__(avm_wrapper, device.hostname, description)
         self._attr_unique_id = f"{self._mac}_internet_access"
-        self._attr_entity_category = EntityCategory.CONFIG
 
     @property
-    def is_on(self) -> bool | None:
-        """Switch status."""
-        return self._avm_wrapper.devices[self._mac].wan_access
+    def device_info(self) -> DeviceInfo:
+        """Return the device information."""
+        return DeviceInfo(
+            connections={(CONNECTION_NETWORK_MAC, self._mac)},
+        )
+
+    @property
+    def _device(self) -> FritzDevice:
+        """Return the device for this profile switch."""
+        return self.coordinator.devices[self._mac]
 
     @property
     def available(self) -> bool:
         """Return availability of the switch."""
-        if self._avm_wrapper.devices[self._mac].wan_access is None:
+        if self._device.wan_access is None:
             return False
-        return super().available
+        return self.coordinator.last_update_success
 
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn on switch."""
-        await self._async_handle_turn_on_off(turn_on=True)
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn off switch."""
-        await self._async_handle_turn_on_off(turn_on=False)
+    @property
+    def is_on(self) -> bool | None:
+        """Switch status."""
+        return self._device.wan_access
 
     async def _async_handle_turn_on_off(self, turn_on: bool) -> None:
         """Handle switch state change request."""
-        await self._avm_wrapper.async_set_allow_wan_access(self.ip_address, turn_on)
-        self._avm_wrapper.devices[self._mac].wan_access = turn_on
+        await self.coordinator.async_set_allow_wan_access(
+            self._device.ip_address, turn_on
+        )
+        self._device.wan_access = turn_on
         self.async_write_ha_state()
 
 

homeassistant/components/fronius/manifest.json

@@ -13,5 +13,5 @@
   "iot_class": "local_polling",
   "loggers": ["pyfronius"],
   "quality_scale": "platinum",
-  "requirements": ["PyFronius==0.8.0"]
+  "requirements": ["PyFronius==0.8.2"]
 }

homeassistant/components/generic_thermostat/strings.json

@@ -93,7 +93,7 @@
   "services": {
     "reload": {
       "description": "Reloads generic thermostats from the YAML-configuration.",
-      "name": "[%key:common::action::reload%]"
+      "name": "Reload generic thermostats"
     }
   },
   "title": "Generic thermostat"

homeassistant/components/google_travel_time/sensor.py

@@ -113,7 +113,7 @@ class GoogleTravelTimeSensor(SensorEntity):
         self._attr_device_info = DeviceInfo(
             entry_type=DeviceEntryType.SERVICE,
             identifiers={(DOMAIN, api_key)},
-            name=DOMAIN,
+            name=DEFAULT_NAME,
         )
 
         self._config_entry = config_entry

homeassistant/components/govee_light_local/coordinator.py

@@ -98,7 +98,7 @@ class GoveeLocalApiCoordinator(DataUpdateCoordinator[list[GoveeDevice]]):
         """Set light color in kelvin."""
         await device.set_temperature(temperature)
 
-    async def set_scene(self, device: GoveeController, scene: str) -> None:
+    async def set_scene(self, device: GoveeDevice, scene: str) -> None:
         """Set light scene."""
         await device.set_scene(scene)
 

homeassistant/components/govee_light_local/light.py

@@ -80,7 +80,6 @@ class GoveeLight(CoordinatorEntity[GoveeLocalApiCoordinator], LightEntity):
 
         super().__init__(coordinator)
         self._device = device
-        device.set_update_callback(self._update_callback)
 
         self._attr_unique_id = device.fingerprint
 
@@ -194,9 +193,20 @@ class GoveeLight(CoordinatorEntity[GoveeLocalApiCoordinator], LightEntity):
         await self.coordinator.turn_off(self._device)
         self.async_write_ha_state()
 
+    async def async_added_to_hass(self) -> None:
+        """Register update callback when entity is added."""
+        await super().async_added_to_hass()
+        self._device.set_update_callback(self._update_callback)
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Unregister update callback when entity is removed."""
+        self._device.set_update_callback(None)
+        await super().async_will_remove_from_hass()
+
     @callback
     def _update_callback(self, device: GoveeDevice) -> None:
-        self.async_write_ha_state()
+        if self.hass:
+            self.async_write_ha_state()
 
     def _save_last_color_state(self) -> None:
         color_mode = self.color_mode

homeassistant/components/hassio/__init__.py

@@ -666,7 +666,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:  # noqa:
 
     # Init add-on ingress panels
     panels_task = hass.async_create_task(
-        async_setup_addon_panel(hass, hassio), eager_start=True
+        async_setup_addon_panel(hass), eager_start=True
     )
 
     # Make sure to await the update_info task before

homeassistant/components/hassio/addon_panel.py

@@ -2,24 +2,23 @@
 
 from http import HTTPStatus
 import logging
-from typing import Any
 
+from aiohasupervisor import SupervisorError
+from aiohasupervisor.models import IngressPanel
 from aiohttp import web
 
 from homeassistant.components import frontend
 from homeassistant.components.http import HomeAssistantView
-from homeassistant.const import ATTR_ICON
 from homeassistant.core import HomeAssistant
 
-from .const import ATTR_ADMIN, ATTR_ENABLE, ATTR_PANELS, ATTR_TITLE
-from .handler import HassIO, HassioAPIError
+from .handler import get_supervisor_client
 
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup_addon_panel(hass: HomeAssistant, hassio: HassIO) -> None:
+async def async_setup_addon_panel(hass: HomeAssistant) -> None:
     """Add-on Ingress Panel setup."""
-    hassio_addon_panel = HassIOAddonPanel(hass, hassio)
+    hassio_addon_panel = HassIOAddonPanel(hass)
     hass.http.register_view(hassio_addon_panel)
 
     # If panels are exists
@@ -28,11 +27,8 @@ async def async_setup_addon_panel(hass: HomeAssistant, hassio: HassIO) -> None:
 
     # Register available panels
     for addon, data in panels.items():
-        if not data[ATTR_ENABLE]:
+        if not data.enable:
             continue
-        # _register_panel never suspends and is only
-        # a coroutine because it would be a breaking change
-        # to make it a normal function
         _register_panel(hass, addon, data)
 
 
@@ -42,23 +38,22 @@ class HassIOAddonPanel(HomeAssistantView):
     name = "api:hassio_push:panel"
     url = "/api/hassio_push/panel/{addon}"
 
-    def __init__(self, hass: HomeAssistant, hassio: HassIO) -> None:
+    def __init__(self, hass: HomeAssistant) -> None:
         """Initialize WebView."""
         self.hass = hass
-        self.hassio = hassio
+        self.client = get_supervisor_client(hass)
 
     async def post(self, request: web.Request, addon: str) -> web.Response:
         """Handle new add-on panel requests."""
         panels = await self.get_panels()
 
         # Panel exists for add-on slug
-        if addon not in panels or not panels[addon][ATTR_ENABLE]:
-            _LOGGER.error("Panel is not enable for %s", addon)
+        if addon not in panels or not panels[addon].enable:
+            _LOGGER.error("Panel is not enabled for %s", addon)
             return web.Response(status=HTTPStatus.BAD_REQUEST)
-        data = panels[addon]
 
         # Register panel
-        _register_panel(self.hass, addon, data)
+        _register_panel(self.hass, addon, panels[addon])
         return web.Response()
 
     async def delete(self, request: web.Request, addon: str) -> web.Response:
@@ -66,24 +61,23 @@ class HassIOAddonPanel(HomeAssistantView):
         frontend.async_remove_panel(self.hass, addon)
         return web.Response()
 
-    async def get_panels(self) -> dict:
+    async def get_panels(self) -> dict[str, IngressPanel]:
         """Return panels add-on info data."""
         try:
-            data = await self.hassio.get_ingress_panels()
-            return data[ATTR_PANELS]
-        except HassioAPIError as err:
+            return await self.client.ingress.panels()
+        except SupervisorError as err:
             _LOGGER.error("Can't read panel info: %s", err)
         return {}
 
 
-def _register_panel(hass: HomeAssistant, addon: str, data: dict[str, Any]):
-    """Init coroutine to register the panel."""
+def _register_panel(hass: HomeAssistant, addon: str, data: IngressPanel):
+    """Helper to register the panel."""
     frontend.async_register_built_in_panel(
         hass,
         "app",
         frontend_url_path=addon,
-        sidebar_title=data[ATTR_TITLE],
-        sidebar_icon=data[ATTR_ICON],
-        require_admin=data[ATTR_ADMIN],
+        sidebar_title=data.title,
+        sidebar_icon=data.icon,
+        require_admin=data.admin,
         config={"addon": addon},
     )

homeassistant/components/hassio/handler.py

@@ -3,7 +3,6 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Callable, Coroutine
 from http import HTTPStatus
 import logging
 import os
@@ -28,21 +27,6 @@ class HassioAPIError(RuntimeError):
     """Return if a API trow a error."""
 
 
-def api_data[**_P](
-    funct: Callable[_P, Coroutine[Any, Any, dict[str, Any]]],
-) -> Callable[_P, Coroutine[Any, Any, Any]]:
-    """Return data of an api."""
-
-    async def _wrapper(*argv: _P.args, **kwargs: _P.kwargs) -> Any:
-        """Wrap function."""
-        data = await funct(*argv, **kwargs)
-        if data["result"] == "ok":
-            return data["data"]
-        raise HassioAPIError(data["message"])
-
-    return _wrapper
-
-
 class HassIO:
     """Small API wrapper for Hass.io."""
 
@@ -64,14 +48,6 @@ class HassIO:
         """Return base url for Supervisor."""
         return self._base_url
 
-    @api_data
-    def get_ingress_panels(self) -> Coroutine:
-        """Return data for Add-on ingress panels.
-
-        This method returns a coroutine.
-        """
-        return self.send_command("/ingress/panels", method="get")
-
     async def send_command(
         self,
         command: str,

homeassistant/components/hassio/manifest.json

@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/hassio",
   "iot_class": "local_polling",
   "quality_scale": "internal",
-  "requirements": ["aiohasupervisor==0.4.2"],
+  "requirements": ["aiohasupervisor==0.4.3"],
   "single_config_entry": true
 }

homeassistant/components/hassio/strings.json

@@ -211,6 +211,10 @@
       "description": "System is currently unhealthy because Docker is configured incorrectly. For troubleshooting information, select Learn more.",
       "title": "Unhealthy system - Docker misconfigured"
     },
+    "unhealthy_docker_gateway_unprotected": {
+      "description": "System is currently unhealthy because Supervisor was not able to apply firewall protection for the Docker gateway IP. For troubleshooting information, select Learn more.",
+      "title": "Unhealthy system - Docker gateway unprotected"
+    },
     "unhealthy_duplicate_os_installation": {
       "description": "System is currently unhealthy because it has detected multiple Home Assistant OS installations. For troubleshooting information, select Learn more.",
       "title": "Unhealthy system - Duplicate Home Assistant OS installation"

homeassistant/components/history_stats/strings.json

@@ -124,7 +124,7 @@
   "services": {
     "reload": {
       "description": "Reloads history stats sensors from the YAML-configuration.",
-      "name": "[%key:common::action::reload%]"
+      "name": "Reload history stats sensors"
     }
   },
   "title": "History Stats"

homeassistant/components/home_connect/coordinator.py

@@ -312,6 +312,7 @@ class HomeConnectApplianceCoordinator(DataUpdateCoordinator[HomeConnectAppliance
             case EventType.NOTIFY:
                 settings = self.data.settings
                 events = self.data.events
+                program_update_event_value = None
                 for event in event_message.data.items:
                     event_key = event.key
                     if event_key in SettingKey.__members__.values():  # type: ignore[comparison-overlap]
@@ -330,11 +331,13 @@ class HomeConnectApplianceCoordinator(DataUpdateCoordinator[HomeConnectAppliance
                             EventKey.BSH_COMMON_ROOT_ACTIVE_PROGRAM,
                             EventKey.BSH_COMMON_ROOT_SELECTED_PROGRAM,
                         ) and isinstance(event_value, str):
-                            await self.update_options(
-                                event_key,
-                                ProgramKey(event_value),
-                            )
+                            program_update_event_value = ProgramKey(event_value)
                         events[event_key] = event
+                # Process program update after all events to ensure
+                # BSH_COMMON_OPTION_BASE_PROGRAM event is available for
+                # favorite program resolution
+                if program_update_event_value:
+                    await self.update_options(program_update_event_value)
                 self._call_event_listener(event_message)
 
             case EventType.EVENT:
@@ -493,7 +496,7 @@ class HomeConnectApplianceCoordinator(DataUpdateCoordinator[HomeConnectAppliance
         programs = []
         events = {}
         options = {}
-        if appliance.type in APPLIANCES_WITH_PROGRAMS:
+        if appliance.type in APPLIANCES_WITH_PROGRAMS:  # pylint: disable=too-many-nested-blocks
             try:
                 all_programs = await self.client.get_all_programs(appliance.ha_id)
             except TooManyRequestsError:
@@ -529,6 +532,17 @@ class HomeConnectApplianceCoordinator(DataUpdateCoordinator[HomeConnectAppliance
                         )
                         current_program_key = program.key
                         program_options = program.options
+                        if (
+                            current_program_key == ProgramKey.BSH_COMMON_FAVORITE_001
+                            and program_options
+                        ):
+                            # The API doesn't allow to fetch the options from the favorite program.
+                            # We can attempt to get the base program and get the options
+                            for option in program_options:
+                                if option.key == OptionKey.BSH_COMMON_BASE_PROGRAM:
+                                    current_program_key = ProgramKey(option.value)
+                                    break
+
                 if current_program_key:
                     options = await self.get_options_definitions(current_program_key)
                     for option in program_options or []:
@@ -595,15 +609,24 @@ class HomeConnectApplianceCoordinator(DataUpdateCoordinator[HomeConnectAppliance
             )
             return {}
 
-    async def update_options(
-        self, event_key: EventKey, program_key: ProgramKey
-    ) -> None:
+    async def update_options(self, program_key: ProgramKey) -> None:
         """Update options for appliance."""
         options = self.data.options
         events = self.data.events
         options_to_notify = options.copy()
         options.clear()
-        options.update(await self.get_options_definitions(program_key))
+        if (
+            program_key == ProgramKey.BSH_COMMON_FAVORITE_001
+            and (event := events.get(EventKey.BSH_COMMON_OPTION_BASE_PROGRAM))
+            and isinstance(event.value, str)
+        ):
+            # The API doesn't allow to fetch the options from the favorite program.
+            # We can attempt to get the base program and get the options
+            resolved_program_key = ProgramKey(event.value)
+        else:
+            resolved_program_key = program_key
+
+        options.update(await self.get_options_definitions(resolved_program_key))
 
         for option in options.values():
             option_value = option.constraints.default if option.constraints else None

homeassistant/components/home_connect/select.py

@@ -430,11 +430,24 @@ class HomeConnectProgramSelectEntity(HomeConnectEntity, SelectEntity):
     def update_native_value(self) -> None:
         """Set the program value."""
         event = self.appliance.events.get(cast(EventKey, self.bsh_key))
-        self._attr_current_option = (
-            PROGRAMS_TRANSLATION_KEYS_MAP.get(ProgramKey(event_value))
+        program_key = (
+            ProgramKey(event_value)
             if event and isinstance(event_value := event.value, str)
             else None
         )
+        if (
+            program_key == ProgramKey.BSH_COMMON_FAVORITE_001
+            and (
+                base_program_event := self.appliance.events.get(
+                    EventKey.BSH_COMMON_OPTION_BASE_PROGRAM
+                )
+            )
+            and isinstance(base_program_event.value, str)
+        ):
+            program_key = ProgramKey(base_program_event.value)
+        self._attr_current_option = (
+            PROGRAMS_TRANSLATION_KEYS_MAP.get(program_key) if program_key else None
+        )
 
     async def async_select_option(self, option: str) -> None:
         """Select new program."""

homeassistant/components/homeassistant/strings.json

@@ -208,11 +208,11 @@
   "services": {
     "check_config": {
       "description": "Checks the Home Assistant YAML-configuration files for errors. Errors will be shown in the Home Assistant logs.",
-      "name": "Check configuration"
+      "name": "Check Home Assistant configuration"
     },
     "reload_all": {
       "description": "Reloads all YAML configuration that can be reloaded without restarting Home Assistant.",
-      "name": "Reload all"
+      "name": "Reload all Home Assistant configuration"
     },
     "reload_config_entry": {
       "description": "Reloads the specified config entry.",
@@ -240,7 +240,7 @@
           "name": "Safe mode"
         }
       },
-      "name": "[%key:common::action::restart%]"
+      "name": "Restart Home Assistant"
     },
     "save_persistent_states": {
       "description": "Saves the persistent states immediately. Maintains the normal periodic saving interval.",
@@ -262,11 +262,11 @@
           "name": "[%key:common::config_flow::data::longitude%]"
         }
       },
-      "name": "Set location"
+      "name": "Set Home Assistant location"
     },
     "stop": {
       "description": "Stops Home Assistant.",
-      "name": "[%key:common::action::stop%]"
+      "name": "Stop Home Assistant"
     },
     "toggle": {
       "description": "Generic action to toggle devices on/off under any domain.",

homeassistant/components/homeassistant_hardware/manifest.json

@@ -8,7 +8,7 @@
   "integration_type": "system",
   "requirements": [
     "serialx==0.6.2",
-    "universal-silabs-flasher==1.0.2",
+    "universal-silabs-flasher==1.0.3",
     "ha-silabs-firmware-client==0.3.0"
   ]
 }

homeassistant/components/hr_energy_qube/__init__.py

@@ -0,0 +1,67 @@
+"""The Qube Heat Pump integration."""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from python_qube_heatpump import QubeClient
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, CONF_PORT
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
+
+from .const import PLATFORMS
+from .coordinator import QubeCoordinator
+
+
+@dataclass
+class QubeData:
+    """Runtime data for Qube Heat Pump."""
+
+    coordinator: QubeCoordinator
+    client: QubeClient
+    sw_version: str | None
+
+
+type QubeConfigEntry = ConfigEntry[QubeData]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: QubeConfigEntry) -> bool:
+    """Set up Qube Heat Pump from a config entry."""
+    client = QubeClient(entry.data[CONF_HOST], entry.data[CONF_PORT])
+
+    # Connect and read software version for device info
+    sw_version: str | None = None
+    try:
+        connected = await client.connect()
+        if not connected:
+            await client.close()
+            raise ConfigEntryNotReady(
+                f"Unable to connect to Qube heat pump at {entry.data[CONF_HOST]}"
+            )
+        sw_version = await client.async_get_software_version()
+    except (OSError, TimeoutError) as err:
+        await client.close()
+        raise ConfigEntryNotReady(
+            f"Unable to connect to Qube heat pump at {entry.data[CONF_HOST]}"
+        ) from err
+
+    coordinator = QubeCoordinator(hass, client, entry)
+
+    entry.runtime_data = QubeData(
+        coordinator=coordinator,
+        client=client,
+        sw_version=sw_version,
+    )
+
+    await coordinator.async_config_entry_first_refresh()
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: QubeConfigEntry) -> bool:
+    """Unload a config entry."""
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        await entry.runtime_data.client.close()
+    return unload_ok

homeassistant/components/hr_energy_qube/config_flow.py

@@ -0,0 +1,61 @@
+"""Config flow for Qube Heat Pump integration."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from python_qube_heatpump import QubeClient
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.const import CONF_HOST, CONF_PORT
+
+from .const import DEFAULT_PORT, DOMAIN
+
+
+class QubeConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Qube Heat Pump."""
+
+    VERSION = 1
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle the user step."""
+        errors: dict[str, str] = {}
+
+        if user_input is not None:
+            host = user_input[CONF_HOST]
+
+            self._async_abort_entries_match({CONF_HOST: host})
+
+            # Connect and verify it's a Qube by reading software version
+            client = QubeClient(host, DEFAULT_PORT)
+            try:
+                connected = await client.connect()
+                if not connected:
+                    errors["base"] = "cannot_connect"
+                else:
+                    version = await client.async_get_software_version()
+                    if version is None:
+                        errors["base"] = "not_qube_device"
+            except OSError, TimeoutError:
+                errors["base"] = "cannot_connect"
+            finally:
+                await client.close()
+
+            if not errors:
+                return self.async_create_entry(
+                    title="Qube heat pump",
+                    data={
+                        CONF_HOST: host,
+                        CONF_PORT: DEFAULT_PORT,
+                    },
+                )
+
+        schema = vol.Schema(
+            {
+                vol.Required(CONF_HOST): str,
+            }
+        )
+        return self.async_show_form(step_id="user", data_schema=schema, errors=errors)

homeassistant/components/hr_energy_qube/const.py

@@ -0,0 +1,9 @@
+"""Constants for the Qube Heat Pump integration."""
+
+from homeassistant.const import Platform
+
+DOMAIN = "hr_energy_qube"
+PLATFORMS = (Platform.SENSOR,)
+
+DEFAULT_PORT = 502
+DEFAULT_SCAN_INTERVAL = 15

homeassistant/components/hr_energy_qube/coordinator.py

@@ -0,0 +1,51 @@
+"""DataUpdateCoordinator for Qube Heat Pump."""
+
+from __future__ import annotations
+
+from datetime import timedelta
+import logging
+from typing import TYPE_CHECKING
+
+from python_qube_heatpump import QubeClient
+from python_qube_heatpump.models import QubeState
+
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import DEFAULT_SCAN_INTERVAL, DOMAIN
+
+if TYPE_CHECKING:
+    from homeassistant.config_entries import ConfigEntry
+    from homeassistant.core import HomeAssistant
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class QubeCoordinator(DataUpdateCoordinator[QubeState]):
+    """Qube Heat Pump data coordinator."""
+
+    def __init__(
+        self, hass: HomeAssistant, client: QubeClient, entry: ConfigEntry
+    ) -> None:
+        """Initialize the coordinator."""
+        self.client = client
+        super().__init__(
+            hass,
+            _LOGGER,
+            name=DOMAIN,
+            update_interval=timedelta(seconds=DEFAULT_SCAN_INTERVAL),
+            config_entry=entry,
+        )
+
+    async def _async_update_data(self) -> QubeState:
+        """Fetch data from the device."""
+        try:
+            data = await self.client.get_all_data()
+        except (ConnectionError, TimeoutError, OSError) as exc:
+            raise UpdateFailed(
+                f"Error communicating with Qube heat pump: {exc}"
+            ) from exc
+
+        if data is None:
+            raise UpdateFailed("No data received from Qube heat pump")
+
+        return data

homeassistant/components/hr_energy_qube/entity.py

@@ -0,0 +1,34 @@
+"""Base entity for Qube Heat Pump."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+from .coordinator import QubeCoordinator
+
+if TYPE_CHECKING:
+    from . import QubeConfigEntry
+
+
+class QubeEntity(CoordinatorEntity[QubeCoordinator]):
+    """Base entity for Qube Heat Pump."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: QubeCoordinator,
+        entry: QubeConfigEntry,
+    ) -> None:
+        """Initialize the base entity."""
+        super().__init__(coordinator)
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, entry.entry_id)},
+            manufacturer="Qube",
+            model="Heat Pump",
+            sw_version=entry.runtime_data.sw_version,
+        )

homeassistant/components/hr_energy_qube/manifest.json

@@ -0,0 +1,12 @@
+{
+  "domain": "hr_energy_qube",
+  "name": "Qube heat pump",
+  "codeowners": ["@MattieGit"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/hr_energy_qube",
+  "integration_type": "hub",
+  "iot_class": "local_polling",
+  "loggers": ["python_qube_heatpump"],
+  "quality_scale": "bronze",
+  "requirements": ["python-qube-heatpump==1.7.0"]
+}

homeassistant/components/hr_energy_qube/quality_scale.yaml

@@ -0,0 +1,78 @@
+rules:
+  # Bronze
+  action-setup:
+    status: exempt
+    comment: Integration does not register custom actions.
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow: done
+  config-flow-test-coverage: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: Integration does not register custom actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup:
+    status: exempt
+    comment: Entities do not subscribe to events.
+  entity-unique-id: done
+  has-entity-name: done
+  runtime-data: done
+  test-before-configure: done
+  test-before-setup: done
+  unique-config-entry: done
+
+  # Silver
+  action-exceptions:
+    status: exempt
+    comment: Integration does not register custom actions.
+  config-entry-unloading: done
+  docs-configuration-parameters:
+    status: exempt
+    comment: No configuration options beyond initial setup.
+  docs-installation-parameters: done
+  entity-unavailable: done
+  integration-owner: done
+  log-when-unavailable: todo
+  parallel-updates: done
+  reauthentication-flow:
+    status: exempt
+    comment: No authentication required for Modbus TCP.
+  test-coverage: done
+
+  # Gold
+  devices: done
+  diagnostics: todo
+  discovery-update-info: todo
+  discovery: todo
+  docs-data-update: todo
+  docs-examples: todo
+  docs-known-limitations: todo
+  docs-supported-devices: todo
+  docs-supported-functions: todo
+  docs-troubleshooting: todo
+  docs-use-cases: todo
+  dynamic-devices:
+    status: exempt
+    comment: Single device per config entry.
+  entity-category: todo
+  entity-device-class: done
+  entity-disabled-by-default: todo
+  entity-translations: done
+  exception-translations: todo
+  icon-translations: todo
+  reconfiguration-flow: todo
+  repair-issues: todo
+  stale-devices:
+    status: exempt
+    comment: Single device per config entry.
+
+  # Platinum
+  async-dependency: done
+  inject-websession:
+    status: exempt
+    comment: Uses Modbus TCP, not HTTP.
+  strict-typing: done