pysmarlaapi 0.1.0__py3-none-any.whl → 0.2.0__py3-none-any.whl

pysmarlaapi/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.0"
+__version__ = "0.2.0"
 
-from .classes import AuthToken, Connection
-from .connection_hub import ConnectionHub
+from .classes import Connection
+from .federwiege import Federwiege

pysmarlaapi/classes/connection.py

@@ -1,3 +1,5 @@
+import asyncio
+
 import aiohttp
 import jsonpickle
 
@@ -6,7 +8,10 @@ from . import AuthToken
 
 class Connection:
 
-    def __init__(self, url: str, token: AuthToken = None, token_str=None, token_json=None):
+    def __init__(
+        self, event_loop: asyncio.AbstractEventLoop, url: str, token: AuthToken = None, token_str=None, token_json=None
+    ):
+        self.event_loop = event_loop
         self.url = url
         if token is not None:
             self.token = token

pysmarlaapi/connection_hub/__init__.py

@@ -31,13 +31,12 @@ class ConnectionHub:
 
     def __init__(
         self,
-        async_loop: asyncio.AbstractEventLoop,
         connection: Connection,
         interval: int = 60,
         backoff: int = 300,
     ):
         self.connection: Connection = connection
-        self._loop: asyncio.AbstractEventLoop = async_loop
+        self._loop: asyncio.AbstractEventLoop = self.connection.event_loop
         self._interval = interval
         self._backoff = backoff
 
@@ -54,9 +53,9 @@ class ConnectionHub:
     async def notifycontrollerconnection(self, args):
         value = args[0]
         if value == "ControllerConnected":
-            await self.notify_listeners(1)
+            await self.notify_listeners(True)
         else:
-            await self.notify_listeners(0)
+            await self.notify_listeners(False)
 
     def setup(self):
         self.client = SignalRClient(self.connection.url + "/MobileAppHub", retry_count=1)

pysmarlaapi/federwiege/__init__.py

@@ -1,2 +1,62 @@
-from .services.analyser_service import AnalyserService
-from .services.babywiege_service import BabywiegeService
+import threading
+
+from ..classes import Connection
+from ..connection_hub import ConnectionHub
+from .classes import Service
+from .services import AnalyserService, BabywiegeService
+
+
+class Federwiege:
+
+    @property
+    def running(self):
+        return self.hub.running
+
+    @property
+    def connected(self):
+        return self.hub.connected
+
+    async def on_controller_connection_change(self, value):
+        self.available = value
+        if value:
+            self.sync()
+
+    def __init__(self, connection: Connection):
+        self.serial_number = connection.token.serialNumber
+        self.hub = ConnectionHub(connection)
+        self.services: dict[str, Service] = {
+            "babywiege": BabywiegeService(self.hub),
+            "analyser": AnalyserService(self.hub),
+        }
+
+        self.registered = False
+        self._lock = threading.Lock()
+
+        self.available = False
+
+    def get_service(self, service):
+        if service not in self.services:
+            return None
+        return self.services[service]
+
+    def connect(self):
+        with self._lock:
+            if not self.registered:
+                return
+            self.hub.start()
+
+    def disconnect(self):
+        self.hub.stop()
+
+    def sync(self):
+        for service in self.services.values():
+            service.sync()
+
+    def register(self):
+        with self._lock:
+            if self.registered:
+                return
+            self.registered = True
+            self.hub.add_listener(self.on_controller_connection_change)
+            for service in self.services.values():
+                service.register()

pysmarlaapi/federwiege/classes/service.py

@@ -4,10 +4,6 @@ from .property import Property
 
 class Service:
 
-    async def on_connection_change(self, value):
-        if value:
-            self.sync()
-
     def __init__(self, connection_hub: ConnectionHub):
         self.hub = connection_hub
         self.registered = False
@@ -20,12 +16,13 @@ class Service:
         return self.props
 
     def get_property(self, key: str):
+        if key not in self.props:
+            return None
         return self.props[key]
 
     def register(self):
         for prop in self.props.values():
             prop.register()
-        self.hub.add_listener(self.on_connection_change)
         self.registered = True
 
     def sync(self):

pysmarlaapi/federwiege/services/__init__.py

@@ -0,0 +1,2 @@
+from .analyser_service import AnalyserService
+from .babywiege_service import BabywiegeService

pysmarlaapi/federwiege/services/analyser_service.py

@@ -8,7 +8,6 @@ class AnalyserService(Service):
         super().__init__(connection_hub)
         self.add_property("oscillation", OscillationProperty(self.hub))
         self.add_property("activity", ActivityProperty(self.hub))
-        self.register()
 
 
 class OscillationProperty(Property[list[int, int]]):

pysmarlaapi/federwiege/services/babywiege_service.py

@@ -9,7 +9,6 @@ class BabywiegeService(Service):
         self.add_property("swing_active", SwingActiveProperty(self.hub))
         self.add_property("intensity", IntensityProperty(self.hub))
         self.add_property("smartmode", SmartModeProperty(self.hub))
-        self.register()
 
 
 class SwingActiveProperty(Property[bool]):

