PyViCare 2.34.0__tar.gz → 2.35.0__tar.gz

{pyvicare-2.34.0 → pyvicare-2.35.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyViCare
-Version: 2.34.0
+Version: 2.35.0
 Summary: Library to communicate with the Viessmann ViCare API.
 Home-page: https://github.com/openviess/PyViCare
 License: Apache-2.0
@@ -20,6 +20,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Dist: authlib (>1.2.0)
 Requires-Dist: requests (>=2.31.0)

{pyvicare-2.34.0 → pyvicare-2.35.0}/PyViCare/PyViCareDevice.py

@@ -15,3 +15,9 @@ class Device:
     @handleNotSupported
     def getSerial(self):
         return self.service.getProperty("device.serial")["properties"]["value"]["value"]
+
+    def isLegacyDevice(self) -> bool:
+        return self.service.hasRoles(["type:legacy"])
+
+    def isE3Device(self) -> bool:
+        return self.service.hasRoles(["type:E3"])

{pyvicare-2.34.0 → pyvicare-2.35.0}/PyViCare/PyViCareDeviceConfig.py

@@ -82,11 +82,14 @@ class PyViCareDeviceConfig:
             (self.asHeatPump, r"Vitocal|VBC70|V200WO1A|CU401B", ["type:heatpump"]),
             (self.asOilBoiler, r"Vitoladens|Vitoradial|Vitorondens|VPlusH|V200KW2_6", []),
             (self.asPelletsBoiler, r"Vitoligno|Ecotronic|VBC550P", []),
+            (self.asElectricalEnergySystem, r"E3_VitoCharge_03", ["type:ees"]),
+            (self.asVentilation, r"E3_ViAir", ["type:ventilation"]),
+            (self.asVentilation, r"E3_VitoPure", ["type:ventilation;purifier"]),
             (self.asRadiatorActuator, r"E3_RadiatorActuator", ["type:radiator"]),
             (self.asRoomSensor, r"E3_RoomSensor", ["type:climateSensor"]),
+            (self.asGateway, r"E3_TCU41_x04", ["type:gateway;TCU100"]),
+            (self.asGateway, r"E3_TCU19_x05", ["type:gateway;TCU200"]),
             (self.asGateway, r"E3_TCU10_x07", ["type:gateway;TCU300"]),
-            (self.asElectricalEnergySystem, r"E3_VitoCharge_03", ["type:ees"]),
-            (self.asVentilation, r"E3_ViAir", ["type:ventilation"]),
             (self.asGateway, r"Heatbox1", ["type:gateway;VitoconnectOpto1"]),
             (self.asGateway, r"Heatbox2", ["type:gateway;VitoconnectOpto2/OT2"])
         ]

{pyvicare-2.34.0 → pyvicare-2.35.0}/PyViCare/PyViCareHeatingDevice.py

@@ -66,16 +66,30 @@ class HeatingDevice(Device):
     def getDomesticHotWaterConfiguredTemperature(self):
         return self.service.getProperty("heating.dhw.temperature.main")["properties"]["value"]["value"]
 
+    @handleNotSupported
+    def getDomesticHotWaterStorageTemperature(self):
+        return self.service.getProperty("heating.dhw.sensors.temperature.dhwCylinder")["properties"]["value"][
+            "value"]
+
     @handleNotSupported
     def getHotWaterStorageTemperatureTop(self):
         return self.service.getProperty("heating.dhw.sensors.temperature.dhwCylinder.top")["properties"]["value"][
             "value"]
 
+    @handleNotSupported
+    def getDomesticHotWaterStorageTemperatureMiddle(self):
+        return self.service.getProperty("heating.dhw.sensors.temperature.dhwCylinder.middle")["properties"]["value"][
+            "value"]
+
+    @handleNotSupported
+    def getDomesticHotWaterStorageTemperatureMidBottom(self):
+        return self.service.getProperty("heating.dhw.sensors.temperature.dhwCylinder.midBottom")["properties"]["value"][
+            "value"]
+
     @handleNotSupported
     def getHotWaterStorageTemperatureBottom(self):
-        return \
-            self.service.getProperty("heating.dhw.sensors.temperature.dhwCylinder.bottom")["properties"]["value"][
-                "value"]
+        return self.service.getProperty("heating.dhw.sensors.temperature.dhwCylinder.bottom")["properties"]["value"][
+            "value"]
 
     @handleNotSupported
     def getDomesticHotWaterConfiguredTemperature2(self):
@@ -113,11 +127,6 @@ class HeatingDevice(Device):
 
         return None
 
-    @handleNotSupported
-    def getDomesticHotWaterStorageTemperature(self):
-        return self.service.getProperty("heating.dhw.sensors.temperature.dhwCylinder")["properties"]["value"][
-            "value"]
-
     @handleNotSupported
     def getDomesticHotWaterOutletTemperature(self):
         return self.service.getProperty("heating.dhw.sensors.temperature.outlet")["properties"]["value"]["value"]

{pyvicare-2.34.0 → pyvicare-2.35.0}/PyViCare/PyViCareRadiatorActuator.py

@@ -1,8 +1,8 @@
-from PyViCare.PyViCareHeatingDevice import HeatingDevice
+from PyViCare.PyViCareDevice import Device
 from PyViCare.PyViCareUtils import handleAPICommandErrors, handleNotSupported
 
 
-class RadiatorActuator(HeatingDevice):
+class RadiatorActuator(Device):
 
     @handleNotSupported
     def getTemperature(self):

{pyvicare-2.34.0 → pyvicare-2.35.0}/PyViCare/PyViCareService.py

@@ -48,7 +48,7 @@ class ViCareService:
         return hasRoles(requested_roles, self.roles)
 
     def _isGateway(self) -> bool:
-        return self.hasRoles(["type:gateway;VitoconnectOpto1"]) or self.hasRoles(["type:gateway;VitoconnectOpto2/OT2"]) or self.hasRoles(["type:gateway;TCU300"])
+        return self.hasRoles(["type:gateway;VitoconnectOpto1"]) or self.hasRoles(["type:gateway;VitoconnectOpto2/OT2"]) or self.hasRoles(["type:gateway;TCU100"]) or self.hasRoles(["type:gateway;TCU200"]) or self.hasRoles(["type:gateway;TCU300"])
 
     def setProperty(self, property_name: str, action: str, data: Any) -> Any:
         url = buildSetPropertyUrl(

{pyvicare-2.34.0 → pyvicare-2.35.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "PyViCare"
-version = "2.34.0"
+version = "2.35.0"
 description = "Library to communicate with the Viessmann ViCare API."
 authors = [
   "Simon Gillet <mail+pyvicare@gillet.ninja>"
@@ -47,7 +47,7 @@ mypy = "^1.11.2"
 pylint = "^3.2.6"
 pytest = "^8.3.2"
 pytest-cov = "^5.0.0"
-ruff = "^0.6.7"
+ruff = "^0.7.0"
 types-requests = ">=2.31"
 
 [tool.mypy]