pysmarlaapi 0.7.1__tar.gz → 0.8.0__tar.gz

{pysmarlaapi-0.7.1 → pysmarlaapi-0.8.0}/PKG-INFO

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

{pysmarlaapi-0.7.1 → pysmarlaapi-0.8.0}/pysmarlaapi/__init__.py

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

{pysmarlaapi-0.7.1 → pysmarlaapi-0.8.0}/pysmarlaapi/classes/connection.py

@@ -27,22 +27,26 @@ class Connection:
     async def refresh_token(self) -> bool:
         try:
             async with aiohttp.ClientSession(self.url) as session:
-                response = await session.post(
-                    "/api/AppParing/getToken",
-                    headers={"accept": "*/*", "Content-Type": "application/json"},
-                    data=jsonpickle.encode(self.token, unpicklable=False),
-                )
+                content = await self._get_token(session)
         except (aiohttp.ClientError, asyncio.TimeoutError):
             return False
 
-        if response.status != 200:
+        if not content:
             return False
 
-        content = await response.json()
-
         try:
             self.token = AuthToken.from_json(content)
         except ValueError:
             return False
 
         return True
+
+    async def _get_token(self, session: aiohttp.ClientSession):
+        async with await session.post(
+            "/api/AppParing/getToken",
+            headers={"accept": "*/*", "Content-Type": "application/json"},
+            data=jsonpickle.encode(self.token, unpicklable=False),
+        ) as response:
+            if response.status != 200:
+                return None
+            return await response.json()

{pysmarlaapi-0.7.1 → pysmarlaapi-0.8.0}/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()
 

{pysmarlaapi-0.7.1 → pysmarlaapi-0.8.0}/pysmarlaapi/federwiege/services/analyser_service.py

@@ -11,7 +11,7 @@ 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"]
@@ -19,8 +19,7 @@ class OscillationProperty(Property[list[int, int]]):
         await self.notify_listeners(value)
 
     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")
@@ -37,8 +36,7 @@ class ActivityProperty(Property[int]):
         await self.notify_listeners(value)
 
     def __init__(self, hub: ConnectionHub):
-        super().__init__(hub)
-        self.value = 0
+        super().__init__(hub, 0)
 
     def pull(self):
         self.hub.send_serialized_data("GetActivity")
@@ -55,8 +53,7 @@ class SwingCountProperty(Property[int]):
         await self.notify_listeners(value)
 
     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.1 → pysmarlaapi-0.8.0}/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]):
@@ -19,8 +19,7 @@ class SwingActiveProperty(Property[bool]):
         await self.notify_listeners(value)
 
     def __init__(self, hub: ConnectionHub):
-        super().__init__(hub)
-        self.value = False
+        super().__init__(hub, False)
 
     def pull(self):
         self.hub.send_serialized_data("GetSwingActive")
@@ -40,8 +39,7 @@ class IntensityProperty(Property[int]):
         await self.notify_listeners(value)
 
     def __init__(self, hub: ConnectionHub):
-        super().__init__(hub)
-        self.value = 0
+        super().__init__(hub, 0)
 
     def pull(self):
         self.hub.send_serialized_data("GetIntensity")
@@ -61,8 +59,7 @@ class SmartModeProperty(Property[bool]):
         await self.notify_listeners(value)
 
     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.1 → pysmarlaapi-0.8.0}/pysmarlaapi/federwiege/services/info_service.py

@@ -18,8 +18,7 @@ class DisplayNameProperty(Property[str]):
         await self.notify_listeners(value)
 
     def __init__(self, hub: ConnectionHub):
-        super().__init__(hub)
-        self.value = "Smarla"
+        super().__init__(hub, "Smarla")
 
     def pull(self):
         self.hub.send_serialized_data("GetDisplayName")
@@ -36,8 +35,7 @@ class VersionProperty(Property[str]):
         await self.notify_listeners(value)
 
     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")