Merge pull request #9 from StephanU/bugfix/reading_energy_named_fields

Fixed faulty values for total energy metrics.

Author: StephanU

custom_components/talent_monitor/entity.py

@@ -22,7 +22,7 @@ def __init__(
         self, coordinator, entity: Entity, entity_suffix: str = ""
     ):
         """Initialize a TalentMonitor entity."""
-        super().__init__(coordinator)
+        CoordinatorEntity.__init__(self,coordinator)
 
         device_id = f"{entity.entity_id}"
         device_name = entity.name

custom_components/talent_monitor/pyTalentMonitor/data_provider.py

@@ -70,6 +70,17 @@ def __init__(self, entity_id: str, name: str) -> None:
         """Initialize the entity."""
         self.entity_id = entity_id
         self.name = name
+        self._data = {}
+
+    @property
+    def data(self):
+        """Return the data of the entity."""
+        return self._data
+
+    @data.setter
+    def data(self, data):
+        """Set the data of the entity."""
+        self._data = data
 
 class AuthenticationError(Exception):
     """AuthenticationError when connecting to the Talent API."""

custom_components/talent_monitor/pyTalentMonitor/inverter.py

@@ -16,17 +16,6 @@ def __init__(
     ) -> None:
         """Initialize the inverter."""
         super().__init__(entity_id, name)
-        self._data = {}
-
-    @property
-    def data(self):
-        """Return the data of the inverter."""
-        return self._data
-
-    @data.setter
-    def data(self, data):
-        """Set the data of the inverter."""
-        self._data = data
 
 
 class InverterDataProvider:

custom_components/talent_monitor/pyTalentMonitor/power_station.py

@@ -18,17 +18,6 @@ def __init__(
     ) -> None:
         """Initialize the power station."""
         super().__init__(entity_id, name)
-        self._data = {}
-
-    @property
-    def data(self):
-        """Return the data of the power station."""
-        return self._data
-
-    @data.setter
-    def data(self, data):
-        """Set the data of the power station."""
-        self._data = data
 
 
 class PowerStationDataProvider:
@@ -70,9 +59,6 @@ async def fetch_data(self):
                         endpoint=f"system/station/getPowerStationByGuid?powerStationGuid={powerStationGuid}&timezone={TIMEZONE}"
                     )
 
-                    #dummy_data = json.loads('{"yearBattDischargeEnergy": 0.0, "yearLoadEnergyNamed": "0.00 Wh","enableFitInApp": false,"monthEnergy": 44590.0,"yearBattChargeEnergy": 0.0,"totalEnergy": 301180.0,"peakHour": 0.14634146341463414,"stationType": "1","totalActivePower": 94.4,"gridSidePower": 0.0,"lastDataUpdateTime": "2024-05-26T06:52:41","statusNamed": "Online","yearEnergyNamed": "118.06 kWh","stationTypeNamed": "Household use","yearBattChargeEnergyNamed": "0.00 Wh","timezoneOffset": "+02:00","gridSidePowerNamed": "0.00 W","layoutMeta": "{}","locationLongitude": "[redacted]","dayEnergyNamed": "120.00 Wh","totalPeakPower": 94.4,"totalPeakPowerNamed": "94.40 W","dayEnergy": 120.0,"monthBattChargeEnergyNamed": "0.00 Wh","images": [],"deptId": 101,"timeZone": "Europe/Berlin","yearGridsellEnergyNamed": "0.00 Wh","monthBattDischargeEnergy": 0.0,"monthLoadEnergy": 0.0,"yearEnergy": 118060.0,"yearBattDischargeEnergyNamed": "0.00 Wh","monthLoadEnergyNamed": "0.00 Wh","electricityGain": 0.0,"deptCode": "[redacted]","yearGridbuyEnergyNamed": "0.00 Wh","status": "ready","isFavorite": 0,"totalActivePowerNamed": "94.40 W","monthBattChargeEnergy": 0.0,"gridConnectedType": "1","monthGridbuyEnergyNamed": "0.00 Wh","co2Reduced": "300.28 KG","yearGridsellEnergy": 0.0,"treesPlanted": "0.82","buildDate": "2023-06-17","monthGridsellEnergy": 0.0,"yearLoadEnergy": 0.0,"monthEnergyNamed": "44.59 kWh","installedCapacity": 820.0,"lightingHours": "23.19K","gridConnectedTypeNamed": "Full access to the Internet","powerStationId": "[redacted]","stationName": "priwatt priWall duo","monthGridbuyEnergy": 0.0,"currency": "EUR","monthGridsellEnergyNamed": "0.00 Wh","powerStationGuid": "[redacted]","owner": "User [redacted]","monthBattDischargeEnergyNamed": "0.00 Wh","locationLatitude": "[redacted]","battSidePowerNamed": "0.00 W","userId": "[redacted]","ownerEmail": "[redacted]","totalEnergyNamed": "301.18 kWh","earnings": "0.00","lastDataUpdateTimeOffseted": "2024-05-26T08:52:41","ownerUserId": "[redacted]","installedCapacityNamed": "820.00 Wp","guests": [],"location": "[redacted]","yearGridbuyEnergy": 0.0,"businessType": "1","battSidePower": 0.0}')
-                    #power_station_info["data"] = dummy_data
-
                     _LOGGER.debug("Details for powerstation GUID %s: %s", powerStationGuid, json.dumps(power_station_info))
                     if power_station_info and "data" in power_station_info:
                         power_station.data = power_station_info["data"]

