pygaposa 0.2.0__tar.gz → 0.2.2__tar.gz

{pygaposa-0.2.0/pygaposa.egg-info → pygaposa-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pygaposa
-Version: 0.2.0
+Version: 0.2.2
 Summary: Unofficial module for access to Gaposa morotized shades cloud API
 Home-page: https://github.com/mwatson2/pygaposa
 Author: Mark Watson

{pygaposa-0.2.0 → pygaposa-0.2.2}/pygaposa/__meta__.py

@@ -4,7 +4,7 @@ name = "pygaposa"
 path = name.lower().replace("-", "_").replace(" ", "_")
 # Your version number should follow https://python.org/dev/peps/pep-0440 and
 # https://semver.org
-version = "0.2.0"
+version = "0.2.2"
 author = "Mark Watson"
 author_email = "markwatson@cantab.net"
 description = "Unofficial module for access to Gaposa morotized shades cloud API"

{pygaposa-0.2.0 → pygaposa-0.2.2}/pygaposa/api_types.py

@@ -164,7 +164,7 @@ class DeviceDocumentRequired(TypedDict):
     Groups: Dict[NumericIdentifier, GroupInfo]
     HeartBeat: HeartBeat
     DeletedChannels: List[int]
-    Pending: list
+    Pending: list | Dict[str, Channel]
     Uid: list[str]
 
 

{pygaposa-0.2.0 → pygaposa-0.2.2}/pygaposa/devicebase.py

@@ -89,7 +89,8 @@ class DeviceBase(Updatable):
         self.uid = self.document["Uid"]
 
         for deletedChannel in self.document["DeletedChannels"]:
-            del self.document["Channels"][str(deletedChannel)]
+            if str(deletedChannel) in self.document["Channels"]:
+                del self.document["Channels"][str(deletedChannel)]
 
     def setLocation(self, location: tuple[float, float], timezone: str):
         self.location = location

{pygaposa-0.2.0 → pygaposa-0.2.2}/pygaposa/poll_manager.py

@@ -3,8 +3,8 @@ from logging import Logger
 from typing import Any, Callable, Coroutine, Optional, TypedDict
 
 POLL_INTERVAL = 2  # seconds
-POLL_RETRIES = 5
-POLL_TIMEOUT = 10  # seconds
+POLL_RETRIES = 10
+POLL_TIMEOUT = 20  # seconds
 
 
 class PollMagagerConfig(TypedDict):
@@ -64,7 +64,7 @@ class PollManager:
         """
         await self.wait_for_condition()
 
-    async def wait_for_condition(self, condition: Optional[Callable[[], bool]] = None):
+    def add_condition(self, condition: Optional[Callable[[], bool]] = None):
         """
         Poll the device document until the callback returns True or just once.
         """
@@ -75,6 +75,13 @@ class PollManager:
         if self.pollingTask is None:
             self.pollingTask = asyncio.create_task(self.execute())
 
+        return event
+
+    async def wait_for_condition(self, condition: Optional[Callable[[], bool]] = None):
+        """
+        Poll the device document until the callback returns True or just once.
+        """
+        event = self.add_condition(condition)
         await event.wait()
 
     async def execute(self):
@@ -84,11 +91,15 @@ class PollManager:
         while self.waiters:
             numConditions = self.numConditions()
             try:
+                self.logger.debug(
+                    f"Polling device document ({numConditions} conditions,"
+                    f" {self.retries} retries)"
+                )
                 await asyncio.wait_for(self.poll(), self.poll_timeout)
             except asyncio.TimeoutError:
                 self.logger.error("Timeout waiting for device document update")
-            except Exception as e:
-                self.logger.error(f"Error {e} waiting for device document update")
+            except Exception:
+                self.logger.exception("Error waiting for device document update")
 
             sleep = numConditions == self.numConditions()
 

{pygaposa-0.2.0 → pygaposa-0.2.2/pygaposa.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pygaposa
-Version: 0.2.0
+Version: 0.2.2
 Summary: Unofficial module for access to Gaposa morotized shades cloud API
 Home-page: https://github.com/mwatson2/pygaposa
 Author: Mark Watson