Migrate alexa_devices to UnitOfDensity / UnitOfRatio enums (#174992)

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

CODEOWNERS

@@ -1986,7 +1986,6 @@ CLAUDE.md @home-assistant/core
 /tests/components/waterfurnace/ @sdague @masterkoppa
 /homeassistant/components/watergate/ @adam-the-hero
 /tests/components/watergate/ @adam-the-hero
-/homeassistant/components/watson_tts/ @rutkai
 /homeassistant/components/watts/ @theobld-ww @devender-verma-ww @ssi-spyro
 /tests/components/watts/ @theobld-ww @devender-verma-ww @ssi-spyro
 /homeassistant/components/watttime/ @bachya

homeassistant/brands/microsoft.json

@@ -7,9 +7,6 @@
     "azure_event_hub",
     "azure_service_bus",
     "azure_storage",
-    "microsoft_face_detect",
-    "microsoft_face_identify",
-    "microsoft_face",
     "microsoft",
     "onedrive",
     "onedrive_for_business",

homeassistant/components/airgradient/number.py

@@ -12,7 +12,7 @@ from homeassistant.components.number import (
     NumberEntity,
     NumberEntityDescription,
 )
-from homeassistant.const import PERCENTAGE, EntityCategory
+from homeassistant.const import EntityCategory, UnitOfRatio
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -40,7 +40,7 @@ DISPLAY_BRIGHTNESS = AirGradientNumberEntityDescription(
     native_min_value=0,
     native_max_value=100,
     native_step=1,
-    native_unit_of_measurement=PERCENTAGE,
+    native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
     value_fn=lambda config: config.display_brightness,
     set_value_fn=lambda client, value: client.set_display_brightness(value),
 )
@@ -52,7 +52,7 @@ LED_BAR_BRIGHTNESS = AirGradientNumberEntityDescription(
     native_min_value=0,
     native_max_value=100,
     native_step=1,
-    native_unit_of_measurement=PERCENTAGE,
+    native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
     value_fn=lambda config: config.led_bar_brightness,
     set_value_fn=lambda client, value: client.set_led_bar_brightness(value),
 )

homeassistant/components/airgradient/sensor.py

@@ -19,11 +19,10 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     EntityCategory,
+    UnitOfDensity,
+    UnitOfRatio,
     UnitOfTemperature,
     UnitOfTime,
 )
