pysmarlaapi 0.2.4__py3-none-any.whl → 0.4.0__py3-none-any.whl

pysmarlaapi/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.4"
+__version__ = "0.4.0"
 
 from .classes import Connection
 from .federwiege import Federwiege

pysmarlaapi/classes/auth_token.py

@@ -1,3 +1,4 @@
+import base64
 from dataclasses import dataclass
 from typing import Self
 
@@ -23,5 +24,13 @@ class AuthToken:
     def from_string(cls, value) -> Self:
         return AuthToken.from_json(jsonpickle.decode(value))
 
+    @classmethod
+    def from_base64(cls, value) -> Self:
+        token = base64.b64decode(value.encode()).decode()
+        return AuthToken.from_string(token)
+
     def get_string(self) -> str:
         return jsonpickle.encode(self, unpicklable=False)
+
+    def get_base64(self) -> str:
+        return base64.b64encode(self.get_string().encode()).decode()

pysmarlaapi/classes/connection.py

@@ -6,7 +6,7 @@ from . import AuthToken
 
 class Connection:
 
-    def __init__(self, url: str, token: AuthToken = None, token_str=None, token_json=None):
+    def __init__(self, url: str, token: AuthToken = None, token_str=None, token_json=None, token_b64=None):
         self.url = url
         if token is not None:
             self.token = token
@@ -14,6 +14,8 @@ class Connection:
             self.token = AuthToken.from_json(token_json)
         elif token_str is not None:
             self.token = AuthToken.from_string(token_str)
+        elif token_b64 is not None:
+            self.token = AuthToken.from_base64(token_b64)
         else:
             self.token = None
 

pysmarlaapi/federwiege/__init__.py

@@ -4,7 +4,7 @@ import threading
 from ..classes import Connection
 from ..connection_hub import ConnectionHub
 from .classes import Service
-from .services import AnalyserService, BabywiegeService
+from .services import AnalyserService, BabywiegeService, InfoService
 
 
 class Federwiege:
@@ -28,6 +28,7 @@ class Federwiege:
         self.services: dict[str, Service] = {
             "babywiege": BabywiegeService(self.hub),
             "analyser": AnalyserService(self.hub),
+            "info": InfoService(self.hub),
         }
 
         self.registered = False

pysmarlaapi/federwiege/classes/property.py

@@ -8,8 +8,8 @@ _VT = TypeVar("_VT")
 
 class Property(Generic[_VT]):
 
-    def __init__(self, connection_hub: ConnectionHub):
-        self.hub = connection_hub
+    def __init__(self, hub: ConnectionHub):
+        self.hub = hub
         self.value: _VT = None
         self.listeners = set()
         self.lock = asyncio.Lock()

pysmarlaapi/federwiege/classes/service.py

@@ -1,11 +1,9 @@
-from ...connection_hub import ConnectionHub
 from .property import Property
 
 
 class Service:
 
-    def __init__(self, connection_hub: ConnectionHub):
-        self.hub = connection_hub
+    def __init__(self):
         self.registered = False
         self.props: dict[str, Property] = {}
 

pysmarlaapi/federwiege/services/__init__.py

@@ -1,2 +1,3 @@
 from .analyser_service import AnalyserService
 from .babywiege_service import BabywiegeService
+from .info_service import InfoService

pysmarlaapi/federwiege/services/analyser_service.py

@@ -4,10 +4,11 @@ from ..classes import Property, Service
 
 class AnalyserService(Service):
 
-    def __init__(self, connection_hub: ConnectionHub):
-        super().__init__(connection_hub)
-        self.add_property("oscillation", OscillationProperty(self.hub))
-        self.add_property("activity", ActivityProperty(self.hub))
+    def __init__(self, hub: ConnectionHub):
+        super().__init__()
+        self.add_property("oscillation", OscillationProperty(hub))
+        self.add_property("activity", ActivityProperty(hub))
+        self.add_property("swing_count", SwingCountProperty(hub))
 
 
 class OscillationProperty(Property[list[int, int]]):
@@ -17,8 +18,8 @@ class OscillationProperty(Property[list[int, int]]):
         self.set(value, push=False)
         await self.notify_listeners(value)
 
