twist-innovation-api 0.0.2__py3-none-any.whl → 0.0.3__py3-none-any.whl

twist/TwistAPI.py

@@ -15,17 +15,15 @@
 import asyncio
 import json
 import random
-from typing import Callable, Awaitable
 
 from .TwistDevice import TwistDevice, TwistModel
 from .TwistTypes import DeviceVariant
 
 
 class TwistAPI:
-    def __init__(self, installation_id: int, model_update: Callable[[TwistModel], Awaitable[None]]):
+    def __init__(self, installation_id: int):
         self._ext_publish = None
         self._subscribe = None
-        self._callback: Callable[[TwistModel], Awaitable[None]] = model_update
 
         self.function_map = {
             "context": self._context_msg,
@@ -92,9 +90,7 @@ class TwistAPI:
 
     async def _context_msg(self, twist_id, payload, model_id):
         device = next((d for d in self.device_list if d.twist_id == twist_id), None)
-        model = await device.context_msg(model_id, payload)
-
-        await self._callback(model)
+        await device.context_msg(model_id, payload)
 
     async def _get_board(self, twist_id, payload, model_id=None):
         data = json.loads(payload)

twist/TwistCbShutter.py

@@ -26,5 +26,8 @@ class TwistCbShutter(TwistModel):
     async def context_msg(self, payload: str):
         self.parse_general_context(payload)
 
+        if self._update_callback is not None:
+            await self._update_callback(self)
+
     def print_context(self):
         print(f"Cb Shutter Device: {self.parent_device.twist_id}, Model: {self.model_id},")

twist/TwistDevice.py

@@ -39,4 +39,3 @@ class TwistDevice:
 
     async def context_msg(self, model_id: int, payload: str):
         await self.model_list[model_id].context_msg(payload)
-        return self.model_list[model_id]

twist/TwistLight.py

@@ -44,6 +44,7 @@ class TwistLight(TwistModel):
         await self._activate_event(TwistLight.EventIndexes.TOGGLE)
 
     async def set_value(self, value: int, fading_time: int | None = None):
+        value = value * 655.35
         if fading_time is None:
             await self._activate_event(TwistLight.EventIndexes.VALUE, value)
         else:
@@ -79,6 +80,9 @@ class TwistLight(TwistModel):
                 elif index == 7:
                     self.current = value[0]
 
+        if self._update_callback is not None:
+            await self._update_callback(self)
+
     def print_context(self):
         print(
             f"Light Device: {self.parent_device.twist_id}, Model: {self.model_id},  Actual: {self.actual_state}, "

twist/TwistLouvre.py

@@ -12,6 +12,7 @@
 # https://www.gnu.org/licenses/gpl-3.0.html
 
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -50,6 +51,9 @@ class TwistLouvre(TwistModel):
                 elif index == 7:
                     self.current = value[0]
 
+        if self._update_callback is not None:
+            await self._update_callback(self)
+
     async def open(self):
         await self._activate_event(TwistLouvre.EventIndexes.OPEN)
 
@@ -66,10 +70,10 @@ class TwistLouvre(TwistModel):
         if fading_time is not None:
             raise NotImplementedError("Fading time can't be used in this model")
         else:
-            await self._activate_event(TwistLouvre.EventIndexes.VALUE, value)
+            await self._activate_event(TwistLouvre.EventIndexes.VALUE, int(value * 655.35))
 
     async def _activate_event(self, index: TwistLouvre.EventIndexes, value: int | None = None,
-                        fading_time: int | None = None):
+                              fading_time: int | None = None):
         data = {
             "i": index.value
         }

twist/TwistModel.py

@@ -12,12 +12,15 @@
 # https://www.gnu.org/licenses/gpl-3.0.html
 
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from TwistDevice import TwistDevice
 
 import json
+
+from typing import Callable, Awaitable
 from .TwistTypes import ContextErrors
 
 
@@ -34,9 +37,13 @@ class TwistModel():
             "prio": None
         }
 
+        self._update_callback: Callable[[TwistModel], Awaitable[None]] | None = None
+
+
     def print_context(self):
         print("function is not supported")
 
+
     def parse_general_context(self, payload: str):
         data = json.loads(payload)
 
@@ -54,29 +61,42 @@ class TwistModel():
                 self.errors["prio"] = value
         return data
 
