Use a base class to keep timestamp sensor inheritance

Author: tsvi

homeassistant/components/jewish_calendar/sensor.py

@@ -17,7 +17,6 @@
 )
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from .entity import (
@@ -28,15 +27,22 @@
 
 
 @dataclass(frozen=True, kw_only=True)
-class JewishCalendarSensorDescription(SensorEntityDescription):
+class JewishCalendarBaseSensorDescription(SensorEntityDescription):
+    """Base class describing Jewish Calendar sensor entities."""
+
+    value_fn: Callable | None
+
+
+@dataclass(frozen=True, kw_only=True)
+class JewishCalendarSensorDescription(JewishCalendarBaseSensorDescription):
     """Class describing Jewish Calendar sensor entities."""
 
     value_fn: Callable[[JewishCalendarDataResults], str | int]
 
 
 @dataclass(frozen=True, kw_only=True)
-class JewishCalendarTimestampSensorDescription(SensorEntityDescription):
-    """Class describing Jewish Calendar sensor entities."""
+class JewishCalendarTimestampSensorDescription(JewishCalendarBaseSensorDescription):
+    """Class describing Jewish Calendar sensor timestamp entities."""
 
     value_fn: (
         Callable[[HDateInfo, Callable[[dt.date], Zmanim]], dt.datetime | None] | None
@@ -209,29 +215,32 @@ async def async_setup_entry(
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Jewish calendar sensors ."""
-    async_add_entities(
-        [
-            JewishCalendarSensor(config_entry, description)
-            for description in INFO_SENSORS
-        ]
-    )
-    async_add_entities(
-        [
-            JewishCalendarTimeSensor(config_entry, description)
-            for description in TIME_SENSORS
-        ]
+    sensors: list[JewishCalendarBaseSensor] = [
+        JewishCalendarSensor(config_entry, description) for description in INFO_SENSORS
+    ]
+    sensors.extend(
+        JewishCalendarTimeSensor(config_entry, description)
+        for description in TIME_SENSORS
     )
+    async_add_entities(sensors)
 
 
-class JewishCalendarSensor(JewishCalendarEntity, SensorEntity):
-    """Representation of an Jewish calendar sensor."""
+class JewishCalendarBaseSensor(JewishCalendarEntity, SensorEntity):
+    """Base class for Jewish calendar sensors."""
 
     _attr_entity_category = EntityCategory.DIAGNOSTIC
+    entity_description: JewishCalendarBaseSensorDescription
+
+
+class JewishCalendarSensor(JewishCalendarBaseSensor):
+    """Representation of an Jewish calendar sensor."""
 
     entity_description: JewishCalendarSensorDescription
 
     def __init__(
-        self, config_entry: JewishCalendarConfigEntry, description: EntityDescription
+        self,
+        config_entry: JewishCalendarConfigEntry,
+        description: SensorEntityDescription,
     ) -> None:
         """Initialize the Jewish calendar sensor."""
         super().__init__(config_entry, description)
@@ -276,12 +285,10 @@ def extra_state_attributes(self) -> dict[str, str]:
         return {}
 
 
-class JewishCalendarTimeSensor(JewishCalendarEntity, SensorEntity):
+class JewishCalendarTimeSensor(JewishCalendarBaseSensor):
     """Implement attributes for sensors returning times."""
 
-    _attr_entity_category = EntityCategory.DIAGNOSTIC
     _attr_device_class = SensorDeviceClass.TIMESTAMP
-
     entity_description: JewishCalendarTimestampSensorDescription
 
     @property
@@ -294,8 +301,3 @@ def native_value(self) -> dt.datetime | None:
         return self.entity_description.value_fn(
             self.data.results.after_tzais_date, self.make_zmanim
         )
-
-    async def async_added_to_hass(self) -> None:
-        """Call when entity is added to hass."""
-        await super().async_added_to_hass()
-        await self.async_update_data()