Merge pull request #142 from tijsverkoyen/fixing-numbers

Fixing numbers

custom_components/fusion_solar/fusion_solar/energy_sensor.py

@@ -10,14 +10,6 @@
 _LOGGER = logging.getLogger(__name__)
 
 
-def isfloat(num) -> bool:
-    try:
-        float(num)
-        return True
-    except ValueError:
-        return False
-
-
 class FusionSolarEnergySensor(CoordinatorEntity, SensorEntity):
     """Base class for all FusionSolarEnergySensor sensors."""
 
@@ -52,31 +44,29 @@ def name(self) -> str:
 
     @property
     def native_value(self) -> float:
-        # It seems like Huawei Fusion Solar returns some invalid data for the lifetime energy just before midnight
-        # Therefore we validate if the new value is higher than the current value
+        # It seems like Huawei Fusion Solar returns some invalid data for the cumulativeEnergy just before midnight.
+        # So we update the value only if the system is producing power at the moment.
         if ATTR_TOTAL_LIFETIME_ENERGY == self._attribute:
             # Grab the current data
             entity = self.hass.states.get(self.entity_id)
-
             if entity is not None:
-                current_value = entity.state
-                if current_value == 'unavailable':
-                    _LOGGER.info(f'{self.entity_id}: not available.')
+                try:
+                    current_value = float(entity.state)
+                except ValueError:
+                    _LOGGER.info(f'{self.entity_id}: not available, so no update to prevent issues.')
                     return
 
-                realtime_power = self.coordinator.data[self._data_name][ATTR_REALTIME_POWER]
-                if math.isclose(float(realtime_power), 0, abs_tol = 0.001):
-                    _LOGGER.info(f'{self.entity_id}: not producing any power, so no energy update to prevent glitches.')
-                    return float(current_value)
-
-        if self._data_name not in self.coordinator.data:
-            return None
+                # Return the current value if the system is not producing
+                if not self.is_producing_at_the_moment():
+                    _LOGGER.info(f'{self.entity_id}: not producing any power, so no update to prevent glitches.')
+                    return current_value
 
-        if self._attribute not in self.coordinator.data[self._data_name]:
+        try:
+            return self.get_float_value_from_coordinator(self._attribute)
+        except FusionSolarEnergySensorException as e:
+            _LOGGER.error(e)
             return None
 
-        return float(self.coordinator.data[self._data_name][self._attribute])
-
     @property
     def native_unit_of_measurement(self) -> str:
         return UnitOfEnergy.KILO_WATT_HOUR
@@ -89,6 +79,33 @@ def state_class(self) -> str:
     def device_info(self) -> dict:
         return self._device_info
 
+    def is_producing_at_the_moment(self) -> bool:
+        try:
+            realtime_power = self.get_float_value_from_coordinator(ATTR_REALTIME_POWER)
+            return not math.isclose(realtime_power, 0, abs_tol=0.001)
+        except FusionSolarEnergySensorException as e:
+            _LOGGER.info(e)
+            return False
+
+    def get_float_value_from_coordinator(self, attribute_name: str) -> float:
+        if self.coordinator.data is False:
+            raise FusionSolarEnergySensorException('Coordinator data is False')
+        if self._data_name not in self.coordinator.data:
+            raise FusionSolarEnergySensorException(f'Attribute {self._data_name} not in coordinator data')
+        if self._attribute not in self.coordinator.data[self._data_name]:
+            raise FusionSolarEnergySensorException(f'Attribute {attribute_name} not in coordinator data')
+
+        if self.coordinator.data[self._data_name][attribute_name] is None:
+            raise FusionSolarEnergySensorException(f'Attribute {attribute_name} has value None')
+        elif self.coordinator.data[self._data_name][attribute_name] == 'N/A':
+            raise FusionSolarEnergySensorException(f'Attribute {attribute_name} has value N/A')
+
+        try:
+            return float(self.coordinator.data[self._data_name][attribute_name])
+        except ValueError:
+            raise FusionSolarEnergySensorException(
+                f'Attribute {self._attribute} has value {self.coordinator.data[self._data_name][attribute_name]} which is not a float')
+
 
 class FusionSolarEnergySensorTotalCurrentDay(FusionSolarEnergySensor):
     pass
@@ -104,3 +121,7 @@ class FusionSolarEnergySensorTotalCurrentYear(FusionSolarEnergySensor):
 
 class FusionSolarEnergySensorTotalLifetime(FusionSolarEnergySensor):
     pass
+
+
+class FusionSolarEnergySensorException(Exception):
+    pass