Fix for failing Solarlog integration in HA 2021.12 (#61602)

homeassistant/components/solarlog/const.py

@@ -4,16 +4,11 @@ from __future__ import annotations
 from dataclasses import dataclass
 
 from homeassistant.components.sensor import (
-    STATE_CLASS_MEASUREMENT,
+    SensorDeviceClass,
-    STATE_CLASS_TOTAL,
     SensorEntityDescription,
+    SensorStateClass,
 )
 from homeassistant.const import (
-    DEVICE_CLASS_ENERGY,
-    DEVICE_CLASS_POWER,
-    DEVICE_CLASS_POWER_FACTOR,
-    DEVICE_CLASS_TIMESTAMP,
-    DEVICE_CLASS_VOLTAGE,
     ELECTRIC_POTENTIAL_VOLT,
     ENERGY_KILO_WATT_HOUR,
     PERCENTAGE,
@@ -38,35 +33,35 @@ SENSOR_TYPES: tuple[SolarLogSensorEntityDescription, ...] = (
     SolarLogSensorEntityDescription(
         key="time",
         name="last update",
-        device_class=DEVICE_CLASS_TIMESTAMP,
+        device_class=SensorDeviceClass.TIMESTAMP,
     ),
     SolarLogSensorEntityDescription(
         key="power_ac",
         name="power AC",
         icon="mdi:solar-power",
         native_unit_of_measurement=POWER_WATT,
-        state_class=STATE_CLASS_MEASUREMENT,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SolarLogSensorEntityDescription(
         key="power_dc",
         name="power DC",
         icon="mdi:solar-power",
         native_unit_of_measurement=POWER_WATT,
-        state_class=STATE_CLASS_MEASUREMENT,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SolarLogSensorEntityDescription(
         key="voltage_ac",
         name="voltage AC",
         native_unit_of_measurement=ELECTRIC_POTENTIAL_VOLT,
-        device_class=DEVICE_CLASS_VOLTAGE,
+        device_class=SensorDeviceClass.VOLTAGE,
-        state_class=STATE_CLASS_MEASUREMENT,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SolarLogSensorEntityDescription(
         key="voltage_dc",
         name="voltage DC",
         native_unit_of_measurement=ELECTRIC_POTENTIAL_VOLT,
-        device_class=DEVICE_CLASS_VOLTAGE,
+        device_class=SensorDeviceClass.VOLTAGE,
-        state_class=STATE_CLASS_MEASUREMENT,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SolarLogSensorEntityDescription(
         key="yield_day",
@@ -101,50 +96,50 @@ SENSOR_TYPES: tuple[SolarLogSensorEntityDescription, ...] = (
         name="yield total",
         icon="mdi:solar-power",
         native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
-        state_class=STATE_CLASS_TOTAL,
+        state_class=SensorStateClass.TOTAL,
         factor=0.001,
     ),
     SolarLogSensorEntityDescription(
         key="consumption_ac",
         name="consumption AC",
         native_unit_of_measurement=POWER_WATT,
-        device_class=DEVICE_CLASS_POWER,
+        device_class=SensorDeviceClass.POWER,
-        state_class=STATE_CLASS_MEASUREMENT,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SolarLogSensorEntityDescription(
         key="consumption_day",
         name="consumption day",
         native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
-        device_class=DEVICE_CLASS_ENERGY,
+        device_class=SensorDeviceClass.ENERGY,
         factor=0.001,
     ),
     SolarLogSensorEntityDescription(
         key="consumption_yesterday",
         name="consumption yesterday",
         native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
-        device_class=DEVICE_CLASS_ENERGY,
+        device_class=SensorDeviceClass.ENERGY,
         factor=0.001,
     ),
     SolarLogSensorEntityDescription(
         key="consumption_month",
         name="consumption month",
         native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
-        device_class=DEVICE_CLASS_ENERGY,
+        device_class=SensorDeviceClass.ENERGY,
         factor=0.001,
     ),
     SolarLogSensorEntityDescription(
         key="consumption_year",
         name="consumption year",
         native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
-        device_class=DEVICE_CLASS_ENERGY,
+        device_class=SensorDeviceClass.ENERGY,
         factor=0.001,
     ),
     SolarLogSensorEntityDescription(
         key="consumption_total",
         name="consumption total",
         native_unit_of_measurement=ENERGY_KILO_WATT_HOUR,
-        device_class=DEVICE_CLASS_ENERGY,
+        device_class=SensorDeviceClass.ENERGY,
-        state_class=STATE_CLASS_TOTAL,
+        state_class=SensorStateClass.TOTAL,
         factor=0.001,
     ),
     SolarLogSensorEntityDescription(
@@ -152,31 +147,31 @@ SENSOR_TYPES: tuple[SolarLogSensorEntityDescription, ...] = (
         name="installed peak power",
         icon="mdi:solar-power",
         native_unit_of_measurement=POWER_WATT,
-        device_class=DEVICE_CLASS_POWER,
+        device_class=SensorDeviceClass.POWER,
     ),
     SolarLogSensorEntityDescription(
         key="alternator_loss",
         name="alternator loss",
         icon="mdi:solar-power",
         native_unit_of_measurement=POWER_WATT,
-        device_class=DEVICE_CLASS_POWER,
+        device_class=SensorDeviceClass.POWER,
-        state_class=STATE_CLASS_MEASUREMENT,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SolarLogSensorEntityDescription(
         key="capacity",
         name="capacity",
         icon="mdi:solar-power",
         native_unit_of_measurement=PERCENTAGE,
-        device_class=DEVICE_CLASS_POWER_FACTOR,
+        device_class=SensorDeviceClass.POWER_FACTOR,
-        state_class=STATE_CLASS_MEASUREMENT,
+        state_class=SensorStateClass.MEASUREMENT,
         factor=100,
     ),
     SolarLogSensorEntityDescription(
         key="efficiency",
         name="efficiency",
         native_unit_of_measurement=PERCENTAGE,
-        device_class=DEVICE_CLASS_POWER_FACTOR,
+        device_class=SensorDeviceClass.POWER_FACTOR,
-        state_class=STATE_CLASS_MEASUREMENT,
+        state_class=SensorStateClass.MEASUREMENT,
         factor=100,
     ),
     SolarLogSensorEntityDescription(
@@ -184,15 +179,15 @@ SENSOR_TYPES: tuple[SolarLogSensorEntityDescription, ...] = (
         name="power available",
         icon="mdi:solar-power",
         native_unit_of_measurement=POWER_WATT,
-        device_class=DEVICE_CLASS_POWER,
+        device_class=SensorDeviceClass.POWER,
-        state_class=STATE_CLASS_MEASUREMENT,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SolarLogSensorEntityDescription(
         key="usage",
         name="usage",
         native_unit_of_measurement=PERCENTAGE,
-        device_class=DEVICE_CLASS_POWER_FACTOR,
+        device_class=SensorDeviceClass.POWER_FACTOR,
-        state_class=STATE_CLASS_MEASUREMENT,
+        state_class=SensorStateClass.MEASUREMENT,
         factor=100,
     ),
 )

homeassistant/components/solarlog/sensor.py

@@ -1,7 +1,8 @@
 """Platform for solarlog sensors."""
 from homeassistant.components.sensor import SensorEntity
 from homeassistant.helpers import update_coordinator
-from homeassistant.helpers.entity import DeviceInfo, StateType
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.util.dt import as_local
 
 from . import SolarlogData
 from .const import DOMAIN, SENSOR_TYPES, SolarLogSensorEntityDescription
@@ -38,11 +39,16 @@ class SolarlogSensor(update_coordinator.CoordinatorEntity, SensorEntity):
         )
 
     @property
-    def native_value(self) -> StateType:
+    def native_value(self):
         """Return the native sensor value."""
-        result = getattr(self.coordinator.data, self.entity_description.key)
+        if self.entity_description.key == "time":
-        if self.entity_description.factor:
+            state = as_local(
-            state = round(result * self.entity_description.factor, 3)
+                getattr(self.coordinator.data, self.entity_description.key)
+            )
         else:
-            state = result
+            result = getattr(self.coordinator.data, self.entity_description.key)
+            if self.entity_description.factor:
+                state = round(result * self.entity_description.factor, 3)
+            else:
+                state = result
         return state