pysmarlaapi 0.6.0__tar.gz → 0.6.2__tar.gz

{pysmarlaapi-0.6.0 → pysmarlaapi-0.6.2}/PKG-INFO

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

{pysmarlaapi-0.6.0 → pysmarlaapi-0.6.2}/pysmarlaapi/__init__.py

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

{pysmarlaapi-0.6.0 → pysmarlaapi-0.6.2}/pysmarlaapi/classes/auth_token.py

@@ -1,4 +1,5 @@
 import base64
+import json
 from dataclasses import dataclass
 from typing import Self
 
@@ -16,16 +17,16 @@ class AuthToken:
     appCulture: str
 
     @classmethod
-    def from_json(cls, value) -> Self:
+    def from_json(cls, value: dict) -> Self:
         value["py/object"] = "pysmarlaapi.classes.auth_token.AuthToken"
-        return jsonpickle.decode(str(value))
+        return jsonpickle.decode(json.dumps(value))
 
     @classmethod
-    def from_string(cls, value) -> Self:
-        return AuthToken.from_json(jsonpickle.decode(value))
+    def from_string(cls, value: str) -> Self:
+        return AuthToken.from_json(json.loads(value))
 
     @classmethod
-    def from_base64(cls, value) -> Self:
+    def from_base64(cls, value: str) -> Self:
         token = base64.b64decode(value.encode()).decode()
         return AuthToken.from_string(token)
 

pysmarlaapi-0.6.2/pysmarlaapi/classes/connection.py

@@ -0,0 +1,41 @@
+import aiohttp
+import jsonpickle
+
+from . import AuthToken
+
+
+class Connection:
+
+    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
+        elif token_json is not None:
+            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
+
+    def get_token(self) -> str:
+        return self.token.token
+
+    async def refresh_token(self) -> bool:
+        async with aiohttp.ClientSession(self.url) as session:
+            async with 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 False
+                json_body = await response.json()
+
+        try:
+            self.token = AuthToken.from_json(json_body)
+        except ValueError:
+            return False
+
+        return True

{pysmarlaapi-0.6.0 → pysmarlaapi-0.6.2}/pysmarlaapi/connection_hub/__init__.py

@@ -123,9 +123,8 @@ class ConnectionHub:
         asyncio.run_coroutine_threadsafe(self.client._transport._ws.close(), self._loop)
 
     async def refresh_token(self):
-        await self.connection.get_token()
-        auth_token = self.connection.token.token
-        self.client._transport._headers["Authorization"] = f"Bearer {auth_token}"
+        await self.connection.refresh_token()
+        self.client._transport._headers["Authorization"] = f"Bearer {self.connection.get_token()}"
         self.logger.info("Auth token refreshed")
 
     def send_serialized_data(self, event, value=None):
@@ -139,9 +138,9 @@ class ConnectionHub:
 
         self.logger.debug(f"Sending data, Event: {event}, Payload: {str(serialized_result)}")
 
-        asyncio.run_coroutine_threadsafe(self.send_data(event, [serialized_result]), self._loop)
+        asyncio.run_coroutine_threadsafe(self.async_send_data(event, [serialized_result]), self._loop)
 
-    async def send_data(self, event, data):
+    async def async_send_data(self, event, data):
         try:
             await self.client.send(event, data)
         except Exception:

{pysmarlaapi-0.6.0 → pysmarlaapi-0.6.2}/pysmarlaapi/federwiege/__init__.py

@@ -36,10 +36,16 @@ class Federwiege:
 
         self.available = False
 
-    def get_service(self, service: str):
-        if service not in self.services:
+    def get_service(self, key: str):
+        if key not in self.services:
             return None
-        return self.services[service]
+        return self.services[key]
+
+    def get_property(self, service_key: str, prop_key: str):
+        service = self.get_service(service_key)
+        if not service:
+            return None
+        return service.get_property(prop_key)
 
     def connect(self):
         with self._lock:

pysmarlaapi-0.6.0/pysmarlaapi/classes/connection.py

@@ -1,40 +0,0 @@
-import aiohttp
-import jsonpickle
-
-from . import AuthToken
-
-
-class Connection:
-
-    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
-        elif token_json is not None:
-            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
-
-    async def get_token(self) -> AuthToken:
-        try:
-            async with aiohttp.ClientSession(self.url) as session:
-                async with 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
-                    json_body = await response.json()
-        except ValueError:
-            return None
-        try:
-            new_token = AuthToken.from_json(json_body)
-        except ValueError:
-            return None
-        self.token = new_token
-        return self.token