ics_2000_python 0.1.5__tar.gz → 0.1.6__tar.gz

{ics_2000_python-0.1.5 → ics_2000_python-0.1.6}/PKG-INFO

@@ -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 → ics_2000_python-0.1.6}/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 → ics_2000_python-0.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ics_2000_python"
-version = "0.1.5"
+version = "0.1.6"
 description = ""
 authors = ["iiTzArcur <zefanjaj@gmail.com>"]
 readme = "README.md"