Merge branch 'master' into heatingRod

.github/workflows/draft-release.yml

@@ -16,6 +16,6 @@ jobs:
       pull-requests: read
     steps:
       - name: 🚀 Run Release Drafter
-        uses: release-drafter/release-drafter@v6.0.0
+        uses: release-drafter/release-drafter@v6.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -39,7 +39,7 @@ jobs:
       - name: 🚀 Run pytest
         run: poetry run pytest --cov PyViCare
       - name: ⬆️ Upload coverage artifact
-        uses: actions/upload-artifact@v4.5.0
+        uses: actions/upload-artifact@v4.6.0
         with:
           name: coverage-${{ matrix.python }}
           path: .coverage

PyViCare/PyViCareHeatPump.py

@@ -240,6 +240,28 @@ def setDomesticHotWaterHysteresisSwitchOff(self, temperature: float) -> Any:
         """
         return self.service.setProperty("heating.dhw.temperature.hysteresis", "setHysteresisSwitchOffValue", {'hysteresis': temperature})
 
+    @handleNotSupported
+    def getSupplyPressureUnit(self) -> str:
+        # Returns heating supply pressure unit (e.g. bar)
+        return str(self.service.getProperty("heating.sensors.pressure.supply")["properties"]["value"]["unit"])
+
+    @handleNotSupported
+    def getSupplyPressure(self) -> float:
+        # Returns heating supply pressure
+        return float(self.service.getProperty("heating.sensors.pressure.supply")["properties"]["value"]["value"])
+
+    @handleNotSupported
+    def getSeasonalPerformanceFactorDHW(self) -> float:
+        return float(self.service.getProperty("heating.spf.dhw")["properties"]["value"]["value"])
+
+    @handleNotSupported
+    def getSeasonalPerformanceFactorHeating(self) -> float:
+        return float(self.service.getProperty("heating.spf.heating")["properties"]["value"]["value"])
+
+    @handleNotSupported
+    def getSeasonalPerformanceFactorTotal(self) -> float:
+        return float(self.service.getProperty("heating.spf.total")["properties"]["value"]["value"])
+
     @handleNotSupported
     def getHeatingRodStarts(self) -> int:
         return int(self.service.getProperty("heating.heatingRod.statistics")["properties"]["starts"]["value"])

pyproject.toml

@@ -52,7 +52,7 @@ mypy = "^1.11.2"
 pylint = "^3.2.6"
 pytest = "^8.3.2"
 pytest-cov = "^6.0.0"
-ruff = "^0.8.0"
+ruff = "^0.9.0"
 types-deprecated = "^1.2.15.20241117"
 types-requests = ">=2.31"
 

tests/test_TestForMissingProperties.py

@@ -42,7 +42,6 @@ def test_missingProperties(self):
             'heating.power.purchase.current',
             'heating.power.sold.cumulative',
             'heating.power.sold.current',
-            'heating.sensors.pressure.supply',
             'heating.sensors.temperature.allengra',
 
             'heating.dhw.operating.modes.active',
@@ -99,9 +98,6 @@ def test_missingProperties(self):
             'heating.scop.dhw', # deprecated
             'heating.scop.heating', # deprecated
             'heating.scop.total', # deprecated
-            'heating.spf.dhw',
-            'heating.spf.heating',
-            'heating.spf.total',
         ]
 
         all_features = self.read_all_features()

tests/test_Vitocal250A.py

@@ -194,6 +194,15 @@ def test_getDomesticHotWaterStorageTemperature(self):
         self.assertEqual(
             self.device.getDomesticHotWaterStorageTemperature(), 58.8)
 
+    def test_getSupplyPressure(self):
+        self.assertEqual(self.device.getSupplyPressure(), 2.1)
+        self.assertEqual(self.device.getSupplyPressureUnit(), "bar")
+
+    def test_getSeasonalPerformanceFactor(self):
+        self.assertEqual(self.device.getSeasonalPerformanceFactorDHW(), 4.1)
+        self.assertEqual(self.device.getSeasonalPerformanceFactorHeating(), 3.2)
+        self.assertEqual(self.device.getSeasonalPerformanceFactorTotal(), 3.9)
+
     def test_getHeatingRod(self):
         self.assertEqual(self.device.getHeatingRodHeatProductionCurrent(), 0)
         self.assertEqual(self.device.getHeatingRodPowerConsumptionCurrent(), 0)