handle missing data

Author: dwradcliffe

custom_components/waterguru/sensor.py

@@ -287,4 +287,6 @@ def native_value(self) -> StateType:
         """Return the value reported by the sensor."""
 
         strTs = self.coordinator.data[self._id].last_measurement_time
+        if strTs is None:
+            return None
         return dt_util.parse_datetime(strTs)

custom_components/waterguru/waterguru.py

@@ -8,6 +8,8 @@
 from warrant import Cognito
 from warrant.aws_srp import AWSSRP
 
+from .waterguru_device import WaterGuruDevice
+
 _LOGGER = logging.getLogger(__name__)
 
 class WaterGuruApiError(Exception):
@@ -75,89 +77,3 @@ def get(self):
 
         data = response.json()
         return {waterBodyData['waterBodyId']: WaterGuruDevice(waterBodyData) for waterBodyData in data['waterBodies']}
-
-
-
-class WaterGuruDevice:
-    """Representation of a WaterGuru device."""
-
-    def __init__(self, waterBodyData):
-        """Initialize the device."""
-        self._data = waterBodyData
-        self._sensors = dict[str, str]
-        self._standard_sensors = {
-            'temp': self._data['waterTemp'],
-            'rssi': self._data['pods'][0]['rssiInfo']['rssi'],
-        }
-        for r in self._data['pods'][0]['refillables']:
-            if r['type'] == 'BATT':
-                self._standard_sensors['battery'] = r['pctLeft']
-            if r['type'] == 'LAB':
-                self._standard_sensors['cassette'] = r['pctLeft']
-                if 'timeLeftText' in r:
-                    number = int(r['timeLeftText'].split()[0])
-                    if "weeks" in r['timeLeftText']:
-                        number = number * 7
-                    elif "months" in r['timeLeftText']:
-                        number = number * 30
-                    self._standard_sensors['cassette_days_remaining'] = number
-        self._measurements = {measurement['type']: measurement for measurement in self._data['measurements']}
-
-    @property
-    def device_id(self):
-        """Return the device ID."""
-        return self._data['waterBodyId']
-
-    @property
-    def name(self):
-        """Return the name of the device."""
-        return f"WaterGuru {self._data['name']}"
-
-    @property
-    def product_name(self):
-        """Return the product name of the device."""
-        return self._data['pods'][0]['pod']['product']
-
-    @property
-    def serial_number(self):
-        """Return the serial number of the device."""
-        return self._data['pods'][0]['pod']['podId']
-
-    @property
-    def firmware_version(self):
-        """Return the firmware version of the device."""
-        return self._data['pods'][0]['pod']['fwUpdateVersion']
-
-    @property
-    def sensors(self):
-        """Return the sensors of the device."""
-        return self._standard_sensors
-
-    @property
-    def measurements(self):
-        """Return the measurements of the device."""
-        return self._measurements
-
-    @property
-    def status(self):
-        """Return the status of the device."""
-        return self._data['status']
-
-    @property
-    def last_measurement_time(self):
-        """Return the last measurement time."""
-        return self._data['latestMeasureTime']
-
-    @property
-    def diagnostics(self):
-        """Return the diagnostics of the device."""
-        return {
-            "name": self.name,
-            "product_name": self.product_name,
-            "firmware_version": self.firmware_version,
-            "status": self.status,
-            "last_measurement_time": self.last_measurement_time,
-            "standard_sensors": self.sensors,
-            "measurements": self.measurements,
-            "raw_data": self._data
-        }

custom_components/waterguru/waterguru_device.py

@@ -0,0 +1,83 @@
+class WaterGuruDevice:
+    """Representation of a WaterGuru device."""
+
+    def __init__(self, waterBodyData):
+        """Initialize the device."""
+        self._data = waterBodyData
+        self._sensors = dict[str, str]
+        self._standard_sensors = {
+            'temp': self._data.get('waterTemp', None),
+            'rssi': self._data['pods'][0].get('rssiInfo', {}).get('rssi', None),
+        }
+        for r in self._data['pods'][0].get('refillables', []):
+            if r['type'] == 'BATT':
+                self._standard_sensors['battery'] = r['pctLeft']
+            if r['type'] == 'LAB':
+                self._standard_sensors['cassette'] = r['pctLeft']
+                if 'timeLeftText' in r:
+                    number = int(r['timeLeftText'].split()[0])
+                    if "weeks" in r['timeLeftText']:
+                        number = number * 7
+                    elif "months" in r['timeLeftText']:
+                        number = number * 30
+                    self._standard_sensors['cassette_days_remaining'] = number
+        self._measurements = {measurement['type']: measurement for measurement in self._data.get('measurements', [])}
+
+    @property
+    def device_id(self):
+        """Return the device ID."""
+        return self._data['waterBodyId']
+
+    @property
+    def name(self):
+        """Return the name of the device."""
+        return f"WaterGuru {self._data['name']}"
+
+    @property
+    def product_name(self):
+        """Return the product name of the device."""
+        return self._data['pods'][0]['pod']['product']
+
+    @property
+    def serial_number(self):
+        """Return the serial number of the device."""
+        return str(self._data['pods'][0]['pod']['podId'])
+
+    @property
+    def firmware_version(self):
+        """Return the firmware version of the device."""
+        return self._data['pods'][0]['pod'].get('fwUpdateVersion', None)
+
+    @property
+    def sensors(self):
+        """Return the sensors of the device."""
+        return self._standard_sensors
+
+    @property
+    def measurements(self):
+        """Return the measurements of the device."""
+        return self._measurements
+
+    @property
+    def status(self):
+        """Return the status of the device."""
+        return self._data['status']
+
+    @property
+    def last_measurement_time(self):
+        """Return the last measurement time."""
+        return self._data.get('latestMeasureTime', None)
+
+    @property
+    def diagnostics(self):
+        """Return the diagnostics of the device."""
+        return {
+            "name": self.name,
+            "product_name": self.product_name,
+            "firmware_version": self.firmware_version,
+            "status": self.status,
+            "last_measurement_time": self.last_measurement_time,
+            "standard_sensors": self.sensors,
+            "measurements": self.measurements,
+            "raw_data": self._data
+        }