Remove last_reset attribute and set state class to total_increasing for Shelly energy sensors (#54800)

homeassistant/components/shelly/const.py

@@ -109,6 +109,3 @@ KELVIN_MIN_VALUE_WHITE: Final = 2700
 KELVIN_MIN_VALUE_COLOR: Final = 3000
 
 UPTIME_DEVIATION: Final = 5
-
-LAST_RESET_UPTIME: Final = "uptime"
-LAST_RESET_NEVER: Final = "never"

homeassistant/components/shelly/entity.py

@@ -179,7 +179,6 @@ class BlockAttributeDescription:
     # Callable (settings, block), return true if entity should be removed
     removal_condition: Callable[[dict, aioshelly.Block], bool] | None = None
     extra_state_attributes: Callable[[aioshelly.Block], dict | None] | None = None
-    last_reset: str | None = None
 
 
 @dataclass

homeassistant/components/shelly/sensor.py

@@ -1,12 +1,8 @@
 """Sensor for Shelly."""
 from __future__ import annotations
 
-from datetime import timedelta
-import logging
 from typing import Final, cast
 
-import aioshelly
-
 from homeassistant.components import sensor
 from homeassistant.components.sensor import SensorEntity
 from homeassistant.config_entries import ConfigEntry
@@ -24,10 +20,8 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
-from homeassistant.util import dt
 
-from . import ShellyDeviceWrapper
+from .const import SHAIR_MAX_WORK_HOURS
-from .const import LAST_RESET_NEVER, LAST_RESET_UPTIME, SHAIR_MAX_WORK_HOURS
 from .entity import (
     BlockAttributeDescription,
     RestAttributeDescription,
@@ -39,8 +33,6 @@ from .entity import (
 )
 from .utils import get_device_uptime, temperature_unit
 
-_LOGGER: Final = logging.getLogger(__name__)
-
 SENSORS: Final = {
     ("device", "battery"): BlockAttributeDescription(
         name="Battery",
@@ -119,49 +111,43 @@ SENSORS: Final = {
         unit=ENERGY_KILO_WATT_HOUR,
         value=lambda value: round(value / 60 / 1000, 2),
         device_class=sensor.DEVICE_CLASS_ENERGY,
-        state_class=sensor.STATE_CLASS_MEASUREMENT,
+        state_class=sensor.STATE_CLASS_TOTAL_INCREASING,
-        last_reset=LAST_RESET_UPTIME,
     ),
     ("emeter", "energy"): BlockAttributeDescription(
         name="Energy",
         unit=ENERGY_KILO_WATT_HOUR,
         value=lambda value: round(value / 1000, 2),
         device_class=sensor.DEVICE_CLASS_ENERGY,
-        state_class=sensor.STATE_CLASS_MEASUREMENT,
+        state_class=sensor.STATE_CLASS_TOTAL_INCREASING,
-        last_reset=LAST_RESET_NEVER,
     ),
     ("emeter", "energyReturned"): BlockAttributeDescription(
         name="Energy Returned",
         unit=ENERGY_KILO_WATT_HOUR,
         value=lambda value: round(value / 1000, 2),
         device_class=sensor.DEVICE_CLASS_ENERGY,
-        state_class=sensor.STATE_CLASS_MEASUREMENT,
+        state_class=sensor.STATE_CLASS_TOTAL_INCREASING,
-        last_reset=LAST_RESET_NEVER,
     ),
     ("light", "energy"): BlockAttributeDescription(
         name="Energy",
         unit=ENERGY_KILO_WATT_HOUR,
         value=lambda value: round(value / 60 / 1000, 2),
         device_class=sensor.DEVICE_CLASS_ENERGY,
-        state_class=sensor.STATE_CLASS_MEASUREMENT,
+        state_class=sensor.STATE_CLASS_TOTAL_INCREASING,
         default_enabled=False,
-        last_reset=LAST_RESET_UPTIME,
     ),
     ("relay", "energy"): BlockAttributeDescription(
         name="Energy",
         unit=ENERGY_KILO_WATT_HOUR,
         value=lambda value: round(value / 60 / 1000, 2),
         device_class=sensor.DEVICE_CLASS_ENERGY,
-        state_class=sensor.STATE_CLASS_MEASUREMENT,
+        state_class=sensor.STATE_CLASS_TOTAL_INCREASING,
-        last_reset=LAST_RESET_UPTIME,
     ),
     ("roller", "rollerEnergy"): BlockAttributeDescription(
         name="Energy",
         unit=ENERGY_KILO_WATT_HOUR,
         value=lambda value: round(value / 60 / 1000, 2),
         device_class=sensor.DEVICE_CLASS_ENERGY,
-        state_class=sensor.STATE_CLASS_MEASUREMENT,
+        state_class=sensor.STATE_CLASS_TOTAL_INCREASING,
-        last_reset=LAST_RESET_UPTIME,
     ),
     ("sensor", "concentration"): BlockAttributeDescription(
         name="Gas Concentration",
@@ -261,39 +247,9 @@ async def async_setup_entry(
 class ShellySensor(ShellyBlockAttributeEntity, SensorEntity):
     """Represent a shelly sensor."""
 
-    def __init__(
-        self,
-        wrapper: ShellyDeviceWrapper,
-        block: aioshelly.Block,
-        attribute: str,
-        description: BlockAttributeDescription,
-    ) -> None:
-        """Initialize sensor."""
-        super().__init__(wrapper, block, attribute, description)
-        self._last_value: float | None = None
-
-        if description.last_reset == LAST_RESET_NEVER:
-            self._attr_last_reset = dt.utc_from_timestamp(0)
-        elif description.last_reset == LAST_RESET_UPTIME:
-            self._attr_last_reset = (
-                dt.utcnow() - timedelta(seconds=wrapper.device.status["uptime"])
-            ).replace(second=0, microsecond=0)
-
     @property
     def native_value(self) -> StateType:
         """Return value of sensor."""
-        if (
-            self.description.last_reset == LAST_RESET_UPTIME
-            and self.attribute_value is not None
-        ):
-            value = cast(float, self.attribute_value)
-
-            if self._last_value and self._last_value > value:
-                self._attr_last_reset = dt.utcnow().replace(second=0, microsecond=0)
-                _LOGGER.info("Energy reset detected for entity %s", self.name)
-
-            self._last_value = value
-
         return self.attribute_value
 
     @property