ics_2000_python 0.1.3__tar.gz → 0.1.5__tar.gz

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

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

{ics_2000_python-0.1.3 → ics_2000_python-0.1.5}/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.3 → ics_2000_python-0.1.5}/ics_2000/config.py

@@ -1,6 +1,5 @@
 from .model.device_config import DeviceConfig
 
-
 API_URL = "https://trustsmartcloud2.com/ics2000_api"
 device_configs: dict[int, DeviceConfig] = {
     1: DeviceConfig(
@@ -94,8 +93,10 @@ device_configs: dict[int, DeviceConfig] = {
         model_name="AWMT Buil-in wall switch",
     ),
     23: DeviceConfig(
-        disabled=True,
         model_name="Somfy Actuator",
+        index_open=0,
+        index_my=1,
+        index_close=2,
     ),
     24: DeviceConfig(
         model_name="KAKU dimmable lightbulb",

{ics_2000_python-0.1.3 → ics_2000_python-0.1.5}/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.5/ics_2000/entities/blind_device.py

@@ -0,0 +1,71 @@
+from ..model import device_data
+from ..model.device_config import DeviceConfig
+from .device import Device
+
+
+class BlindDevice(Device):
+    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}'")
+        if device_config.index_close is None:
+            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}'")
+
+    def open(self, send_local: bool = False) -> None:
+        """Turn off the device.
+
+        Args:
+          send_local: Use the ip_address set on the hub to talk to the device
+          send_local set to false, because it triggers a time out.
+        """
+        if self.device_config.index_open is None:
+            return
+
+        self.get_hub().change_status(
+            self.entity_id,
+            self.device_config.index_open,
+            0,
+            self.is_group,
+            send_local,
+        )
+
+    def close(self, send_local: bool = False) -> None:
+        """Turn off the device.
+
+        Args:
+          send_local: Use the ip_address set on the hub to talk to the device
+          send_local set to false, because it triggers a timeout.
+        """
+        if self.device_config.index_close is None:
+            return
+
+        self.get_hub().change_status(
+            self.entity_id,
+            self.device_config.index_close,
+            0,
+            self.is_group,
+            send_local,
+        )
+
+    def stop(self, send_local: bool = False) -> None:
+        """Turn off the device.
+
+        Args:
+          send_local: Use the ip_address set on the hub to talk to the device
+          send_local set to false, because it triggers a timeout.
+        """
+        if self.device_config.index_my is None:
+            return
+
+        self.get_hub().change_status(
+            self.entity_id,
+            self.device_config.index_my,
+            0,
+            self.is_group,
+            send_local,
+        )

{ics_2000_python-0.1.3 → ics_2000_python-0.1.5}/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.3 → ics_2000_python-0.1.5}/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.3 → ics_2000_python-0.1.5}/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.3 → ics_2000_python-0.1.5}/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.3 → ics_2000_python-0.1.5}/ics_2000/hub.py

@@ -1,11 +1,19 @@
-from datetime import datetime
 import json
+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
 from .entities.dim_device import DimDevice
@@ -27,7 +35,7 @@ class Hub:
     def __init__(self, email: str, password: str):
         self.homes = []
         self.devices: list[
-            Device | DimDevice | SwitchDevice | ColorTemperatureDevice
+            Device | DimDevice | SwitchDevice | ColorTemperatureDevice | BlindDevice
         ] = []
         """List of available devices within the authenticated home"""
         self.aes_key: str | None = None
@@ -72,7 +80,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)
@@ -94,7 +104,7 @@ class Hub:
                 "email": self.email,
                 "mac": self.mac,
                 "password_hash": self.password,
-                "home_id": "",
+                "home_id": self.home_id,
             },
         )
         data = []
@@ -120,12 +130,13 @@ class Hub:
 
     def get_devices(
         self,
-    ) -> list[Device | DimDevice | SwitchDevice | ColorTemperatureDevice]:
+    ) -> list[Device | DimDevice | SwitchDevice | ColorTemperatureDevice | BlindDevice]:
         """Gets all devices connected to the hub"""
         if self.home_id is None:
             raise NoHomeSelectedException()
 
         entities = self.get_raw_devices_data(True, False)
+        print(entities)
         for device in entities:
             device_data = DeviceData(
                 home_id=self.home_id,
@@ -157,6 +168,12 @@ 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
+            ):
+                self.devices.append(BlindDevice(self, device_data, device_config))
             else:
                 self.devices.append(Device(self, device_data, device_config))
         return self.devices

ics_2000_python-0.1.5/ics_2000/model/device_config.py

@@ -0,0 +1,27 @@
+from typing import Optional
+
+
+class DeviceConfig:
+    def __init__(
+        self,
+        model_name: str,
+        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
+        self.on_off_function = on_off_function
+        self.dim_function = dim_function
+        self.color_temperature_function = color_temperature_function
+        self.max_brightness = max_brightness
+        self.max_color_temperature = max_color_temperature
+        self.index_open = index_open
+        self.index_close = index_close
+        self.index_my = index_my

{ics_2000_python-0.1.3 → ics_2000_python-0.1.5}/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.3 → ics_2000_python-0.1.5}/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.3 → ics_2000_python-0.1.5}/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.3 → ics_2000_python-0.1.5}/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.3 → ics_2000_python-0.1.5}/pyproject.toml

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

ics_2000_python-0.1.3/ics_2000/model/device_config.py

@@ -1,21 +0,0 @@
-from typing import Optional
-
-
-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,
-    ):
-        self.disabled = disabled
-        self.model_name = model_name
-        self.on_off_function = on_off_function
-        self.dim_function = dim_function
-        self.color_temperature_function = color_temperature_function
-        self.max_brightness = max_brightness
-        self.max_color_temperature = max_color_temperature

{ics_2000_python-0.1.3 → ics_2000_python-0.1.5}/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