PyViCare 2.34.1__tar.gz → 2.36.0__tar.gz

{pyvicare-2.34.1 → pyvicare-2.36.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyViCare
-Version: 2.34.1
+Version: 2.36.0
 Summary: Library to communicate with the Viessmann ViCare API.
 Home-page: https://github.com/openviess/PyViCare
 License: Apache-2.0
@@ -9,17 +9,17 @@ Author: Simon Gillet
 Author-email: mail+pyvicare@gillet.ninja
 Maintainer: Christopher Fenner
 Maintainer-email: fenner.christopher@gmail.com
-Requires-Python: >=3.8,<4.0
+Requires-Python: >=3.9,<4.0
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Natural Language :: English
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 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.36.0/PyViCare/PyViCareDevice.py

@@ -0,0 +1,38 @@
+from PyViCare.PyViCareService import ViCareService
+from PyViCare.PyViCareUtils import PyViCareNotSupportedFeatureError, handleNotSupported
+
+
+class Device:
+    """This is the base class for all simple devices.
+    This class connects to the Viessmann ViCare API.
+    The authentication is done through OAuth2.
+    Note that currently, a new token is generated for each run.
+    """
+
+    def __init__(self, service: ViCareService) -> None:
+        self.service = service
+
+    @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"])
+
+    def isDomesticHotWaterDevice(self):
+        return self._isTypeDevice("heating.dhw")
+
+    def isSolarThermalDevice(self):
+        return self._isTypeDevice("heating.solar")
+
+    def isVentilationDevice(self):
+        return self._isTypeDevice("ventilation")
+
+    def _isTypeDevice(self, deviceType: str):
+        try:
+            return self.service.getProperty(deviceType)["isEnabled"] and self.service.getProperty(deviceType)["properties"]["active"]["value"]
+        except PyViCareNotSupportedFeatureError:
+            return False

{pyvicare-2.34.1 → pyvicare-2.36.0}/PyViCare/PyViCareDeviceConfig.py

@@ -84,6 +84,8 @@ class PyViCareDeviceConfig:
             (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_ViAir", ["type:ventilation;central"]),
+            (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"]),

{pyvicare-2.34.1 → pyvicare-2.36.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.1 → pyvicare-2.36.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "PyViCare"
-version = "2.34.1"
+version = "2.36.0"
 description = "Library to communicate with the Viessmann ViCare API."
 authors = [
   "Simon Gillet <mail+pyvicare@gillet.ninja>"
@@ -23,6 +23,10 @@ keywords = [
 classifiers = [
   "Intended Audience :: Developers",
   "Natural Language :: English",
+  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3",
   "License :: OSI Approved :: Apache Software License",
   "Topic :: Software Development :: Libraries :: Python Modules",
@@ -38,7 +42,7 @@ Changelog = "https://github.com/openviess/PyViCare/releases"
 
 [tool.poetry.dependencies]
 authlib = ">1.2.0"
-python = "^3.8"
+python = "^3.9"
 requests = ">=2.31.0"
 
 [tool.poetry.group.dev.dependencies]
@@ -46,8 +50,8 @@ codespell = "^2.3.0"
 mypy = "^1.11.2"
 pylint = "^3.2.6"
 pytest = "^8.3.2"
-pytest-cov = "^5.0.0"
-ruff = "^0.6.7"
+pytest-cov = "^6.0.0"
+ruff = "^0.7.0"
 types-requests = ">=2.31"
 
 [tool.mypy]

pyvicare-2.34.1/PyViCare/PyViCareDevice.py

@@ -1,17 +0,0 @@
-from PyViCare.PyViCareService import ViCareService
-from PyViCare.PyViCareUtils import handleNotSupported
-
-
-class Device:
-    """This is the base class for all simple devices.
-    This class connects to the Viessmann ViCare API.
-    The authentication is done through OAuth2.
-    Note that currently, a new token is generated for each run.
-    """
-
-    def __init__(self, service: ViCareService) -> None:
-        self.service = service
-
-    @handleNotSupported
-    def getSerial(self):
-        return self.service.getProperty("device.serial")["properties"]["value"]["value"]