-    def __init__(self, parent: Service):
-        super().__init__(parent)
+    def __init__(self, hub: ConnectionHub):
+        super().__init__(hub)
         self.value = [0, 0]
 
     def pull(self):
@@ -35,8 +36,8 @@ class ActivityProperty(Property[int]):
         self.set(value, push=False)
         await self.notify_listeners(value)
 
-    def __init__(self, parent: Service):
-        super().__init__(parent)
+    def __init__(self, hub: ConnectionHub):
+        super().__init__(hub)
         self.value = 0
 
     def pull(self):
@@ -44,3 +45,21 @@ class ActivityProperty(Property[int]):
 
     def register(self):
         self.hub.client.on("GetActivityCallback", self.on_callback)
+
+
+class SwingCountProperty(Property[int]):
+
+    async def on_callback(self, args):
+        value = args[0]["value"]
+        self.set(value, push=False)
+        await self.notify_listeners(value)
+
+    def __init__(self, hub: ConnectionHub):
+        super().__init__(hub)
+        self.value = 0
+
+    def pull(self):
+        self.hub.send_serialized_data("GetSwingCount")
+
+    def register(self):
+        self.hub.client.on("GetSwingCountCallback", self.on_callback)

pysmarlaapi/federwiege/services/babywiege_service.py

@@ -4,11 +4,11 @@ from ..classes import Property, Service
 
 class BabywiegeService(Service):
 
-    def __init__(self, connection_hub: ConnectionHub):
-        super().__init__(connection_hub)
-        self.add_property("swing_active", SwingActiveProperty(self.hub))
-        self.add_property("intensity", IntensityProperty(self.hub))
-        self.add_property("smartmode", SmartModeProperty(self.hub))
+    def __init__(self, hub: ConnectionHub):
+        super().__init__()
+        self.add_property("swing_active", SwingActiveProperty(hub))
+        self.add_property("intensity", IntensityProperty(hub))
+        self.add_property("smartmode", SmartModeProperty(hub))
 
 
 class SwingActiveProperty(Property[bool]):
@@ -18,8 +18,8 @@ class SwingActiveProperty(Property[bool]):
         self.set(value, push=False)
         await self.notify_listeners(value)
 
-    def __init__(self, parent: Service):
-        super().__init__(parent)
+    def __init__(self, hub: ConnectionHub):
+        super().__init__(hub)
         self.value = False
 
     def pull(self):
@@ -39,8 +39,8 @@ class IntensityProperty(Property[int]):
         self.set(value, push=False)
         await self.notify_listeners(value)
 
-    def __init__(self, parent: Service):
-        super().__init__(parent)
+    def __init__(self, hub: ConnectionHub):
+        super().__init__(hub)
         self.value = 0
 
     def pull(self):
@@ -60,8 +60,8 @@ class SmartModeProperty(Property[bool]):
         self.set(value, push=False)
         await self.notify_listeners(value)
 
-    def __init__(self, parent: Service):
-        super().__init__(parent)
+    def __init__(self, hub: ConnectionHub):
+        super().__init__(hub)
         self.value = False
 
     def pull(self):

pysmarlaapi/federwiege/services/info_service.py

@@ -0,0 +1,46 @@
+from ...connection_hub import ConnectionHub
+from ..classes import Property, Service
+
+
+class InfoService(Service):
+
+    def __init__(self, hub: ConnectionHub):
+        super().__init__()
+        self.add_property("display_name", DisplayNameProperty(hub))
+        self.add_property("version", VersionProperty(hub))
+
+
+class DisplayNameProperty(Property[str]):
+
+    async def on_callback(self, args):
+        value = args[0]["value"]
+        self.set(value, push=False)
+        await self.notify_listeners(value)
+
+    def __init__(self, hub: ConnectionHub):
+        super().__init__(hub)
+        self.value = "Smarla"
+
+    def pull(self):
+        self.hub.send_serialized_data("GetDisplayName")
+
+    def register(self):
+        self.hub.client.on("GetDisplayNameCallback", self.on_callback)
+
+
+class VersionProperty(Property[str]):
+
+    async def on_callback(self, args):
+        value = args[0]["value"]
+        self.set(value, push=False)
+        await self.notify_listeners(value)
+
+    def __init__(self, hub: ConnectionHub):
+        super().__init__(hub)
+        self.value = "1.0.0"
+
+    def pull(self):
+        self.hub.send_serialized_data("GetVersion")
+
+    def register(self):
+        self.hub.client.on("GetVersionCallback", self.on_callback)