+
     def _get_value_from_context(self, ctx: dict):
         return ctx["i"], ctx["vl"]
 
+
     async def context_msg(self, payload):
         raise NotImplementedError("Function not supported for this model")
 
+
     async def turn_on(self):
         raise NotImplementedError("Function not supported for this model")
 
+
     async def turn_off(self):
         raise NotImplementedError("Function not supported for this model")
 
+
     async def open(self):
         raise NotImplementedError("Function not supported for this model")
 
+
     async def stop(self):
         raise NotImplementedError("Function not supported for this model")
 
+
     async def close(self):
         raise NotImplementedError("Function not supported for this model")
 
+
     async def toggle(self):
         raise NotImplementedError("Function not supported for this model")
 
+
     async def set_value(self, value: int | list[int, int] | list[int, int, int], fading_time: int | None = None):
         raise NotImplementedError("Function not supported for this model")
+
+
+    def register_update_cb(self, cb: Callable[[TwistModel], Awaitable[None]]):
+        self._update_callback = cb

twist/TwistRgb.py

@@ -12,6 +12,7 @@
 # https://www.gnu.org/licenses/gpl-3.0.html
 
 from __future__ import annotations
+
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -57,8 +58,8 @@ class TwistRgb(TwistModel):
         else:
             await self._activate_event(TwistRgb.EventIndexes.VALUE_FADING, value, fading_time)
 
-    async def _activate_event(self, index: TwistRgb.EventIndexes, value: list[int, int, int] | None = None,
-                        fading_time: int | None = None):
+    async def _activate_event(self, index: TwistRgb.EventIndexes, value: tuple[int, int, int] | None = None,
+                              fading_time: int | None = None):
         data = {
             "i": index.value
         }
@@ -66,8 +67,9 @@ class TwistRgb(TwistModel):
         if value is None:
             data["vl"] = []
         elif fading_time is None:
-            data["vl"] = value
+            data["vl"] = [int(v / 655.35) for v in value]
         else:
+            value = list(value)
             value.append(fading_time)
             data["vl"] = value
 
@@ -91,6 +93,9 @@ class TwistRgb(TwistModel):
                 if index == 6:
                     self.operating_time = value[0]
 
+        if self._update_callback is not None:
+            await self._update_callback(self)
+
     def print_context(self):
         print(f"Rgb Device: {self.parent_device.twist_id}, Model: {self.model_id}, "
               f"Actual: h{self.actual_h} s{self.actual_s} v{self.actual_v}")

twist/TwistSensor.py

@@ -27,5 +27,8 @@ class TwistSensor(TwistModel):
     async def context_msg(self, payload: str):
         self.parse_general_context(payload)
 
+        if self._update_callback is not None:
+            await self._update_callback(self)
+
     def print_context(self):
         print(f"Sensor Device: {self.parent_device.twist_id}, Model: {self.model_id}")

{twist_innovation_api-0.0.2.dist-info → twist_innovation_api-0.0.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: twist-innovation-api
-Version: 0.0.2
+Version: 0.0.3
 Summary: Python library to talk to the twist-innovation api
 Home-page: https://github.com/twist-innovation/twist-innovation-api
 Author: Sibrecht Goudsmedt
@@ -133,12 +133,13 @@ async def main():
             asyncio.create_task(listen())
 
         # Initialize Twist API with async methods
-        twist_api = TwistAPI(8, on_model_update)
+        twist_api = TwistAPI(8)
         await twist_api.add_mqtt(mqtt_publish, mqtt_subscribe)
 
         twist_model_list: list[TwistModel] = await twist_api.search_models()
 
         for model in twist_model_list:
+            model.register_update_cb(on_model_update)
             print(f"{type(model)} has Model id: {model.model_id}, Device id: {model.parent_device.twist_id}")
             
         while True:

twist_innovation_api-0.0.3.dist-info/RECORD

@@ -0,0 +1,16 @@
+twist/TwistAPI.py,sha256=LBLBGgwY66lVBNSto4VjPEpzj9kmDzXTCwpW9f3OSic,3579
+twist/TwistCbShutter.py,sha256=mWQa4ro30uI8qm0J1rkR8M0KP7IwxlCRfWt0wSyCOLA,1199
+twist/TwistDevice.py,sha256=PoPKnNrbiy1j55MyZJW4nDg9OXtGZI7CgHlxcDEQhqs,1380
+twist/TwistLight.py,sha256=6f-gPfP6v7BgaRJUFt7Q3r990y2L0812d76K_33KSTw,3230
+twist/TwistLouvre.py,sha256=f2ocRjLkf3qC45hbcHdEOboA2mbkaxLaOa15tvkHOHY,3320
+twist/TwistModel.py,sha256=SQHpYmpdV7PfZij69-TIHDa_77QabamZ71f9ZUeyvOk,3179
+twist/TwistRgb.py,sha256=V7YuaqJaLTH3cL8CsQ3xIztfVKfqdMMJ7uyh9UZQDwA,3572
+twist/TwistSensor.py,sha256=6eYrwtZFFFOHmoHS68JHmsyi6FVVzoQy19KooGU0vMI,1192
+twist/TwistTypes.py,sha256=wsp-lnkaU70wNdoKWOWcnsq89vBheBYmM31ZXW3FMRw,2166
+twist/Variants.py,sha256=SFAZ7bSmTRomPspOfU1qNWEW-htRuyhTKuyGKK9Qh54,1369
+twist/__init__.py,sha256=gf8GHc9utiG0vD8GP3IfzLFHAG-ev1TXBIm0XUHxy38,201
+twist_innovation_api-0.0.3.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+twist_innovation_api-0.0.3.dist-info/METADATA,sha256=aquMRxNsC_ZBZJLCrulRkXUxDfTyG4mxub0WDOgmBXo,4335
+twist_innovation_api-0.0.3.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+twist_innovation_api-0.0.3.dist-info/top_level.txt,sha256=mkoeBkRPFodjnd-3UDf9YndjTQ6Sriz-EKSI4nQ7brs,6
+twist_innovation_api-0.0.3.dist-info/RECORD,,

twist_innovation_api-0.0.2.dist-info/RECORD

@@ -1,16 +0,0 @@
-twist/TwistAPI.py,sha256=hXkkxkUM9W9oDczRKwioDJ1SZA0s1K8Ed612YkvtUmk,3797
-twist/TwistCbShutter.py,sha256=Ps_Yvr7pl71wvt0h3BU12MyccUitA6qJMyBP-Yq9qks,1106
-twist/TwistDevice.py,sha256=1wfLNB0BgJHDSUrBYD4gv_Txak7SS4mmHrJ0jcMxfI8,1421
-twist/TwistLight.py,sha256=TrlZ03Aztc8-Qvybv96RYA_21zAke6GLBGHFpk-RznU,3106
-twist/TwistLouvre.py,sha256=wFl8MOMMslKDzSr2FkqArXXoJ5CWvBqMde7-UTlEpgU,3206
-twist/TwistModel.py,sha256=pyaGiw2vpaCsZkp0xC6XDB7HABGZM_2X7aZCqAxhmE0,2925
-twist/TwistRgb.py,sha256=MxAshwe4fczGD-pEgMAXG5847kKR0KFm7WemWKeDKHs,3412
-twist/TwistSensor.py,sha256=C1uHxdVvixnJeijeWAhArSAu5e7Dag7yt-dqqt407lg,1099
-twist/TwistTypes.py,sha256=wsp-lnkaU70wNdoKWOWcnsq89vBheBYmM31ZXW3FMRw,2166
-twist/Variants.py,sha256=SFAZ7bSmTRomPspOfU1qNWEW-htRuyhTKuyGKK9Qh54,1369
-twist/__init__.py,sha256=gf8GHc9utiG0vD8GP3IfzLFHAG-ev1TXBIm0XUHxy38,201
-twist_innovation_api-0.0.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-twist_innovation_api-0.0.2.dist-info/METADATA,sha256=g7LK4ufC35S-4xD1w8me6pb95jbmURlhALaRs7p3yp0,4298
-twist_innovation_api-0.0.2.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-twist_innovation_api-0.0.2.dist-info/top_level.txt,sha256=mkoeBkRPFodjnd-3UDf9YndjTQ6Sriz-EKSI4nQ7brs,6
-twist_innovation_api-0.0.2.dist-info/RECORD,,