Refine RoomControl enrichment handling

lackas · lackas · commit 1f03875efa9d · 2026-04-16T18:37:24.000+02:00
diff --git a/PyViCare/PyViCare.py b/PyViCare/PyViCare.py
@@ -8,7 +8,7 @@
 from PyViCare.PyViCareOAuthManager import ViCareOAuthManager
 from PyViCare.PyViCareRoomControl import RoomControl
 from PyViCare.PyViCareService import ViCareDeviceAccessor, ViCareService
-from PyViCare.PyViCareUtils import PyViCareInvalidDataError
+from PyViCare.PyViCareUtils import PyViCareInvalidDataError, PyViCareNotSupportedFeatureError
 
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())
@@ -73,23 +73,26 @@ def __enrichZigbeeDevices(self):
         mapping by cross-referencing RoomControl actors with Zigbee
         device IDs.
         """
+        devices_by_id = {device_config.device_id: device_config for device_config in self.devices}
+
         for device_config in self.devices:
             if device_config.device_type != "roomControl":
                 continue
 
             room_control = RoomControl(device_config.service)
             try:
                 actor_map = room_control.buildActorRoomMap()
-            except Exception:
-                logger.debug("Could not build actor map for %s", device_config.getModel())
+            except (KeyError, IndexError, PyViCareNotSupportedFeatureError):
+                logger.debug("Could not build actor map for %s", device_config.getModel(), exc_info=True)
                 continue
 
-            for zigbee_config in self.devices:
-                if zigbee_config.device_id in actor_map:
-                    room_id = actor_map[zigbee_config.device_id]
-                    zigbee_config.setRoomControlEnrichment(room_control, room_id)
-                    logger.info("Enriched %s with room %s data from %s",
-                                zigbee_config.device_id, room_id, device_config.getModel())
+            for device_id, room_id in actor_map.items():
+                zigbee_config = devices_by_id.get(device_id)
+                if zigbee_config is None:
+                    continue
+                zigbee_config.setRoomControlEnrichment(room_control, room_id)
+                logger.info("Enriched %s with room %s data from %s",
+                            zigbee_config.device_id, room_id, device_config.getModel())
 
 
 class DictWrap(object):
diff --git a/PyViCare/PyViCareRoomControl.py b/PyViCare/PyViCareRoomControl.py
@@ -1,5 +1,4 @@
 import logging
-from typing import Any
 
 from PyViCare.PyViCareDevice import Device
 from PyViCare.PyViCareUtils import PyViCareNotSupportedFeatureError, handleNotSupported, handleAPICommandErrors
diff --git a/PyViCare/PyViCareRoomSensor.py b/PyViCare/PyViCareRoomSensor.py
@@ -14,6 +14,11 @@ def setRoomControl(self, room_control, room_id):
         self._room_control = room_control
         self._room_id = room_id
 
+    def _getRoomControl(self):
+        if self._room_control is None:
+            raise KeyError("roomControl")
+        return self._room_control
+
     @handleNotSupported
     def getSerial(self):
         return self.getProperty("device.sensors.temperature")["deviceId"]
@@ -34,99 +39,72 @@ def getHumidity(self):
 
     @handleNotSupported
     def getCO2(self):
-        if self._room_control is not None:
-            return self._room_control.getRoomCO2(self._room_id)
-        return None
+        return self._getRoomControl().getRoomCO2(self._room_id)
 
     @handleNotSupported
     def getRoomName(self):
-        if self._room_control is not None:
-            return self._room_control.getRoomName(self._room_id)
-        return None
+        return self._getRoomControl().getRoomName(self._room_id)
 
     @handleNotSupported
     def getRoomType(self):
-        if self._room_control is not None:
-            return self._room_control.getRoomType(self._room_id)
-        return None
+        return self._getRoomControl().getRoomType(self._room_id)
 
     @handleNotSupported
     def getCondensationRisk(self):
-        if self._room_control is not None:
-            return self._room_control.getRoomCondensationRisk(self._room_id)
-        return None
+        return self._getRoomControl().getRoomCondensationRisk(self._room_id)
 
     # --- Operating state ---
 
     @handleNotSupported
     def getOperatingStateLevel(self):
-        if self._room_control is not None:
-            return self._room_control.getRoomOperatingStateLevel(self._room_id)
-        return None
+        return self._getRoomControl().getRoomOperatingStateLevel(self._room_id)
 
     @handleNotSupported
     def getOperatingStateDemand(self):
-        if self._room_control is not None:
-            return self._room_control.getRoomOperatingStateDemand(self._room_id)
-        return None
+        return self._getRoomControl().getRoomOperatingStateDemand(self._room_id)
 
     # --- Heating programs ---
 
     @handleNotSupported
     def getNormalHeatingTemperature(self):
-        if self._room_control is not None:
-            return self._room_control.getRoomNormalHeatingTemperature(self._room_id)
-        return None
+        return self._getRoomControl().getRoomNormalHeatingTemperature(self._room_id)
 
     @handleAPICommandErrors
     def setNormalHeatingTemperature(self, temperature):
-        if self._room_control is not None:
-            return self._room_control.setRoomNormalHeatingTemperature(self._room_id, temperature)
+        return self._getRoomControl().setRoomNormalHeatingTemperature(self._room_id, temperature)
 
     @handleNotSupported
     def getReducedHeatingTemperature(self):
-        if self._room_control is not None:
-            return self._room_control.getRoomReducedHeatingTemperature(self._room_id)
-        return None
+        return self._getRoomControl().getRoomReducedHeatingTemperature(self._room_id)
 
     @handleAPICommandErrors
     def setReducedHeatingTemperature(self, temperature):
-        if self._room_control is not None:
-            return self._room_control.setRoomReducedHeatingTemperature(self._room_id, temperature)
+        return self._getRoomControl().setRoomReducedHeatingTemperature(self._room_id, temperature)
 
     @handleNotSupported
     def getComfortHeatingTemperature(self):
-        if self._room_control is not None:
-            return self._room_control.getRoomComfortHeatingTemperature(self._room_id)
-        return None
+        return self._getRoomControl().getRoomComfortHeatingTemperature(self._room_id)
 
     @handleAPICommandErrors
     def setComfortHeatingTemperature(self, temperature):
-        if self._room_control is not None:
-            return self._room_control.setRoomComfortHeatingTemperature(self._room_id, temperature)
+        return self._getRoomControl().setRoomComfortHeatingTemperature(self._room_id, temperature)
 
     # --- Quick modes ---
 
     @handleNotSupported
     def getManualTillNextScheduleActive(self):
-        if self._room_control is not None:
-            return self._room_control.getRoomManualTillNextScheduleActive(self._room_id)
-        return None
+        return self._getRoomControl().getRoomManualTillNextScheduleActive(self._room_id)
 
     @handleAPICommandErrors
     def activateManualTillNextSchedule(self, temperature):
-        if self._room_control is not None:
-            return self._room_control.activateRoomManualTillNextSchedule(self._room_id, temperature)
+        return self._getRoomControl().activateRoomManualTillNextSchedule(self._room_id, temperature)
 
     @handleAPICommandErrors
     def deactivateManualTillNextSchedule(self):
-        if self._room_control is not None:
-            return self._room_control.deactivateRoomManualTillNextSchedule(self._room_id)
+        return self._getRoomControl().deactivateRoomManualTillNextSchedule(self._room_id)
 
     # --- Schedule ---
 
     @handleNotSupported
     def getSchedule(self):
-        if self._room_control is not None:
-            return self._room_control.getRoomSchedule(self._room_id)
-        return None
+        return self._getRoomControl().getRoomSchedule(self._room_id)
diff --git a/tests/test_RoomControl.py b/tests/test_RoomControl.py
@@ -2,6 +2,11 @@
 
 from PyViCare.PyViCareRoomControl import RoomControl
 from PyViCare.PyViCareRoomSensor import RoomSensor
+from PyViCare.PyViCareUtils import (
+    PyViCareCommandError,
+    PyViCareNotSupportedFeatureError,
+    isSupported,
+)
 from tests.ViCareServiceMock import ViCareServiceMock
 
 
@@ -121,7 +126,16 @@ def test_getManualTillNextScheduleActive(self):
         result = self.sensor.getManualTillNextScheduleActive()
         self.assertIsInstance(result, bool)
 
-    def test_without_enrichment_returns_none(self):
+    def test_without_enrichment_reports_not_supported(self):
         sensor = RoomSensor(self.sensor_service)
-        self.assertIsNone(sensor.getRoomName())
-        self.assertIsNone(sensor.getNormalHeatingTemperature())
+        self.assertFalse(isSupported(sensor.getRoomName))
+        self.assertFalse(isSupported(sensor.getNormalHeatingTemperature))
+
+        with self.assertRaises(PyViCareNotSupportedFeatureError):
+            sensor.getRoomName()
+
+        with self.assertRaises(PyViCareNotSupportedFeatureError):
+            sensor.getNormalHeatingTemperature()
+
+        with self.assertRaises(PyViCareCommandError):
+            sensor.setNormalHeatingTemperature(20)

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import logging`
`2`		`-from typing import Any`
`3`	`2`
`4`	`3`	`from PyViCare.PyViCareDevice import Device`
`5`	`4`	`from PyViCare.PyViCareUtils import PyViCareNotSupportedFeatureError, handleNotSupported, handleAPICommandErrors`