{pysmarlaapi-0.2.4.dist-info → pysmarlaapi-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pysmarlaapi
-Version: 0.2.4
+Version: 0.4.0
 Summary: Swing2Sleep Smarla API
 Author-email: Robin Lintermann <robin.lintermann@explicatis.com>
 Requires-Python: >=3.11.9

pysmarlaapi-0.4.0.dist-info/RECORD

@@ -0,0 +1,16 @@
+pysmarlaapi/__init__.py,sha256=7NFNMBkl7qODMJYvG4pHJy4qdfoAqloPqXoKRbkrUoE,94
+pysmarlaapi/classes/__init__.py,sha256=4F4LRzLQtj6AmzrXn74iHEZl-YElpMkb7MhEGkab504,71
+pysmarlaapi/classes/auth_token.py,sha256=bxpp0gDzWuLzNSgUksN4mMlyvkDWLhqs3fT76Mb-0c8,950
+pysmarlaapi/classes/connection.py,sha256=tmMaPEN1lu8fC8cV-SX6l4aVUkaAOh-32aZUhR7nMSU,1403
+pysmarlaapi/connection_hub/__init__.py,sha256=6bLOH7cY_AyZwsMLKlFEA-kwmhKCI4pb0aLrflgfWdQ,4600
+pysmarlaapi/federwiege/__init__.py,sha256=uFExZeBgoKfmfE7YZ20V_AynZzN61ZrH2DdztGOhjq8,1800
+pysmarlaapi/federwiege/classes/__init__.py,sha256=1cCe3iToaNmbUfy_7PynoPenNHtVcKC03rFc4ADqnbE,62
+pysmarlaapi/federwiege/classes/property.py,sha256=7CmNN-vQ-6BBYDvp9I7Md15S-LvADlAGpZr4HXlW14U,1062
+pysmarlaapi/federwiege/classes/service.py,sha256=Um2EQYtHdPvUGn4Q9cZM45yciSFBMNYL6Nyf5ln2WMc,660
+pysmarlaapi/federwiege/services/__init__.py,sha256=20A54vK90HAmAF3VvXSAaHSujCVr0o6xqT6YG2G582c,135
+pysmarlaapi/federwiege/services/analyser_service.py,sha256=PJmPqEIytrb9RUyuHDm5ShvpyrmiAXWO0LfINku_NVE,1854
+pysmarlaapi/federwiege/services/babywiege_service.py,sha256=Uup7oU_GUImNAOojbRMbKdROZ2X9Vmu7Eqq43ZdcXbA,2127
+pysmarlaapi/federwiege/services/info_service.py,sha256=dfODCRBK3Vinme73IlmjSqsvwfPrXeqDz_EEA9cWnhk,1294
+pysmarlaapi-0.4.0.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+pysmarlaapi-0.4.0.dist-info/METADATA,sha256=9yzsOhL2NBsUH7VtuAmgu-GR_N4PgluXJ5xDeeGdKh8,925
+pysmarlaapi-0.4.0.dist-info/RECORD,,

pysmarlaapi-0.2.4.dist-info/RECORD

@@ -1,15 +0,0 @@
-pysmarlaapi/__init__.py,sha256=ja471fsB9Kv4UrmXpPaDtnjKVnDadDi_-Q9VLLzYFGw,94
-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=6bLOH7cY_AyZwsMLKlFEA-kwmhKCI4pb0aLrflgfWdQ,4600
-pysmarlaapi/federwiege/__init__.py,sha256=6Hk_Oqrk8AKoomNGdq3o-2pBW6E8ejvKArAc0DdOBGw,1743
-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.4.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-pysmarlaapi-0.2.4.dist-info/METADATA,sha256=E5gjtqiCARZYk0kDfw2-0p3Nc7CZ4PMFRLPzkUVRnjg,925
-pysmarlaapi-0.2.4.dist-info/RECORD,,