ics_2000_python 0.1.4__tar.gz → 0.1.6__tar.gz

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

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

{ics_2000_python-0.1.4 → ics_2000_python-0.1.6}/ics_2000/command.py

@@ -1,7 +1,8 @@
 import json
-from typing import List
 import socket
+
 import requests
+
 from .config import API_URL
 from .encryption import encrypt
 from .model.entity_type import Entity_Type
@@ -16,7 +17,7 @@ class Command:
         value: int | float,
         aes_key: str,
         entity_type: Entity_Type,
-        device_functions: List[int | float] = [],
+        device_functions: list[int | float] = [],
     ):
         self.hub_mac = hub_mac
         self.device_id = device_id

{ics_2000_python-0.1.4 → ics_2000_python-0.1.6}/ics_2000/config.py

@@ -1,7 +1,5 @@
-
 from .model.device_config import DeviceConfig
 
-
 API_URL = "https://trustsmartcloud2.com/ics2000_api"
 device_configs: dict[int, DeviceConfig] = {
     1: DeviceConfig(

{ics_2000_python-0.1.4 → ics_2000_python-0.1.6}/ics_2000/encryption.py

@@ -1,4 +1,5 @@
 import base64
+
 from Crypto.Cipher import AES
 from Crypto.Util.Padding import unpad
 

{ics_2000_python-0.1.4 → ics_2000_python-0.1.6}/ics_2000/entities/blind_device.py

@@ -4,21 +4,17 @@ from .device import Device
 
 
 class BlindDevice(Device):
-    def __init__(self, hub, device_data: device_data.DeviceData, device_config: DeviceConfig):
+    def __init__(
+        self, hub, device_data: device_data.DeviceData, device_config: DeviceConfig
+    ):
         super().__init__(hub, device_data, device_config)
 
         if device_config.index_open is None:
-            raise ValueError(
-                f"index_open not defined for '{self.device_data.name}'"
-            )
+            raise ValueError(f"index_open not defined for '{self.device_data.name}'")
         if device_config.index_close is None:
-            raise ValueError(
-                f"index_close not defined for '{self.device_data.name}'"
-            )
+            raise ValueError(f"index_close not defined for '{self.device_data.name}'")
         if device_config.index_my is None:
-            raise ValueError(
-                f"index_my not defined for '{self.device_data.name}'"
-            )
+            raise ValueError(f"index_my not defined for '{self.device_data.name}'")
 
     def open(self, send_local: bool = False) -> None:
         """Turn off the device.
@@ -55,6 +51,7 @@ class BlindDevice(Device):
             self.is_group,
             send_local,
         )
+
     def stop(self, send_local: bool = False) -> None:
         """Turn off the device.
 

{ics_2000_python-0.1.4 → ics_2000_python-0.1.6}/ics_2000/entities/color_temperature_device.py

@@ -1,7 +1,8 @@
 from typing import TYPE_CHECKING
+
+from ..model.device_config import DeviceConfig
 from ..model.device_data import DeviceData
 from .dim_device import DimDevice
-from ..model.device_config import DeviceConfig
 
 if TYPE_CHECKING:
     from ..hub import Hub

{ics_2000_python-0.1.4 → ics_2000_python-0.1.6}/ics_2000/entities/device.py

@@ -1,7 +1,8 @@
 from typing import TYPE_CHECKING
-from .entity import Entity
-from ..model.device_data import DeviceData
+
 from ..model.device_config import DeviceConfig
+from ..model.device_data import DeviceData
+from .entity import Entity
 
 if TYPE_CHECKING:
     from ..hub import Hub

{ics_2000_python-0.1.4 → ics_2000_python-0.1.6}/ics_2000/entities/dim_device.py

@@ -1,7 +1,8 @@
 from typing import TYPE_CHECKING
+
+from ..model.device_config import DeviceConfig
 from ..model.device_data import DeviceData
 from .switch_device import SwitchDevice
-from ..model.device_config import DeviceConfig
 
 if TYPE_CHECKING:
     from ..hub import Hub

{ics_2000_python-0.1.4 → ics_2000_python-0.1.6}/ics_2000/entities/entity.py

@@ -1,4 +1,4 @@
-from typing import List, TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from ..model.device_data import DeviceData
 from ..model.entity_type import EntityType
@@ -25,7 +25,7 @@ class Entity:
         self.device_data = device_data
         self.is_group = entity_type == "group"
 
-    def get_status(self) -> List[int]:
+    def get_status(self) -> list[int]:
         return self._hub.get_device_status(self.entity_id)
 
     def get_hub(self) -> "Hub":

{ics_2000_python-0.1.4 → ics_2000_python-0.1.6}/ics_2000/hub.py

@@ -1,11 +1,19 @@
-from datetime import datetime
 import json
+import logging
+from datetime import datetime
+
 import requests
 
-from ics_2000.exceptions import InvalidAuthException, InvalidHomeException, InvalidMacOrAuthException, NoHomeSelectedException
+from ics_2000.exceptions import (
+    InvalidAuthException,
+    InvalidHomeException,
+    InvalidMacOrAuthException,
+    NoHomeSelectedException,
+)
+
 from .command import Command
-from .encryption import decrypt
 from .config import API_URL, device_configs
+from .encryption import decrypt
 from .entities.blind_device import BlindDevice
 from .entities.color_temperature_device import ColorTemperatureDevice
 from .entities.device import Device
@@ -15,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
@@ -73,7 +83,9 @@ class Hub:
         data = response.json()
         if data is not None:
             self.homes = data.get("homes", [])
-        return dict([(home.get("home_id"), home.get("home_name"))for home in self.homes])
+        return dict(
+            [(home.get("home_id"), home.get("home_name")) for home in self.homes]
+        )
 
     def select_home(self, home_id: str) -> None:
         home = next(home for home in self.homes if home.get("home_id") == home_id)
@@ -95,7 +107,7 @@ class Hub:
                 "email": self.email,
                 "mac": self.mac,
                 "password_hash": self.password,
-                "home_id": "",
+                "home_id": self.home_id,
             },
         )
         data = []
