feat: expose power consumption for heating, dhw and total (#667)

* Adding sensors for heating.power.consumption.dhw, heating.power.consumption.heating and heating.power.consumption.total

* Adding test response file for Vitocal252A

* Sorted Vitocal252A.json with jq, according to README

* Implementing initial tests for Vitocal252A. Copied from Vitocal250A and adjusted

* Implemented test for Power Consumption Heating

* Implemented tests for Total power consumption

* Adding test for Power consumption for Domestic Hot Water

* Align naming on tests

* Update of test for Vitocal252A, after ViCare API had Maintenance window 2025-11-18. That seems to have fixed some values

* Adding missing Properties for tests. Marked under '# heating - not yet used'

* Adding sensors to GazBoiler

* Adding another test for GazBoiler

* Fix for some GazBoilers have unit in another dict

* Added additional test for FuelCell

* Adding sensors to fuelcell

* adding extra test for Gaz boiler

* Adding additional tests

* Update PyViCare/PyViCareHeatPump.py

def getPowerConsumptionHeatingYear(self):
    def getPowerConsumptionHeatingThisYear(self):

Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com>

* Renaming getPowerConsumptionHeatingYear to getPowerConsumptionHeatingThisYear

* Fix for missing return, after implementation of fetching Unit of kilowattHour, that can be stored in either properties.day.unit or properties.unit.value

* Renamed getPowerConsumptionDomesticHotWaterYear to getPowerConsumptionDomesticHotWaterThisYear

* pylint Fix C0304: Final newline missing (missing-final-newline) in test_Vitodens200W, test_Vitodens200W_B2HF, test_Vitodens222W, test_Vitodens300W

* pylint Fix C0303: Trailing whitespace (trailing-whitespace) in test_VitovalorPT2, line 110, column 20

---------

Co-authored-by: TESC (Troels Schwarz-Linnet) <tesc@novozymes.com>
Co-authored-by: Christopher Fenner <9592452+CFenner@users.noreply.github.com>

Author: 3 people

PyViCare/PyViCareFuelCell.py

@@ -23,6 +23,7 @@ def getAvailableBurners(self):
     def getReturnTemperature(self):
         return self.getProperty("heating.sensors.temperature.return")["properties"]["value"]["value"]
 
+    # Total power consumption:
     @handleNotSupported
     def getPowerConsumptionUnit(self):
         return self.getProperty("heating.power.consumption.total")["properties"]["day"]["unit"]
@@ -59,6 +60,7 @@ def getPowerConsumptionYears(self):
     def getPowerConsumptionThisYear(self):
         return self.getProperty('heating.power.consumption.total')['properties']['year']['value'][0]
 
+    # Power consumption for Heating:
     @handleNotSupported
     def getPowerConsumptionHeatingUnit(self):
         return self.getProperty("heating.power.consumption.heating")["properties"]["day"]["unit"]
@@ -95,6 +97,24 @@ def getPowerConsumptionHeatingYears(self):
     def getPowerConsumptionHeatingThisYear(self):
         return self.getProperty('heating.power.consumption.heating')['properties']['year']['value'][0]
 
+    # Power consumption for Domestic Hot Water:
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterUnit(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["day"]["unit"]
+
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterToday(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["day"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterThisMonth(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["month"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterThisYear(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["year"]["value"][0]
+
+    # Gas consumption:
     @handleNotSupported
     def getGasConsumptionUnit(self):
         return self.getProperty("heating.gas.consumption.total")["properties"]["day"]["unit"]

PyViCare/PyViCareGazBoiler.py

@@ -103,9 +103,13 @@ def getBoilerTargetTemperature(self):
     def getDomesticHotWaterChargingLevel(self):
         return self.getProperty("heating.dhw.charging.level")["properties"]["value"]["value"]
 
+    # Total power consumption:
     @handleNotSupported
     def getPowerConsumptionUnit(self):
-        return self.getProperty("heating.power.consumption.total")["properties"]["day"]["unit"]
+        try :
+            return self.getProperty("heating.power.consumption.total")["properties"]["day"]["unit"]
+        except KeyError:
+            return self.getProperty("heating.power.consumption.total")["properties"]["unit"]["value"]
 
     @handleNotSupported
     def getPowerConsumptionDays(self):
@@ -139,6 +143,7 @@ def getPowerConsumptionYears(self):
     def getPowerConsumptionThisYear(self):
         return self.getProperty("heating.power.consumption.total")["properties"]["year"]["value"][0]
 
+    # Flow
     @handleNotSupported
     def getVolumetricFlowReturn(self):
         return self.getProperty("heating.sensors.volumetricFlow.allengra")["properties"]["value"]["value"]
@@ -204,6 +209,26 @@ def getGasSummaryConsumptionDomesticHotWaterLastYear(self):
 
     # Power consumption for Heating:
     @handleNotSupported
+    def getPowerConsumptionHeatingUnit(self):
+        try:
+            return self.getProperty("heating.power.consumption.heating")["properties"]["day"]["unit"]
+        except KeyError:
+            return self.getProperty("heating.power.consumption.heating")["properties"]["unit"]["value"]
+
+    @handleNotSupported
+    def getPowerConsumptionHeatingToday(self):
+        return self.getProperty("heating.power.consumption.heating")["properties"]["day"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionHeatingThisMonth(self):
+        return self.getProperty("heating.power.consumption.heating")["properties"]["month"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionHeatingThisYear(self):
+        return self.getProperty("heating.power.consumption.heating")["properties"]["year"]["value"][0]
+
+    # Power summary consumption for Heating:
+    @handleNotSupported
     def getPowerSummaryConsumptionHeatingUnit(self):
         return self.getProperty("heating.power.consumption.summary.heating")["properties"]["currentDay"]["unit"]
 
@@ -233,6 +258,26 @@ def getPowerSummaryConsumptionHeatingLastYear(self):
 
     # Power consumption for Domestic Hot Water:
     @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterUnit(self):
+        try:
+            return self.getProperty("heating.power.consumption.dhw")["properties"]["day"]["unit"]
+        except KeyError:
+            return self.getProperty("heating.power.consumption.dhw")["properties"]["unit"]["value"]
+
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterToday(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["day"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterThisMonth(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["month"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterThisYear(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["year"]["value"][0]
+
+    # Power summary consumption for Domestic Hot Water:
+    @handleNotSupported
     def getPowerSummaryConsumptionDomesticHotWaterUnit(self):
         return self.getProperty("heating.power.consumption.summary.dhw")["properties"]["currentDay"]["unit"]
 

PyViCare/PyViCareHeatPump.py

@@ -53,6 +53,23 @@ def getBufferTopTemperature(self):
 
     # Power consumption for Heating:
     @handleNotSupported
+    def getPowerConsumptionHeatingUnit(self):
+        return self.getProperty("heating.power.consumption.heating")["properties"]["day"]["unit"]
+
+    @handleNotSupported
+    def getPowerConsumptionHeatingToday(self):
+        return self.getProperty("heating.power.consumption.heating")["properties"]["day"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionHeatingThisMonth(self):
+        return self.getProperty("heating.power.consumption.heating")["properties"]["month"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionHeatingThisYear(self):
+        return self.getProperty("heating.power.consumption.heating")["properties"]["year"]["value"][0]
+
+    # Power summary consumption for Heating:
+    @handleNotSupported
     def getPowerSummaryConsumptionHeatingUnit(self):
         return self.getProperty("heating.power.consumption.summary.heating")["properties"]["currentDay"]["unit"]
 
@@ -97,6 +114,7 @@ def getPowerConsumptionCoolingThisMonth(self):
     def getPowerConsumptionCoolingThisYear(self):
         return self.getProperty("heating.power.consumption.cooling")["properties"]["year"]["value"][0]
 
+    # Total power consumption:
     @handleNotSupported
     def getPowerConsumptionUnit(self):
         return self.getProperty("heating.power.consumption.total")["properties"]["day"]["unit"]
@@ -105,11 +123,32 @@ def getPowerConsumptionUnit(self):
     def getPowerConsumptionToday(self):
         return self.getProperty("heating.power.consumption.total")["properties"]["day"]["value"][0]
 
+    @handleNotSupported
+    def getPowerConsumptionThisMonth(self):
+        return self.getProperty("heating.power.consumption.total")["properties"]["month"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionThisYear(self):
+        return self.getProperty("heating.power.consumption.total")["properties"]["year"]["value"][0]
+
+    # Power consumption for Domestic Hot Water:
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterUnit(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["day"]["unit"]
+
     @handleNotSupported
     def getPowerConsumptionDomesticHotWaterToday(self):
         return self.getProperty("heating.power.consumption.dhw")["properties"]["day"]["value"][0]
 
-    # Power consumption for Domestic Hot Water:
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterThisMonth(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["month"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterThisYear(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["year"]["value"][0]
+
+    # Power summary consumption for Domestic Hot Water:
     @handleNotSupported
     def getPowerSummaryConsumptionDomesticHotWaterUnit(self):
         return self.getProperty("heating.power.consumption.summary.dhw")["properties"]["currentDay"]["unit"]