WIP

Author: andrew-codechimp

custom_components/battery_notes/coordinator.py

@@ -9,8 +9,8 @@
 
 from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSOR_DOMAIN
 from homeassistant.components.binary_sensor import BinarySensorDeviceClass
-from homeassistant.components.sensor.const import DOMAIN as SENSOR_DOMAIN
-from homeassistant.components.sensor.const import SensorDeviceClass
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+from homeassistant.components.sensor import SensorDeviceClass
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_DEVICE_ID,
@@ -187,8 +187,9 @@ def __init__(
                 last_replaced,
             )
 
-            if last_replaced:
-                self.last_replaced = datetime.fromisoformat(last_replaced)
+            self.last_replaced = (
+                datetime.fromisoformat(last_replaced) if last_replaced else None
+            )
 
         # If there is not a last_reported set to now
         if not self.last_reported:
@@ -679,7 +680,7 @@ def battery_low(self) -> bool:
         if self.battery_low_template:
             return self.battery_low_template_state
         elif self.wrapped_battery:
-            if self.current_battery_level is not None and validate_is_float(self.current_battery_level):
+            if validate_is_float(self.current_battery_level):
                 return bool(
                     float(self.current_battery_level) < self.battery_low_threshold
                 )

custom_components/battery_notes/sensor.py

@@ -12,26 +12,20 @@
 from homeassistant.components.sensor import (
     PLATFORM_SCHEMA,
     RestoreSensor,
+    SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
+    SensorStateClass,
 )
-from homeassistant.components.sensor.const import SensorDeviceClass, SensorStateClass
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_DEVICE_ID,
     CONF_NAME,
     PERCENTAGE,
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
-    EntityCategory,
-)
-from homeassistant.core import (
-    Event,
-    EventStateReportedData,
-    HomeAssistant,
-    callback,
-    split_entity_id,
 )
+from homeassistant.core import Event, HomeAssistant, callback, split_entity_id
 from homeassistant.helpers import (
     config_validation as cv,
 )
@@ -41,13 +35,14 @@
 from homeassistant.helpers import (
     entity_registry as er,
 )
-from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.entity import DeviceInfo, EntityCategory
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.entity_registry import (
     EVENT_ENTITY_REGISTRY_UPDATED,
 )
 from homeassistant.helpers.event import (
     EventStateChangedData,
+    EventStateReportedData,
     async_track_entity_registry_updated_event,
     async_track_state_change_event,
     async_track_state_report_event,
@@ -57,7 +52,6 @@
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
 )
-from propcache.api import cached_property
 
 from .common import utcnow_no_timezone, validate_is_float
 from .const import (
@@ -247,7 +241,7 @@ async def async_setup_platform(
 
 
 class BatteryNotesBatteryPlusSensor(
-    SensorEntity, CoordinatorEntity[BatteryNotesCoordinator]
+    RestoreSensor, SensorEntity, CoordinatorEntity[BatteryNotesCoordinator]
 ):
     """Represents a battery plus type sensor."""
 
@@ -580,7 +574,7 @@ def _handle_coordinator_update(self) -> None:
 
         self.async_write_ha_state()
 
-    @cached_property
+    @property
     def extra_state_attributes(self) -> dict[str, Any] | None:
         """Return the state attributes of the battery type."""
 
@@ -610,7 +604,7 @@ def extra_state_attributes(self) -> dict[str, Any] | None:
             attrs.update(self._wrapped_attributes)
         return attrs
 
-    @cached_property
+    @property
     def native_value(self) -> StateType | Any | datetime:
         """Return the value reported by the sensor."""
         return self._attr_native_value