@@ -158,7 +170,11 @@ class Hub:
 
             elif device_config.on_off_function is not None:
                 self.devices.append(SwitchDevice(self, device_data, device_config))
-            elif device_config.index_open is not None and device_config.index_close is not None and device_config.index_my is not None:
+            elif (
+                device_config.index_open is not None
+                and device_config.index_close is not None
+                and device_config.index_my is not None
+            ):
                 self.devices.append(BlindDevice(self, device_data, device_config))
             else:
                 self.devices.append(Device(self, device_data, device_config))
@@ -256,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}"
             )
@@ -285,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.4 → ics_2000_python-0.1.6}/ics_2000/model/device_config.py

@@ -5,15 +5,15 @@ class DeviceConfig:
     def __init__(
         self,
         model_name: str,
-        disabled: Optional[bool] = None,
-        on_off_function: Optional[int] = None,
-        dim_function: Optional[int] = None,
-        color_temperature_function: Optional[int] = None,
-        max_brightness: Optional[int] = None,
-        max_color_temperature: Optional[int] = None,
-        index_open: Optional[int] = None,
-        index_close: Optional[int] = None,
-        index_my: Optional[int] = None,
+        disabled: bool | None = None,
+        on_off_function: int | None = None,
+        dim_function: int | None = None,
+        color_temperature_function: int | None = None,
+        max_brightness: int | None = None,
+        max_color_temperature: int | None = None,
+        index_open: int | None = None,
+        index_close: int | None = None,
+        index_my: int | None = None,
     ):
         self.disabled = disabled
         self.model_name = model_name

{ics_2000_python-0.1.4 → ics_2000_python-0.1.6}/ics_2000/model/device_data.py

@@ -1,6 +1,3 @@
-from typing import Dict
-
-
 class DeviceData:
     def __init__(
         self,
@@ -9,8 +6,8 @@ class DeviceData:
         name: str,
         device: int,
         isGroup: bool,
-        status: Dict[str, Dict[str, int]],
-        data: Dict[str, Dict[str, int]],
+        status: dict[str, dict[str, int]],
+        data: dict[str, dict[str, int]],
     ):
         self.home_id = home_id
         self.id = id

{ics_2000_python-0.1.4 → ics_2000_python-0.1.6}/ics_2000/model/entity_type.py

@@ -8,4 +8,4 @@ class Entity_Type(enum.Enum):
     Scene = "scene"
 
 
-EntityType = Union[Literal["module"], Literal["group"], Literal["scene"]]
+EntityType = Literal["module", "group", "scene"]

{ics_2000_python-0.1.4 → ics_2000_python-0.1.6}/ics_2000/model/smart_meter_data.py

@@ -1,4 +1,3 @@
-from typing import Union
 from datetime import datetime
 
 Precision = str
@@ -7,7 +6,7 @@ Precision = str
 class SmartMeterData:
     def __init__(
         self,
-        date: Union[datetime, str, int],
+        date: datetime | str | int,
         power_consumed_low_tariff: float,
         power_consumed: float,
         power_produced_low_tariff: float,

{ics_2000_python-0.1.4 → ics_2000_python-0.1.6}/ics_2000/model/smart_meter_data_current.py

@@ -1,6 +1,3 @@
-from typing import List
-
-
 class SmartMeterDataCurrent:
     def __init__(
         self,
@@ -11,7 +8,7 @@ class SmartMeterDataCurrent:
         current_consumption: float,
         current_production: float,
         gas: float,
-        raw_data_array: List[float],
+        raw_data_array: list[float],
     ):
         self.power_consumed_low_tariff = power_consumed_low_tariff
         self.power_consumed = power_consumed

{ics_2000_python-0.1.4 → ics_2000_python-0.1.6}/pyproject.toml

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

{ics_2000_python-0.1.4 → ics_2000_python-0.1.6}/ics_2000/entities/switch_device.py

@@ -1,5 +1,5 @@
-from ..model.device_data import DeviceData
 from ..model.device_config import DeviceConfig
+from ..model.device_data import DeviceData
 from .device import Device