@@ -57,21 +56,21 @@ MEASUREMENT_SENSOR_TYPES: tuple[AirGradientMeasurementSensorEntityDescription, .
     AirGradientMeasurementSensorEntityDescription(
         key="pm01",
         device_class=SensorDeviceClass.PM1,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda status: status.pm01,
     ),
     AirGradientMeasurementSensorEntityDescription(
         key="pm02",
         device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda status: status.pm02,
     ),
     AirGradientMeasurementSensorEntityDescription(
         key="pm10",
         device_class=SensorDeviceClass.PM10,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda status: status.pm10,
     ),
@@ -85,7 +84,7 @@ MEASUREMENT_SENSOR_TYPES: tuple[AirGradientMeasurementSensorEntityDescription, .
     AirGradientMeasurementSensorEntityDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda status: status.relative_humidity,
     ),
@@ -113,7 +112,7 @@ MEASUREMENT_SENSOR_TYPES: tuple[AirGradientMeasurementSensorEntityDescription, .
     AirGradientMeasurementSensorEntityDescription(
         key="co2",
         device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda status: status.rco2,
     ),
@@ -144,7 +143,7 @@ MEASUREMENT_SENSOR_TYPES: tuple[AirGradientMeasurementSensorEntityDescription, .
         key="pm02_raw",
         translation_key="raw_pm02",
         device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
         value_fn=lambda status: status.raw_pm02,
@@ -190,7 +189,7 @@ CONFIG_LED_BAR_SENSOR_TYPES: tuple[AirGradientConfigSensorEntityDescription, ...
     AirGradientConfigSensorEntityDescription(
         key="led_bar_brightness",
         translation_key="led_bar_brightness",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda config: config.led_bar_brightness,
     ),
@@ -216,9 +215,9 @@ CONFIG_DISPLAY_SENSOR_TYPES: tuple[AirGradientConfigSensorEntityDescription, ...
     AirGradientConfigSensorEntityDescription(
         key="display_brightness",
         translation_key="display_brightness",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda config: config.display_brightness,
+        value_fn=lambda config: config.led_bar_brightness,
     ),
 )
 

homeassistant/components/airobot/sensor.py

@@ -14,9 +14,8 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
     EntityCategory,
+    UnitOfRatio,
     UnitOfTemperature,
     UnitOfTime,
 )
@@ -59,7 +58,7 @@ SENSOR_TYPES: tuple[AirobotSensorEntityDescription, ...] = (
     AirobotSensorEntityDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda status: status.hum_air,
     ),
@@ -75,7 +74,7 @@ SENSOR_TYPES: tuple[AirobotSensorEntityDescription, ...] = (
     AirobotSensorEntityDescription(
         key="co2",
         device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda status: status.co2,
         supported_fn=lambda status: status.has_co2_sensor,

homeassistant/components/airthings/sensor.py

@@ -11,14 +11,12 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
     LIGHT_LUX,
-    PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS,
     EntityCategory,
+    UnitOfDensity,
     UnitOfPressure,
+    UnitOfRatio,
     UnitOfSoundPressure,
     UnitOfTemperature,
 )
@@ -49,7 +47,7 @@ SENSORS: dict[str, SensorEntityDescription] = {
     "humidity": SensorEntityDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
     ),
@@ -70,7 +68,7 @@ SENSORS: dict[str, SensorEntityDescription] = {
     "battery": SensorEntityDescription(
         key="battery",
         device_class=SensorDeviceClass.BATTERY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
@@ -78,20 +76,20 @@ SENSORS: dict[str, SensorEntityDescription] = {
     "co2": SensorEntityDescription(
         key="co2",
         device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
     ),
     "voc": SensorEntityDescription(
         key="voc",
         device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_BILLION,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
     ),
     "light": SensorEntityDescription(
         key="light",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         translation_key="light",
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
@@ -126,14 +124,14 @@ SENSORS: dict[str, SensorEntityDescription] = {
     ),
     "pm1": SensorEntityDescription(
         key="pm1",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM1,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
     ),
     "pm25": SensorEntityDescription(
         key="pm25",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM25,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,

homeassistant/components/airvisual/sensor.py

@@ -12,14 +12,13 @@ from homeassistant.const import (
     ATTR_LATITUDE,
     ATTR_LONGITUDE,
     ATTR_STATE,
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
     CONF_COUNTRY,
     CONF_LATITUDE,
     CONF_LONGITUDE,
     CONF_SHOW_ON_MAP,
     CONF_STATE,
+    UnitOfDensity,
+    UnitOfRatio,
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -94,12 +93,12 @@ POLLUTANT_LEVELS = {
 }
 
 POLLUTANT_UNITS = {
-    "co": CONCENTRATION_PARTS_PER_MILLION,
-    "n2": CONCENTRATION_PARTS_PER_BILLION,
-    "o3": CONCENTRATION_PARTS_PER_BILLION,
-    "p1": CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    "p2": CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    "s2": CONCENTRATION_PARTS_PER_BILLION,
+    "co": UnitOfRatio.PARTS_PER_MILLION,
+    "n2": UnitOfRatio.PARTS_PER_BILLION,
+    "o3": UnitOfRatio.PARTS_PER_BILLION,
+    "p1": UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
+    "p2": UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
+    "s2": UnitOfRatio.PARTS_PER_BILLION,
 }
 
 

homeassistant/components/airvisual_pro/sensor.py

@@ -11,10 +11,9 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
     EntityCategory,
+    UnitOfDensity,
+    UnitOfRatio,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
@@ -57,21 +56,21 @@ SENSOR_DESCRIPTIONS = (
         key="battery_level",
         device_class=SensorDeviceClass.BATTERY,
         entity_category=EntityCategory.DIAGNOSTIC,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda settings, status, measurements, history: status["battery"],
     ),
     AirVisualProMeasurementDescription(
         key="carbon_dioxide",
         device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda settings, status, measurements, history: measurements["co2"],
     ),
     AirVisualProMeasurementDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda settings, status, measurements, history: measurements[
             "humidity"
@@ -80,21 +79,21 @@ SENSOR_DESCRIPTIONS = (
     AirVisualProMeasurementDescription(
         key="particulate_matter_0_1",
         translation_key="pm01",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda settings, status, measurements, history: measurements["pm0_1"],
     ),
     AirVisualProMeasurementDescription(
         key="particulate_matter_1_0",
         device_class=SensorDeviceClass.PM1,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda settings, status, measurements, history: measurements["pm1_0"],
     ),
     AirVisualProMeasurementDescription(
         key="particulate_matter_2_5",
         device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda settings, status, measurements, history: measurements["pm2_5"],
     ),
@@ -110,7 +109,7 @@ SENSOR_DESCRIPTIONS = (
     AirVisualProMeasurementDescription(
         key="voc",
         device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda settings, status, measurements, history: measurements["voc"],
     ),

homeassistant/components/airzone_cloud/sensor.py

@@ -35,13 +35,13 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     EntityCategory,
+    UnitOfDensity,
     UnitOfElectricCurrent,
     UnitOfInformation,
     UnitOfPressure,
+    UnitOfRatio,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
@@ -141,7 +141,7 @@ WEBSERVER_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
         key=AZD_CPU_USAGE,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         translation_key="cpu_usage",
     ),
@@ -172,19 +172,19 @@ ZONE_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
     SensorEntityDescription(
         device_class=SensorDeviceClass.PM1,
         key=AZD_AQ_PM_1,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         device_class=SensorDeviceClass.PM25,
         key=AZD_AQ_PM_2P5,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         device_class=SensorDeviceClass.PM10,
         key=AZD_AQ_PM_10,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
@@ -196,20 +196,20 @@ ZONE_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
     SensorEntityDescription(
         device_class=SensorDeviceClass.HUMIDITY,
         key=AZD_HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         device_class=SensorDeviceClass.BATTERY,
         key=AZD_THERMOSTAT_BATTERY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         entity_category=EntityCategory.DIAGNOSTIC,
         entity_registry_enabled_default=False,
         key=AZD_THERMOSTAT_COVERAGE,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         translation_key="thermostat_coverage",
     ),

homeassistant/components/alexa_devices/sensor.py

@@ -18,13 +18,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
-    LIGHT_LUX,
-    PERCENTAGE,
-    UnitOfTemperature,
-)
+from homeassistant.const import LIGHT_LUX, UnitOfDensity, UnitOfRatio, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
@@ -97,25 +91,25 @@ SENSORS: Final = (
     AmazonSensorEntityDescription(
         key="Humidity",
         device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     AmazonSensorEntityDescription(
         key="PM10",
         device_class=SensorDeviceClass.PM10,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     AmazonSensorEntityDescription(
         key="PM25",
         device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     AmazonSensorEntityDescription(
         key="CO",
         device_class=SensorDeviceClass.CO,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     AmazonSensorEntityDescription(

homeassistant/components/altruist/sensor.py

@@ -12,12 +12,11 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     EntityCategory,
+    UnitOfDensity,
     UnitOfPressure,
+    UnitOfRatio,
     UnitOfSoundPressure,
     UnitOfTemperature,
 )
@@ -45,7 +44,7 @@ SENSOR_DESCRIPTIONS = [
         device_class=SensorDeviceClass.HUMIDITY,
         key="BME280_humidity",
         translation_key="humidity",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         suggested_display_precision=2,
         translation_placeholders={"sensor_name": "BME280"},
     ),
@@ -70,7 +69,7 @@ SENSOR_DESCRIPTIONS = [
         device_class=SensorDeviceClass.HUMIDITY,
         key="BME680_humidity",
         translation_key="humidity",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         suggested_display_precision=2,
         translation_placeholders={"sensor_name": "BME680"},
     ),
@@ -129,7 +128,7 @@ SENSOR_DESCRIPTIONS = [
         device_class=SensorDeviceClass.HUMIDITY,
         key="HTU21D_humidity",
         translation_key="humidity",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         suggested_display_precision=2,
         translation_placeholders={"sensor_name": "HTU21D"},
     ),
@@ -145,21 +144,21 @@ SENSOR_DESCRIPTIONS = [
         device_class=SensorDeviceClass.PM10,
         translation_key="pm_10",
         key="SDS_P1",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         suggested_display_precision=2,
     ),
     AltruistSensorEntityDescription(
         device_class=SensorDeviceClass.PM25,
         translation_key="pm_25",
         key="SDS_P2",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         suggested_display_precision=2,
     ),
     AltruistSensorEntityDescription(
         device_class=SensorDeviceClass.HUMIDITY,
         key="SHT3X_humidity",
         translation_key="humidity",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         suggested_display_precision=2,
         translation_placeholders={"sensor_name": "SHT3X"},
     ),
@@ -194,7 +193,7 @@ SENSOR_DESCRIPTIONS = [
     ),
     AltruistSensorEntityDescription(
         device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         translation_key="co2",
         key="CCS_CO2",
         suggested_display_precision=2,
@@ -203,7 +202,7 @@ SENSOR_DESCRIPTIONS = [
     AltruistSensorEntityDescription(
         device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS,
         key="CCS_TVOC",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         suggested_display_precision=2,
     ),
     AltruistSensorEntityDescription(
@@ -215,7 +214,7 @@ SENSOR_DESCRIPTIONS = [
     AltruistSensorEntityDescription(
         device_class=SensorDeviceClass.CO2,
         translation_key="co2",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         key="SCD4x_co2",
         suggested_display_precision=2,
         translation_placeholders={"sensor_name": "SCD4x"},

homeassistant/components/ambient_network/sensor.py

@@ -10,15 +10,14 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
     CONF_MAC,
     DEGREE,
-    PERCENTAGE,
+    UnitOfDensity,
     UnitOfIrradiance,
     UnitOfLength,
     UnitOfPrecipitationDepth,
     UnitOfPressure,
+    UnitOfRatio,
     UnitOfSpeed,
     UnitOfTemperature,
     UnitOfVolumetricFlux,
@@ -94,7 +93,7 @@ SENSOR_DESCRIPTIONS = (
     ),
     SensorEntityDescription(
         key=TYPE_CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         device_class=SensorDeviceClass.CO2,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=2,
@@ -134,7 +133,7 @@ SENSOR_DESCRIPTIONS = (
     ),
     SensorEntityDescription(
         key=TYPE_HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=1,
@@ -188,14 +187,14 @@ SENSOR_DESCRIPTIONS = (
     SensorEntityDescription(
         key=TYPE_PM25_24H,
         translation_key="pm25_24h_average",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM25,
         suggested_display_precision=1,
         entity_registry_enabled_default=False,
     ),
     SensorEntityDescription(
         key=TYPE_PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM25,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=1,

homeassistant/components/anthropic/__init__.py

@@ -29,7 +29,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 async def async_setup_entry(hass: HomeAssistant, entry: AnthropicConfigEntry) -> bool:
     """Set up Anthropic from a config entry."""
     coordinator = AnthropicCoordinator(hass, entry)
-    await coordinator.async_setup()
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator
     LOGGER.debug("Available models: %s", coordinator.data)

homeassistant/components/anthropic/config_flow.py

@@ -28,6 +28,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, llm
+from homeassistant.helpers.httpx_client import get_async_client
 from homeassistant.helpers.selector import (
     NumberSelector,
     NumberSelectorConfig,
@@ -65,7 +66,7 @@ from .const import (
     TOOL_SEARCH_UNSUPPORTED_MODELS,
     PromptCaching,
 )
-from .coordinator import async_create_client, model_alias
+from .coordinator import model_alias
 
 if TYPE_CHECKING:
     from . import AnthropicConfigEntry
@@ -94,7 +95,9 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> None:
 
     Data has the keys from STEP_USER_DATA_SCHEMA with values provided by the user.
     """
-    client = await async_create_client(hass, data[CONF_API_KEY])
+    client = anthropic.AsyncAnthropic(
+        api_key=data[CONF_API_KEY], http_client=get_async_client(hass)
+    )
     await client.models.list(timeout=10.0)
 
 
@@ -546,8 +549,9 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
         location_data: dict[str, str] = {}
         zone_home = self.hass.states.get(ENTITY_ID_HOME)
         if zone_home is not None:
-            client = await async_create_client(
-                self.hass, self._get_entry().data[CONF_API_KEY]
+            client = anthropic.AsyncAnthropic(
+                api_key=self._get_entry().data[CONF_API_KEY],
+                http_client=get_async_client(self.hass),
             )
             location_schema = vol.Schema(
                 {

homeassistant/components/anthropic/coordinator.py

@@ -1,7 +1,6 @@
 """Coordinator for the Anthropic integration."""
 
 import datetime
-from functools import partial
 from typing import override
 
 import anthropic
@@ -21,19 +20,6 @@ UPDATE_INTERVAL_DISCONNECTED = datetime.timedelta(minutes=1)
 type AnthropicConfigEntry = ConfigEntry[AnthropicCoordinator]
 
 
-async def async_create_client(
-    hass: HomeAssistant, api_key: str
-) -> anthropic.AsyncAnthropic:
-    """Create an Anthropic client."""
-    return await hass.async_add_executor_job(
-        partial(
-            anthropic.AsyncAnthropic,
-            api_key=api_key,
-            http_client=get_async_client(hass),
-        )
-    )
-
-
 @callback
 def model_alias(model_id: str) -> str:
     """Resolve alias from versioned model name."""
@@ -47,8 +33,7 @@ def model_alias(model_id: str) -> str:
 class AnthropicCoordinator(DataUpdateCoordinator[list[anthropic.types.ModelInfo]]):
     """Coordinator using different intervals after success and failure."""
 
-    config_entry: AnthropicConfigEntry
-    _client: anthropic.AsyncAnthropic | None = None
+    client: anthropic.AsyncAnthropic
 
     def __init__(self, hass: HomeAssistant, config_entry: AnthropicConfigEntry) -> None:
         """Initialize the coordinator."""
@@ -61,18 +46,8 @@ class AnthropicCoordinator(DataUpdateCoordinator[list[anthropic.types.ModelInfo]
             update_method=self.async_update_data,
             always_update=False,
         )
-
-    @property
-    def client(self) -> anthropic.AsyncAnthropic:
-        """Return the Anthropic client."""
-        if self._client is None:
-            raise RuntimeError("Anthropic client is not set up")
-        return self._client
-
-    async def async_setup(self) -> None:
-        """Set up the coordinator."""
-        self._client = await async_create_client(
-            self.hass, self.config_entry.data[CONF_API_KEY]
+        self.client = anthropic.AsyncAnthropic(
+            api_key=config_entry.data[CONF_API_KEY], http_client=get_async_client(hass)
         )
 
     @callback

homeassistant/components/aranet/sensor.py

@@ -23,10 +23,9 @@ from homeassistant.const import (
     ATTR_MODEL,
     ATTR_NAME,
     ATTR_SW_VERSION,
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
     EntityCategory,
     UnitOfPressure,
+    UnitOfRatio,
     UnitOfTemperature,
     UnitOfTime,
 )
@@ -62,7 +61,7 @@ SENSOR_DESCRIPTIONS = {
         key="humidity",
         name="Humidity",
         device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     "pressure": AranetSensorEntityDescription(
@@ -83,7 +82,7 @@ SENSOR_DESCRIPTIONS = {
         key="co2",
         name="Carbon Dioxide",
         device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     "radiation_rate": AranetSensorEntityDescription(
@@ -115,7 +114,7 @@ SENSOR_DESCRIPTIONS = {
         key="battery",
         name="Battery",
         device_class=SensorDeviceClass.BATTERY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),

homeassistant/components/arve/sensor.py

@@ -12,12 +12,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
-    UnitOfTemperature,
-)
+from homeassistant.const import UnitOfDensity, UnitOfRatio, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
@@ -35,7 +30,7 @@ class ArveDeviceEntityDescription(SensorEntityDescription):
 SENSORS: tuple[ArveDeviceEntityDescription, ...] = (
     ArveDeviceEntityDescription(
         key="CO2",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         device_class=SensorDeviceClass.CO2,
         value_fn=lambda arve_data: arve_data.co2,
         state_class=SensorStateClass.MEASUREMENT,
@@ -48,21 +43,21 @@ SENSORS: tuple[ArveDeviceEntityDescription, ...] = (
     ),
     ArveDeviceEntityDescription(
         key="Humidity",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         device_class=SensorDeviceClass.HUMIDITY,
         value_fn=lambda arve_data: arve_data.humidity,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     ArveDeviceEntityDescription(
         key="PM10",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM10,
         value_fn=lambda arve_data: arve_data.pm10,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     ArveDeviceEntityDescription(
         key="PM25",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM25,
         value_fn=lambda arve_data: arve_data.pm25,
         state_class=SensorStateClass.MEASUREMENT,

homeassistant/components/awair/sensor.py

@@ -16,12 +16,9 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_CONNECTIONS,
     ATTR_SW_VERSION,
-    CONCENTRATION_GRAMS_PER_CUBIC_METER,
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
     LIGHT_LUX,
-    PERCENTAGE,
+    UnitOfDensity,
+    UnitOfRatio,
     UnitOfSoundPressure,
     UnitOfTemperature,
 )
@@ -61,7 +58,7 @@ class AwairSensorEntityDescription(SensorEntityDescription):
 
 SENSOR_TYPE_SCORE = AwairSensorEntityDescription(
     key=API_SCORE,
-    native_unit_of_measurement=PERCENTAGE,
+    native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
     translation_key="score",
     unique_id_tag="score",  # matches legacy format
     state_class=SensorStateClass.MEASUREMENT,
@@ -71,7 +68,7 @@ SENSOR_TYPES: tuple[AwairSensorEntityDescription, ...] = (
     AwairSensorEntityDescription(
         key=API_HUMID,
         device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         unique_id_tag="HUMID",  # matches legacy format
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -93,7 +90,7 @@ SENSOR_TYPES: tuple[AwairSensorEntityDescription, ...] = (
     AwairSensorEntityDescription(
         key=API_VOC,
         device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_BILLION,
         unique_id_tag="VOC",  # matches legacy format
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -107,7 +104,7 @@ SENSOR_TYPES: tuple[AwairSensorEntityDescription, ...] = (
     AwairSensorEntityDescription(
         key=API_CO2,
         device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         unique_id_tag="CO2",  # matches legacy format
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -123,7 +120,7 @@ SENSOR_TYPES: tuple[AwairSensorEntityDescription, ...] = (
     AwairSensorEntityDescription(
         key=API_ABS_HUMID,
         device_class=SensorDeviceClass.ABSOLUTE_HUMIDITY,
-        native_unit_of_measurement=CONCENTRATION_GRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.GRAMS_PER_CUBIC_METER,
         unique_id_tag="absolute_humidity",
         state_class=SensorStateClass.MEASUREMENT,
         entity_registry_enabled_default=False,
@@ -134,14 +131,14 @@ SENSOR_TYPES_DUST: tuple[AwairSensorEntityDescription, ...] = (
     AwairSensorEntityDescription(
         key=API_PM25,
         device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         unique_id_tag="PM25",  # matches legacy format
         state_class=SensorStateClass.MEASUREMENT,
     ),
     AwairSensorEntityDescription(
         key=API_PM10,
         device_class=SensorDeviceClass.PM10,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         unique_id_tag="PM10",  # matches legacy format
         state_class=SensorStateClass.MEASUREMENT,
     ),

homeassistant/components/blinksticklight/__init__.py

@@ -1 +0,0 @@
-"""The BlinkStick integration."""

homeassistant/components/blinksticklight/light.py

@@ -1,87 +0,0 @@
-"""Support for BlinkStick lights."""
-
-# mypy: ignore-errors
-from typing import Any
-
-# from blinkstick import blinkstick
-import voluptuous as vol
-
-from homeassistant.components.light import (
-    ATTR_BRIGHTNESS,
-    ATTR_HS_COLOR,
-    PLATFORM_SCHEMA as LIGHT_PLATFORM_SCHEMA,
-    ColorMode,
-    LightEntity,
-)
-from homeassistant.const import CONF_NAME
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-from homeassistant.util import color as color_util
-
-CONF_SERIAL = "serial"
-
-DEFAULT_NAME = "Blinkstick"
-
-PLATFORM_SCHEMA = LIGHT_PLATFORM_SCHEMA.extend(
-    {
-        vol.Required(CONF_SERIAL): cv.string,
-        vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-    }
-)
-
-
-def setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up BlinkStick device specified by serial number."""
-
-    name = config[CONF_NAME]
-    serial = config[CONF_SERIAL]
-
-    stick = blinkstick.find_by_serial(serial)
-
-    add_entities([BlinkStickLight(stick, name)], True)
-
-
-class BlinkStickLight(LightEntity):
-    """Representation of a BlinkStick light."""
-
-    _attr_color_mode = ColorMode.HS
-    _attr_supported_color_modes = {ColorMode.HS}
-
-    def __init__(self, stick, name):
-        """Initialize the light."""
-        self._stick = stick
-        self._attr_name = name
-
-    def update(self) -> None:
-        """Read back the device state."""
-        rgb_color = self._stick.get_color()
-        hsv = color_util.color_RGB_to_hsv(*rgb_color)
-        self._attr_hs_color = hsv[:2]
-        self._attr_brightness = int(hsv[2])
-        self._attr_is_on = self.brightness is not None and self.brightness > 0
-
-    def turn_on(self, **kwargs: Any) -> None:
-        """Turn the device on."""
-        if ATTR_HS_COLOR in kwargs:
-            self._attr_hs_color = kwargs[ATTR_HS_COLOR]
-
-        brightness: int = kwargs.get(ATTR_BRIGHTNESS, 255)
-        self._attr_brightness = brightness
-        self._attr_is_on = bool(brightness)
-
-        assert self.hs_color
-        rgb_color = color_util.color_hsv_to_RGB(
-            self.hs_color[0], self.hs_color[1], brightness / 255 * 100
-        )
-        self._stick.set_color(red=rgb_color[0], green=rgb_color[1], blue=rgb_color[2])
-
-    def turn_off(self, **kwargs: Any) -> None:
-        """Turn the device off."""
-        self._stick.turn_off()

homeassistant/components/blinksticklight/manifest.json

@@ -1,11 +0,0 @@
-{
-  "domain": "blinksticklight",
-  "name": "BlinkStick",
-  "codeowners": [],
-  "disabled": "This integration is disabled because it uses non-open source code to operate.",
-  "documentation": "https://www.home-assistant.io/integrations/blinksticklight",
-  "iot_class": "local_polling",
-  "loggers": ["blinkstick"],
-  "quality_scale": "legacy",
-  "requirements": ["BlinkStick==1.2.0"]
-}

homeassistant/components/blinksticklight/ruff.toml

@@ -1,5 +0,0 @@
-extend = "../../../pyproject.toml"
-
-lint.extend-ignore = [
-  "F821"
-]

homeassistant/components/bosch_shc/sensor.py

@@ -13,10 +13,9 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
     UnitOfEnergy,
     UnitOfPower,
+    UnitOfRatio,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
@@ -58,13 +57,13 @@ SENSOR_DESCRIPTIONS: dict[str, SHCSensorEntityDescription] = {
     HUMIDITY_SENSOR: SHCSensorEntityDescription(
         key=HUMIDITY_SENSOR,
         device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         value_fn=lambda device: device.humidity,
     ),
     PURITY_SENSOR: SHCSensorEntityDescription(
         key=PURITY_SENSOR,
         translation_key=PURITY_SENSOR,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         value_fn=lambda device: device.purity,
     ),
     AIR_QUALITY_SENSOR: SHCSensorEntityDescription(
@@ -112,7 +111,7 @@ SENSOR_DESCRIPTIONS: dict[str, SHCSensorEntityDescription] = {
         key=VALVE_TAPPET_SENSOR,
         translation_key=VALVE_TAPPET_SENSOR,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         value_fn=lambda device: device.position,
         attributes_fn=lambda device: {
             "valve_tappet_state": device.valvestate.name,

homeassistant/components/broadlink/sensor.py

@@ -10,12 +10,12 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    PERCENTAGE,
+    UnitOfDensity,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
     UnitOfPower,
+    UnitOfRatio,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
@@ -37,25 +37,25 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     ),
     SensorEntityDescription(
         key="pm10",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM10,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="pm2_5",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM25,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="pm1",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM1,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="humidity",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
     ),

homeassistant/components/bsblan/manifest.json

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

homeassistant/components/clementine/__init__.py

@@ -1 +0,0 @@
-"""The clementine component."""

homeassistant/components/clementine/manifest.json

@@ -1,10 +0,0 @@
-{
-  "domain": "clementine",
-  "name": "Clementine Music Player",
-  "codeowners": [],
-  "documentation": "https://www.home-assistant.io/integrations/clementine",
-  "iot_class": "local_polling",
-  "loggers": ["clementineremote"],
-  "quality_scale": "legacy",
-  "requirements": ["python-clementine-remote==1.0.1"]
-}

homeassistant/components/clementine/media_player.py

@@ -1,166 +0,0 @@
-"""Support for Clementine Music Player as media player."""
-
-from datetime import timedelta
-import time
-from typing import override
-
-from clementineremote import ClementineRemote
-import voluptuous as vol
-
-from homeassistant.components.media_player import (
-    PLATFORM_SCHEMA as MEDIA_PLAYER_PLATFORM_SCHEMA,
-    MediaPlayerEntity,
-    MediaPlayerEntityFeature,
-    MediaPlayerState,
-    MediaType,
-)
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_HOST, CONF_NAME, CONF_PORT
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-
-DEFAULT_NAME = "Clementine Remote"
-DEFAULT_PORT = 5500
-
-SCAN_INTERVAL = timedelta(seconds=5)
-
-PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
-    {
-        vol.Required(CONF_HOST): cv.string,
-        vol.Optional(CONF_ACCESS_TOKEN): cv.positive_int,
-        vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-        vol.Optional(CONF_PORT, default=DEFAULT_PORT): cv.port,
-    }
-)
-
-
-def setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up the Clementine platform."""
-
-    host = config[CONF_HOST]
-    port = config[CONF_PORT]
-    token = config.get(CONF_ACCESS_TOKEN)
-
-    client = ClementineRemote(host, port, token, reconnect=True)
-
-    add_entities([ClementineDevice(client, config[CONF_NAME])])
-
-
-class ClementineDevice(MediaPlayerEntity):
-    """Representation of Clementine Player."""
-
-    _attr_media_content_type = MediaType.MUSIC
-    _attr_supported_features = (
-        MediaPlayerEntityFeature.PAUSE
-        | MediaPlayerEntityFeature.VOLUME_STEP
-        | MediaPlayerEntityFeature.PREVIOUS_TRACK
-        | MediaPlayerEntityFeature.VOLUME_SET
-        | MediaPlayerEntityFeature.NEXT_TRACK
-        | MediaPlayerEntityFeature.SELECT_SOURCE
-        | MediaPlayerEntityFeature.PLAY
-    )
-    _attr_volume_step = 0.04
-
-    def __init__(self, client, name):
-        """Initialize the Clementine device."""
-        self._client = client
-        self._attr_name = name
-
-    def update(self) -> None:
-        """Retrieve the latest data from the Clementine Player."""
-        try:
-            client = self._client
-
-            if client.state == "Playing":
-                self._attr_state = MediaPlayerState.PLAYING
-            elif client.state == "Paused":
-                self._attr_state = MediaPlayerState.PAUSED
-            elif client.state == "Disconnected":
-                self._attr_state = MediaPlayerState.OFF
-            else:
-                self._attr_state = MediaPlayerState.PAUSED
-
-            if client.last_update and (time.time() - client.last_update > 40):
-                self._attr_state = MediaPlayerState.OFF
-
-            volume = float(client.volume) if client.volume else 0.0
-            self._attr_volume_level = volume / 100.0
-            if client.active_playlist_id in client.playlists:
-                self._attr_source = client.playlists[client.active_playlist_id]["name"]
-            else:
-                self._attr_source = "Unknown"
-            self._attr_source_list = [s["name"] for s in client.playlists.values()]
-
-            if client.current_track:
-                self._attr_media_title = client.current_track["title"]
-                self._attr_media_artist = client.current_track["track_artist"]
-                self._attr_media_album_name = client.current_track["track_album"]
-                self._attr_media_image_hash = client.current_track["track_id"]
-            else:
-                self._attr_media_image_hash = None
-
-        except Exception:
-            self._attr_state = MediaPlayerState.OFF
-            raise
-
-    @override
-    def select_source(self, source: str) -> None:
-        """Select input source."""
-        client = self._client
-        sources = [s for s in client.playlists.values() if s["name"] == source]
-        if len(sources) == 1:
-            client.change_song(sources[0]["id"], 0)
-
-    @override
-    async def async_get_media_image(self) -> tuple[bytes | None, str | None]:
-        """Fetch media image of current playing image."""
-        if self._client.current_track:
-            image = bytes(self._client.current_track["art"])
-            return (image, "image/png")
-
-        return None, None
-
-    @override
-    def mute_volume(self, mute: bool) -> None:
-        """Send mute command."""
-        self._client.set_volume(0)
-
-    @override
-    def set_volume_level(self, volume: float) -> None:
-        """Set volume level."""
-        self._client.set_volume(int(100 * volume))
-
-    def media_play_pause(self) -> None:
-        """Simulate play pause media player."""
-        if self.state == MediaPlayerState.PLAYING:
-            self.media_pause()
-        else:
-            self.media_play()
-
-    @override
-    def media_play(self) -> None:
-        """Send play command."""
-        self._attr_state = MediaPlayerState.PLAYING
-        self._client.play()
-
-    @override
-    def media_pause(self) -> None:
-        """Send media pause command to media player."""
-        self._attr_state = MediaPlayerState.PAUSED
-        self._client.pause()
-
-    @override
-    def media_next_track(self) -> None:
-        """Send next track command."""
-        self._client.next()
-
-    @override
-    def media_previous_track(self) -> None:
-        """Send the previous track command."""
-        self._client.previous()

homeassistant/components/compit/sensor.py

@@ -13,12 +13,11 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
+    UnitOfDensity,
     UnitOfElectricCurrent,
     UnitOfEnergy,
     UnitOfPower,
+    UnitOfRatio,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
@@ -117,7 +116,7 @@ DESCRIPTIONS: dict[CompitParameter, SensorEntityDescription] = {
         device_class=SensorDeviceClass.BATTERY,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
     ),
     CompitParameter.BOILER_TEMPERATURE: SensorEntityDescription(
         key=CompitParameter.BOILER_TEMPERATURE.value,
@@ -204,14 +203,14 @@ DESCRIPTIONS: dict[CompitParameter, SensorEntityDescription] = {
         device_class=SensorDeviceClass.CO2,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
     ),
     CompitParameter.CO2_PERCENT: SensorEntityDescription(
         key=CompitParameter.CO2_PERCENT.value,
         translation_key="co2_percent",
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
     ),
     CompitParameter.COLLECTOR_POWER: SensorEntityDescription(
         key=CompitParameter.COLLECTOR_POWER.value,
@@ -290,7 +289,7 @@ DESCRIPTIONS: dict[CompitParameter, SensorEntityDescription] = {
         translation_key="fuel_level",
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
     ),
     CompitParameter.HEATING1_TARGET_TEMPERATURE: SensorEntityDescription(
         key=CompitParameter.HEATING1_TARGET_TEMPERATURE.value,
@@ -333,7 +332,7 @@ DESCRIPTIONS: dict[CompitParameter, SensorEntityDescription] = {
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
     ),
     CompitParameter.LOWER_SOURCE_TEMPERATURE: SensorEntityDescription(
         key=CompitParameter.LOWER_SOURCE_TEMPERATURE.value,
@@ -401,14 +400,14 @@ DESCRIPTIONS: dict[CompitParameter, SensorEntityDescription] = {
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
         device_class=SensorDeviceClass.PM1,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
     ),
     CompitParameter.PM4_LEVEL_MEASURED: SensorEntityDescription(
         key=CompitParameter.PM4_LEVEL_MEASURED.value,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
         device_class=SensorDeviceClass.PM4,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
     ),
     CompitParameter.PM10_LEVEL: SensorEntityDescription(
         key=CompitParameter.PM10_LEVEL.value,
@@ -422,7 +421,7 @@ DESCRIPTIONS: dict[CompitParameter, SensorEntityDescription] = {
         key=CompitParameter.PM10_MEASURED.value,
         device_class=SensorDeviceClass.PM10,
         entity_category=EntityCategory.DIAGNOSTIC,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
     ),
     CompitParameter.PM25_LEVEL: SensorEntityDescription(
         key=CompitParameter.PM25_LEVEL.value,
@@ -436,7 +435,7 @@ DESCRIPTIONS: dict[CompitParameter, SensorEntityDescription] = {
         key=CompitParameter.PM25_MEASURED.value,
         device_class=SensorDeviceClass.PM25,
         entity_category=EntityCategory.DIAGNOSTIC,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
     ),
     CompitParameter.PROTECTION_TEMPERATURE: SensorEntityDescription(
         key=CompitParameter.PROTECTION_TEMPERATURE.value,

homeassistant/components/deconz/sensor.py

@@ -35,15 +35,13 @@ from homeassistant.components.sensor import (
 from homeassistant.const import (
     ATTR_TEMPERATURE,
     ATTR_VOLTAGE,
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
     LIGHT_LUX,
-    PERCENTAGE,
     EntityCategory,
+    UnitOfDensity,
     UnitOfEnergy,
     UnitOfPower,
     UnitOfPressure,
+    UnitOfRatio,
     UnitOfTemperature,
     UnitOfTime,
 )
@@ -138,7 +136,7 @@ ENTITY_DESCRIPTIONS: tuple[DeconzSensorDescription, ...] = (
         name_suffix="PPB",
         old_unique_id_suffix="ppb",
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_BILLION,
     ),
     DeconzSensorDescription[AirQuality](
         key="air_quality_formaldehyde",
@@ -149,7 +147,7 @@ ENTITY_DESCRIPTIONS: tuple[DeconzSensorDescription, ...] = (
         name_suffix="CH2O",
         device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
     ),
     DeconzSensorDescription[AirQuality](
         key="air_quality_co2",
@@ -160,7 +158,7 @@ ENTITY_DESCRIPTIONS: tuple[DeconzSensorDescription, ...] = (
         name_suffix="CO2",
         device_class=SensorDeviceClass.CO2,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
     ),
     DeconzSensorDescription[AirQuality](
         key="air_quality_pm2_5",
@@ -171,7 +169,7 @@ ENTITY_DESCRIPTIONS: tuple[DeconzSensorDescription, ...] = (
         name_suffix="PM25",
         device_class=SensorDeviceClass.PM25,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
     ),
     DeconzSensorDescription[CarbonDioxide](
         key="carbon_dioxide",
@@ -181,7 +179,7 @@ ENTITY_DESCRIPTIONS: tuple[DeconzSensorDescription, ...] = (
         instance_check=CarbonDioxide,
         device_class=SensorDeviceClass.CO2,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_BILLION,
     ),
     DeconzSensorDescription[Consumption](
         key="consumption",
@@ -210,7 +208,7 @@ ENTITY_DESCRIPTIONS: tuple[DeconzSensorDescription, ...] = (
         instance_check=Formaldehyde,
         device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_BILLION,
     ),
     DeconzSensorDescription[GenericStatus](
         key="status",
@@ -227,7 +225,7 @@ ENTITY_DESCRIPTIONS: tuple[DeconzSensorDescription, ...] = (
         instance_check=Humidity,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         suggested_display_precision=1,
     ),
     DeconzSensorDescription[LightLevel](
@@ -248,7 +246,7 @@ ENTITY_DESCRIPTIONS: tuple[DeconzSensorDescription, ...] = (
         instance_check=Moisture,
         device_class=SensorDeviceClass.MOISTURE,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         suggested_display_precision=1,
     ),
     DeconzSensorDescription[ParticulateMatter](
@@ -260,7 +258,7 @@ ENTITY_DESCRIPTIONS: tuple[DeconzSensorDescription, ...] = (
         name_suffix="PM25",
         device_class=SensorDeviceClass.PM25,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
     ),
     DeconzSensorDescription[Power](
         key="power",
@@ -310,7 +308,7 @@ ENTITY_DESCRIPTIONS: tuple[DeconzSensorDescription, ...] = (
         old_unique_id_suffix="battery",
         device_class=SensorDeviceClass.BATTERY,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     DeconzSensorDescription[SensorResources](

homeassistant/components/demo/sensor.py

@@ -12,11 +12,10 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
     EntityCategory,
     UnitOfEnergy,
     UnitOfPower,
+    UnitOfRatio,
     UnitOfTemperature,
     UnitOfVolume,
 )
@@ -52,7 +51,7 @@ async def async_setup_entry(
                 12,
                 SensorDeviceClass.BATTERY,
                 SensorStateClass.MEASUREMENT,
-                PERCENTAGE,
+                UnitOfRatio.PERCENTAGE,
                 entity_category=EntityCategory.DIAGNOSTIC,
                 entity_name="Battery",
             ),
@@ -63,7 +62,7 @@ async def async_setup_entry(
                 54,
                 SensorDeviceClass.HUMIDITY,
                 SensorStateClass.MEASUREMENT,
-                PERCENTAGE,
+                UnitOfRatio.PERCENTAGE,
             ),
             DemoSensor(
                 "sensor_3",
@@ -72,7 +71,7 @@ async def async_setup_entry(
                 54,
                 SensorDeviceClass.CO,
                 SensorStateClass.MEASUREMENT,
-                CONCENTRATION_PARTS_PER_MILLION,
+                UnitOfRatio.PARTS_PER_MILLION,
             ),
             DemoSensor(
                 "sensor_4",
@@ -81,7 +80,7 @@ async def async_setup_entry(
                 54,
                 SensorDeviceClass.CO2,
                 SensorStateClass.MEASUREMENT,
-                CONCENTRATION_PARTS_PER_MILLION,
+                UnitOfRatio.PARTS_PER_MILLION,
             ),
             DemoSensor(
                 "battery_4",
@@ -90,7 +89,7 @@ async def async_setup_entry(
                 99,
                 SensorDeviceClass.BATTERY,
                 SensorStateClass.MEASUREMENT,
-                PERCENTAGE,
+                UnitOfRatio.PERCENTAGE,
                 entity_category=EntityCategory.DIAGNOSTIC,
                 entity_name="Battery",
             ),

homeassistant/components/drop_connect/sensor.py

@@ -12,11 +12,10 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
     TEMPERATURE,
     EntityCategory,
     UnitOfPressure,
+    UnitOfRatio,
     UnitOfTemperature,
     UnitOfVolume,
     UnitOfVolumeFlowRate,
@@ -141,7 +140,7 @@ SENSORS: list[DROPSensorEntityDescription] = [
     DROPSensorEntityDescription(
         key=BATTERY,
         device_class=SensorDeviceClass.BATTERY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         suggested_display_precision=0,
         value_fn=lambda device: device.drop_api.battery(),
         state_class=SensorStateClass.MEASUREMENT,
@@ -158,7 +157,7 @@ SENSORS: list[DROPSensorEntityDescription] = [
     DROPSensorEntityDescription(
         key=INLET_TDS,
         translation_key=INLET_TDS,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
         value_fn=lambda device: device.drop_api.inlet_tds(),
@@ -166,7 +165,7 @@ SENSORS: list[DROPSensorEntityDescription] = [
     DROPSensorEntityDescription(
         key=OUTLET_TDS,
         translation_key=OUTLET_TDS,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
         value_fn=lambda device: device.drop_api.outlet_tds(),
@@ -174,7 +173,7 @@ SENSORS: list[DROPSensorEntityDescription] = [
     DROPSensorEntityDescription(
         key=CARTRIDGE_1_LIFE,
         translation_key=CARTRIDGE_1_LIFE,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
         suggested_display_precision=0,
@@ -183,7 +182,7 @@ SENSORS: list[DROPSensorEntityDescription] = [
     DROPSensorEntityDescription(
         key=CARTRIDGE_2_LIFE,
         translation_key=CARTRIDGE_2_LIFE,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
         suggested_display_precision=0,
@@ -192,7 +191,7 @@ SENSORS: list[DROPSensorEntityDescription] = [
     DROPSensorEntityDescription(
         key=CARTRIDGE_3_LIFE,
         translation_key=CARTRIDGE_3_LIFE,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
         suggested_display_precision=0,

homeassistant/components/ecobee/sensor.py

@@ -11,12 +11,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
-    UnitOfTemperature,
-)
+from homeassistant.const import UnitOfDensity, UnitOfRatio, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -42,14 +37,14 @@ SENSOR_TYPES: tuple[EcobeeSensorEntityDescription, ...] = (
     ),
     EcobeeSensorEntityDescription(
         key="humidity",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
         runtime_key=None,
     ),
     EcobeeSensorEntityDescription(
         key="co2PPM",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         device_class=SensorDeviceClass.CO2,
         state_class=SensorStateClass.MEASUREMENT,
         runtime_key="actualCO2",
@@ -57,7 +52,7 @@ SENSOR_TYPES: tuple[EcobeeSensorEntityDescription, ...] = (
     EcobeeSensorEntityDescription(
         key="vocPPM",
         device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         runtime_key="actualVOC",
     ),

homeassistant/components/emoncms/sensor.py

@@ -9,17 +9,16 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
     CONF_URL,
-    PERCENTAGE,
     UnitOfApparentPower,
+    UnitOfDensity,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
     UnitOfFrequency,
     UnitOfPower,
     UnitOfPressure,
+    UnitOfRatio,
     UnitOfSoundPressure,
     UnitOfSpeed,
     UnitOfTemperature,
@@ -158,19 +157,19 @@ SENSORS: dict[str | None, SensorEntityDescription] = {
     "μg/m³": SensorEntityDescription(
         key="concentration|microgram_per_cubic_meter",
         translation_key="concentration",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     "ppm": SensorEntityDescription(
         key="concentration|microgram_parts_per_million",
         translation_key="concentration",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     "%": SensorEntityDescription(
         key="percent",
         translation_key="percent",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
 }

homeassistant/components/epion/sensor.py

@@ -8,12 +8,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
-    UnitOfPressure,
-    UnitOfTemperature,
-)
+from homeassistant.const import UnitOfPressure, UnitOfRatio, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -26,7 +21,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         device_class=SensorDeviceClass.CO2,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         key="co2",
         suggested_display_precision=0,
     ),
@@ -40,7 +35,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         key="humidity",
         suggested_display_precision=1,
     ),

homeassistant/components/fibaro/sensor.py

@@ -13,12 +13,11 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
     LIGHT_LUX,
-    PERCENTAGE,
     Platform,
     UnitOfEnergy,
     UnitOfPower,
+    UnitOfRatio,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
@@ -39,20 +38,20 @@ MAIN_SENSOR_TYPES: dict[str, SensorEntityDescription] = {
     "com.fibaro.smokeSensor": SensorEntityDescription(
         key="com.fibaro.smokeSensor",
         name="Smoke",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         icon="mdi:fire",
     ),
     "CO2": SensorEntityDescription(
         key="CO2",
         name="CO2",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         device_class=SensorDeviceClass.CO2,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     "com.fibaro.humiditySensor": SensorEntityDescription(
         key="com.fibaro.humiditySensor",
         name="Humidity",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
     ),

homeassistant/components/foobot/sensor.py

@@ -16,12 +16,10 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import (
     ATTR_TEMPERATURE,
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
     CONF_TOKEN,
     CONF_USERNAME,
-    PERCENTAGE,
+    UnitOfDensity,
+    UnitOfRatio,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
@@ -44,7 +42,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="pm",
         name=ATTR_PM2_5,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         icon="mdi:cloud",
     ),
     SensorEntityDescription(
@@ -56,25 +54,25 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="hum",
         name=ATTR_HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         icon="mdi:water-percent",
     ),
     SensorEntityDescription(
         key="co2",
         name=ATTR_CARBON_DIOXIDE,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         icon="mdi:molecule-co2",
     ),
     SensorEntityDescription(
         key="voc",
         name=ATTR_VOLATILE_ORGANIC_COMPOUNDS,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_BILLION,
         icon="mdi:cloud",
     ),
     SensorEntityDescription(
         key="allpollu",
         name=ATTR_FOOBOT_INDEX,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         icon="mdi:percent",
     ),
 )

homeassistant/components/freshr/sensor.py

@@ -13,12 +13,7 @@ from homeassistant.components.sensor import (
     SensorStateClass,
     StateType,
 )
-from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
-    UnitOfTemperature,
-    UnitOfVolumeFlowRate,
-)
+from homeassistant.const import UnitOfRatio, UnitOfTemperature, UnitOfVolumeFlowRate
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
@@ -54,14 +49,14 @@ _T2 = FreshrSensorEntityDescription(
 _CO2 = FreshrSensorEntityDescription(
     key="co2",
     device_class=SensorDeviceClass.CO2,
-    native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+    native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
     state_class=SensorStateClass.MEASUREMENT,
     value_fn=lambda r: r.co2,
 )
 _HUM = FreshrSensorEntityDescription(
     key="hum",
     device_class=SensorDeviceClass.HUMIDITY,
-    native_unit_of_measurement=PERCENTAGE,
+    native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
     state_class=SensorStateClass.MEASUREMENT,
     value_fn=lambda r: r.hum,
 )

homeassistant/components/google_air_quality/sensor.py

@@ -14,11 +14,7 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.config_entries import ConfigSubentry
-from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
-    CONF_LATITUDE,
-    CONF_LONGITUDE,
-)
+from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE, UnitOfRatio
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -125,7 +121,7 @@ AIR_QUALITY_SENSOR_TYPES: tuple[AirQualitySensorEntityDescription, ...] = (
         native_unit_of_measurement_fn=lambda x: x.pollutants.co.concentration.units,
         exists_fn=lambda x: "co" in {p.code for p in x.pollutants},
         value_fn=lambda x: x.pollutants.co.concentration.value,
-        suggested_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        suggested_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
     ),
     AirQualitySensorEntityDescription(
         key="nh3",

homeassistant/components/homematic/sensor.py

@@ -12,11 +12,9 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import (
     ATTR_NAME,
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
     DEGREE,
     LIGHT_LUX,
-    PERCENTAGE,
+    UnitOfDensity,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
@@ -24,6 +22,7 @@ from homeassistant.const import (
     UnitOfPower,
     UnitOfPrecipitationDepth,
     UnitOfPressure,
+    UnitOfRatio,
     UnitOfSpeed,
     UnitOfTemperature,
     UnitOfVolume,
@@ -57,7 +56,7 @@ HM_STATE_HA_CAST = {
 SENSOR_DESCRIPTIONS: dict[str, SensorEntityDescription] = {
     "HUMIDITY": SensorEntityDescription(
         key="HUMIDITY",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -129,7 +128,7 @@ SENSOR_DESCRIPTIONS: dict[str, SensorEntityDescription] = {
     ),
     "CONCENTRATION": SensorEntityDescription(
         key="CONCENTRATION",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         device_class=SensorDeviceClass.CO2,
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -204,15 +203,15 @@ SENSOR_DESCRIPTIONS: dict[str, SensorEntityDescription] = {
     ),
     "VALVE_STATE": SensorEntityDescription(
         key="VALVE_STATE",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
     ),
     "CARRIER_SENSE_LEVEL": SensorEntityDescription(
         key="CARRIER_SENSE_LEVEL",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
     ),
     "DUTY_CYCLE_LEVEL": SensorEntityDescription(
         key="DUTY_CYCLE_LEVEL",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
     ),
     "BRIGHTNESS": SensorEntityDescription(
         key="BRIGHTNESS",
@@ -221,37 +220,37 @@ SENSOR_DESCRIPTIONS: dict[str, SensorEntityDescription] = {
     ),
     "MASS_CONCENTRATION_PM_1": SensorEntityDescription(
         key="MASS_CONCENTRATION_PM_1",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM1,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     "MASS_CONCENTRATION_PM_2_5": SensorEntityDescription(
         key="MASS_CONCENTRATION_PM_2_5",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM25,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     "MASS_CONCENTRATION_PM_10": SensorEntityDescription(
         key="MASS_CONCENTRATION_PM_10",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM10,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     "MASS_CONCENTRATION_PM_1_24H_AVERAGE": SensorEntityDescription(
         key="MASS_CONCENTRATION_PM_1_24H_AVERAGE",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM1,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     "MASS_CONCENTRATION_PM_2_5_24H_AVERAGE": SensorEntityDescription(
         key="MASS_CONCENTRATION_PM_2_5_24H_AVERAGE",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM25,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     "MASS_CONCENTRATION_PM_10_24H_AVERAGE": SensorEntityDescription(
         key="MASS_CONCENTRATION_PM_10_24H_AVERAGE",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM10,
         state_class=SensorStateClass.MEASUREMENT,
     ),

homeassistant/components/immich/manifest.json

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

homeassistant/components/intelliclima/sensor.py

@@ -12,11 +12,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
-    UnitOfTemperature,
-)
+from homeassistant.const import UnitOfRatio, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
@@ -46,14 +42,14 @@ INTELLICLIMA_SENSORS: tuple[IntelliClimaSensorEntityDescription, ...] = (
         key="humidity",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         value_fn=lambda device_data: float(device_data.rh),
     ),
     IntelliClimaSensorEntityDescription(
         key="voc",
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         value_fn=lambda device_data: float(device_data.voc_state),
     ),
 )

homeassistant/components/lcn/sensor.py

@@ -14,15 +14,14 @@ from homeassistant.components.sensor import (
     SensorEntity,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
     CONF_DOMAIN,
     CONF_ENTITIES,
     CONF_SOURCE,
     CONF_UNIT_OF_MEASUREMENT,
     LIGHT_LUX,
-    PERCENTAGE,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
+    UnitOfRatio,
     UnitOfSpeed,
     UnitOfTemperature,
 )
@@ -67,8 +66,8 @@ UNIT_OF_MEASUREMENT_MAPPING = {
     pypck.lcn_defs.VarUnit.METERPERSECOND: UnitOfSpeed.METERS_PER_SECOND,
     pypck.lcn_defs.VarUnit.VOLT: UnitOfElectricPotential.VOLT,
     pypck.lcn_defs.VarUnit.AMPERE: UnitOfElectricCurrent.AMPERE,
-    pypck.lcn_defs.VarUnit.PPM: CONCENTRATION_PARTS_PER_MILLION,
-    pypck.lcn_defs.VarUnit.PERCENT: PERCENTAGE,
+    pypck.lcn_defs.VarUnit.PPM: UnitOfRatio.PARTS_PER_MILLION,
+    pypck.lcn_defs.VarUnit.PERCENT: UnitOfRatio.PERCENTAGE,
 }
 
 

homeassistant/components/lg_thinq/number.py

@@ -15,7 +15,7 @@ from homeassistant.components.number import (
     NumberMode,
 )
 from homeassistant.components.script import scripts_with_entity
-from homeassistant.const import PERCENTAGE, UnitOfTemperature, UnitOfTime
+from homeassistant.const import UnitOfRatio, UnitOfTemperature, UnitOfTime
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -41,13 +41,13 @@ NUMBER_DESC: dict[ThinQProperty, NumberEntityDescription] = {
     ),
     ThinQProperty.LIGHT_STATUS: NumberEntityDescription(
         key=ThinQProperty.LIGHT_STATUS,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         translation_key=ThinQProperty.LIGHT_STATUS,
     ),
     ThinQProperty.TARGET_HUMIDITY: NumberEntityDescription(
         key=ThinQProperty.TARGET_HUMIDITY,
         device_class=NumberDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         translation_key=ThinQProperty.TARGET_HUMIDITY,
     ),
     ThinQProperty.TARGET_TEMPERATURE: NumberEntityDescription(

homeassistant/components/lg_thinq/sensor.py

@@ -18,9 +18,9 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    PERCENTAGE,
+    UnitOfDensity,
     UnitOfEnergy,
+    UnitOfRatio,
     UnitOfTemperature,
     UnitOfTime,
 )
@@ -37,25 +37,25 @@ AIR_QUALITY_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
     ThinQProperty.PM1: SensorEntityDescription(
         key=ThinQProperty.PM1,
         device_class=SensorDeviceClass.PM1,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     ThinQProperty.PM2: SensorEntityDescription(
         key=ThinQProperty.PM2,
         device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     ThinQProperty.PM10: SensorEntityDescription(
         key=ThinQProperty.PM10,
         device_class=SensorDeviceClass.PM10,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     ThinQProperty.HUMIDITY: SensorEntityDescription(
         key=ThinQProperty.HUMIDITY,
         device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     ThinQProperty.MONITORING_ENABLED: SensorEntityDescription(
@@ -106,12 +106,12 @@ FILTER_INFO_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
     ),
     ThinQProperty.FILTER_REMAIN_PERCENT: SensorEntityDescription(
         key=ThinQProperty.FILTER_REMAIN_PERCENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         translation_key=ThinQProperty.FILTER_LIFETIME,
     ),
     ThinQProperty.TOP_FILTER_REMAIN_PERCENT: SensorEntityDescription(
         key=ThinQProperty.TOP_FILTER_REMAIN_PERCENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         translation_key=ThinQProperty.TOP_FILTER_REMAIN_PERCENT,
     ),
 }
@@ -119,7 +119,7 @@ HUMIDITY_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
     ThinQProperty.CURRENT_HUMIDITY: SensorEntityDescription(
         key=ThinQProperty.CURRENT_HUMIDITY,
         device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     )
 }
@@ -215,7 +215,7 @@ RECIPE_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
     ),
     ThinQProperty.BEER_REMAIN: SensorEntityDescription(
         key=ThinQProperty.BEER_REMAIN,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         translation_key=ThinQProperty.BEER_REMAIN,
     ),
 }
@@ -227,7 +227,7 @@ REFRIGERATION_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
     ),
     ThinQProperty.FRESH_AIR_FILTER_REMAIN_PERCENT: SensorEntityDescription(
         key=ThinQProperty.FRESH_AIR_FILTER_REMAIN_PERCENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         translation_key=ThinQProperty.FRESH_AIR_FILTER,
     ),
 }
@@ -318,17 +318,17 @@ WATER_FILTER_INFO_SENSOR_DESC: dict[ThinQProperty, SensorEntityDescription] = {
     ),
     ThinQProperty.WATER_FILTER_1_REMAIN_PERCENT: SensorEntityDescription(
         key=ThinQProperty.WATER_FILTER_1_REMAIN_PERCENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         translation_key=ThinQProperty.WATER_FILTER_1_REMAIN_PERCENT,
     ),
     ThinQProperty.WATER_FILTER_2_REMAIN_PERCENT: SensorEntityDescription(
         key=ThinQProperty.WATER_FILTER_2_REMAIN_PERCENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         translation_key=ThinQProperty.WATER_FILTER_2_REMAIN_PERCENT,
     ),
     ThinQProperty.WATER_FILTER_3_REMAIN_PERCENT: SensorEntityDescription(
         key=ThinQProperty.WATER_FILTER_3_REMAIN_PERCENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         translation_key=ThinQProperty.WATER_FILTER_3_REMAIN_PERCENT,
     ),
 }

homeassistant/components/luftdaten/sensor.py

@@ -11,10 +11,10 @@ from homeassistant.components.sensor import (
 from homeassistant.const import (
     ATTR_LATITUDE,
     ATTR_LONGITUDE,
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     CONF_SHOW_ON_MAP,
-    PERCENTAGE,
+    UnitOfDensity,
     UnitOfPressure,
+    UnitOfRatio,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
@@ -36,7 +36,7 @@ SENSORS: tuple[SensorEntityDescription, ...] = (
     ),
     SensorEntityDescription(
         key="humidity",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -55,13 +55,13 @@ SENSORS: tuple[SensorEntityDescription, ...] = (
     ),
     SensorEntityDescription(
         key="P1",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM10,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="P2",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM25,
         state_class=SensorStateClass.MEASUREMENT,
     ),

homeassistant/components/matter/number.py

@@ -16,10 +16,10 @@ from homeassistant.components.number import (
     NumberMode,
 )
 from homeassistant.const import (
-    PERCENTAGE,
     EntityCategory,
     Platform,
     UnitOfLength,
+    UnitOfRatio,
     UnitOfTemperature,
     UnitOfTime,
 )
@@ -354,7 +354,7 @@ DISCOVERY_SCHEMAS = [
         platform=Platform.NUMBER,
         entity_description=MatterNumberEntityDescription(
             key="pump_setpoint",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
             translation_key="pump_setpoint",
             native_max_value=100,
             native_min_value=0.5,
@@ -516,7 +516,7 @@ DISCOVERY_SCHEMAS = [
         entity_description=MatterRangeNumberEntityDescription(
             key="speaker_setpoint",
             translation_key="speaker_setpoint",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
             command=lambda value: clusters.LevelControl.Commands.MoveToLevel(
                 level=int(value)
             ),

homeassistant/components/microbees/sensor.py

@@ -10,13 +10,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
-    LIGHT_LUX,
-    PERCENTAGE,
-    UnitOfPower,
-    UnitOfTemperature,
-)
+from homeassistant.const import LIGHT_LUX, UnitOfPower, UnitOfRatio, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
@@ -42,14 +36,14 @@ SENSOR_TYPES = {
     14: SensorEntityDescription(
         device_class=SensorDeviceClass.CO2,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         key="carbon_dioxide",
         suggested_display_precision=1,
     ),
     16: SensorEntityDescription(
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         key="humidity",
         suggested_display_precision=1,
     ),

homeassistant/components/microsoft_face/__init__.py

@@ -1,344 +0,0 @@
-"""Support for Microsoft face recognition."""
-
-import asyncio
-from collections.abc import Coroutine
-import json
-import logging
-from typing import Any, override
-
-import aiohttp
-from aiohttp.hdrs import CONTENT_TYPE
-import voluptuous as vol
-
-from homeassistant.components import camera
-from homeassistant.const import ATTR_NAME, CONF_API_KEY, CONF_TIMEOUT, CONTENT_TYPE_JSON
-from homeassistant.core import HomeAssistant, ServiceCall
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_component import EntityComponent
-from homeassistant.helpers.typing import ConfigType
-from homeassistant.util import slugify
-from homeassistant.util.hass_dict import HassKey
-
-_LOGGER = logging.getLogger(__name__)
-
-ATTR_CAMERA_ENTITY = "camera_entity"
-ATTR_GROUP = "group"
-ATTR_PERSON = "person"
-
-CONF_AZURE_REGION = "azure_region"
-
-DEFAULT_TIMEOUT = 10
-DOMAIN = "microsoft_face"
-DATA_MICROSOFT_FACE: HassKey[MicrosoftFace] = HassKey(DOMAIN)
-
-FACE_API_URL = "api.cognitive.microsoft.com/face/v1.0/{0}"
-
-SERVICE_CREATE_GROUP = "create_group"
-SERVICE_CREATE_PERSON = "create_person"
-SERVICE_DELETE_GROUP = "delete_group"
-SERVICE_DELETE_PERSON = "delete_person"
-SERVICE_FACE_PERSON = "face_person"
-SERVICE_TRAIN_GROUP = "train_group"
-
-CONFIG_SCHEMA = vol.Schema(
-    {
-        DOMAIN: vol.Schema(
-            {
-                vol.Required(CONF_API_KEY): cv.string,
-                vol.Optional(CONF_AZURE_REGION, default="westus"): cv.string,
-                vol.Optional(CONF_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
-            }
-        )
-    },
-    extra=vol.ALLOW_EXTRA,
-)
-
-SCHEMA_GROUP_SERVICE = vol.Schema({vol.Required(ATTR_NAME): cv.string})
-
-SCHEMA_PERSON_SERVICE = SCHEMA_GROUP_SERVICE.extend(
-    {vol.Required(ATTR_GROUP): cv.slugify}
-)
-
-SCHEMA_FACE_SERVICE = vol.Schema(
-    {
-        vol.Required(ATTR_PERSON): cv.string,
-        vol.Required(ATTR_GROUP): cv.slugify,
-        vol.Required(ATTR_CAMERA_ENTITY): cv.entity_id,
-    }
-)
-
-SCHEMA_TRAIN_SERVICE = vol.Schema({vol.Required(ATTR_GROUP): cv.slugify})
-
-
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up Microsoft Face."""
-    component = EntityComponent[MicrosoftFaceGroupEntity](
-        logging.getLogger(__name__), DOMAIN, hass
-    )
-    entities: dict[str, MicrosoftFaceGroupEntity] = {}
-    domain_config: dict[str, Any] = config[DOMAIN]
-    azure_region: str = domain_config[CONF_AZURE_REGION]
-    api_key: str = domain_config[CONF_API_KEY]
-    timeout: int = domain_config[CONF_TIMEOUT]
-    face = MicrosoftFace(
-        hass,
-        azure_region,
-        api_key,
-        timeout,
-        component,
-        entities,
-    )
-
-    try:
-        # read exists group/person from cloud and create entities
-        await face.update_store()
-    except HomeAssistantError as err:
-        _LOGGER.error("Can't load data from face api: %s", err)
-        return False
-
-    hass.data[DATA_MICROSOFT_FACE] = face
-
-    async def async_create_group(service: ServiceCall) -> None:
-        """Create a new person group."""
-        name = service.data[ATTR_NAME]
-        g_id = slugify(name)
-
-        try:
-            await face.call_api("put", f"persongroups/{g_id}", {"name": name})
-            face.store[g_id] = {}
-            old_entity = entities.pop(g_id, None)
-            if old_entity:
-                await component.async_remove_entity(old_entity.entity_id)
-
-            entities[g_id] = MicrosoftFaceGroupEntity(face, g_id, name)
-            await component.async_add_entities([entities[g_id]])
-        # pylint: disable-next=home-assistant-action-swallowed-exception
-        except HomeAssistantError as err:
-            _LOGGER.error("Can't create group '%s' with error: %s", g_id, err)
-
-    hass.services.async_register(
-        DOMAIN, SERVICE_CREATE_GROUP, async_create_group, schema=SCHEMA_GROUP_SERVICE
-    )
-
-    async def async_delete_group(service: ServiceCall) -> None:
-        """Delete a person group."""
-        g_id = slugify(service.data[ATTR_NAME])
-
-        try:
-            await face.call_api("delete", f"persongroups/{g_id}")
-            face.store.pop(g_id)
-
-            entity = entities.pop(g_id)
-            await component.async_remove_entity(entity.entity_id)
-        # pylint: disable-next=home-assistant-action-swallowed-exception
-        except HomeAssistantError as err:
-            _LOGGER.error("Can't delete group '%s' with error: %s", g_id, err)
-
-    hass.services.async_register(
-        DOMAIN, SERVICE_DELETE_GROUP, async_delete_group, schema=SCHEMA_GROUP_SERVICE
-    )
-
-    async def async_train_group(service: ServiceCall) -> None:
-        """Train a person group."""
-        g_id = service.data[ATTR_GROUP]
-
-        try:
-            await face.call_api("post", f"persongroups/{g_id}/train")
-        # pylint: disable-next=home-assistant-action-swallowed-exception
-        except HomeAssistantError as err:
-            _LOGGER.error("Can't train group '%s' with error: %s", g_id, err)
-
-    hass.services.async_register(
-        DOMAIN, SERVICE_TRAIN_GROUP, async_train_group, schema=SCHEMA_TRAIN_SERVICE
-    )
-
-    async def async_create_person(service: ServiceCall) -> None:
-        """Create a person in a group."""
-        name = service.data[ATTR_NAME]
-        g_id = service.data[ATTR_GROUP]
-
-        try:
-            user_data = await face.call_api(
-                "post", f"persongroups/{g_id}/persons", {"name": name}
-            )
-
-            face.store[g_id][name] = user_data["personId"]
-            entities[g_id].async_write_ha_state()
-        # pylint: disable-next=home-assistant-action-swallowed-exception
-        except HomeAssistantError as err:
-            _LOGGER.error("Can't create person '%s' with error: %s", name, err)
-
-    hass.services.async_register(
-        DOMAIN, SERVICE_CREATE_PERSON, async_create_person, schema=SCHEMA_PERSON_SERVICE
-    )
-
-    async def async_delete_person(service: ServiceCall) -> None:
-        """Delete a person in a group."""
-        name = service.data[ATTR_NAME]
-        g_id = service.data[ATTR_GROUP]
-        p_id = face.store[g_id].get(name)
-
-        try:
-            await face.call_api("delete", f"persongroups/{g_id}/persons/{p_id}")
-
-            face.store[g_id].pop(name)
-            entities[g_id].async_write_ha_state()
-        # pylint: disable-next=home-assistant-action-swallowed-exception
-        except HomeAssistantError as err:
-            _LOGGER.error("Can't delete person '%s' with error: %s", p_id, err)
-
-    hass.services.async_register(
-        DOMAIN, SERVICE_DELETE_PERSON, async_delete_person, schema=SCHEMA_PERSON_SERVICE
-    )
-
-    async def async_face_person(service: ServiceCall) -> None:
-        """Add a new face picture to a person."""
-        g_id = service.data[ATTR_GROUP]
-        p_id = face.store[g_id].get(service.data[ATTR_PERSON])
-
-        camera_entity = service.data[ATTR_CAMERA_ENTITY]
-
-        try:
-            image = await camera.async_get_image(hass, camera_entity)
-
-            await face.call_api(
-                "post",
-                f"persongroups/{g_id}/persons/{p_id}/persistedFaces",
-                image.content,
-                binary=True,
-            )
-        # pylint: disable-next=home-assistant-action-swallowed-exception
-        except HomeAssistantError as err:
-            _LOGGER.error(
-                "Can't add an image of a person '%s' with error: %s", p_id, err
-            )
-
-    hass.services.async_register(
-        DOMAIN, SERVICE_FACE_PERSON, async_face_person, schema=SCHEMA_FACE_SERVICE
-    )
-
-    return True
-
-
-class MicrosoftFaceGroupEntity(Entity):
-    """Person-Group state/data Entity."""
-
-    _attr_should_poll = False
-
-    def __init__(self, api: MicrosoftFace, g_id: str, name: str) -> None:
-        """Initialize person/group entity."""
-        self.entity_id = f"{DOMAIN}.{g_id}"
-        self._api = api
-        self._id = g_id
-        self._attr_name = name
-
-    @property
-    @override
-    def state(self) -> int:
-        """Return the state of the entity."""
-        return len(self._api.store[self._id])
-
-    @property
-    @override
-    def extra_state_attributes(self) -> dict[str, Any]:
-        """Return device specific state attributes."""
-        return dict(self._api.store[self._id])
-
-
-class MicrosoftFace:
-    """Microsoft Face api for Home Assistant."""
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        server_loc: str,
-        api_key: str,
-        timeout: int,
-        component: EntityComponent[MicrosoftFaceGroupEntity],
-        entities: dict[str, MicrosoftFaceGroupEntity],
-    ) -> None:
-        """Initialize Microsoft Face api."""
-        self.hass = hass
-        self.websession = async_get_clientsession(hass)
-        self.timeout = timeout
-        self._api_key = api_key
-        self._server_url = f"https://{server_loc}.{FACE_API_URL}"
-        self._store: dict[str, dict[str, Any]] = {}
-        self._component = component
-        self._entities = entities
-
-    @property
-    def store(self) -> dict[str, dict[str, Any]]:
-        """Store group/person data and IDs."""
-        return self._store
-
-    async def update_store(self) -> None:
-        """Load all group/person data into local store."""
-        groups = await self.call_api("get", "persongroups")
-
-        remove_tasks: list[Coroutine[Any, Any, None]] = []
-        new_entities = []
-        for group in groups:
-            g_id = group["personGroupId"]
-            self._store[g_id] = {}
-            old_entity = self._entities.pop(g_id, None)
-            if old_entity:
-                remove_tasks.append(
-                    self._component.async_remove_entity(old_entity.entity_id)
-                )
-
-            self._entities[g_id] = MicrosoftFaceGroupEntity(self, g_id, group["name"])
-            new_entities.append(self._entities[g_id])
-
-            persons = await self.call_api("get", f"persongroups/{g_id}/persons")
-
-            for person in persons:
-                self._store[g_id][person["name"]] = person["personId"]
-
-        if remove_tasks:
-            await asyncio.gather(*remove_tasks)
-        await self._component.async_add_entities(new_entities)
-
-    async def call_api(self, method, function, data=None, binary=False, params=None):
-        """Make an api call."""
-        headers = {"Ocp-Apim-Subscription-Key": self._api_key}
-        url = self._server_url.format(function)
-
-        payload = None
-        if binary:
-            headers[CONTENT_TYPE] = "application/octet-stream"
-            payload = data
-        else:
-            headers[CONTENT_TYPE] = CONTENT_TYPE_JSON
-            if data is not None:
-                payload = json.dumps(data).encode()
-            else:
-                payload = None
-
-        try:
-            async with asyncio.timeout(self.timeout):
-                response = await self.websession.request(
-                    method, url, data=payload, headers=headers, params=params
-                )
-
-                answer = await response.json()
-
-            _LOGGER.debug("Read from microsoft face api: %s", answer)
-            if response.status < 300:
-                return answer
-
-            _LOGGER.warning(
-                "Error %d microsoft face api %s", response.status, response.url
-            )
-            raise HomeAssistantError(answer["error"]["message"])
-
-        except aiohttp.ClientError:
-            _LOGGER.warning("Can't connect to microsoft face api")
-
-        except TimeoutError:
-            _LOGGER.warning("Timeout from microsoft face api %s", response.url)
-
-        raise HomeAssistantError("Network error on microsoft face api.")

homeassistant/components/microsoft_face/icons.json

@@ -1,22 +0,0 @@
-{
-  "services": {
-    "create_group": {
-      "service": "mdi:account-multiple-plus"
-    },
-    "create_person": {
-      "service": "mdi:account-plus"
-    },
-    "delete_group": {
-      "service": "mdi:account-multiple-remove"
-    },
-    "delete_person": {
-      "service": "mdi:account-remove"
-    },
-    "face_person": {
-      "service": "mdi:face-man"
-    },
-    "train_group": {
-      "service": "mdi:account-multiple-check"
-    }
-  }
-}

homeassistant/components/microsoft_face/manifest.json

@@ -1,9 +0,0 @@
-{
-  "domain": "microsoft_face",
-  "name": "Microsoft Face",
-  "codeowners": [],
-  "dependencies": ["camera"],
-  "documentation": "https://www.home-assistant.io/integrations/microsoft_face",
-  "iot_class": "cloud_push",
-  "quality_scale": "legacy"
-}

homeassistant/components/microsoft_face/services.yaml

@@ -1,62 +0,0 @@
-create_group:
-  fields:
-    name:
-      required: true
-      example: family
-      selector:
-        text:
-create_person:
-  fields:
-    group:
-      required: true
-      example: family
-      selector:
-        text:
-    name:
-      required: true
-      example: Hans
-      selector:
-        text:
-delete_group:
-  fields:
-    name:
-      required: true
-      example: family
-      selector:
-        text:
-delete_person:
-  fields:
-    group:
-      required: true
-      example: family
-      selector:
-        text:
-    name:
-      required: true
-      example: Hans
-      selector:
-        text:
-face_person:
-  fields:
-    camera_entity:
-      required: true
-      example: camera.door
-      selector:
-        text:
-    group:
-      required: true
-      example: family
-      selector:
-        text:
-    person:
-      required: true
-      example: Hans
-      selector:
-        text:
-train_group:
-  fields:
-    group:
-      required: true
-      example: family
-      selector:
-        text:

homeassistant/components/microsoft_face/strings.json

@@ -1,80 +0,0 @@
-{
-  "services": {
-    "create_group": {
-      "description": "Creates a new person group.",
-      "fields": {
-        "name": {
-          "description": "Name of the group.",
-          "name": "[%key:common::config_flow::data::name%]"
-        }
-      },
-      "name": "Create group"
-    },
-    "create_person": {
-      "description": "Creates a new person in the group.",
-      "fields": {
-        "group": {
-          "description": "Name of the group.",
-          "name": "Group"
-        },
-        "name": {
-          "description": "Name of the person.",
-          "name": "[%key:common::config_flow::data::name%]"
-        }
-      },
-      "name": "Create person"
-    },
-    "delete_group": {
-      "description": "Deletes a new person group.",
-      "fields": {
-        "name": {
-          "description": "Name of the group.",
-          "name": "[%key:common::config_flow::data::name%]"
-        }
-      },
-      "name": "Delete group"
-    },
-    "delete_person": {
-      "description": "Deletes a person in the group.",
-      "fields": {
-        "group": {
-          "description": "Name of the group.",
-          "name": "Group"
-        },
-        "name": {
-          "description": "[%key:component::microsoft_face::services::create_person::fields::name::description%]",
-          "name": "[%key:common::config_flow::data::name%]"
-        }
-      },
-      "name": "Delete person"
-    },
-    "face_person": {
-      "description": "Adds a new picture to a person.",
-      "fields": {
-        "camera_entity": {
-          "description": "Camera to take a picture.",
-          "name": "Camera entity"
-        },
-        "group": {
-          "description": "Name of the group.",
-          "name": "Group"
-        },
-        "person": {
-          "description": "[%key:component::microsoft_face::services::create_person::fields::name::description%]",
-          "name": "Person"
-        }
-      },
-      "name": "Face person"
-    },
-    "train_group": {
-      "description": "Trains a person group.",
-      "fields": {
-        "group": {
-          "description": "Name of the group.",
-          "name": "Group"
-        }
-      },
-      "name": "Train group"
-    }
-  }
-}

homeassistant/components/microsoft_face_detect/__init__.py

@@ -1 +0,0 @@
-"""The microsoft_face_detect component."""

homeassistant/components/microsoft_face_detect/image_processing.py

@@ -1,125 +0,0 @@
-"""Component that will help set the Microsoft face detect processing."""
-
-import logging
-from typing import TYPE_CHECKING, override
-
-import voluptuous as vol
-
-from homeassistant.components.image_processing import (
-    ATTR_AGE,
-    ATTR_GENDER,
-    ATTR_GLASSES,
-    PLATFORM_SCHEMA as IMAGE_PROCESSING_PLATFORM_SCHEMA,
-    FaceInformation,
-    ImageProcessingFaceEntity,
-)
-from homeassistant.components.microsoft_face import DATA_MICROSOFT_FACE, MicrosoftFace
-from homeassistant.const import CONF_ENTITY_ID, CONF_NAME, CONF_SOURCE
-from homeassistant.core import HomeAssistant, split_entity_id
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-
-_LOGGER = logging.getLogger(__name__)
-
-SUPPORTED_ATTRIBUTES = [ATTR_AGE, ATTR_GENDER, ATTR_GLASSES]
-
-CONF_ATTRIBUTES = "attributes"
-DEFAULT_ATTRIBUTES = [ATTR_AGE, ATTR_GENDER]
-
-
-def validate_attributes(list_attributes):
-    """Validate face attributes."""
-    for attr in list_attributes:
-        if attr not in SUPPORTED_ATTRIBUTES:
-            raise vol.Invalid(f"Invalid attribute {attr}")
-    return list_attributes
-
-
-PLATFORM_SCHEMA = IMAGE_PROCESSING_PLATFORM_SCHEMA.extend(
-    {
-        vol.Optional(CONF_ATTRIBUTES, default=DEFAULT_ATTRIBUTES): vol.All(
-            cv.ensure_list, validate_attributes
-        )
-    }
-)
-
-
-async def async_setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up the Microsoft Face detection platform."""
-    api = hass.data[DATA_MICROSOFT_FACE]
-    attributes: list[str] = config[CONF_ATTRIBUTES]
-    source: list[dict[str, str]] = config[CONF_SOURCE]
-
-    async_add_entities(
-        MicrosoftFaceDetectEntity(
-            camera[CONF_ENTITY_ID], api, attributes, camera.get(CONF_NAME)
-        )
-        for camera in source
-    )
-
-
-class MicrosoftFaceDetectEntity(ImageProcessingFaceEntity):
-    """Microsoft Face API entity for identify."""
-
-    def __init__(
-        self,
-        camera_entity: str,
-        api: MicrosoftFace,
-        attributes: list[str],
-        name: str | None,
-    ) -> None:
-        """Initialize Microsoft Face."""
-        super().__init__()
-
-        self._api = api
-        self._attr_camera_entity = camera_entity
-        self._attributes = attributes
-
-        if name:
-            self._attr_name = name
-        else:
-            self._attr_name = f"MicrosoftFace {split_entity_id(camera_entity)[1]}"
-
-    @override
-    async def async_process_image(self, image: bytes) -> None:
-        """Process image.
-
-        This method is a coroutine.
-        """
-        face_data = None
-        try:
-            face_data = await self._api.call_api(
-                "post",
-                "detect",
-                image,
-                binary=True,
-                params={"returnFaceAttributes": ",".join(self._attributes)},
-            )
-
-        except HomeAssistantError as err:
-            _LOGGER.error("Can't process image on microsoft face: %s", err)
-            return
-
-        if not face_data:
-            face_data = []
-
-        faces: list[FaceInformation] = []
-        for face in face_data:
-            face_attr = FaceInformation()
-            for attr in self._attributes:
-                if TYPE_CHECKING:
-                    assert attr in SUPPORTED_ATTRIBUTES
-                if attr in face["faceAttributes"]:
-                    face_attr[attr] = face["faceAttributes"][attr]  # type: ignore[literal-required]
-
-            if face_attr:
-                faces.append(face_attr)
-
-        self.async_process_faces(faces, len(face_data))

homeassistant/components/microsoft_face_detect/manifest.json

@@ -1,9 +0,0 @@
-{
-  "domain": "microsoft_face_detect",
-  "name": "Microsoft Face Detect",
-  "codeowners": [],
-  "dependencies": ["microsoft_face"],
-  "documentation": "https://www.home-assistant.io/integrations/microsoft_face_detect",
-  "iot_class": "cloud_push",
-  "quality_scale": "legacy"
-}

homeassistant/components/microsoft_face_identify/__init__.py

@@ -1 +0,0 @@
-"""The microsoft_face_identify component."""

homeassistant/components/microsoft_face_identify/image_processing.py

@@ -1,121 +0,0 @@
-"""Component that will help set the Microsoft face for verify processing."""
-
-import logging
-from typing import override
-
-import voluptuous as vol
-
-from homeassistant.components.image_processing import (
-    ATTR_CONFIDENCE,
-    CONF_CONFIDENCE,
-    PLATFORM_SCHEMA as IMAGE_PROCESSING_PLATFORM_SCHEMA,
-    FaceInformation,
-    ImageProcessingFaceEntity,
-)
-from homeassistant.components.microsoft_face import DATA_MICROSOFT_FACE, MicrosoftFace
-from homeassistant.const import ATTR_NAME, CONF_ENTITY_ID, CONF_NAME, CONF_SOURCE
-from homeassistant.core import HomeAssistant, split_entity_id
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-
-_LOGGER = logging.getLogger(__name__)
-
-CONF_GROUP = "group"
-
-PLATFORM_SCHEMA = IMAGE_PROCESSING_PLATFORM_SCHEMA.extend(
-    {vol.Required(CONF_GROUP): cv.slugify}
-)
-
-
-async def async_setup_platform(
-    hass: HomeAssistant,
-    config: ConfigType,
-    async_add_entities: AddEntitiesCallback,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> None:
-    """Set up the Microsoft Face identify platform."""
-    api = hass.data[DATA_MICROSOFT_FACE]
-    face_group: str = config[CONF_GROUP]
-    confidence: float = config[CONF_CONFIDENCE]
-    source: list[dict[str, str]] = config[CONF_SOURCE]
-
-    async_add_entities(
-        MicrosoftFaceIdentifyEntity(
-            camera[CONF_ENTITY_ID],
-            api,
-            face_group,
-            confidence,
-            camera.get(CONF_NAME),
-        )
-        for camera in source
-    )
-
-
-class MicrosoftFaceIdentifyEntity(ImageProcessingFaceEntity):
-    """Representation of the Microsoft Face API entity for identify."""
-
-    def __init__(
-        self,
-        camera_entity: str,
-        api: MicrosoftFace,
-        face_group: str,
-        confidence: float,
-        name: str | None,
-    ) -> None:
-        """Initialize the Microsoft Face API."""
-        super().__init__()
-
-        self._api = api
-        self._attr_camera_entity = camera_entity
-        self._attr_confidence = confidence
-        self._face_group = face_group
-
-        if name:
-            self._attr_name = name
-        else:
-            self._attr_name = f"MicrosoftFace {split_entity_id(camera_entity)[1]}"
-
-    @override
-    async def async_process_image(self, image: bytes) -> None:
-        """Process image.
-
-        This method is a coroutine.
-        """
-        detect = []
-        try:
-            face_data = await self._api.call_api("post", "detect", image, binary=True)
-
-            if face_data:
-                face_ids = [data["faceId"] for data in face_data]
-                detect = await self._api.call_api(
-                    "post",
-                    "identify",
-                    {"faceIds": face_ids, "personGroupId": self._face_group},
-                )
-
-        except HomeAssistantError as err:
-            _LOGGER.error("Can't process image on Microsoft face: %s", err)
-            return
-
-        # Parse data
-        known_faces: list[FaceInformation] = []
-        total = 0
-        for face in detect:
-            total += 1
-            if not face["candidates"]:
-                continue
-
-            data = face["candidates"][0]
-            name = ""
-            for s_name, s_id in self._api.store[self._face_group].items():
-                if data["personId"] == s_id:
-                    name = s_name
-                    break
-
-            known_faces.append(
-                {ATTR_NAME: name, ATTR_CONFIDENCE: data["confidence"] * 100}
-            )
-
-        self.async_process_faces(known_faces, total)

homeassistant/components/microsoft_face_identify/manifest.json

@@ -1,9 +0,0 @@
-{
-  "domain": "microsoft_face_identify",
-  "name": "Microsoft Face Identify",
-  "codeowners": [],
-  "dependencies": ["microsoft_face"],
-  "documentation": "https://www.home-assistant.io/integrations/microsoft_face_identify",
-  "iot_class": "cloud_push",
-  "quality_scale": "legacy"
-}

homeassistant/components/miele/coordinator.py

@@ -114,20 +114,26 @@ class MieleDataUpdateCoordinator(DataUpdateCoordinator[MieleCoordinatorData]):
 
     async def callback_update_data(self, devices_json: dict[str, dict]) -> None:
         """Handle data update from the API."""
-        devices = {
+        updated_devices = {
             device_id: MieleDevice(device) for device_id, device in devices_json.items()
         }
         self.async_set_updated_data(
-            MieleCoordinatorData(devices=devices, actions=self.data.actions)
+            MieleCoordinatorData(
+                devices={**self.data.devices, **updated_devices},
+                actions=self.data.actions,
+            )
         )
 
     async def callback_update_actions(self, actions_json: dict[str, dict]) -> None:
         """Handle data update from the API."""
-        actions = {
+        updated_actions = {
             device_id: MieleAction(action) for device_id, action in actions_json.items()
         }
         self.async_set_updated_data(
-            MieleCoordinatorData(devices=self.data.devices, actions=actions)
+            MieleCoordinatorData(
+                devices=self.data.devices,
+                actions={**self.data.actions, **updated_actions},
+            )
         )
 
 

homeassistant/components/mill/sensor.py

@@ -11,12 +11,10 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
     EntityCategory,
     UnitOfEnergy,
     UnitOfPower,
+    UnitOfRatio,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
@@ -65,7 +63,7 @@ HEATER_SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="control_signal",
         translation_key="control_signal",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
 )
@@ -80,26 +78,26 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key=HUMIDITY,
         device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key=BATTERY,
         device_class=SensorDeviceClass.BATTERY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     SensorEntityDescription(
         key=ECO2,
         device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         translation_key="estimated_co2",
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key=TVOC,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_BILLION,
         translation_key="tvoc",
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -109,7 +107,7 @@ LOCAL_SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="control_signal",
         translation_key="control_signal",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
@@ -133,7 +131,7 @@ SOCKET_SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key=HUMIDITY,
         device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     *HEATER_SENSOR_TYPES,

homeassistant/components/monoprice/__init__.py

@@ -4,7 +4,7 @@ from dataclasses import dataclass
 import logging
 
 from pymonoprice import Monoprice, get_monoprice
-from serial import SerialException
+from serialx import SerialException
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PORT, Platform

homeassistant/components/monoprice/config_flow.py

@@ -4,7 +4,7 @@ import logging
 from typing import Any, override
 
 from pymonoprice import get_monoprice
-from serial import SerialException
+from serialx import SerialException
 import voluptuous as vol
 
 from homeassistant.config_entries import (

homeassistant/components/monoprice/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["pymonoprice"],
-  "requirements": ["pymonoprice==0.5"]
+  "requirements": ["pymonoprice==0.6.1"]
 }

homeassistant/components/monoprice/media_player.py

@@ -3,7 +3,7 @@
 import logging
 from typing import override
 
-from serial import SerialException
+from serialx import SerialException
 
 from homeassistant import core
 from homeassistant.components.media_player import (

homeassistant/components/netatmo/sensor.py

@@ -19,13 +19,12 @@ from homeassistant.components.sensor import (
 from homeassistant.const import (
     ATTR_LATITUDE,
     ATTR_LONGITUDE,
-    CONCENTRATION_PARTS_PER_MILLION,
     DEGREE,
-    PERCENTAGE,
     EntityCategory,
     UnitOfPower,
     UnitOfPrecipitationDepth,
     UnitOfPressure,
+    UnitOfRatio,
     UnitOfSoundPressure,
     UnitOfSpeed,
     UnitOfTemperature,
@@ -163,7 +162,7 @@ NETATMO_WEATHER_SENSOR_DESCRIPTIONS: Final[list[NetatmoSensorEntityDescription]]
     NetatmoSensorEntityDescription(
         key="co2",
         netatmo_name="co2",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.CO2,
     ),
@@ -190,7 +189,7 @@ NETATMO_WEATHER_SENSOR_DESCRIPTIONS: Final[list[NetatmoSensorEntityDescription]]
     NetatmoSensorEntityDescription(
         key="humidity",
         netatmo_name="humidity",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.HUMIDITY,
     ),
@@ -221,7 +220,7 @@ NETATMO_WEATHER_SENSOR_DESCRIPTIONS: Final[list[NetatmoSensorEntityDescription]]
         key="battery_percent",
         netatmo_name="battery",
         entity_category=EntityCategory.DIAGNOSTIC,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.BATTERY,
     ),
@@ -336,7 +335,7 @@ PUBLIC_WEATHER_STATION_TYPES: tuple[
     ),
     NetatmoPublicWeatherSensorEntityDescription(
         key="humidity",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.HUMIDITY,
         value_fn=lambda area: area.get_latest_humidities(),
@@ -408,7 +407,7 @@ NETATMO_CLIMATE_BATTERY_SENSOR_DESCRIPTIONS: Final[
         key="battery",
         netatmo_name="battery",
         entity_category=EntityCategory.DIAGNOSTIC,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.BATTERY,
     )
@@ -419,7 +418,7 @@ NETATMO_OPENING_SENSOR_DESCRIPTIONS: Final[list[NetatmoSensorEntityDescription]]
         key="battery",
         netatmo_name="battery",
         entity_category=EntityCategory.DIAGNOSTIC,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.BATTERY,
         is_sticky=True,

homeassistant/components/nobo_hub/config_flow.py

@@ -25,6 +25,8 @@ from .const import (
     DOMAIN,
     OVERRIDE_TYPE_CONSTANT,
     OVERRIDE_TYPE_NOW,
+    SERIAL_LENGTH,
+    SERIAL_PREFIX_LENGTH,
 )
 
 DATA_NOBO_HUB_IMPL = "nobo_hub_flow_implementation"
@@ -49,7 +51,20 @@ class NoboHubConfigFlow(ConfigFlow, domain=DOMAIN):
     ) -> ConfigFlowResult:
         """Handle the initial step."""
         if self._discovered_hubs is None:
-            self._discovered_hubs = dict(await nobo.async_discover_hubs())
+            # Wait 5s — real-world gaps up to ~4s have been observed.
+            discovered = dict(await nobo.async_discover_hubs(autodiscover_wait=5.0))
+            # Hide hubs that already have a config entry. Include matching on IP
+            # as serial prefix is not unique.
+            configured = {
+                (entry.data[CONF_IP_ADDRESS], entry.unique_id[:SERIAL_PREFIX_LENGTH])
+                for entry in self._async_current_entries(include_ignore=False)
+                if entry.unique_id
+            }
+            self._discovered_hubs = {
+                ip: prefix
+                for ip, prefix in discovered.items()
+                if (ip, prefix) not in configured
+            }
 
         if not self._discovered_hubs:
             # No hubs auto discovered
@@ -227,7 +242,7 @@ class NoboHubConfigFlow(ConfigFlow, domain=DOMAIN):
         )
 
     async def _test_connection(self, serial: str, ip_address: str) -> str:
-        if not len(serial) == 12 or not serial.isdigit():
+        if len(serial) != SERIAL_LENGTH or not serial.isdigit():
             raise NoboHubConnectError("invalid_serial")
         try:
             socket.inet_aton(ip_address)

homeassistant/components/nobo_hub/const.py

@@ -9,6 +9,11 @@ CONF_OVERRIDE_TYPE = "override_type"
 OVERRIDE_TYPE_CONSTANT = "constant"
 OVERRIDE_TYPE_NOW = "now"
 
+# Hub serial: 9-digit batch prefix + 3-digit per-hub suffix. Discovery
+# broadcasts only the prefix; the user supplies the suffix.
+SERIAL_PREFIX_LENGTH = 9
+SERIAL_LENGTH = SERIAL_PREFIX_LENGTH + 3
+
 NOBO_MANUFACTURER = "Glen Dimplex Nordic AS"
 ATTR_HARDWARE_VERSION: Final = "hardware_version"
 ATTR_SOFTWARE_VERSION: Final = "software_version"

homeassistant/components/nobo_hub/quality_scale.yaml

@@ -64,11 +64,7 @@ rules:
   docs-use-cases: todo
   dynamic-devices: todo
   entity-category: todo
-  entity-device-class:
-    status: todo
-    comment: >
-      Custom device class on global override select being dropped in
-      PR #170135.
+  entity-device-class: done
   entity-disabled-by-default: todo
   entity-translations: todo
   exception-translations: todo

homeassistant/components/nobo_hub/select.py

@@ -53,7 +53,6 @@ class NoboGlobalSelector(NoboBaseEntity, SelectEntity):
     """Global override selector for Nobø Ecohub."""
 
     _attr_translation_key = "global_override"
-    _attr_device_class = "nobo_hub__override"
     _modes = {
         nobo.API.OVERRIDE_MODE_NORMAL: "none",
         nobo.API.OVERRIDE_MODE_AWAY: "away",

homeassistant/components/omnilogic/sensor.py

@@ -4,10 +4,9 @@ from typing import Any, override
 
 from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
     UnitOfElectricPotential,
     UnitOfMass,
+    UnitOfRatio,
     UnitOfTemperature,
     UnitOfVolume,
 )
@@ -139,7 +138,7 @@ class OmniLogicPumpSpeedSensor(OmnilogicSensor):
         pump_speed = self.coordinator.data[self._item_id][self._state_key]
 
         if pump_type == "VARIABLE":
-            self._attr_native_unit_of_measurement = PERCENTAGE
+            self._attr_native_unit_of_measurement = UnitOfRatio.PERCENTAGE
             state = pump_speed
         elif pump_type == "DUAL":
             self._attr_native_unit_of_measurement = None
@@ -279,7 +278,7 @@ SENSOR_TYPES: dict[tuple[int, str], list[dict[str, Any]]] = {
             "kind": "filter_pump_speed",
             "device_class": None,
             "icon": "mdi:speedometer",
-            "unit": PERCENTAGE,
+            "unit": UnitOfRatio.PERCENTAGE,
             "guard_condition": [
                 {"Filter-Type": "FMT_SINGLE_SPEED"},
             ],
@@ -292,7 +291,7 @@ SENSOR_TYPES: dict[tuple[int, str], list[dict[str, Any]]] = {
             "kind": "pump_speed",
             "device_class": None,
             "icon": "mdi:speedometer",
-            "unit": PERCENTAGE,
+            "unit": UnitOfRatio.PERCENTAGE,
             "guard_condition": [
                 {"Type": "PMP_SINGLE_SPEED"},
             ],
@@ -305,7 +304,7 @@ SENSOR_TYPES: dict[tuple[int, str], list[dict[str, Any]]] = {
             "kind": "chlorinator",
             "device_class": None,
             "icon": "mdi:gauge",
-            "unit": PERCENTAGE,
+            "unit": UnitOfRatio.PERCENTAGE,
             "guard_condition": [
                 {
                     "Shared-Type": "BOW_SHARED_EQUIPMENT",
@@ -322,7 +321,7 @@ SENSOR_TYPES: dict[tuple[int, str], list[dict[str, Any]]] = {
             "kind": "salt_level",
             "device_class": None,
             "icon": "mdi:gauge",
-            "unit": CONCENTRATION_PARTS_PER_MILLION,
+            "unit": UnitOfRatio.PARTS_PER_MILLION,
             "guard_condition": [
                 {
                     "Shared-Type": "BOW_SHARED_EQUIPMENT",

homeassistant/components/ondilo_ico/sensor.py

@@ -9,10 +9,9 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
     EntityCategory,
     UnitOfElectricPotential,
+    UnitOfRatio,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
@@ -50,12 +49,12 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="tds",
         translation_key="tds",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key="battery",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
@@ -63,7 +62,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key="rssi",
         translation_key="rssi",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
     ),

homeassistant/components/opendisplay/services.py

@@ -2,7 +2,6 @@
 
 import asyncio
 from collections.abc import Callable
-import contextlib
 from datetime import timedelta
 from enum import IntEnum
 import io
@@ -188,9 +187,7 @@ async def _async_upload_image(call: ServiceCall) -> None:
     current = asyncio.current_task()
     if (prev := entry.runtime_data.upload_task) is not None and not prev.done():
         prev.cancel()
-        # pylint: disable-next=home-assistant-action-swallowed-exception
-        with contextlib.suppress(asyncio.CancelledError):
-            await prev
+        await asyncio.wait({prev})
     entry.runtime_data.upload_task = current
 
     try:

homeassistant/components/opensensemap/sensor.py

@@ -11,11 +11,11 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     DEGREE,
     LIGHT_LUX,
-    PERCENTAGE,
+    UnitOfDensity,
     UnitOfPressure,
+    UnitOfRatio,
     UnitOfSpeed,
     UnitOfTemperature,
 )
@@ -44,21 +44,21 @@ SENSOR_DESCRIPTIONS: tuple[OpenSenseMapSensorEntityDescription, ...] = (
     OpenSenseMapSensorEntityDescription(
         key="pm2_5",
         device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.pm2_5,
     ),
     OpenSenseMapSensorEntityDescription(
         key="pm10",
         device_class=SensorDeviceClass.PM10,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.pm10,
     ),
     OpenSenseMapSensorEntityDescription(
         key="pm1_0",
         device_class=SensorDeviceClass.PM1,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.pm1_0,
     ),
@@ -72,7 +72,7 @@ SENSOR_DESCRIPTIONS: tuple[OpenSenseMapSensorEntityDescription, ...] = (
     OpenSenseMapSensorEntityDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.humidity,
     ),

homeassistant/components/openweathermap/sensor.py

@@ -9,12 +9,12 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     DEGREE,
-    PERCENTAGE,
     UV_INDEX,
+    UnitOfDensity,
     UnitOfLength,
     UnitOfPressure,
+    UnitOfRatio,
     UnitOfSpeed,
     UnitOfTemperature,
     UnitOfVolumetricFlux,
@@ -107,7 +107,7 @@ WEATHER_SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     ),
     SensorEntityDescription(
         key=ATTR_API_HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -121,7 +121,7 @@ WEATHER_SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     SensorEntityDescription(
         key=ATTR_API_CLOUDS,
         translation_key=ATTR_API_CLOUDS,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
@@ -174,43 +174,43 @@ AIRPOLLUTION_SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
     ),
     SensorEntityDescription(
         key=ATTR_API_AIRPOLLUTION_CO,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.CO,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key=ATTR_API_AIRPOLLUTION_NO,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.NITROGEN_MONOXIDE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key=ATTR_API_AIRPOLLUTION_NO2,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.NITROGEN_DIOXIDE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key=ATTR_API_AIRPOLLUTION_O3,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.OZONE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key=ATTR_API_AIRPOLLUTION_SO2,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.SULPHUR_DIOXIDE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key=ATTR_API_AIRPOLLUTION_PM2_5,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM25,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key=ATTR_API_AIRPOLLUTION_PM10,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM10,
         state_class=SensorStateClass.MEASUREMENT,
     ),

homeassistant/components/overkiz/const.py

@@ -13,11 +13,8 @@ from pyoverkiz.enums import (
 )
 
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
     DEGREE,
     LIGHT_LUX,
-    PERCENTAGE,
     Platform,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
@@ -26,6 +23,7 @@ from homeassistant.const import (
     UnitOfLength,
     UnitOfPower,
     UnitOfPressure,
+    UnitOfRatio,
     UnitOfSpeed,
     UnitOfTemperature,
     UnitOfTime,
@@ -165,19 +163,19 @@ OVERKIZ_UNIT_TO_HA: dict[str, str] = {
     ),
     MeasuredValueType.FOSSIL_ENERGY_IN_WH: UnitOfEnergy.WATT_HOUR,
     MeasuredValueType.GRADIENT_IN_PERCENTAGE_PER_SECOND: (
-        f"{PERCENTAGE}/{UnitOfTime.SECONDS}"
+        f"{UnitOfRatio.PERCENTAGE}/{UnitOfTime.SECONDS}"
     ),
     MeasuredValueType.LENGTH_IN_METER: UnitOfLength.METERS,
     MeasuredValueType.LINEAR_SPEED_IN_METER_PER_SECOND: UnitOfSpeed.METERS_PER_SECOND,
     MeasuredValueType.LUMINANCE_IN_LUX: LIGHT_LUX,
-    MeasuredValueType.PARTS_PER_BILLION: CONCENTRATION_PARTS_PER_BILLION,
-    MeasuredValueType.PARTS_PER_MILLION: CONCENTRATION_PARTS_PER_MILLION,
+    MeasuredValueType.PARTS_PER_BILLION: UnitOfRatio.PARTS_PER_BILLION,
+    MeasuredValueType.PARTS_PER_MILLION: UnitOfRatio.PARTS_PER_MILLION,
     MeasuredValueType.PARTS_PER_QUADRILLION: "ppq",
     MeasuredValueType.PARTS_PER_TRILLION: "ppt",
     MeasuredValueType.POWER_PER_SQUARE_METER: UnitOfIrradiance.WATTS_PER_SQUARE_METER,
     MeasuredValueType.PRESSURE_IN_HPA: UnitOfPressure.HPA,
     MeasuredValueType.PRESSURE_IN_MILLI_BAR: UnitOfPressure.MBAR,
-    MeasuredValueType.RELATIVE_VALUE_IN_PERCENTAGE: PERCENTAGE,
+    MeasuredValueType.RELATIVE_VALUE_IN_PERCENTAGE: UnitOfRatio.PERCENTAGE,
     MeasuredValueType.TEMPERATURE_IN_CELCIUS: UnitOfTemperature.CELSIUS,
     MeasuredValueType.TEMPERATURE_IN_KELVIN: UnitOfTemperature.KELVIN,
     MeasuredValueType.TIME_IN_SECOND: UnitOfTime.SECONDS,

homeassistant/components/pooldose/number.py

@@ -9,9 +9,9 @@ from homeassistant.components.number import (
     NumberEntityDescription,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
     EntityCategory,
     UnitOfElectricPotential,
+    UnitOfRatio,
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
@@ -46,7 +46,7 @@ NUMBER_DESCRIPTIONS: tuple[NumberEntityDescription, ...] = (
         key="cl_target",
         translation_key="cl_target",
         entity_category=EntityCategory.CONFIG,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
     ),
     NumberEntityDescription(
         key="ofa_ph_lower",
@@ -78,13 +78,13 @@ NUMBER_DESCRIPTIONS: tuple[NumberEntityDescription, ...] = (
         key="ofa_cl_lower",
         translation_key="ofa_cl_lower",
         entity_category=EntityCategory.CONFIG,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
     ),
     NumberEntityDescription(
         key="ofa_cl_upper",
         translation_key="ofa_cl_upper",
         entity_category=EntityCategory.CONFIG,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
     ),
     NumberEntityDescription(
         key="time_off_ph_dosing",

homeassistant/components/pooldose/sensor.py

@@ -11,9 +11,9 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
     EntityCategory,
     UnitOfElectricPotential,
+    UnitOfRatio,
     UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
@@ -51,7 +51,7 @@ SENSOR_DESCRIPTIONS: tuple[PooldoseSensorEntityDescription, ...] = (
     PooldoseSensorEntityDescription(
         key="cl",
         translation_key="cl",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
     ),
     PooldoseSensorEntityDescription(
         key="flow_rate",

homeassistant/components/purpleair/sensor.py

@@ -13,11 +13,11 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     EntityCategory,
+    UnitOfDensity,
     UnitOfPressure,
+    UnitOfRatio,
     UnitOfTemperature,
     UnitOfTime,
     UnitOfVolume,
@@ -43,7 +43,7 @@ SENSOR_DESCRIPTIONS = [
     PurpleAirSensorEntityDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda sensor: sensor.humidity,
     ),
@@ -74,7 +74,7 @@ SENSOR_DESCRIPTIONS = [
     PurpleAirSensorEntityDescription(
         key="pm1.0_mass_concentration",
         device_class=SensorDeviceClass.PM1,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda sensor: sensor.pm1_0,
     ),
@@ -89,7 +89,7 @@ SENSOR_DESCRIPTIONS = [
     PurpleAirSensorEntityDescription(
         key="pm10.0_mass_concentration",
         device_class=SensorDeviceClass.PM10,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda sensor: sensor.pm10_0,
     ),
@@ -104,7 +104,7 @@ SENSOR_DESCRIPTIONS = [
     PurpleAirSensorEntityDescription(
         key="pm2.5_mass_concentration",
         device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda sensor: sensor.pm2_5,
     ),

homeassistant/components/renson/sensor.py

@@ -34,8 +34,7 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
+    UnitOfRatio,
     UnitOfTemperature,
     UnitOfTime,
     UnitOfVolumeFlowRate,
@@ -78,7 +77,7 @@ SENSORS: tuple[RensonSensorEntityDescription, ...] = (
         raw_format=True,
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
     ),
     RensonSensorEntityDescription(
         key="AIR_FIELD",
@@ -86,7 +85,7 @@ SENSORS: tuple[RensonSensorEntityDescription, ...] = (
         field=AIR_QUALITY_FIELD,
         state_class=SensorStateClass.MEASUREMENT,
         raw_format=True,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
     ),
     RensonSensorEntityDescription(
         key="CURRENT_LEVEL_FIELD",
@@ -145,7 +144,7 @@ SENSORS: tuple[RensonSensorEntityDescription, ...] = (
         raw_format=False,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
     ),
     RensonSensorEntityDescription(
         key="MANUAL_LEVEL_FIELD",
@@ -194,7 +193,7 @@ SENSORS: tuple[RensonSensorEntityDescription, ...] = (
         translation_key="co2_threshold",
         field=CO2_THRESHOLD_FIELD,
         raw_format=False,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         entity_registry_enabled_default=False,
     ),
     RensonSensorEntityDescription(
@@ -202,7 +201,7 @@ SENSORS: tuple[RensonSensorEntityDescription, ...] = (
         translation_key="co2_hysteresis",
         field=CO2_HYSTERESIS_FIELD,
         raw_format=False,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         entity_registry_enabled_default=False,
     ),
     RensonSensorEntityDescription(
@@ -221,7 +220,7 @@ SENSORS: tuple[RensonSensorEntityDescription, ...] = (
         raw_format=False,
         device_class=SensorDeviceClass.POWER_FACTOR,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
     ),
 )
 

homeassistant/components/sensibo/number.py

@@ -11,7 +11,7 @@ from homeassistant.components.number import (
     NumberEntity,
     NumberEntityDescription,
 )
-from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfTemperature
+from homeassistant.const import EntityCategory, UnitOfRatio, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
@@ -48,7 +48,7 @@ DEVICE_NUMBER_TYPES = (
         key="calibration_hum",
         translation_key="calibration_humidity",
         device_class=NumberDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         remote_key="humidity",
         entity_category=EntityCategory.CONFIG,
         entity_registry_enabled_default=False,

homeassistant/components/sensibo/sensor.py

@@ -14,13 +14,11 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     EntityCategory,
+    UnitOfDensity,
     UnitOfElectricPotential,
+    UnitOfRatio,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
@@ -87,7 +85,7 @@ MOTION_SENSOR_TYPES: tuple[SensiboMotionSensorEntityDescription, ...] = (
     SensiboMotionSensorEntityDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.humidity,
     ),
@@ -181,7 +179,7 @@ AIRQ_SENSOR_TYPES: tuple[SensiboDeviceSensorEntityDescription, ...] = (
     SensiboDeviceSensorEntityDescription(
         key="airq_tvoc",
         translation_key="airq_tvoc",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_BILLION,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.tvoc,
         extra_fn=None,
@@ -190,7 +188,7 @@ AIRQ_SENSOR_TYPES: tuple[SensiboDeviceSensorEntityDescription, ...] = (
         key="airq_co2",
         translation_key="airq_co2",
         device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.co2,
         extra_fn=None,
@@ -202,7 +200,7 @@ ELEMENT_SENSOR_TYPES: tuple[SensiboDeviceSensorEntityDescription, ...] = (
     SensiboDeviceSensorEntityDescription(
         key="pm25",
         device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.pm25,
         extra_fn=None,
@@ -210,7 +208,7 @@ ELEMENT_SENSOR_TYPES: tuple[SensiboDeviceSensorEntityDescription, ...] = (
     SensiboDeviceSensorEntityDescription(
         key="tvoc",
         translation_key="tvoc",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_BILLION,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.tvoc,
         extra_fn=None,
@@ -218,14 +216,14 @@ ELEMENT_SENSOR_TYPES: tuple[SensiboDeviceSensorEntityDescription, ...] = (
     SensiboDeviceSensorEntityDescription(
         key="co2",
         device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.co2,
         extra_fn=None,
     ),
     SensiboDeviceSensorEntityDescription(
         key="ethanol",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
         translation_key="ethanol",
         value_fn=lambda data: data.etoh,

homeassistant/components/serial_pm/sensor.py

@@ -10,7 +10,7 @@ from homeassistant.components.sensor import (
     PLATFORM_SCHEMA as SENSOR_PLATFORM_SCHEMA,
     SensorEntity,
 )
-from homeassistant.const import CONCENTRATION_MICROGRAMS_PER_CUBIC_METER, CONF_NAME
+from homeassistant.const import CONF_NAME, UnitOfDensity
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -94,7 +94,7 @@ class ParticulateMatterSensor(SensorEntity):
     @override
     def native_unit_of_measurement(self):
         """Return the unit of measurement of this entity, if any."""
-        return CONCENTRATION_MICROGRAMS_PER_CUBIC_METER
+        return UnitOfDensity
 
     def update(self) -> None:
         """Read from sensor and update the state."""

homeassistant/components/smartthings/sensor.py

@@ -15,16 +15,15 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
     LIGHT_LUX,
-    PERCENTAGE,
     EntityCategory,
     UnitOfArea,
+    UnitOfDensity,
     UnitOfEnergy,
     UnitOfMass,
     UnitOfPower,
     UnitOfPressure,
+    UnitOfRatio,
     UnitOfTemperature,
     UnitOfVolume,
     UnitOfVolumeFlowRate,
@@ -240,7 +239,7 @@ CAPABILITY_TO_SENSORS: dict[
             SmartThingsSensorEntityDescription(
                 key=Attribute.VOLUME,
                 translation_key="audio_volume",
-                native_unit_of_measurement=PERCENTAGE,
+                native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
                 deprecated=(
                     lambda status: (
                         ("2025.10.0", "media_player")
@@ -255,7 +254,7 @@ CAPABILITY_TO_SENSORS: dict[
         Attribute.BATTERY: [
             SmartThingsSensorEntityDescription(
                 key=Attribute.BATTERY,
-                native_unit_of_measurement=PERCENTAGE,
+                native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
                 device_class=SensorDeviceClass.BATTERY,
                 entity_category=EntityCategory.DIAGNOSTIC,
             )
@@ -288,7 +287,7 @@ CAPABILITY_TO_SENSORS: dict[
         Attribute.CARBON_DIOXIDE: [
             SmartThingsSensorEntityDescription(
                 key=Attribute.CARBON_DIOXIDE,
-                native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+                native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
                 device_class=SensorDeviceClass.CO2,
                 state_class=SensorStateClass.MEASUREMENT,
             )
@@ -310,7 +309,7 @@ CAPABILITY_TO_SENSORS: dict[
         Attribute.CARBON_MONOXIDE_LEVEL: [
             SmartThingsSensorEntityDescription(
                 key=Attribute.CARBON_MONOXIDE_LEVEL,
-                native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+                native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
                 device_class=SensorDeviceClass.CO,
                 state_class=SensorStateClass.MEASUREMENT,
             )
@@ -356,7 +355,7 @@ CAPABILITY_TO_SENSORS: dict[
             SmartThingsSensorEntityDescription(
                 key=Attribute.WATER_FILTER_USAGE,
                 translation_key="water_filter_usage",
-                native_unit_of_measurement=PERCENTAGE,
+                native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
                 state_class=SensorStateClass.MEASUREMENT,
             )
         ]
@@ -468,7 +467,7 @@ CAPABILITY_TO_SENSORS: dict[
             SmartThingsSensorEntityDescription(
                 key=Attribute.DUST_LEVEL,
                 device_class=SensorDeviceClass.PM10,
-                native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+                native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
                 state_class=SensorStateClass.MEASUREMENT,
             )
         ],
@@ -476,7 +475,7 @@ CAPABILITY_TO_SENSORS: dict[
             SmartThingsSensorEntityDescription(
                 key=Attribute.FINE_DUST_LEVEL,
                 device_class=SensorDeviceClass.PM25,
-                native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+                native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
                 state_class=SensorStateClass.MEASUREMENT,
             )
         ],
@@ -507,7 +506,7 @@ CAPABILITY_TO_SENSORS: dict[
             SmartThingsSensorEntityDescription(
                 key=Attribute.EQUIVALENT_CARBON_DIOXIDE_MEASUREMENT,
                 translation_key="equivalent_carbon_dioxide",
-                native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+                native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
                 device_class=SensorDeviceClass.CO2,
                 state_class=SensorStateClass.MEASUREMENT,
             )
@@ -528,7 +527,7 @@ CAPABILITY_TO_SENSORS: dict[
         Attribute.FINE_DUST_LEVEL: [
             SmartThingsSensorEntityDescription(
                 key=Attribute.FINE_DUST_LEVEL,
-                native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+                native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
                 state_class=SensorStateClass.MEASUREMENT,
                 device_class=SensorDeviceClass.PM25,
             )
@@ -540,7 +539,7 @@ CAPABILITY_TO_SENSORS: dict[
             SmartThingsSensorEntityDescription(
                 key=Attribute.FORMALDEHYDE_LEVEL,
                 translation_key="formaldehyde",
-                native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+                native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
                 state_class=SensorStateClass.MEASUREMENT,
             )
         ]
@@ -594,7 +593,7 @@ CAPABILITY_TO_SENSORS: dict[
             SmartThingsSensorEntityDescription(
                 key=Attribute.INFRARED_LEVEL,
                 translation_key="infrared_level",
-                native_unit_of_measurement=PERCENTAGE,
+                native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
                 state_class=SensorStateClass.MEASUREMENT,
             )
         ]
@@ -869,7 +868,7 @@ CAPABILITY_TO_SENSORS: dict[
         Attribute.HUMIDITY: [
             SmartThingsSensorEntityDescription(
                 key=Attribute.HUMIDITY,
-                native_unit_of_measurement=PERCENTAGE,
+                native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
                 device_class=SensorDeviceClass.HUMIDITY,
                 state_class=SensorStateClass.MEASUREMENT,
             )
@@ -1095,7 +1094,7 @@ CAPABILITY_TO_SENSORS: dict[
             SmartThingsSensorEntityDescription(
                 key=Attribute.TVOC_LEVEL,
                 device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
-                native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+                native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
                 state_class=SensorStateClass.MEASUREMENT,
             )
         ]
@@ -1124,7 +1123,7 @@ CAPABILITY_TO_SENSORS: dict[
         Attribute.VERY_FINE_DUST_LEVEL: [
             SmartThingsSensorEntityDescription(
                 key=Attribute.VERY_FINE_DUST_LEVEL,
-                native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+                native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
                 device_class=SensorDeviceClass.PM1,
                 state_class=SensorStateClass.MEASUREMENT,
             )
@@ -1223,7 +1222,7 @@ CAPABILITY_TO_SENSORS: dict[
                 key=Attribute.HOOD_FILTER_USAGE,
                 translation_key="hood_filter_usage",
                 state_class=SensorStateClass.MEASUREMENT,
-                native_unit_of_measurement=PERCENTAGE,
+                native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
                 entity_category=EntityCategory.DIAGNOSTIC,
             )
         ]
@@ -1319,7 +1318,7 @@ UNITS = {
     "ccf": UnitOfVolume.CENTUM_CUBIC_FEET,
     "lux": LIGHT_LUX,
     "mG": None,
-    "μg/m^3": CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    "μg/m^3": UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
     "kPa": UnitOfPressure.KPA,
 }
 

homeassistant/components/smlight/manifest.json

@@ -12,7 +12,7 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "quality_scale": "silver",
-  "requirements": ["pysmlight==0.4.0"],
+  "requirements": ["pysmlight==0.5.0"],
   "zeroconf": [
     {
       "type": "_slzb-06._tcp.local."

homeassistant/components/switchbot/sensor.py

@@ -15,16 +15,15 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
     LIGHT_LUX,
-    PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     EntityCategory,
+    UnitOfDensity,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
     UnitOfPower,
+    UnitOfRatio,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
@@ -66,14 +65,14 @@ SENSOR_TYPES: dict[str, SwitchBotSensorEntityDescription] = {
     ),
     "battery": SwitchBotSensorEntityDescription(
         key="battery",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
     "co2": SwitchBotSensorEntityDescription(
         key="co2",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.CO2,
     ),
@@ -84,7 +83,7 @@ SENSOR_TYPES: dict[str, SwitchBotSensorEntityDescription] = {
     ),
     "humidity": SwitchBotSensorEntityDescription(
         key="humidity",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.HUMIDITY,
     ),
@@ -151,7 +150,7 @@ SENSOR_TYPES: dict[str, SwitchBotSensorEntityDescription] = {
     ),
     "pm25": SwitchBotSensorEntityDescription(
         key="pm25",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.PM25,
     ),

homeassistant/components/switchbot_cloud/sensor.py

@@ -13,12 +13,11 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
     UnitOfPower,
+    UnitOfRatio,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
@@ -78,14 +77,14 @@ HUMIDITY_DESCRIPTION = SwitchbotCloudSensorEntityDescription(
     key=SENSOR_TYPE_HUMIDITY,
     device_class=SensorDeviceClass.HUMIDITY,
     state_class=SensorStateClass.MEASUREMENT,
-    native_unit_of_measurement=PERCENTAGE,
+    native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
 )
 
 BATTERY_DESCRIPTION = SwitchbotCloudSensorEntityDescription(
     key=SENSOR_TYPE_BATTERY,
     device_class=SensorDeviceClass.BATTERY,
     state_class=SensorStateClass.MEASUREMENT,
-    native_unit_of_measurement=PERCENTAGE,
+    native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
 )
 
 POWER_DESCRIPTION = SwitchbotCloudSensorEntityDescription(
@@ -120,7 +119,7 @@ CO2_DESCRIPTION = SwitchbotCloudSensorEntityDescription(
     key=SENSOR_TYPE_CO2,
     device_class=SensorDeviceClass.CO2,
     state_class=SensorStateClass.MEASUREMENT,
-    native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+    native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
 )
 
 POWER_CONSUMPTION_DESCRIPTION = SwitchbotCloudSensorEntityDescription(

homeassistant/components/tasmota/sensor.py

@@ -15,15 +15,12 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
     LIGHT_LUX,
-    PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     EntityCategory,
     UnitOfApparentPower,
+    UnitOfDensity,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
@@ -32,6 +29,7 @@ from homeassistant.const import (
     UnitOfMass,
     UnitOfPower,
     UnitOfPressure,
+    UnitOfRatio,
     UnitOfReactivePower,
     UnitOfSpeed,
     UnitOfTemperature,
@@ -211,10 +209,10 @@ SENSOR_DEVICE_CLASS_ICON_MAP: dict[str, dict[str, Any]] = {
 
 SENSOR_UNIT_MAP = {
     hc.CONCENTRATION_MICROGRAMS_PER_CUBIC_METER: (
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER
+        UnitOfDensity.MICROGRAMS_PER_CUBIC_METER
     ),
-    hc.CONCENTRATION_PARTS_PER_BILLION: CONCENTRATION_PARTS_PER_BILLION,
-    hc.CONCENTRATION_PARTS_PER_MILLION: CONCENTRATION_PARTS_PER_MILLION,
+    hc.CONCENTRATION_PARTS_PER_BILLION: UnitOfRatio.PARTS_PER_BILLION,
+    hc.CONCENTRATION_PARTS_PER_MILLION: UnitOfRatio.PARTS_PER_MILLION,
     hc.ELECTRICAL_CURRENT_AMPERE: UnitOfElectricCurrent.AMPERE,
     hc.ELECTRICAL_VOLT_AMPERE: UnitOfApparentPower.VOLT_AMPERE,
     hc.ENERGY_KILO_WATT_HOUR: UnitOfEnergy.KILO_WATT_HOUR,
@@ -222,7 +220,7 @@ SENSOR_UNIT_MAP = {
     hc.LENGTH_CENTIMETERS: UnitOfLength.CENTIMETERS,
     hc.LIGHT_LUX: LIGHT_LUX,
     hc.MASS_KILOGRAMS: UnitOfMass.KILOGRAMS,
-    hc.PERCENTAGE: PERCENTAGE,
+    hc.PERCENTAGE: UnitOfRatio.PERCENTAGE,
     hc.POWER_WATT: UnitOfPower.WATT,
     hc.PRESSURE_HPA: UnitOfPressure.HPA,
     hc.REACTIVE_POWER: UnitOfReactivePower.VOLT_AMPERE_REACTIVE,

homeassistant/components/tuya/number.py

@@ -14,7 +14,7 @@ from homeassistant.components.number import (
     NumberEntity,
     NumberEntityDescription,
 )
-from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfTime
+from homeassistant.const import EntityCategory, UnitOfRatio, UnitOfTime
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -328,13 +328,13 @@ NUMBERS: dict[DeviceCategory, tuple[NumberEntityDescription, ...]] = {
         NumberEntityDescription(
             key=DPCode.ARM_DOWN_PERCENT,
             translation_key="move_down",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
             entity_category=EntityCategory.CONFIG,
         ),
         NumberEntityDescription(
             key=DPCode.ARM_UP_PERCENT,
             translation_key="move_up",
-            native_unit_of_measurement=PERCENTAGE,
+            native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
             entity_category=EntityCategory.CONFIG,
         ),
         NumberEntityDescription(

homeassistant/components/uhoo/sensor.py

@@ -13,11 +13,9 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
+    UnitOfDensity,
     UnitOfPressure,
+    UnitOfRatio,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
@@ -59,28 +57,28 @@ SENSOR_TYPES: tuple[UhooSensorEntityDescription, ...] = (
     UhooSensorEntityDescription(
         key=API_CO,
         device_class=SensorDeviceClass.CO,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.co,
     ),
     UhooSensorEntityDescription(
         key=API_CO2,
         device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.co2,
     ),
     UhooSensorEntityDescription(
         key=API_PM25,
         device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.pm25,
     ),
     UhooSensorEntityDescription(
         key=API_HUMIDITY,
         device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.humidity,
     ),
@@ -102,21 +100,21 @@ SENSOR_TYPES: tuple[UhooSensorEntityDescription, ...] = (
         key=API_TVOC,
         translation_key="volatile_organic_compounds",
         device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_BILLION,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.tvoc,
     ),
     UhooSensorEntityDescription(
         key=API_NO2,
         translation_key="nitrogen_dioxide",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_BILLION,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.no2,
     ),
     UhooSensorEntityDescription(
         key=API_OZONE,
         translation_key="ozone",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_BILLION,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data.ozone,
     ),

homeassistant/components/vallox/sensor.py

@@ -11,11 +11,10 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
     CONF_NAME,
-    PERCENTAGE,
     REVOLUTIONS_PER_MINUTE,
     EntityCategory,
+    UnitOfRatio,
     UnitOfTemperature,
     UnitOfTime,
 )
@@ -167,7 +166,7 @@ SENSOR_ENTITIES: tuple[ValloxSensorEntityDescription, ...] = (
         translation_key="fan_speed",
         metric_key="A_CYC_FAN_SPEED",
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         entity_type=ValloxFanSpeedSensor,
     ),
     ValloxSensorEntityDescription(
@@ -254,14 +253,14 @@ SENSOR_ENTITIES: tuple[ValloxSensorEntityDescription, ...] = (
         metric_key="A_CYC_RH_VALUE",
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
     ),
     ValloxSensorEntityDescription(
         key="efficiency",
         translation_key="efficiency",
         metric_key="A_CYC_EXTRACT_EFFICIENCY",
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         entity_registry_enabled_default=False,
         round_ndigits=0,
     ),
@@ -270,7 +269,7 @@ SENSOR_ENTITIES: tuple[ValloxSensorEntityDescription, ...] = (
         metric_key="A_CYC_CO2_VALUE",
         device_class=SensorDeviceClass.CO2,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         entity_registry_enabled_default=False,
     ),
     ValloxSensorEntityDescription(

homeassistant/components/venstar/sensor.py

@@ -10,12 +10,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
-    UnitOfTemperature,
-    UnitOfTime,
-)
+from homeassistant.const import UnitOfRatio, UnitOfTemperature, UnitOfTime
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -178,7 +173,7 @@ SENSOR_ENTITIES: tuple[VenstarSensorEntityDescription, ...] = (
         key="hum",
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
-        uom_fn=lambda _: PERCENTAGE,
+        uom_fn=lambda _: UnitOfRatio.PERCENTAGE,
         value_fn=lambda coordinator, sensor_name: coordinator.client.get_sensor(
             sensor_name, "hum"
         ),
@@ -198,7 +193,7 @@ SENSOR_ENTITIES: tuple[VenstarSensorEntityDescription, ...] = (
         key="co2",
         device_class=SensorDeviceClass.CO2,
         state_class=SensorStateClass.MEASUREMENT,
-        uom_fn=lambda _: CONCENTRATION_PARTS_PER_MILLION,
+        uom_fn=lambda _: UnitOfRatio.PARTS_PER_MILLION,
         value_fn=lambda coordinator, sensor_name: coordinator.client.get_sensor(
             sensor_name, "co2"
         ),
@@ -218,7 +213,7 @@ SENSOR_ENTITIES: tuple[VenstarSensorEntityDescription, ...] = (
         key="battery",
         device_class=SensorDeviceClass.BATTERY,
         state_class=SensorStateClass.MEASUREMENT,
-        uom_fn=lambda _: PERCENTAGE,
+        uom_fn=lambda _: UnitOfRatio.PERCENTAGE,
         value_fn=lambda coordinator, sensor_name: coordinator.client.get_sensor(
             sensor_name, "battery"
         ),

homeassistant/components/vesync/sensor.py

@@ -15,12 +15,12 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    PERCENTAGE,
     EntityCategory,
+    UnitOfDensity,
     UnitOfElectricPotential,
     UnitOfEnergy,
     UnitOfPower,
+    UnitOfRatio,
     UnitOfTemperature,
     UnitOfTime,
 )
@@ -54,7 +54,7 @@ SENSORS: tuple[VeSyncSensorEntityDescription, ...] = (
     VeSyncSensorEntityDescription(
         key="filter-life",
         translation_key="filter_life",
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda device: device.state.filter_life,
@@ -71,7 +71,7 @@ SENSORS: tuple[VeSyncSensorEntityDescription, ...] = (
     VeSyncSensorEntityDescription(
         key="pm1",
         device_class=SensorDeviceClass.PM1,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda device: device.state.pm1,
         exists_fn=lambda device: rgetattr(device, "state.pm1") is not None,
@@ -79,7 +79,7 @@ SENSORS: tuple[VeSyncSensorEntityDescription, ...] = (
     VeSyncSensorEntityDescription(
         key="pm10",
         device_class=SensorDeviceClass.PM10,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda device: device.state.pm10,
         exists_fn=lambda device: rgetattr(device, "state.pm10") is not None,
@@ -87,7 +87,7 @@ SENSORS: tuple[VeSyncSensorEntityDescription, ...] = (
     VeSyncSensorEntityDescription(
         key="pm25",
         device_class=SensorDeviceClass.PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda device: device.state.pm25,
         exists_fn=lambda device: rgetattr(device, "state.pm25") is not None,
@@ -155,7 +155,7 @@ SENSORS: tuple[VeSyncSensorEntityDescription, ...] = (
     VeSyncSensorEntityDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda device: device.state.humidity,
         exists_fn=is_humidifier,

homeassistant/components/victron_ble/sensor.py

@@ -23,6 +23,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+    UnitOfApparentPower,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
     UnitOfEnergy,
@@ -348,6 +349,13 @@ SENSOR_DESCRIPTIONS = {
         native_unit_of_measurement=UnitOfElectricPotential.VOLT,
         state_class=SensorStateClass.MEASUREMENT,
     ),
+    Keys.OUTPUT_CURRENT: VictronBLESensorEntityDescription(
+        key=Keys.OUTPUT_CURRENT,
+        translation_key=Keys.OUTPUT_CURRENT,
+        device_class=SensorDeviceClass.CURRENT,
+        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
     Keys.REMAINING_MINUTES: VictronBLESensorEntityDescription(
         key=Keys.REMAINING_MINUTES,
         translation_key=Keys.REMAINING_MINUTES,
@@ -412,6 +420,27 @@ SENSOR_DESCRIPTIONS = {
         native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
+    Keys.AC_APPARENT_POWER: VictronBLESensorEntityDescription(
+        key=Keys.AC_APPARENT_POWER,
+        translation_key=Keys.AC_APPARENT_POWER,
+        device_class=SensorDeviceClass.APPARENT_POWER,
+        native_unit_of_measurement=UnitOfApparentPower.VOLT_AMPERE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    Keys.AC_VOLTAGE: VictronBLESensorEntityDescription(
+        key=Keys.AC_VOLTAGE,
+        translation_key=Keys.AC_VOLTAGE,
+        device_class=SensorDeviceClass.VOLTAGE,
+        native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    Keys.INPUT_CURRENT: VictronBLESensorEntityDescription(
+        key=Keys.INPUT_CURRENT,
+        translation_key=Keys.INPUT_CURRENT,
+        device_class=SensorDeviceClass.CURRENT,
+        native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
     Keys.OUTPUT_VOLTAGE_1: VictronBLESensorEntityDescription(
         key=Keys.OUTPUT_VOLTAGE_1,
         translation_key="output_phase_voltage",

homeassistant/components/victron_ble/strings.json

@@ -50,6 +50,9 @@
   },
   "entity": {
     "sensor": {
+      "ac_apparent_power": {
+        "name": "AC apparent power"
+      },
       "ac_current": {
         "name": "AC current"
       },
@@ -67,6 +70,9 @@
       "ac_out_power": {
         "name": "AC-out power"
       },
+      "ac_voltage": {
+        "name": "AC voltage"
+      },
       "alarm": {
         "name": "Alarm",
         "state": {
@@ -210,6 +216,9 @@
       "external_device_load": {
         "name": "External device load"
       },
+      "input_current": {
+        "name": "Input current"
+      },
       "input_voltage": {
         "name": "Input voltage"
       },
@@ -254,6 +263,9 @@
           "switched_off_switch": "Switched off by switch"
         }
       },
+      "output_current": {
+        "name": "Output current"
+      },
       "output_phase_current": {
         "name": "Output phase {phase} current"
       },

homeassistant/components/watson_tts/__init__.py

@@ -1 +0,0 @@
-"""Support for IBM Watson TTS integration."""

homeassistant/components/watson_tts/manifest.json

@@ -1,11 +0,0 @@
-{
-  "domain": "watson_tts",
-  "name": "IBM Watson TTS",
-  "codeowners": ["@rutkai"],
-  "disabled": "Dependencies not compatible with the new pip resolver",
-  "documentation": "https://www.home-assistant.io/integrations/watson_tts",
-  "iot_class": "cloud_push",
-  "loggers": ["ibm_cloud_sdk_core", "ibm_watson"],
-  "quality_scale": "legacy",
-  "requirements": ["ibm-watson==5.2.2"]
-}

homeassistant/components/watson_tts/tts.py

@@ -1,200 +0,0 @@
-"""Support for IBM Watson TTS integration."""
-
-import logging
-from typing import Any, override
-
-from ibm_cloud_sdk_core.authenticators import IAMAuthenticator
-from ibm_watson import TextToSpeechV1
-import voluptuous as vol
-
-from homeassistant.components.tts import (
-    PLATFORM_SCHEMA as TTS_PLATFORM_SCHEMA,
-    Provider,
-    TtsAudioType,
-)
-from homeassistant.helpers import config_validation as cv
-
-_LOGGER = logging.getLogger(__name__)
-
-CONF_URL = "watson_url"
-CONF_APIKEY = "watson_apikey"
-
-DEFAULT_URL = "https://api.us-south.text-to-speech.watson.cloud.ibm.com"
-
-CONF_VOICE = "voice"
-CONF_OUTPUT_FORMAT = "output_format"
-CONF_TEXT_TYPE = "text"
-
-# List from https://tinyurl.com/watson-tts-docs
-SUPPORTED_VOICES = [
-    "de-DE_BirgitV2Voice",
-    "de-DE_BirgitV3Voice",
-    "de-DE_BirgitVoice",
-    "de-DE_DieterV2Voice",
-    "de-DE_DieterV3Voice",
-    "de-DE_DieterVoice",
-    "de-DE_ErikaV3Voice",
-    "en-AU_HeidiExpressive",
-    "en-AU_JackExpressive",
-    "en-GB_CharlotteV3Voice",
-    "en-GB_JamesV3Voice",
-    "en-GB_KateV3Voice",
-    "en-GB_KateVoice",
-    "en-US_AllisonExpressive",
-    "en-US_AllisonV2Voice",
-    "en-US_AllisonV3Voice",
-    "en-US_AllisonVoice",
-    "en-US_EmilyV3Voice",
-    "en-US_EmmaExpressive",
-    "en-US_HenryV3Voice",
-    "en-US_KevinV3Voice",
-    "en-US_LisaExpressive",
-    "en-US_LisaV2Voice",
-    "en-US_LisaV3Voice",
-    "en-US_LisaVoice",
-    "en-US_MichaelExpressive",
-    "en-US_MichaelV2Voice",
-    "en-US_MichaelV3Voice",
-    "en-US_MichaelVoice",
-    "en-US_OliviaV3Voice",
-    "es-ES_EnriqueV3Voice",
-    "es-ES_EnriqueVoice",
-    "es-ES_LauraV3Voice",
-    "es-ES_LauraVoice",
-    "es-LA_SofiaV3Voice",
-    "es-LA_SofiaVoice",
-    "es-US_SofiaV3Voice",
-    "es-US_SofiaVoice",
-    "fr-CA_LouiseV3Voice",
-    "fr-FR_NicolasV3Voice",
-    "fr-FR_ReneeV3Voice",
-    "fr-FR_ReneeVoice",
-    "it-IT_FrancescaV2Voice",
-    "it-IT_FrancescaV3Voice",
-    "it-IT_FrancescaVoice",
-    "ja-JP_EmiV3Voice",
-    "ja-JP_EmiVoice",
-    "ko-KR_JinV3Voice",
-    "nl-NL_MerelV3Voice",
-    "pt-BR_IsabelaV3Voice",
-    "pt-BR_IsabelaVoice",
-]
-
-DEPRECATED_VOICES = [
-    "de-DE_BirgitVoice",
-    "de-DE_DieterVoice",
-    "en-US_AllisonVoice",
-    "en-US_LisaVoice",
-    "en-US_MichaelVoice",
-    "es-ES_EnriqueVoice",
-    "es-ES_LauraVoice",
-    "es-LA_SofiaVoice",
-    "es-US_SofiaVoice",
-    "fr-FR_ReneeVoice",
-    "it-IT_FrancescaVoice",
-    "ja-JP_EmiVoice",
-    "pt-BR_IsabelaVoice",
-]
-
-SUPPORTED_OUTPUT_FORMATS = [
-    "audio/flac",
-    "audio/mp3",
-    "audio/mpeg",
-    "audio/ogg",
-    "audio/ogg;codecs=opus",
-    "audio/ogg;codecs=vorbis",
-    "audio/wav",
-]
-
-CONTENT_TYPE_EXTENSIONS = {
-    "audio/flac": "flac",
-    "audio/mp3": "mp3",
-    "audio/mpeg": "mp3",
-    "audio/ogg": "ogg",
-    "audio/ogg;codecs=opus": "ogg",
-    "audio/ogg;codecs=vorbis": "ogg",
-    "audio/wav": "wav",
-}
-
-DEFAULT_VOICE = "en-US_AllisonV3Voice"
-DEFAULT_OUTPUT_FORMAT = "audio/mp3"
-
-PLATFORM_SCHEMA = TTS_PLATFORM_SCHEMA.extend(
-    {
-        vol.Optional(CONF_URL, default=DEFAULT_URL): cv.string,
-        vol.Required(CONF_APIKEY): cv.string,
-        vol.Optional(CONF_VOICE, default=DEFAULT_VOICE): vol.In(SUPPORTED_VOICES),
-        vol.Optional(CONF_OUTPUT_FORMAT, default=DEFAULT_OUTPUT_FORMAT): vol.In(
-            SUPPORTED_OUTPUT_FORMATS
-        ),
-    }
-)
-
-
-def get_engine(hass, config, discovery_info=None):
-    """Set up IBM Watson TTS component."""
-
-    authenticator = IAMAuthenticator(config[CONF_APIKEY])
-    service = TextToSpeechV1(authenticator)
-    service.set_service_url(config[CONF_URL])
-
-    supported_languages = list({s[:5] for s in SUPPORTED_VOICES})
-    default_voice = config[CONF_VOICE]
-    output_format = config[CONF_OUTPUT_FORMAT]
-    service.set_default_headers({"x-watson-learning-opt-out": "true"})
-
-    if default_voice in DEPRECATED_VOICES:
-        _LOGGER.warning(
-            "Watson TTS voice %s is deprecated, it may be removed in the future",
-            default_voice,
-        )
-
-    return WatsonTTSProvider(service, supported_languages, default_voice, output_format)
-
-
-class WatsonTTSProvider(Provider):
-    """IBM Watson TTS api provider."""
-
-    def __init__(self, service, supported_languages, default_voice, output_format):
-        """Initialize Watson TTS provider."""
-        self.service = service
-        self.supported_langs = supported_languages
-        self.default_lang = default_voice[:5]
-        self.default_voice = default_voice
-        self.output_format = output_format
-        self.name = "Watson TTS"
-
-    @property
-    @override
-    def supported_languages(self) -> list[str]:
-        """Return a list of supported languages."""
-        return self.supported_langs
-
-    @property
-    @override
-    def default_language(self) -> str:
-        """Return the default language."""
-        return self.default_lang
-
-    @property
-    @override
-    def default_options(self) -> dict[str, Any]:
-        """Return dict include default options."""
-        return {CONF_VOICE: self.default_voice}
-
-    @property
-    @override
-    def supported_options(self) -> list[str]:
-        """Return a list of supported options."""
-        return [CONF_VOICE]
-
-    @override
-    def get_tts_audio(
-        self, message: str, language: str, options: dict[str, Any]
-    ) -> TtsAudioType:
-        """Request TTS file from Watson TTS."""
-        response = self.service.synthesize(
-            text=message, accept=self.output_format, voice=options[CONF_VOICE]
-        ).get_result()
-
-        return (CONTENT_TYPE_EXTENSIONS[self.output_format], response.content)

homeassistant/components/xiaomi_miio/sensor.py

@@ -24,19 +24,18 @@ from homeassistant.components.sensor import (
 from homeassistant.const import (
     ATTR_BATTERY_LEVEL,
     ATTR_TEMPERATURE,
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
     CONF_DEVICE,
     CONF_HOST,
     CONF_MODEL,
     CONF_TOKEN,
     LIGHT_LUX,
-    PERCENTAGE,
     REVOLUTIONS_PER_MINUTE,
     EntityCategory,
     UnitOfArea,
+    UnitOfDensity,
     UnitOfPower,
     UnitOfPressure,
+    UnitOfRatio,
     UnitOfTemperature,
     UnitOfTime,
     UnitOfVolume,
@@ -167,7 +166,7 @@ SENSOR_TYPES = {
     ),
     ATTR_HUMIDITY: XiaomiMiioSensorDescription(
         key=ATTR_HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         device_class=SensorDeviceClass.HUMIDITY,
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -186,7 +185,7 @@ SENSOR_TYPES = {
     ATTR_WATER_LEVEL: XiaomiMiioSensorDescription(
         key=ATTR_WATER_LEVEL,
         translation_key=ATTR_WATER_LEVEL,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         icon="mdi:water-check",
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -264,32 +263,32 @@ SENSOR_TYPES = {
         key=ATTR_TVOC,
         translation_key=ATTR_TVOC,
         state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS,
     ),
     ATTR_PM10: XiaomiMiioSensorDescription(
         key=ATTR_PM10,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM10,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     ATTR_PM25: XiaomiMiioSensorDescription(
         key=ATTR_AQI,
         translation_key=ATTR_AQI,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM25,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     ATTR_PM25_2: XiaomiMiioSensorDescription(
         key=ATTR_PM25,
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        native_unit_of_measurement=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM25,
         state_class=SensorStateClass.MEASUREMENT,
     ),
     ATTR_FILTER_LIFE_REMAINING: XiaomiMiioSensorDescription(
         key=ATTR_FILTER_LIFE_REMAINING,
         translation_key=ATTR_FILTER_LIFE_REMAINING,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         icon="mdi:air-filter",
         state_class=SensorStateClass.MEASUREMENT,
         attributes=("filter_type",),
@@ -316,7 +315,7 @@ SENSOR_TYPES = {
     ATTR_DUST_FILTER_LIFE_REMAINING: XiaomiMiioSensorDescription(
         key=ATTR_DUST_FILTER_LIFE_REMAINING,
         translation_key=ATTR_DUST_FILTER_LIFE_REMAINING,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         icon="mdi:air-filter",
         state_class=SensorStateClass.MEASUREMENT,
         attributes=("filter_type",),
@@ -334,7 +333,7 @@ SENSOR_TYPES = {
     ATTR_UPPER_FILTER_LIFE_REMAINING: XiaomiMiioSensorDescription(
         key=ATTR_UPPER_FILTER_LIFE_REMAINING,
         translation_key=ATTR_UPPER_FILTER_LIFE_REMAINING,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         icon="mdi:air-filter",
         state_class=SensorStateClass.MEASUREMENT,
         attributes=("filter_type",),
@@ -351,7 +350,7 @@ SENSOR_TYPES = {
     ),
     ATTR_CARBON_DIOXIDE: XiaomiMiioSensorDescription(
         key=ATTR_CARBON_DIOXIDE,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         device_class=SensorDeviceClass.CO2,
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -366,7 +365,7 @@ SENSOR_TYPES = {
     ),
     ATTR_BATTERY: XiaomiMiioSensorDescription(
         key=ATTR_BATTERY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         device_class=SensorDeviceClass.BATTERY,
         state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,

homeassistant/components/yolink/sensor.py

@@ -43,14 +43,13 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     EntityCategory,
     UnitOfConductivity,
     UnitOfEnergy,
     UnitOfLength,
     UnitOfPower,
+    UnitOfRatio,
     UnitOfTemperature,
     UnitOfVolume,
 )
@@ -214,7 +213,7 @@ SENSOR_TYPES: tuple[YoLinkSensorEntityDescription, ...] = (
     YoLinkSensorEntityDescription(
         key="battery",
         device_class=SensorDeviceClass.BATTERY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.MEASUREMENT,
         exists_fn=lambda device: device.device_type in BATTERY_POWER_SENSOR,
@@ -224,7 +223,7 @@ SENSOR_TYPES: tuple[YoLinkSensorEntityDescription, ...] = (
     YoLinkSensorEntityDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
+        native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         exists_fn=lambda device: (
             device.device_type
@@ -404,7 +403,7 @@ SENSOR_TYPES: tuple[YoLinkSensorEntityDescription, ...] = (
     YoLinkSensorEntityDescription(
         key="co",
         device_class=SensorDeviceClass.CO,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        native_unit_of_measurement=UnitOfRatio.PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
         exists_fn=lambda device: (
             device.device_type == ATTR_DEVICE_MULTI_FUNCTIONAL_SENSOR