custom_components/talent_monitor/sensor.py

@@ -2,6 +2,7 @@
 from datetime import datetime
 import logging
 from custom_components.talent_monitor.entity import TalentMonitorEntity, TalentMonitorInverterEntity
+from custom_components.talent_monitor.pyTalentMonitor.data_provider import Entity
 from custom_components.talent_monitor.pyTalentMonitor.inverter import Inverter
 from custom_components.talent_monitor.pyTalentMonitor.power_station import PowerStation
 from homeassistant.components.sensor import SensorDeviceClass
@@ -104,48 +105,70 @@ async def async_setup_entry(hass, entry, async_add_devices):
                     ]
                 )
 
-class TalentMonitorPowerStationSensor(TalentMonitorEntity, SensorEntity):
-    """TalentMonitor PowerStation Sensor class."""
+
+class TalentMonitorSensor(SensorEntity):
+    """TalentMonitor Sensor class."""
 
     def __init__(
         self,
-        coordinator,
-        power_station: PowerStation,
-        sensorEntityDescription: SensorEntityDescription,
+        entity: Entity,
     ):
-        """Initialize a TalentMonitor PowerStation sensor."""
-        super().__init__(
-            coordinator,
-            power_station,
-            sensorEntityDescription.key
-        )
-
-        self._power_station = power_station
-        self.entity_description = sensorEntityDescription
+        """Initialize a TalentMonitor sensor."""
+        self._entity = entity
 
     @property
     def native_value(self):
         """Return the state of the sensor."""
         if (self.entity_description.key == "lastDataUpdateTime"):
-            return datetime.fromisoformat(self._power_station.data[self.entity_description.key])
+            return datetime.fromisoformat(self._entity.data[self.entity_description.key])
         else:
-            return self._power_station.data[self.entity_description.key]
+            key_for_value_with_unit = self.entity_description.key + "Named"
+
+            if (key_for_value_with_unit in self._entity.data and self._entity.data[key_for_value_with_unit]):
+                value_split = self._entity.data[key_for_value_with_unit].split(" ")
+
+                if (value_split and len(value_split) == 2):
+                    value = value_split[0]
+                    return value
+                else:
+                    return self._entity.data[self.entity_description.key]
+            else:
+                return self._entity.data[self.entity_description.key]
 
     @property
     def native_unit_of_measurement(self) -> str | None:
         """Return the unit of measurement."""
         key_for_value_with_unit = self.entity_description.key + "Named"
 
-        if (key_for_value_with_unit in self._power_station.data and self._power_station.data[key_for_value_with_unit]):
-            value_split = self._power_station.data[key_for_value_with_unit].split(" ")
+        if (key_for_value_with_unit in self._entity.data and self._entity.data[key_for_value_with_unit]):
+            value_split = self._entity.data[key_for_value_with_unit].split(" ")
             if (value_split and len(value_split) == 2):
                 unit = value_split[1]
                 return SENSOR_UNIT_MAPPING[unit]
 
         return None
 
+class TalentMonitorPowerStationSensor(TalentMonitorEntity, TalentMonitorSensor):
+    """TalentMonitor PowerStation Sensor class."""
 
-class TalentMonitorInverterSensor(TalentMonitorInverterEntity, SensorEntity):
+    def __init__(
+        self,
+        coordinator,
+        power_station: PowerStation,
+        sensorEntityDescription: SensorEntityDescription,
+    ):
+        """Initialize a TalentMonitor PowerStation sensor."""
+        TalentMonitorEntity.__init__(self,
+            coordinator,
+            power_station,
+            sensorEntityDescription.key
+        )
+        TalentMonitorSensor.__init__(self,power_station)
+
+        self.entity_description = sensorEntityDescription
+
+
+class TalentMonitorInverterSensor(TalentMonitorInverterEntity, TalentMonitorSensor):
     """TalentMonitor Inverter Sensor class."""
 
     def __init__(
@@ -155,36 +178,13 @@ def __init__(
         sensorEntityDescription: SensorEntityDescription,
     ):
         """Initialize a TalentMonitor Inverter sensor."""
-        super().__init__(
+        TalentMonitorInverterEntity.__init__(self,
             coordinator,
             inverter,
             sensorEntityDescription.key
         )
+        TalentMonitorSensor.__init__(self, inverter)
 
-        self._inverter = inverter
         self.entity_description = sensorEntityDescription
 
-    @property
-    def native_value(self):
-        """Return the state of the sensor."""
-        if (self.entity_description.key == "lastDataUpdateTime"):
-            return datetime.fromisoformat(self._inverter.data[self.entity_description.key])
-        else:
-            return self._inverter.data[self.entity_description.key]
-
-    @property
-    def native_unit_of_measurement(self) -> str | None:
-        """Return the unit of measurement."""
-        _LOGGER.debug('native_unit_of_measurement for %s', self.entity_description.key)
-        key_for_value_with_unit = self.entity_description.key + "Named"
-
-        if (key_for_value_with_unit in self._inverter.data and self._inverter.data[key_for_value_with_unit]):
-            value_split = self._inverter.data[key_for_value_with_unit].split(" ")
-
-            _LOGGER.debug('native_unit_of_measurement for %s', self._inverter.data[key_for_value_with_unit])
-            if (value_split and len(value_split) == 2):
-                unit = value_split[1]
-                return SENSOR_UNIT_MAPPING[unit]
-
-        return None