Stop polling on weather sensors

Use async updates when coordinator updates, do not poll.
izacus · Aug 27, 2024 · b0ab220 · b0ab220
1 parent f54f234
commit b0ab220
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 23 deletions.
diff --git a/custom_components/swissweather/__init__.py b/custom_components/swissweather/__init__.py
@@ -47,7 +47,8 @@ def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
         self._post_code = config_entry.data[CONF_POST_CODE]
         self._client = MeteoClient()
         update_interval = timedelta(minutes=randrange(55, 65))
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval)
+        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval,
+                         always_update=False)
 
     async def _async_update_data(self) -> Tuple[CurrentState, WeatherForecast]:
         _LOGGER.info("Updating weather data...")

diff --git a/custom_components/swissweather/sensor.py b/custom_components/swissweather/sensor.py
@@ -22,11 +22,12 @@
     UnitOfTemperature,
     UnitOfTime,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceEntryType
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import SwissWeatherDataCoordinator
 from .const import CONF_POST_CODE, CONF_STATION_CODE, DOMAIN
@@ -75,10 +76,14 @@ async def async_setup_entry(
     entities: list[SwissWeatherSensor] = [SwissWeatherSensor(postCode, stationCode, sensorEntry, coordinator) for sensorEntry in SENSORS]
     async_add_entities(entities)
 
-class SwissWeatherSensor(SensorEntity):
+class SwissWeatherSensor(CoordinatorEntity[SwissWeatherDataCoordinator], SensorEntity):
     def __init__(self, post_code:str, station_code:str, sensor_entry:SwissWeatherSensorEntry, coordinator:SwissWeatherDataCoordinator) -> None:
-        self.entity_description = SensorEntityDescription(key=sensor_entry.key, name=sensor_entry.description, native_unit_of_measurement=sensor_entry.native_unit, device_class=sensor_entry.device_class, state_class=sensor_entry.state_class)
-        self._coordinator = coordinator
+        super().__init__(coordinator)
+        self.entity_description = SensorEntityDescription(key=sensor_entry.key,
+                                                          name=sensor_entry.description,
+                                                          native_unit_of_measurement=sensor_entry.native_unit,
+                                                          device_class=sensor_entry.device_class,
+                                                          state_class=sensor_entry.state_class)
         self._sensor_entry = sensor_entry
         if station_code is None:
             id_combo = f"{post_code}"
@@ -88,22 +93,9 @@ def __init__(self, post_code:str, station_code:str, sensor_entry:SwissWeatherSen
         self._attr_unique_id = f"{post_code}.{sensor_entry.key}"
         self._attr_device_info = DeviceInfo(entry_type=DeviceEntryType.SERVICE, name=f"MeteoSwiss at {id_combo}", identifiers={(DOMAIN, f"swissweather-{id_combo}")})
 
-    @property
-    def available(self) -> bool:
-        return self._coordinator.last_update_success
-
-    async def async_added_to_hass(self) -> None:
-        """Connect to dispatcher listening for entity data notifications."""
-        self.async_on_remove(
-            self._coordinator.async_add_listener(self.async_write_ha_state)
-        )
-
-    async def async_update(self) -> None:
-        await self._coordinator.async_request_refresh()
-
     @property
     def native_value(self) -> StateType | Decimal:
-        if self._coordinator.data is None:
+        if self.coordinator.data is None:
             return None
-        currentState = self._coordinator.data[0]
-        return self._sensor_entry.data_function(currentState)
+        currentState = self.coordinator.data[0]
+        return self._sensor_entry.data_function(currentState)
diff --git a/custom_components/swissweather/weather.py b/custom_components/swissweather/weather.py
@@ -2,7 +2,6 @@
 
 import datetime
 import logging
-from typing import Any
 
 from homeassistant.components.weather import Forecast, WeatherEntity
 from homeassistant.components.weather.const import WeatherEntityFeature
@@ -14,8 +13,8 @@
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.device_registry import DeviceEntryType
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity