twist-innovation-api 0.0.4__py3-none-any.whl → 0.0.5__py3-none-any.whl

twist/BackendAdapter.py

@@ -24,41 +24,23 @@ import aiohttp
 from typing import Optional, Type, Dict
 from .TwistModel import TwistModel
 from .TwistLight import TwistLight
-from .TwistLouvre import TwistLouvre
+from .TwistShutter import TwistShutter
 from .TwistRgb import TwistRgb
 from .TwistSensor import TwistSensor
-from .TwistCbShutter import TwistCbShutter
 from .TwistGarage import TwistGarage
 from .TwistRelay import TwistRelay
 from .TwistButton import TwistButton
 from .TwistBinarySensor import TwistBinarySensor
 
 
-# Type mapping: maps backend type strings to Twist model classes
-# Add new mappings here when new device types are added
-TYPE_TO_MODEL_MAP: Dict[str, Type[TwistModel]] = {
-    "Mono_Light": TwistLight,
-    "TB_Shutter": TwistLouvre,
-    "Louvre": TwistLouvre,
-    "RGB": TwistRgb,
-    "Sensor": TwistSensor,
-    "CB_Shutter": TwistCbShutter,
-    "PB_Shutter": TwistCbShutter,
-    "Garage": TwistGarage,
-    "Relay": TwistRelay,
-    "Button": TwistButton,
-    "Binary_Sensor": TwistBinarySensor,
-}
-
-
 class DeviceInfo:
     """Container for device information from backend"""
-    def __init__(self, device_id: int, model_id: int, name: str, device_type: str,
+    def __init__(self, device_id: int, model_id: int, name: str, model_class: Type[TwistModel],
                  device_key: str, device_allocation_model_key: Optional[str] = None):
         self.device_id = device_id
         self.model_id = model_id
         self.name = name
-        self.device_type = device_type
+        self.model_class = model_class
         self.device_key = device_key
         self.device_allocation_model_key = device_allocation_model_key
 
@@ -230,15 +212,15 @@ class BackendAdapter:
                     label = model.get("label", f"Model {model_index}")
                     device_allocation_model_key = model.get("deviceAllocationModelKey")
 
-                    # Map model type name to device type string
-                    device_type = self._map_model_type_to_device_type(model_type_name)
+                    # Map model type name directly to model class
+                    model_class = self._map_model_type_to_class(model_type_name)
 
-                    if device_type:
+                    if model_class:
                         device_info = DeviceInfo(
                             device_id=twist_id,
                             model_id=model_index,
                             name=label,
-                            device_type=device_type,
+                            model_class=model_class,
                             device_key=device_key,
                             device_allocation_model_key=device_allocation_model_key
                         )
@@ -252,44 +234,34 @@ class BackendAdapter:
 
         return device_list
 
-    def _map_model_type_to_device_type(self, model_type_name: str) -> Optional[str]:
+    def _map_model_type_to_class(self, model_type_name: str) -> Optional[Type[TwistModel]]:
         """
-        Map the new API's modelTypeName to the device type string used internally
+        Map the API's modelTypeName directly to Twist model class
 
         Args:
-            model_type_name: Model type name from the new API
+            model_type_name: Model type name from the API
 
         Returns:
-            Device type string or None if unmapped
+            TwistModel subclass or None if unmapped
         """
-        # Mapping from new API model type names to internal device type strings
         mapping = {
-            "Louvres": "Louvre",
-            "Mono Light": "Mono_Light",
-            "RGB": "RGB",
-            "Temperature": "Sensor",
-            "CB Shutter": "CB_Shutter",
-            "PB Shutter": "PB_Shutter",
-            "Garage": "Garage",
-            "Relay": "Relay",
-            "Button": "Button",
-            "Binary Sensor": "Binary_Sensor",
+            "Louvres": TwistShutter,
+            "Mono Light": TwistLight,
+            "RGB": TwistRgb,
+            "Temperature": TwistSensor,
+            "CB Shutter": TwistShutter,
+            "PB Shutter": TwistShutter,
+            "Shutter": TwistShutter,
+            "Garage": TwistGarage,
+            "Relay": TwistRelay,
+            "Button": TwistButton,
+            "Binary Sensor": TwistBinarySensor,
+            "Gateway": None,  # Skip Gateway models
+            "Weather": None,  # Skip Weather models
+            "Wind": None,  # Skip Wind models
+            "Rain Sensor": None,  # Skip Rain Sensor models
+            "Pergola Protection": None,  # Skip logic models
+            "Unknown": None,  # Skip unknown models
         }
 
         return mapping.get(model_type_name)
-
-    @staticmethod
-    def get_model_class(device_type: str) -> Type[TwistModel]:
-        """
-        Get the appropriate model class for a device type.
-
-        This method maps backend device types to Twist model classes.
-        If a type is not recognized, it returns the base TwistModel class.
-
-        Args:
-            device_type: Device type string from backend
-
-        Returns:
-            Appropriate TwistModel subclass
-        """
-        return TYPE_TO_MODEL_MAP.get(device_type, TwistModel)

twist/TwistAPI.py

@@ -97,13 +97,7 @@ class TwistAPI:
 
             # Create models for this device
             for info in infos:
-                model_class = BackendAdapter.get_model_class(info.device_type)
-
-                if model_class == TwistModel:
-                    print(f"Skipping unknown device type '{info.device_type}' for '{info.name}' (device {info.device_id}, model {info.model_id})")
-                    continue
-
-                model = model_class(info.model_id, device)
+                model = info.model_class(info.model_id, device)
 
                 # Get product info if available using deviceAllocationModelKey
                 product_info = None
@@ -117,8 +111,6 @@ class TwistAPI:
                     model.product_name = None
                     model.name = info.name
 
-                model.device_type = info.device_type
-
                 # Add model at correct position in model_list
                 while len(device.model_list) <= info.model_id:
                     device.model_list.append(None)

twist/{TwistLouvre.py → TwistShutter.py}

@@ -22,7 +22,7 @@ from .TwistDevice import TwistModel
 from enum import Enum
 
 
-class TwistLouvre(TwistModel):
+class TwistShutter(TwistModel):
     class EventIndexes(Enum):
         OPEN = 0
         STOP = 1
@@ -55,24 +55,24 @@ class TwistLouvre(TwistModel):
             await self._update_callback(self)
 
     async def open(self):
-        await self._activate_event(TwistLouvre.EventIndexes.OPEN)
+        await self._activate_event(TwistShutter.EventIndexes.OPEN)
 
     async def stop(self):
-        await self._activate_event(TwistLouvre.EventIndexes.STOP)
+        await self._activate_event(TwistShutter.EventIndexes.STOP)
 
     async def close(self):
-        await self._activate_event(TwistLouvre.EventIndexes.CLOSE)
+        await self._activate_event(TwistShutter.EventIndexes.CLOSE)
 
     async def toggle(self):
-        await self._activate_event(TwistLouvre.EventIndexes.TOGGLE)
+        await self._activate_event(TwistShutter.EventIndexes.TOGGLE)
 
     async def set_value(self, value: int, fading_time: int | None = None):
         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, int(value * 655.35))
+            await self._activate_event(TwistShutter.EventIndexes.VALUE, int(value * 655.35))
 
