feat: expose raw data of installations, gatways and devices (openvies…

…s#212)

* feat: expose raw data of installations, gatways and devices

* fmt

* extract devices via new properties

PyViCare/PyViCare.py

@@ -1,4 +1,5 @@
 import logging
+from datetime import datetime
 
 from PyViCare.PyViCareAbstractOAuthManager import AbstractViCareOAuthManager
 from PyViCare.PyViCareBrowserOAuthManager import ViCareBrowserOAuthManager
@@ -45,27 +46,38 @@ def __loadInstallations(self):
             logger.error("Missing 'data' property when fetching installations")
             raise PyViCareInvalidDataError(installations)
 
-        self.devices = list(self.__readInstallations(installations["data"]))
+        data = installations['data']
+        self.installations = Wrap(data)
+        self.devices = list(self.__extract_devices())
 
-    def __readInstallations(self, data):
-        for installation in data:
-            installation_id = installation["id"]
-
-            for gateway in installation["gateways"]:
-                gateway_serial = gateway["serial"]
-
-                for device in gateway["devices"]:
-                    if device["deviceType"] != "heating":
+    def __extract_devices(self):
+        for installation in self.installations:
+            for gateway in installation.gateways:
+                for device in gateway.devices:
+                    if device.deviceType != "heating":
                         continue  # we are not interested in non heating devices
 
-                    device_id = device["id"]
-                    device_model = device["modelId"]
-                    status = device["status"]
-
                     accessor = ViCareDeviceAccessor(
-                        installation_id, gateway_serial, device_id)
+                        installation.id, gateway.serial, device.id)
                     service = self.__buildService(accessor)
 
-                    logger.info(f"Device found: {device_model}")
+                    logger.info(f"Device found: {device.modelId}")
+
+                    yield PyViCareDeviceConfig(service, device.modelId, device.status)
+
+
+class DictWrap(object):
+    def __init__(self, d):
+        for k, v in d.items():
+            setattr(self, k, Wrap(v))
+
 
-                    yield PyViCareDeviceConfig(service, device_model, status)
+def Wrap(v):
+    if isinstance(v, list):
+        return [Wrap(x) for x in v]
+    if isinstance(v, dict):
+        return DictWrap(v)
+    if isinstance(v, str) and len(v) == 24 and v[23] == 'Z' and v[10] == 'T':
+        return datetime.strptime(v, '%Y-%m-%dT%H:%M:%S.%f%z')
+    else:
+        return v

tests/test_Integration.py

@@ -107,6 +107,21 @@ def test_PyViCare(self):
 
             print()
 
+            for i in vicare.installations:
+                print(i.id)
+                print(i.description)
+                print(i.address.street)
+                print()
+                for g in i.gateways:
+                    print(g.producedAt)
+                    print(g.autoUpdate)
+                    print(g.aggregatedStatus)
+                    print(g.registeredAt)
+                    print()
+                    for d in g.devices:
+                        print(d.modelId)
+                        print(d.createdAt)
+
     @unittest.skipIf(not EXEC_INTEGRATION_TEST, "environments needed")
     def test_Dump(self):
         email = os.getenv('PYVICARE_EMAIL', '')