pysmarlaapi 0.2.4__tar.gz → 0.4.0__tar.gz

{pysmarlaapi-0.2.4 → pysmarlaapi-0.4.0}/PKG-INFO

@@ -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.2.4 → pysmarlaapi-0.4.0}/pysmarlaapi/__init__.py

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

{pysmarlaapi-0.2.4 → pysmarlaapi-0.4.0}/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-0.2.4 → pysmarlaapi-0.4.0}/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-0.2.4 → pysmarlaapi-0.4.0}/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-0.2.4 → pysmarlaapi-0.4.0}/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-0.2.4 → pysmarlaapi-0.4.0}/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-0.2.4 → pysmarlaapi-0.4.0}/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-0.4.0/pysmarlaapi/federwiege/services/analyser_service.py

@@ -0,0 +1,65 @@
+from ...connection_hub import ConnectionHub
+from ..classes import Property, Service
+
+
+class AnalyserService(Service):
+
+    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]]):
+
+    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, 0]
+
+    def pull(self):
+        self.hub.send_serialized_data("GetOscillation")
+
+    def register(self):
+        self.hub.client.on("GetOscillationCallback", self.on_callback)
+
+
+class ActivityProperty(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("GetActivity")
+
+    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-0.2.4 → pysmarlaapi-0.4.0}/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-0.4.0/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 → pysmarlaapi-0.4.0}/tests/test.py

@@ -10,15 +10,15 @@ logging.basicConfig(level=20)
 from pysmarlaapi import Connection, Federwiege
 
 try:
-    from config import AUTH_TOKEN_PERSONAL, HOST
+    from config import AUTH_TOKEN_B64, HOST
 except ImportError:
     print("config.py or mandatory variables missing, please add in root folder...")
-    exit()
+    sys.exit()
 
 loop = asyncio.get_event_loop()
 async_thread = threading.Thread(target=loop.run_forever)
 
-connection = Connection(url=HOST, token_json=AUTH_TOKEN_PERSONAL)
+connection = Connection(url=HOST, token_b64=AUTH_TOKEN_B64)
 
 federwiege = Federwiege(loop, connection)
 
@@ -33,10 +33,19 @@ def main():
 
     swing_active_prop = federwiege.get_service("babywiege").get_property("swing_active")
     intensity_prop = federwiege.get_service("babywiege").get_property("intensity")
+
     oscillation_prop = federwiege.get_service("analyser").get_property("oscillation")
+    swing_count_prop = federwiege.get_service("analyser").get_property("swing_count")
+
+    display_name_prop = federwiege.get_service("info").get_property("display_name")
+    version_prop = federwiege.get_service("info").get_property("version")
 
     time.sleep(1)
 
+    print(display_name_prop.get())
+    print(version_prop.get())
+    print(swing_count_prop.get())
+
     value = swing_active_prop.get()
     print(f"Swing Active: {value}")
     intensity = intensity_prop.get()

pysmarlaapi-0.2.4/pysmarlaapi/federwiege/services/analyser_service.py

@@ -1,46 +0,0 @@
-from ...connection_hub import ConnectionHub
-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))
-
-
-class OscillationProperty(Property[list[int, int]]):
-
-    async def on_callback(self, args):
-        value = args[0]["value"]
-        self.set(value, push=False)
-        await self.notify_listeners(value)
-
-    def __init__(self, parent: Service):
-        super().__init__(parent)
-        self.value = [0, 0]
-
-    def pull(self):
-        self.hub.send_serialized_data("GetOscillation")
-
-    def register(self):
-        self.hub.client.on("GetOscillationCallback", self.on_callback)
-
-
-class ActivityProperty(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, parent: Service):
-        super().__init__(parent)
-        self.value = 0
-
-    def pull(self):
-        self.hub.send_serialized_data("GetActivity")
-
-    def register(self):
-        self.hub.client.on("GetActivityCallback", self.on_callback)