Use core radon device class for Airthings cloud radon (#166087)

homeassistant/components/airthings/sensor.py

@@ -16,6 +16,7 @@ from homeassistant.const import (
     EntityCategory,
     UnitOfDensity,
     UnitOfPressure,
+    UnitOfRadiationConcentration,
     UnitOfRatio,
     UnitOfSoundPressure,
     UnitOfTemperature,
@@ -33,36 +34,34 @@ from .coordinator import AirthingsDataUpdateCoordinator
 SENSORS: dict[str, SensorEntityDescription] = {
     "radonShortTermAvg": SensorEntityDescription(
         key="radonShortTermAvg",
-        native_unit_of_measurement="Bq/m³",
-        translation_key="radon",
+        device_class=SensorDeviceClass.RADON,
+        native_unit_of_measurement=(
+            UnitOfRadiationConcentration.BECQUEREL_PER_CUBIC_METER
+        ),
         suggested_display_precision=0,
     ),
     "temp": SensorEntityDescription(
         key="temp",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=1,
     ),
     "humidity": SensorEntityDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
         native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
     ),
     "pressure": SensorEntityDescription(
         key="pressure",
         device_class=SensorDeviceClass.ATMOSPHERIC_PRESSURE,
         native_unit_of_measurement=UnitOfPressure.MBAR,
-        state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=1,
     ),
     "sla": SensorEntityDescription(
         key="sla",
         device_class=SensorDeviceClass.SOUND_PRESSURE,
         native_unit_of_measurement=UnitOfSoundPressure.WEIGHTED_DECIBEL_A,
-        state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
     ),
     "battery": SensorEntityDescription(
@@ -70,47 +69,40 @@ SENSORS: dict[str, SensorEntityDescription] = {
         device_class=SensorDeviceClass.BATTERY,
         native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         entity_category=EntityCategory.DIAGNOSTIC,
-        state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
     ),
     "co2": SensorEntityDescription(
         key="co2",
         device_class=SensorDeviceClass.CO2,
         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=UnitOfRatio.PARTS_PER_BILLION,
-        state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
     ),
     "light": SensorEntityDescription(
         key="light",
         native_unit_of_measurement=UnitOfRatio.PERCENTAGE,
         translation_key="light",
-        state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
     ),
     "lux": SensorEntityDescription(
         key="lux",
         device_class=SensorDeviceClass.ILLUMINANCE,
         native_unit_of_measurement=LIGHT_LUX,
-        state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
     ),
     "virusRisk": SensorEntityDescription(
         key="virusRisk",
         translation_key="virus_risk",
-        state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
     ),
     "mold": SensorEntityDescription(
         key="mold",
         translation_key="mold",
-        state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
     ),
     "rssi": SensorEntityDescription(
@@ -119,21 +111,18 @@ SENSORS: dict[str, SensorEntityDescription] = {
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         entity_registry_enabled_default=False,
         entity_category=EntityCategory.DIAGNOSTIC,
-        state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
     ),
     "pm1": SensorEntityDescription(
         key="pm1",
         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=UnitOfDensity.MICROGRAMS_PER_CUBIC_METER,
         device_class=SensorDeviceClass.PM25,
-        state_class=SensorStateClass.MEASUREMENT,
         suggested_display_precision=0,
     ),
 }
@@ -145,8 +134,8 @@ async def async_setup_entry(
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Airthings sensor."""
-
     coordinator = entry.runtime_data
+
     entities = [
         AirthingsDeviceSensor(
             coordinator,

homeassistant/components/airthings/strings.json

@@ -26,9 +26,6 @@
       "mold": {
         "name": "Mold"
       },
-      "radon": {
-        "name": "Radon"
-      },
       "virus_risk": {
         "name": "Virus Risk"
       }

tests/components/airthings/snapshots/test_sensor.ambr

@@ -380,24 +380,25 @@
         'suggested_display_precision': 0,
       }),
     }),
-    'original_device_class': None,
+    'original_device_class': <SensorDeviceClass.RADON: 'radon'>,
     'original_icon': None,
     'original_name': 'Radon',
     'platform': 'airthings',
     'previous_unique_id': None,
     'suggested_object_id': None,
     'supported_features': 0,
-    'translation_key': 'radon',
+    'translation_key': None,
     'unique_id': '2960000001_radonShortTermAvg',
-    'unit_of_measurement': 'Bq/m³',
+    'unit_of_measurement': <UnitOfRadiationConcentration.BECQUEREL_PER_CUBIC_METER: 'Bq/m³'>,
   })
 # ---
 # name: test_all_device_types[view_plus][sensor.living_room_radon-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
+      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'radon',
       <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Living Room Radon',
       <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: 'Bq/m³',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRadiationConcentration.BECQUEREL_PER_CUBIC_METER: 'Bq/m³'>,
     }),
     'context': <ANY>,
     'entity_id': 'sensor.living_room_radon',
@@ -1255,24 +1256,25 @@
         'suggested_display_precision': 0,
       }),
     }),
-    'original_device_class': None,
+    'original_device_class': <SensorDeviceClass.RADON: 'radon'>,
     'original_icon': None,
     'original_name': 'Radon',
     'platform': 'airthings',
     'previous_unique_id': None,
     'suggested_object_id': None,
     'supported_features': 0,
-    'translation_key': 'radon',
+    'translation_key': None,
     'unique_id': '2930000002_radonShortTermAvg',
-    'unit_of_measurement': 'Bq/m³',
+    'unit_of_measurement': <UnitOfRadiationConcentration.BECQUEREL_PER_CUBIC_METER: 'Bq/m³'>,
   })
 # ---
 # name: test_all_device_types[wave_plus][sensor.office_radon-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
+      <EntityStateAttribute.DEVICE_CLASS: 'device_class'>: 'radon',
       <EntityStateAttribute.FRIENDLY_NAME: 'friendly_name'>: 'Office Radon',
       <SensorEntityCapabilityAttribute.STATE_CLASS: 'state_class'>: <SensorStateClass.MEASUREMENT: 'measurement'>,
-      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: 'Bq/m³',
+      <EntityStateAttribute.UNIT_OF_MEASUREMENT: 'unit_of_measurement'>: <UnitOfRadiationConcentration.BECQUEREL_PER_CUBIC_METER: 'Bq/m³'>,
     }),
     'context': <ANY>,
     'entity_id': 'sensor.office_radon',