twist-innovation-api 0.0.6__tar.gz → 0.0.8__tar.gz

{twist_innovation_api-0.0.6/twist_innovation_api.egg-info → twist_innovation_api-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: twist_innovation_api
-Version: 0.0.6
+Version: 0.0.8
 Summary: Python library to talk to the twist-innovation api
 Home-page: https://github.com/twist-innovation/twist-innovation-api
 Author: Sibrecht Goudsmedt

{twist_innovation_api-0.0.6 → twist_innovation_api-0.0.8}/setup.py

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

{twist_innovation_api-0.0.6 → twist_innovation_api-0.0.8}/twist/TwistAPI.py

@@ -43,27 +43,27 @@ 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):
+    def set_mqtt_publish(self, publisher):
+        """Set MQTT publish function so entities can send messages during registration."""
         self._ext_publish = publisher
-        self._subscribe = subscriber
 
+    async def set_mqtt_subscribe(self, subscriber):
+        """Set MQTT subscribe function and start receiving messages."""
+        self._subscribe = subscriber
         await self._subscribe(f"v2/{self.installation_id}/rx/#", self._on_message_received)
 
+    async def add_mqtt(self, publisher, subscriber):
+        """Legacy method for backward compatibility - sets both publish and subscribe."""
+        self.set_mqtt_publish(publisher)
+        await self.set_mqtt_subscribe(subscriber)
+
     async def get_models(self):
         """
         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 +90,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 +103,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 +139,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 +162,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.6 → twist_innovation_api-0.0.8}/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.6 → twist_innovation_api-0.0.8/twist_innovation_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: twist_innovation_api
-Version: 0.0.6
+Version: 0.0.8
 Summary: Python library to talk to the twist-innovation api
 Home-page: https://github.com/twist-innovation/twist-innovation-api
 Author: Sibrecht Goudsmedt