Merge pull request #416 from plugwise/relay_config

Relay config

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v0.59.2
+
+- Fix set_relay_init() function, improve _handle_coordinator_update() error-handling in all platform files
+- Link to plugwise_usb [v0.47.6](https://github.com/plugwise/python-plugwise-usb/releases/tag/v0.47.6)
+- Link to plugwise_usb v0.47.5 (not released)
+- Link to plugwise_usb [v0.47.4](https://github.com/plugwise/python-plugwise-usb/releases/tag/v0.47.4)
+
 ## v0.59.1
 
 - Remove device serial_number, ZigBee MAC addresses are now shown in HA, via PR [400](https://github.com/plugwise/plugwise_usb-beta/pull/400)

custom_components/plugwise_usb/binary_sensor.py

@@ -16,6 +16,7 @@
 from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.update_coordinator import UpdateFailed
 
 from .const import NODES, STICK, UNSUB_NODE_LOADED
 from .coordinator import PlugwiseUSBConfigEntry
@@ -143,20 +144,21 @@ class PlugwiseUSBBinarySensor(PlugwiseUSBEntity, BinarySensorEntity):
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
-        data = self.coordinator.data.get(self.entity_description.node_feature, None)
-        if data is None:
+
+        if self.coordinator.data is None:
             _LOGGER.debug(
-                "No %s binary sensor data for %s",
-                self.entity_description.node_feature,
+                "No coordinator data available for %s",
                 self._node_info.mac,
             )
             return
-        if self.coordinator.data[self.entity_description.node_feature] is None:
-            _LOGGER.info(
-                "No binary sensor data for %s",
-                str(self.entity_description.node_feature),
-            )
+
+        feature = self.entity_description.node_feature
+        data = self.coordinator.data.get(feature, None)
+        if data is None or self.coordinator.data.get(feature) is None:
+            _LOGGER.debug(
+                "No %s binary sensor data for %s", feature, self._node_info.mac)
             return
+
         self._attr_is_on = getattr(
             self.coordinator.data[self.entity_description.node_feature],
             self.entity_description.api_attribute,

custom_components/plugwise_usb/coordinator.py

@@ -75,12 +75,10 @@ async def async_node_update(self) -> dict[NodeFeature, Any]:
         features = tuple(freq_features.keys())
         try:
             states = await self.node.get_state(features)
-        except StickError as err:
-            raise ConfigEntryError from err
-        except (StickTimeout, NodeTimeout) as err:
-            raise TimeoutError from err
-        except NodeError as err:
-            raise UpdateFailed from err
+        except (NodeError, NodeTimeout, StickError, StickTimeout) as err:
+            raise UpdateFailed(
+                f"Failed to refresh node {self.node.node_info.mac}: {err}"
+            ) from err
 
         if (
             not self.node.node_info.is_battery_powered

custom_components/plugwise_usb/event.py

@@ -16,6 +16,7 @@
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.update_coordinator import UpdateFailed
 
 from .const import NODES, STICK, UNSUB_NODE_LOADED
 from .coordinator import PlugwiseUSBConfigEntry, PlugwiseUSBDataUpdateCoordinator
@@ -135,14 +136,21 @@ def __init__(
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
-        data = self.coordinator.data.get(self.entity_description.node_feature, None)
-        if data is None:
+        if self.coordinator.data is None:
             _LOGGER.debug(
-                "No %s event data for %s",
-                self.entity_description.node_feature,
+                "No coordinator data available for %s",
                 self._node_info.mac,
             )
             return
+
+        feature = self.entity_description.node_feature
+        data = self.coordinator.data.get(feature, None)
+
+        if data is None or self.coordinator.data.get(feature) is None:
+            _LOGGER.debug(
+                "No %s event data for %s", feature, self._node_info.mac)
+            return
+
         # SWITCH logic
         state_value = data.state
         group_value = data.group

custom_components/plugwise_usb/manifest.json

@@ -9,6 +9,6 @@
   "iot_class": "local_polling",
   "issue_tracker": "https://github.com/plugwise/python-plugwise-usb/issues",
   "loggers": ["plugwise_usb"],
-  "requirements": ["plugwise-usb==0.47.2"],
-  "version": "0.59.1"
+  "requirements": ["plugwise-usb==0.47.6"],
+  "version": "0.59.2"
 }

custom_components/plugwise_usb/number.py

@@ -22,6 +22,7 @@
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.update_coordinator import UpdateFailed
 
 from .const import NODES, STICK, UNSUB_NODE_LOADED
 from .coordinator import PlugwiseUSBConfigEntry, PlugwiseUSBDataUpdateCoordinator
@@ -240,14 +241,20 @@ def __init__(
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
-        data = self.coordinator.data.get(self.entity_description.node_feature, None)
-        if data is None:
+        if self.coordinator.data is None:
             _LOGGER.debug(
-                "No %s number data for %s",
-                self.entity_description.node_feature,
+                "No coordinator data available for %s",
                 self._node_info.mac,
             )
             return
+
+        feature = self.entity_description.node_feature
+        data = self.coordinator.data.get(feature, None)
+        if data is None or self.coordinator.data.get(feature) is None:
+            _LOGGER.debug(
+                "No %s numbeer data for %s", feature, self._node_info.mac)
+            return
+
         self._attr_native_value = getattr(
             self.coordinator.data[self.entity_description.node_feature],
             self.entity_description.key,

custom_components/plugwise_usb/select.py

@@ -13,6 +13,7 @@
 from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.update_coordinator import UpdateFailed
 
 from .const import NODES, STICK, UNSUB_NODE_LOADED
 from .coordinator import PlugwiseUSBConfigEntry, PlugwiseUSBDataUpdateCoordinator
@@ -113,15 +114,20 @@ def __init__(
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
-        data = self.coordinator.data.get(self.entity_description.node_feature, None)
-        if data is None:
+        if self.coordinator.data is None:
             _LOGGER.debug(
-                "No %s select data for %s",
-                str(self.entity_description.node_feature),
+                "No coordinator data available for %s",
                 self._node_info.mac,
             )
             return
 
+        feature = self.entity_description.node_feature
+        data = self.coordinator.data.get(feature, None)
+        if data is None or self.coordinator.data.get(feature) is None:
+            _LOGGER.debug(
+                "No %s select data for %s", feature, self._node_info.mac)
+            return
+
         current_option = getattr(
             data,
             self.entity_description.key,

custom_components/plugwise_usb/sensor.py

@@ -26,6 +26,7 @@
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.update_coordinator import UpdateFailed
 
 from .const import NODES, STICK, UNSUB_NODE_LOADED
 from .coordinator import PlugwiseUSBConfigEntry
@@ -220,14 +221,20 @@ class PlugwiseUSBSensorEntity(PlugwiseUSBEntity, SensorEntity):
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
-        data = self.coordinator.data.get(self.entity_description.node_feature, None)
-        if data is None:
+        if self.coordinator.data is None:
             _LOGGER.debug(
-                "No %s sensor data for %s",
-                self.entity_description.node_feature,
+                "No coordinator data available for %s",
                 self._node_info.mac,
             )
             return
+
+        feature = self.entity_description.node_feature
+        data = self.coordinator.data.get(feature, None)
+        if data is None or self.coordinator.data.get(feature) is None:
+            _LOGGER.debug(
+                "No %s sensor data for %s", feature, self._node_info.mac)
+            return
+
         self._attr_native_value = getattr(
             self.coordinator.data[self.entity_description.node_feature],
             self.entity_description.key,

custom_components/plugwise_usb/switch.py

@@ -16,6 +16,7 @@
 from homeassistant.const import EntityCategory, Platform
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.update_coordinator import UpdateFailed
 
 from .const import NODES, STICK, UNSUB_NODE_LOADED
 from .coordinator import PlugwiseUSBConfigEntry, PlugwiseUSBDataUpdateCoordinator
@@ -60,7 +61,7 @@ class PlugwiseSwitchEntityDescription(
         async_switch_fn="set_relay_init",
         entity_category=EntityCategory.CONFIG,
         node_feature=NodeFeature.RELAY_INIT,
-        api_attribute="state",
+        api_attribute="init_state",
     ),
     PlugwiseSwitchEntityDescription(
         key="daylight_mode",
@@ -174,15 +175,20 @@ def __init__(
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
-        data = self.coordinator.data.get(self.entity_description.node_feature, None)
-        if data is None:
+        if self.coordinator.data is None:
             _LOGGER.debug(
-                "No %s switch data for %s",
-                str(self.entity_description.node_feature),
+                "No coordinator data available for %s",
                 self._node_info.mac,
             )
             return
 
+        feature = self.entity_description.node_feature
+        data = self.coordinator.data.get(feature, None)
+        if data is None or self.coordinator.data.get(feature) is None:
+            _LOGGER.debug(
+                "No %s switch data for %s", feature, self._node_info.mac)
+            return
+
         self._attr_is_on = getattr(
             data,
             self.entity_description.api_attribute,

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plugwise_usb-beta"
-version = "0.59.1"
+version = "0.59.2"
 description = "Plugwise USB custom_component (BETA)"
 readme = "README.md"
 requires-python = ">=3.13"