pysmarlaapi 0.6.0__py3-none-any.whl → 0.6.2__py3-none-any.whl

pysmarlaapi/__init__.py

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

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/classes/connection.py

@@ -19,22 +19,23 @@ class Connection:
         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
+    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:
-            new_token = AuthToken.from_json(json_body)
+            self.token = AuthToken.from_json(json_body)
         except ValueError:
-            return None
-        self.token = new_token
-        return self.token
+            return False
+
+        return True

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/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.dist-info → pysmarlaapi-0.6.2.dist-info}/METADATA

@@ -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.dist-info → pysmarlaapi-0.6.2.dist-info}/RECORD

@@ -1,9 +1,9 @@
-pysmarlaapi/__init__.py,sha256=HWaO4zQfblKUzxbw84sng4K4BCzAbCUGCeFTmwuJ1d4,90
+pysmarlaapi/__init__.py,sha256=Ri9MvYD3A64kxEx0v2t7ziBYvmqud7Fb8Ophky7vvZI,90
 pysmarlaapi/classes/__init__.py,sha256=N-ZV3Id_t5ciovUlPUGCk5SLLiMUonRoQZWpfOU4ZsM,69
-pysmarlaapi/classes/auth_token.py,sha256=zzBTmCNuQIGD2u52g1p1pwxE5XYZDKQHU_Z89GP9-Ro,914
-pysmarlaapi/classes/connection.py,sha256=aX2Fc97kpMzkaBkLfJskyJNPkG4ZT463Od9Qf3Hs6mA,1363
-pysmarlaapi/connection_hub/__init__.py,sha256=wiOSA3upJD1iWve330DdCR2REfEWQH4WBWGWAL2DsxM,4452
-pysmarlaapi/federwiege/__init__.py,sha256=A32w5oaBI8huZBWnbaG90lAl3oF7EqH2LdaCa9ay6L4,1741
+pysmarlaapi/classes/auth_token.py,sha256=dpo0lBT9Advm3Iyxu-fT9sq078U2OxgXXBuF5gbBZkM,942
+pysmarlaapi/classes/connection.py,sha256=kFwdZeKqgCV9VgVyvEIaPwLp8zsnbnDJRYbeFWvcxZA,1295
+pysmarlaapi/connection_hub/__init__.py,sha256=4GwcybM2cr5vCfusGy4UhAKz-uwPyRHMOzWc9bP0WRo,4436
+pysmarlaapi/federwiege/__init__.py,sha256=7Fl_GnwN6GbS8fhkHdfMhuYFospKnap40pvUtSGIeoE,1933
 pysmarlaapi/federwiege/classes/__init__.py,sha256=DFJJVOKpra40S4ZX_oq2RyMazg6Nx0c8hoPggmj1bXA,60
 pysmarlaapi/federwiege/classes/property.py,sha256=kTVbaGbWmmku5GmVq0mtWF8uSA7G8oHakyZ_LOO9h3c,1028
 pysmarlaapi/federwiege/classes/service.py,sha256=Y0OQxtQLaHp4qY8Vthj0zRroPoYTiD2WA9ZR96teZTo,632
@@ -11,7 +11,7 @@ pysmarlaapi/federwiege/services/__init__.py,sha256=bJuOsk0lw9WWxB1NZodRTL8Pm_Ra8
 pysmarlaapi/federwiege/services/analyser_service.py,sha256=y02j4cNvRAblBa1pTlJi1u1_7c3vV4xMj9uHe_vwV38,1789
 pysmarlaapi/federwiege/services/babywiege_service.py,sha256=8hCu-uFAcT_G0F5oUD3EqYzb02L2bE5mVF72NrunEpc,2070
 pysmarlaapi/federwiege/services/info_service.py,sha256=03a4eZFAL1zaIaWo1e-a_Zm2wVl0RuFLm2rTS7ABJIQ,1248
-pysmarlaapi-0.6.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-pysmarlaapi-0.6.0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-pysmarlaapi-0.6.0.dist-info/METADATA,sha256=WQ1UYubXCJACE9ektKkgxCpFP_B8OqLEcAydBF2Wexw,1106
-pysmarlaapi-0.6.0.dist-info/RECORD,,
+pysmarlaapi-0.6.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+pysmarlaapi-0.6.2.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+pysmarlaapi-0.6.2.dist-info/METADATA,sha256=yQbezgR-CCxh7D7i0x1X86kszFKdgAV2q-iFSDpTpLY,1106
+pysmarlaapi-0.6.2.dist-info/RECORD,,