ics_2000_python 0.1.5__py3-none-any.whl → 0.1.6__py3-none-any.whl

ics_2000/hub.py

@@ -1,4 +1,5 @@
 import json
+import logging
 from datetime import datetime
 
 import requests
@@ -22,6 +23,8 @@ from .model.device_config import DeviceConfig
 from .model.device_data import DeviceData
 from .model.entity_type import Entity_Type
 
+logger = logging.getLogger(__name__)
+
 
 class Hub:
     """KlikAanKlikUit ICS-2000 Control Station connection info
@@ -136,7 +139,6 @@ class Hub:
             raise NoHomeSelectedException()
 
         entities = self.get_raw_devices_data(True, False)
-        print(entities)
         for device in entities:
             device_data = DeviceData(
                 home_id=self.home_id,
@@ -270,13 +272,17 @@ class Hub:
             "home_id": "",
             "entity_id": ids_string,
         }
-        status_list = requests.post(
+        response = requests.post(
             f"{API_URL}/entity.php",
             params,
-        ).json()
+        )
+        if response.status_code != 200:
+            raise Exception(
+                f"Unknown error while fetching device statuses, {response.status_code} response: {response.content}"
+            )
+        status_list = response.json()
 
         if len(status_list) == 0:
-            print(params)
             raise Exception(
                 f"Unknown error while fetching device statuses, response json: {status_list}"
             )
@@ -299,14 +305,48 @@ class Hub:
 
     def get_all_device_statuses(self):
         status_list = self.get_raw_device_statuses(False, True)
+
+        if not isinstance(status_list, list):
+            logger.warning(
+                "ICS-2000: invalid device status response; type=%s",
+                type(status_list).__name__,
+            )
+            return
+
         for device in status_list:
-            json_status = device["status"]
-            if "module" in json_status.keys():
-                self.device_statuses[device["id"]] = json_status["module"]["functions"]
-            elif "group" in json_status.keys():
-                self.device_statuses[device["id"]] = json_status["group"]["functions"]
+            if not isinstance(device, dict):
+                logger.debug("ICS-2000: skipping malformed device record")
+                continue
+
+            device_id = device.get("id")
+            json_status = device.get("status")
+
+            if device_id is None or not isinstance(json_status, dict):
+                logger.debug(
+                    "ICS-2000: skipping device with invalid status; id=%s",
+                    device_id,
+                )
+                continue
+
+            if "module" in json_status:
+                section = json_status["module"]
+            elif "group" in json_status:
+                section = json_status["group"]
             else:
-                Exception("Module or group data not found")
+                logger.debug(
+                    "ICS-2000: unsupported status structure; id=%s",
+                    device_id,
+                )
+                continue
+
+            if not isinstance(section, dict) or "functions" not in section:
+                logger.debug(
+                    "ICS-2000: missing device functions; id=%s",
+                    device_id,
+                )
+                continue
+
+            self.device_statuses[device_id] = section["functions"]
 
     def change_status(
         self,

{ics_2000_python-0.1.5.dist-info → ics_2000_python-0.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ics_2000_python
-Version: 0.1.5
+Version: 0.1.6
 Summary: 
 Keywords: ics_2000,ics-2000,klikaanklikuit
 Author: iiTzArcur

{ics_2000_python-0.1.5.dist-info → ics_2000_python-0.1.6.dist-info}/RECORD

@@ -10,14 +10,14 @@ ics_2000/entities/dim_device.py,sha256=aza_BKYk8QjLqbCJHFoWzbo_ZoJlObgPUIja1oKtA
 ics_2000/entities/entity.py,sha256=822GeRCE4RKuehe27EJ0PP6pQ-bDIHqPe8vdzCcXVvA,1152
 ics_2000/entities/switch_device.py,sha256=69E7VD2mrHQnngtyhGkYcC5kQEjPSirjHvo1oH5-Ccc,2244
 ics_2000/exceptions.py,sha256=kJeu9-uCZ0bqjzxkffF65m1Q7u4qEoEGTb0yZiUwGKA,353
-ics_2000/hub.py,sha256=wyDl5Bi1dceuptP-hYsHuXzdU_hjMBwuD9JRo1SsMwk,13745
+ics_2000/hub.py,sha256=rdmVSbVbD9Ak7y7KNN9oW17YhDAJmNxkz4LP0qMKcdQ,14975
 ics_2000/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ics_2000/model/device_config.py,sha256=lULB6FWY2fKi3abHmtsDMZExEMlTLcWyxcp6bPsR9q4,941
 ics_2000/model/device_data.py,sha256=92P-uS1hTtNFlOpjNdKyf_Os4NEFMCK7vCsGzeLicW4,434
 ics_2000/model/entity_type.py,sha256=U58z4GiXma-MX6XQL6t1a3IVuubIoW5CwE71YmnmjBQ,191
 ics_2000/model/smart_meter_data.py,sha256=yH1yFnU51BmyrK-f5ez3YElAITDJFcEjDofu5JFgG_Y,633
 ics_2000/model/smart_meter_data_current.py,sha256=HajM_osqE7MqMwOXCoqBfkPInWgzJhsjtpezcCzVX1A,742
-ics_2000_python-0.1.5.dist-info/LICENSE,sha256=WYmcYJG1QFgu1hfo7qrEkZ3Jhcz8NUWe6XUraZvlIFs,10172
-ics_2000_python-0.1.5.dist-info/METADATA,sha256=F_VWrXUHX5AvVpTeKfDh7yHURL1MyFLg99qQ5J_q0eE,1464
-ics_2000_python-0.1.5.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-ics_2000_python-0.1.5.dist-info/RECORD,,
+ics_2000_python-0.1.6.dist-info/LICENSE,sha256=WYmcYJG1QFgu1hfo7qrEkZ3Jhcz8NUWe6XUraZvlIFs,10172
+ics_2000_python-0.1.6.dist-info/METADATA,sha256=__y0xJzPdJ7Tgh51fN9niKNznXqIAQKkAdpompCOGJM,1464
+ics_2000_python-0.1.6.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+ics_2000_python-0.1.6.dist-info/RECORD,,