consolidate sense data into single propertie

Author: dirixmjm

plugwise_usb/api.py

@@ -230,15 +230,10 @@ class EnergyStatistics:
     day_production_reset: datetime | None = None
 
 @dataclass
-class Temperature:
-    """Temperature statistics collection."""
+class SenseStatistics:
+    """Sense statistics collection."""
 
     temperature: float | None = None
-
-@dataclass
-class Humidity:
-    """Humidity statistics collection."""
-
     humidity: float | None = None
 
 class PlugwiseNode(Protocol):

plugwise_usb/nodes/node.py

@@ -25,8 +25,7 @@
     RelayConfig,
     RelayLock,
     RelayState,
-    Temperature,
-    Humidity,
+    SenseStatistics,
 )
 from ..connection import StickController
 from ..constants import SUPPRESS_INITIALIZATION_WARNINGS, TYPE_MODEL, UTF8
@@ -194,14 +193,6 @@ def features(self) -> tuple[NodeFeature, ...]:
         """Supported feature types of node."""
         return self._features
 
-    @property
-    @raise_not_loaded
-    def humidity(self) -> Humidity:
-        """Humidity state."""
-        if NodeFeature.HUMIDITY not in self._features:
-            raise FeatureError(f"Humidity state is not supported for node {self.mac}")
-        raise NotImplementedError()
-
     @property
     def is_battery_powered(self) -> bool:
         """Return if node is battery powered."""
@@ -322,12 +313,14 @@ def switch(self) -> bool:
 
     @property
     @raise_not_loaded
-    def temperature(self) -> Temperature:
-        """Temperature value."""
+    def sense(self) -> SenseStatistics:
+        """Sense statistics."""
         if NodeFeature.TEMPERATURE not in self._features:
             raise FeatureError(
                 f"Temperature state is not supported for node {self.mac}"
             )
+        if NodeFeature.HUMIDITY not in self._features:
+            raise FeatureError(f"Humidity state is not supported for node {self.mac}")
         raise NotImplementedError()
 
     # endregion

plugwise_usb/nodes/sense.py

@@ -6,7 +6,7 @@
 import logging
 from typing import Any, Final
 
-from ..api import NodeEvent, NodeFeature, Temperature, Humidity
+from ..api import NodeEvent, NodeFeature, SenseStatistics
 from ..connection import StickController
 from ..exceptions import MessageError, NodeError
 from ..messages.responses import SENSE_REPORT_ID, PlugwiseResponse, SenseReportResponse
@@ -43,8 +43,7 @@ def __init__(
         """Initialize Scan Device."""
         super().__init__(mac, address, controller, loaded_callback)
 
-        self._humidity = Humidity()
-        self._temperature = Temperature()
+        self._sense_statistics = SenseStatistics()
 
         self._sense_subscription: Callable[[], None] | None = None
 
@@ -94,26 +93,18 @@ async def unload(self) -> None:
     def _load_defaults(self) -> None:
         """Load default configuration settings."""
         super()._load_defaults()
-        self._temperature = Temperature(
-            temperature = 0.0,
+        self._sense_statistics = SenseStatistics(
+            temperature=0.0,
+            humidity=0.0,
         )
-        self._humidity = Humidity(
-            humidity = 0.0,
-        )
-# region properties
-    
-    @property
-    @raise_not_loaded
-    def temperature(self) -> Temperature:
-        """Temperature."""
-        return self._temperature
-
 
+# region properties
+ 
     @property
     @raise_not_loaded
-    def humidity(self) -> Humidity:
-        """Humidity."""
-        return self._humidity
+    def sense_statistics(self) -> SenseStatistics:
+        """Sense Statistics."""
+        return self._sense_statistics
 
 # end region
 
@@ -126,22 +117,22 @@ async def _sense_report(self, response: PlugwiseResponse) -> bool:
         report_received = False
         await self._available_update_state(True, response.timestamp)
         if response.temperature.value != 65535:
-            self._temperature.temperature = float(
+            self._sense_statistics.temperature = float(
                 SENSE_TEMPERATURE_MULTIPLIER * (response.temperature.value / 65536)
                 - SENSE_TEMPERATURE_OFFSET
             )
             await self.publish_feature_update_to_subscribers(
-                NodeFeature.TEMPERATURE, self._temperature
+                NodeFeature.TEMPERATURE, self._sense_statistics
             )
             report_received = True
 
         if response.humidity.value != 65535:
-            self._humidity.humidity = float(
+            self._sense_statistics.humidity = float(
                 SENSE_HUMIDITY_MULTIPLIER * (response.humidity.value / 65536)
                 - SENSE_HUMIDITY_OFFSET
             )
             await self.publish_feature_update_to_subscribers(
-                NodeFeature.HUMIDITY, self._humidity
+                NodeFeature.HUMIDITY, self._sense_statistics
             )
             report_received = True
 
@@ -164,9 +155,9 @@ async def get_state(self, features: tuple[NodeFeature]) -> dict[NodeFeature, Any
 
             match feature:
                 case NodeFeature.TEMPERATURE:
-                    states[NodeFeature.TEMPERATURE] = self._temperature
+                    states[NodeFeature.TEMPERATURE] = self._sense_statistics
                 case NodeFeature.HUMIDITY:
-                    states[NodeFeature.HUMIDITY] = self._humidity
+                    states[NodeFeature.HUMIDITY] = self._sense_statistics
                 case NodeFeature.PING:
                     states[NodeFeature.PING] = await self.ping_update()
                 case _: