twist-innovation-api 0.0.5__tar.gz → 0.0.7__tar.gz

{twist_innovation_api-0.0.5 → twist_innovation_api-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: twist_innovation_api
-Version: 0.0.5
+Version: 0.0.7
 Summary: Python library to talk to the twist-innovation api
 Home-page: https://github.com/twist-innovation/twist-innovation-api
 Author: Sibrecht Goudsmedt
@@ -11,6 +11,15 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary
 
 # Twist Innovation API
 

{twist_innovation_api-0.0.5 → twist_innovation_api-0.0.7}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="twist_innovation_api",
-    version="0.0.5",
+    version="0.0.7",
     packages=find_packages(),
     install_requires=[
         # "requests"  # For REST API

{twist_innovation_api-0.0.5 → twist_innovation_api-0.0.7}/twist/TwistAPI.py

@@ -43,7 +43,8 @@ class TwistAPI:
         self.installation_id: Optional[int] = None
 
         # Backend adapter for fetching device info
-        self._backend_adapter = BackendAdapter(backend_url, api_key, installation_uuid)
+        self._backend_adapter = BackendAdapter(
+            backend_url, api_key, installation_uuid)
 
     async def add_mqtt(self, publisher, subscriber):
         self._ext_publish = publisher
@@ -55,15 +56,6 @@ class TwistAPI:
         """
         Get models from backend
 
-        Returns:
-            List of TwistModel objects
-        """
-        return await self._get_models_from_backend()
-
-    async def _get_models_from_backend(self):
-        """
-        Fetch devices from backend and create model list
-
         Returns:
             List of TwistModel objects
         """
@@ -90,7 +82,8 @@ class TwistAPI:
             infos.sort(key=lambda x: x.model_id)
 
             # Create device if it doesn't exist
-            device = next((d for d in self.device_list if d.twist_id == device_id), None)
+            device = next(
+                (d for d in self.device_list if d.twist_id == device_id), None)
             if device is None:
                 device = TwistDevice(device_id, 0, self)
                 self.device_list.append(device)
@@ -102,7 +95,8 @@ class TwistAPI:
                 # Get product info if available using deviceAllocationModelKey
                 product_info = None
                 if info.device_allocation_model_key:
-                    product_info = products.get(info.device_allocation_model_key)
+                    product_info = products.get(
+                        info.device_allocation_model_key)
 
                 if product_info:
                     model.product_name = product_info.product_name
@@ -137,6 +131,9 @@ class TwistAPI:
     async def activate_event(self, model: TwistModel, data: json):
         await self._publish(model.parent_device.twist_id, "activate_event", data, model.model_id)
 
+    async def request_context(self, model: TwistModel):
+        await self._publish(model.parent_device.twist_id, "context", model_id=model.model_id)
+
     def _parse_topic(self, topic):
         tpc_delim = topic.split('/')
 
@@ -157,7 +154,8 @@ class TwistAPI:
                 await self.function_map[data["opcode"]](data["twist_id"], payload, data["model_id"])
 
     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)
+        device = next(
+            (d for d in self.device_list if d.twist_id == twist_id), None)
         await device.context_msg(model_id, payload)
 
     async def _get_board(self, twist_id, payload, model_id=None):

{twist_innovation_api-0.0.5 → twist_innovation_api-0.0.7}/twist/TwistModel.py

@@ -37,7 +37,8 @@ class TwistModel():
             "prio": None
         }
 
-        self._update_callback: Callable[[TwistModel], Awaitable[None]] | None = None
+        self._update_callback: Callable[[
+            TwistModel], Awaitable[None]] | None = None
 
     @property
     def friendly_name(self) -> str:
@@ -54,11 +55,9 @@ class TwistModel():
         # Replace underscores with spaces and capitalize first letter
         return self.name.replace('_', ' ').capitalize()
 
-
     def print_context(self):
         print("function is not supported")
 
-
     def parse_general_context(self, payload: str):
         data = json.loads(payload)
 
@@ -76,42 +75,34 @@ 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]]):
+    async def register_update_cb(self, cb: Callable[[TwistModel], Awaitable[None]]):
         self._update_callback = cb
+
+        await self.parent_device.api.request_context(self)

{twist_innovation_api-0.0.5 → twist_innovation_api-0.0.7}/twist/TwistRgb.py

@@ -53,10 +53,25 @@ class TwistRgb(TwistModel):
         await self._activate_event(TwistRgb.EventIndexes.TOGGLE)
 
     async def set_value(self, value: list[int, int, int], fading_time: int | None = None):
+        """Set HSV values.
+
+        Args:
+            value: [H, S, V] where H is 0-360 degrees, S is 0-100%, V is 0-100%
+            fading_time: Optional transition time in milliseconds
+        """
+        # Convert from standard ranges to device range (0-65535)
+        # H: 0-360 -> 0-65535 (multiply by 182.04)
+        # S: 0-100 -> 0-65535 (multiply by 655.35)
+        # V: 0-100 -> 0-65535 (multiply by 655.35)
+        h_value = round(value[0] * 182.04)
+        s_value = round(value[1] * 655.35)
+        v_value = round(value[2] * 655.35)
+        converted_value = [h_value, s_value, v_value]
+
         if fading_time is None:
-            await self._activate_event(TwistRgb.EventIndexes.VALUE, value)
+            await self._activate_event(TwistRgb.EventIndexes.VALUE, converted_value)
         else:
-            await self._activate_event(TwistRgb.EventIndexes.VALUE_FADING, value, fading_time)
+            await self._activate_event(TwistRgb.EventIndexes.VALUE_FADING, converted_value, fading_time)
 
     async def _activate_event(self, index: TwistRgb.EventIndexes, value: tuple[int, int, int] | None = None,
                               fading_time: int | None = None):
@@ -67,28 +82,33 @@ class TwistRgb(TwistModel):
         if value is None:
             data["vl"] = []
         elif fading_time is None:
-            data["vl"] = [int(v / 655.35) for v in value]
+            data["vl"] = list(value)
         else:
-            value = list(value)
-            value.append(fading_time)
-            data["vl"] = value
+            data["vl"] = list(value) + [fading_time]
 
         await self.parent_device.api.activate_event(self, data)
 
     async def context_msg(self, payload: str):
+        """Parse context message from device.
+
+        Device sends HSV in 0-65535 range, convert to standard ranges:
+        H: 0-65535 -> 0-360 degrees (divide by 182.04)
+        S: 0-65535 -> 0-100% (divide by 655.35)
+        V: 0-65535 -> 0-100% (divide by 655.35)
+        """
         data = self.parse_general_context(payload)
 
         for ctx in data["cl"]:
             index, value = self._get_value_from_context(ctx)
             if index < ContextErrors.MAX.value:
                 if ContextErrors(index) == ContextErrors.ACTUAL:
-                    self.actual_h = round(value[0] / 655.35, 0)
-                    self.actual_s = round(value[1] / 655.35, 0)
-                    self.actual_v = round(value[2] / 655.35, 0)
+                    self.actual_h = round(value[0] / 182.04, 1)
+                    self.actual_s = round(value[1] / 655.35, 1)
+                    self.actual_v = round(value[2] / 655.35, 1)
                 elif ContextErrors(index) == ContextErrors.REQUESTED:
-                    self.requested_h = round(value[0] / 655.35, 0)
-                    self.requested_s = round(value[0] / 655.35, 0)
-                    self.requested_v = round(value[0] / 655.35, 0)
+                    self.requested_h = round(value[0] / 182.04, 1)
+                    self.requested_s = round(value[1] / 655.35, 1)
+                    self.requested_v = round(value[2] / 655.35, 1)
             else:
                 if index == 6:
                     self.operating_time = value[0]

{twist_innovation_api-0.0.5 → twist_innovation_api-0.0.7}/twist_innovation_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
-Name: twist-innovation-api
-Version: 0.0.5
+Metadata-Version: 2.4
+Name: twist_innovation_api
+Version: 0.0.7
 Summary: Python library to talk to the twist-innovation api
 Home-page: https://github.com/twist-innovation/twist-innovation-api
 Author: Sibrecht Goudsmedt
@@ -11,6 +11,15 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-python
+Dynamic: summary
 
 # Twist Innovation API