-    async def _activate_event(self, index: TwistLouvre.EventIndexes, value: int | None = None,
+    async def _activate_event(self, index: TwistShutter.EventIndexes, value: int | None = None,
                               fading_time: int | None = None):
         data = {
             "i": index.value
@@ -89,5 +89,5 @@ class TwistLouvre(TwistModel):
 
     def print_context(self):
         print(
-            f"Louvre Device: {self.parent_device.twist_id}, Model: {self.model_id},  Actual: {self.actual_state}, "
+            f"Shutter Device: {self.parent_device.twist_id}, Model: {self.model_id},  Actual: {self.actual_state}, "
             f"Requested: {self.requested_state}, Operating: {self.operating_time}, Current: {self.current}")

{twist_innovation_api-0.0.4.dist-info → twist_innovation_api-0.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: twist-innovation-api
-Version: 0.0.4
+Version: 0.0.5
 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.4.dist-info → twist_innovation_api-0.0.5.dist-info}/RECORD

@@ -1,20 +1,19 @@
-twist/BackendAdapter.py,sha256=vvFomOgBiyKOZJ_n565AdHzdCgB-hNEU9UVDRONdhZc,10509
-twist/TwistAPI.py,sha256=0wwIiJRwV92tVoLdSJ6NYnZHu-UAPAVYZ7jaGsLpQq0,6477
+twist/BackendAdapter.py,sha256=v-kjbuuHyktIjWX6MG_I3sH3ZQBawJhSiwBzzatZ3C0,9758
+twist/TwistAPI.py,sha256=wjLl9tFs9krEaw8elTdXQJMqeuWAMXNS0nwJScXNMnY,6125
 twist/TwistBinarySensor.py,sha256=k9gsF1dTR3E_kiB60R1SUuUc9oUGGRGs592fQqy2VPM,1747
 twist/TwistButton.py,sha256=p5svcsU6maGwyWa06NnlKCGUXHoFzuwFPEQI0UqoGB4,2172
-twist/TwistCbShutter.py,sha256=mWQa4ro30uI8qm0J1rkR8M0KP7IwxlCRfWt0wSyCOLA,1199
 twist/TwistDevice.py,sha256=-ttj9LrZhR3BwLK4ADSe2TrTtY5Z3GMkz3BruUP_jCU,1159
 twist/TwistGarage.py,sha256=RaE0Pi-1dE9FwHEIANf--Uig9tFt6EAZBt_lxjZgk18,2149
 twist/TwistLight.py,sha256=6f-gPfP6v7BgaRJUFt7Q3r990y2L0812d76K_33KSTw,3230
-twist/TwistLouvre.py,sha256=f2ocRjLkf3qC45hbcHdEOboA2mbkaxLaOa15tvkHOHY,3320
 twist/TwistModel.py,sha256=HKDDm-vaRiNEF-a67N-cjWw2UZDiSPSRMkEmlAIUPTg,3667
 twist/TwistRelay.py,sha256=VL9eKXSOoZ_9GHT8TGZKDU1hGH-cgoogoMmJWLfjOqc,2309
 twist/TwistRgb.py,sha256=V7YuaqJaLTH3cL8CsQ3xIztfVKfqdMMJ7uyh9UZQDwA,3572
 twist/TwistSensor.py,sha256=6eYrwtZFFFOHmoHS68JHmsyi6FVVzoQy19KooGU0vMI,1192
+twist/TwistShutter.py,sha256=gXMbgV_Y-3GLzxE0K6XRP6qqDHEw0uySjZc82IOMsYY,3328
 twist/TwistTypes.py,sha256=k1CdLqjhJi8MyrFZsHkDsEoL9gEXF-HQv6I-r3G7ngA,726
 twist/__init__.py,sha256=gf8GHc9utiG0vD8GP3IfzLFHAG-ev1TXBIm0XUHxy38,201
-twist_innovation_api-0.0.4.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-twist_innovation_api-0.0.4.dist-info/METADATA,sha256=c5eSo06IcHRdW1vTHfXxQdyEYcrUtUctP98MaL8Lx8c,4139
-twist_innovation_api-0.0.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-twist_innovation_api-0.0.4.dist-info/top_level.txt,sha256=mkoeBkRPFodjnd-3UDf9YndjTQ6Sriz-EKSI4nQ7brs,6
-twist_innovation_api-0.0.4.dist-info/RECORD,,
+twist_innovation_api-0.0.5.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+twist_innovation_api-0.0.5.dist-info/METADATA,sha256=qd3IkTYqKU2qVxeqaSltdVRQCKMJd_gdCu5zXXvzk5o,4139
+twist_innovation_api-0.0.5.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+twist_innovation_api-0.0.5.dist-info/top_level.txt,sha256=mkoeBkRPFodjnd-3UDf9YndjTQ6Sriz-EKSI4nQ7brs,6
+twist_innovation_api-0.0.5.dist-info/RECORD,,

twist/TwistCbShutter.py

@@ -1,33 +0,0 @@
-# Copyright (C) 2025 Twist Innovation
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# See the GNU General Public License for more details:
-# 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
-from .TwistDevice import TwistModel
-
-
-class TwistCbShutter(TwistModel):
-    def __init__(self, model_id: int, parent_device: TwistDevice):
-        super().__init__(model_id, parent_device)
-
-    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},")