pysmarlaapi 0.7.0__tar.gz → 0.7.2__tar.gz

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

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

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

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

{pysmarlaapi-0.7.0 → pysmarlaapi-0.7.2}/pysmarlaapi/classes/connection.py

@@ -1,3 +1,5 @@
+import asyncio
+
 import aiohttp
 import jsonpickle
 
@@ -23,19 +25,28 @@ class Connection:
         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:
+            async with aiohttp.ClientSession(self.url) as session:
+                content = await self._get_token(session)
+        except (aiohttp.ClientError, asyncio.TimeoutError):
+            return False
+
+        if not content:
+            return False
 
         try:
-            self.token = AuthToken.from_json(json_body)
+            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.0 → pysmarlaapi-0.7.2}/pysmarlaapi/connection_hub/__init__.py

@@ -86,7 +86,7 @@ class ConnectionHub:
         self.logger.info("Connection to server closed")
 
     async def on_error(self, message):
-        self.logger.error("Connection error occurred: " + str(message))
+        self.logger.error("Connection error occurred: %s", str(message))
 
     def start(self):
         if self.running:
@@ -107,7 +107,7 @@ class ConnectionHub:
             try:
                 await self.client.run()
             except Exception as e:
-                self.logger.warning(f"Error during connection: {type(e).__name__}: {str(e)}")
+                self.logger.warning("Error during connection: %s: %s", type(e).__name__, str(e))
 
             # Random backoff to avoid simultaneous connection attempts
             backoff = random.randint(0, self._backoff)
@@ -136,7 +136,7 @@ class ConnectionHub:
         if value is not None:
             serialized_result["value"] = value
 
-        self.logger.debug(f"Sending data, Event: {event}, Payload: {str(serialized_result)}")
+        self.logger.debug("Sending data, Event: %s, Payload: %s", event, str(serialized_result))
 
         asyncio.run_coroutine_threadsafe(self.async_send_data(event, [serialized_result]), self._loop)