{pysmarlaapi-0.1.0.dist-info → pysmarlaapi-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pysmarlaapi
-Version: 0.1.0
+Version: 0.2.0
 Summary: Swing2Sleep Smarla API via websocket with signalr protocol
 Author-email: Robin Lintermann <robin.lintermann@explicatis.com>
 Requires-Python: >=3.11.9

pysmarlaapi-0.2.0.dist-info/RECORD

@@ -0,0 +1,15 @@
+pysmarlaapi/__init__.py,sha256=i45rOL2uYBjAHltN282RAZVC16RoTLHoGGdHZbZfMlY,94
+pysmarlaapi/classes/__init__.py,sha256=4F4LRzLQtj6AmzrXn74iHEZl-YElpMkb7MhEGkab504,71
+pysmarlaapi/classes/auth_token.py,sha256=FgLkZ0xPETfh1ZMQfWhwW6tkPnqFYeHhDUBLBFbauwA,663
+pysmarlaapi/classes/connection.py,sha256=tjcSmuUgCns0YRCB0WxFLtMYQujDInIlQs0FyigUO1k,1402
+pysmarlaapi/connection_hub/__init__.py,sha256=h20zSrb60nmiKC-oR91mkQal1yZbNko6IVTslDBppNg,4595
+pysmarlaapi/federwiege/__init__.py,sha256=YfhO-Vg25e_dbUrMJUhTEloFtwLyoRPyw2Af8h66mU0,1676
+pysmarlaapi/federwiege/classes/__init__.py,sha256=1cCe3iToaNmbUfy_7PynoPenNHtVcKC03rFc4ADqnbE,62
+pysmarlaapi/federwiege/classes/property.py,sha256=YZnpw0cD2NUPnlWo6TBjOzNTWcSJG1tvArXs1dRT6dY,1084
+pysmarlaapi/federwiege/classes/service.py,sha256=J_4WjL0SyyxwlvBp-zpO9EaXNUUcTnOLoPfSdU1FrjA,771
+pysmarlaapi/federwiege/services/__init__.py,sha256=F_54VQIYWAZaGm2ITzCJeG7G-6ARW2PfWvqaut56WN8,96
+pysmarlaapi/federwiege/services/analyser_service.py,sha256=tQb6ijNlrtbz4igH7awdoBnOVHu4TO6SPJmMW5yeT3A,1340
+pysmarlaapi/federwiege/services/babywiege_service.py,sha256=SJFPAsZaf4nSRmt6ojJq-9MtWqk1MdtcaPzBmTN3H0Y,2167
+pysmarlaapi-0.2.0.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+pysmarlaapi-0.2.0.dist-info/METADATA,sha256=XOCu8O2fyfOypK-oFsDm3O4TYHkDusw4W_zr7AU72hI,763
+pysmarlaapi-0.2.0.dist-info/RECORD,,

pysmarlaapi-0.1.0.dist-info/RECORD

@@ -1,14 +0,0 @@
-pysmarlaapi/__init__.py,sha256=znC1d_F9YF0NBjawoeGmtVz7GxsTaECIFihco71pctE,112
-pysmarlaapi/classes/__init__.py,sha256=4F4LRzLQtj6AmzrXn74iHEZl-YElpMkb7MhEGkab504,71
-pysmarlaapi/classes/auth_token.py,sha256=FgLkZ0xPETfh1ZMQfWhwW6tkPnqFYeHhDUBLBFbauwA,663
-pysmarlaapi/classes/connection.py,sha256=vNh9vG4xAewl2gmkducwSd3u7osjYw5gwtZTZ48rqVo,1291
-pysmarlaapi/connection_hub/__init__.py,sha256=U76wUkXHjAgzZNuJKS8ZFRwIskPIkCW1HdI1_SLlGs0,4620
-pysmarlaapi/federwiege/__init__.py,sha256=-zzqsip6li-QPsUJv-wEoqLpUzHHN9gbUYACRAc_wSg,114
-pysmarlaapi/federwiege/classes/__init__.py,sha256=1cCe3iToaNmbUfy_7PynoPenNHtVcKC03rFc4ADqnbE,62
-pysmarlaapi/federwiege/classes/property.py,sha256=YZnpw0cD2NUPnlWo6TBjOzNTWcSJG1tvArXs1dRT6dY,1084
-pysmarlaapi/federwiege/classes/service.py,sha256=wZcfq4xVXu_LKojcZALs63n5le9ekx0sEYT8nHKJKbU,865
-pysmarlaapi/federwiege/services/analyser_service.py,sha256=RoY5gv_DxUb9W9oucmPGJgOmoy9zn_uHmNyZX2P_wOY,1365
-pysmarlaapi/federwiege/services/babywiege_service.py,sha256=qHZjkQK7vmHK0vVmtXrdAsTh9vdAAbuwOQfKLF6ltyQ,2192
-pysmarlaapi-0.1.0.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-pysmarlaapi-0.1.0.dist-info/METADATA,sha256=W1W63qwrvPtAh-Rfw0LUuqF-Ch-h9i9TneuQdxbr8tQ,763
-pysmarlaapi-0.1.0.dist-info/RECORD,,