pysmarlaapi 0.7.2__tar.gz → 0.8.1__tar.gz

{pysmarlaapi-0.7.2 → pysmarlaapi-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysmarlaapi
-Version: 0.7.2
+Version: 0.8.1
 Summary: Swing2Sleep Smarla API
 Author-email: Robin Lintermann <robin.lintermann@explicatis.com>
 Requires-Python: >=3.11

{pysmarlaapi-0.7.2 → pysmarlaapi-0.8.1}/pysmarlaapi/__init__.py

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

{pysmarlaapi-0.7.2 → pysmarlaapi-0.8.1}/pysmarlaapi/federwiege/classes/property.py

@@ -8,9 +8,9 @@ _VT = TypeVar("_VT")
 
 class Property(Generic[_VT]):
 
-    def __init__(self, hub: ConnectionHub):
+    def __init__(self, hub: ConnectionHub, value: _VT):
         self.hub = hub
-        self.value: _VT = None
+        self.value: _VT = value
         self.listeners = set()
         self.lock = asyncio.Lock()
 
@@ -22,10 +22,10 @@ class Property(Generic[_VT]):
         async with self.lock:
             self.listeners.remove(listener)
 
-    async def notify_listeners(self, value):
+    async def notify_listeners(self):
         async with self.lock:
             for listener in self.listeners:
-                await listener(value)
+                await listener(self.value)
 
     def get(self) -> _VT:
         return self.value

{pysmarlaapi-0.7.2 → pysmarlaapi-0.8.1}/pysmarlaapi/federwiege/services/analyser_service.py

@@ -11,16 +11,15 @@ class AnalyserService(Service):
         self.add_property("swing_count", SwingCountProperty(hub))
 
 
-class OscillationProperty(Property[list[int, int]]):
+class OscillationProperty(Property[list[int]]):
 
     async def on_callback(self, args):
         value = args[0]["value"]
         self.set(value, push=False)
-        await self.notify_listeners(value)
+        await self.notify_listeners()
 
     def __init__(self, hub: ConnectionHub):
-        super().__init__(hub)
-        self.value = [0, 0]
+        super().__init__(hub, [0, 0])
 
     def pull(self):
         self.hub.send_serialized_data("GetOscillation")
@@ -34,11 +33,10 @@ class ActivityProperty(Property[int]):
     async def on_callback(self, args):
         value = args[0]["value"]
         self.set(value, push=False)
-        await self.notify_listeners(value)
+        await self.notify_listeners()
 
     def __init__(self, hub: ConnectionHub):
-        super().__init__(hub)
-        self.value = 0
+        super().__init__(hub, 0)
 
     def pull(self):
         self.hub.send_serialized_data("GetActivity")
@@ -52,11 +50,10 @@ class SwingCountProperty(Property[int]):
     async def on_callback(self, args):
         value = args[0]["value"]
         self.set(value, push=False)
-        await self.notify_listeners(value)
+        await self.notify_listeners()
 
     def __init__(self, hub: ConnectionHub):
-        super().__init__(hub)
-        self.value = 0
+        super().__init__(hub, 0)
 
     def pull(self):
         self.hub.send_serialized_data("GetSwingCount")

{pysmarlaapi-0.7.2 → pysmarlaapi-0.8.1}/pysmarlaapi/federwiege/services/babywiege_service.py

@@ -8,7 +8,7 @@ class BabywiegeService(Service):
         super().__init__()
         self.add_property("swing_active", SwingActiveProperty(hub))
         self.add_property("intensity", IntensityProperty(hub))
-        self.add_property("smartmode", SmartModeProperty(hub))
+        self.add_property("smart_mode", SmartModeProperty(hub))
 
 
 class SwingActiveProperty(Property[bool]):
@@ -16,11 +16,10 @@ class SwingActiveProperty(Property[bool]):
     async def on_callback(self, args):
         value = args[0]["value"]
         self.set(value, push=False)
-        await self.notify_listeners(value)
+        await self.notify_listeners()
 
     def __init__(self, hub: ConnectionHub):
-        super().__init__(hub)
-        self.value = False
+        super().__init__(hub, False)
 
     def pull(self):
         self.hub.send_serialized_data("GetSwingActive")
@@ -37,11 +36,10 @@ class IntensityProperty(Property[int]):
     async def on_callback(self, args):
         value = args[0]["value"]
         self.set(value, push=False)
-        await self.notify_listeners(value)
+        await self.notify_listeners()
 
     def __init__(self, hub: ConnectionHub):
-        super().__init__(hub)
-        self.value = 0
+        super().__init__(hub, 0)
 
     def pull(self):
         self.hub.send_serialized_data("GetIntensity")
@@ -58,11 +56,10 @@ class SmartModeProperty(Property[bool]):
     async def on_callback(self, args):
         value = args[0]["value"]
         self.set(value, push=False)
-        await self.notify_listeners(value)
+        await self.notify_listeners()
 
     def __init__(self, hub: ConnectionHub):
-        super().__init__(hub)
-        self.value = False
+        super().__init__(hub, False)
 
     def pull(self):
         self.hub.send_serialized_data("GetSmartMode")

{pysmarlaapi-0.7.2 → pysmarlaapi-0.8.1}/pysmarlaapi/federwiege/services/info_service.py

@@ -15,11 +15,10 @@ class DisplayNameProperty(Property[str]):
     async def on_callback(self, args):
         value = args[0]["value"]
         self.set(value, push=False)
-        await self.notify_listeners(value)
+        await self.notify_listeners()
 
     def __init__(self, hub: ConnectionHub):
-        super().__init__(hub)
-        self.value = "Smarla"
+        super().__init__(hub, "Smarla")
 
     def pull(self):
         self.hub.send_serialized_data("GetDisplayName")
@@ -33,11 +32,10 @@ class VersionProperty(Property[str]):
     async def on_callback(self, args):
         value = args[0]["value"]
         self.set(value, push=False)
-        await self.notify_listeners(value)
+        await self.notify_listeners()
 
     def __init__(self, hub: ConnectionHub):
-        super().__init__(hub)
-        self.value = "1.0.0"
+        super().__init__(hub, "1.0.0")
 
     def pull(self):
         self.hub.send_serialized_data("GetVersion")