dycw-utilities 0.129.1__py3-none-any.whl → 0.129.2__py3-none-any.whl

{dycw_utilities-0.129.1.dist-info → dycw_utilities-0.129.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.129.1
+Version: 0.129.2
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12

{dycw_utilities-0.129.1.dist-info → dycw_utilities-0.129.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
-utilities/__init__.py,sha256=SD3J-kHQFgs1qNwFwV6LhMTAXj4jsrYuL05YluwVtcE,60
+utilities/__init__.py,sha256=xCbJwDm5euQ0FhR3M7TD-JZyt1BghWGAEn2rH1dZO9k,60
 utilities/altair.py,sha256=Gpja-flOo-Db0PIPJLJsgzAlXWoKUjPU1qY-DQ829ek,9156
-utilities/asyncio.py,sha256=OIQ4JddpQw8tSubzwDR0WyqQ-uE-L5DdbwuTqRQK5MQ,38202
+utilities/asyncio.py,sha256=mP67R3RwY6cTCgiNlxA9h-o3Y6xv5uGzKKB08C49uKI,37001
 utilities/atomicwrites.py,sha256=geFjn9Pwn-tTrtoGjDDxWli9NqbYfy3gGL6ZBctiqSo,5393
 utilities/atools.py,sha256=IYMuFSFGSKyuQmqD6v5IUtDlz8PPw0Sr87Cub_gRU3M,1168
 utilities/cachetools.py,sha256=C1zqOg7BYz0IfQFK8e3qaDDgEZxDpo47F15RTfJM37Q,2910
@@ -89,7 +89,7 @@ utilities/warnings.py,sha256=un1LvHv70PU-LLv8RxPVmugTzDJkkGXRMZTE2-fTQHw,1771
 utilities/whenever.py,sha256=jS31ZAY5OMxFxLja_Yo5Fidi87Pd-GoVZ7Vi_teqVDA,16743
 utilities/zipfile.py,sha256=24lQc9ATcJxHXBPc_tBDiJk48pWyRrlxO2fIsFxU0A8,699
 utilities/zoneinfo.py,sha256=-5j7IQ9nb7gR43rdgA7ms05im-XuqhAk9EJnQBXxCoQ,1874
-dycw_utilities-0.129.1.dist-info/METADATA,sha256=5y1_o16EDF5UAXj97fupC2XxHo_SqHwLxYDo22_4xe0,12803
-dycw_utilities-0.129.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.129.1.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.129.1.dist-info/RECORD,,
+dycw_utilities-0.129.2.dist-info/METADATA,sha256=2XZ9vn3lnybj_7rhJwuTFSU8SVBRLkroYURNVY1_9sc,12803
+dycw_utilities-0.129.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.129.2.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.129.2.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.129.1"
+__version__ = "0.129.2"

utilities/asyncio.py

@@ -458,7 +458,9 @@ class Looper(Generic[_T]):
         """Remove and return an item from the end of the queue without blocking."""
         return self._queue.get_right_nowait()
 
-    async def initialize(self, *, sleep_if_failure: bool) -> Exception | None:
+    async def initialize(
+        self, *, skip_sleep_if_failure: bool = False
+    ) -> Exception | None:
         """Initialize the looper."""
         match self._is_initializing.is_set():
             case True:
@@ -476,21 +478,21 @@ class Looper(Generic[_T]):
                     async with self._lock:
                         self._initialization_failures += 1
                     ret = error
-                    match sleep_if_failure:
+                    match skip_sleep_if_failure:
                         case True:
                             _ = self._logger.warning(
-                                "%s: encountered %s whilst initializing; sleeping for %s...",
+                                "%s: encountered %s whilst initializing",
                                 self,
                                 repr_error(error),
-                                self.backoff,
                             )
-                            await sleep(self._backoff)
                         case False:
                             _ = self._logger.warning(
-                                "%s: encountered %s whilst initializing",
+                                "%s: encountered %s whilst initializing; sleeping for %s...",
                                 self,
                                 repr_error(error),
+                                self.backoff,
                             )
+                            await sleep(self._backoff)
                         case _ as never:
                             assert_never(never)
                 else:
@@ -590,20 +592,22 @@ class Looper(Generic[_T]):
             case _ as never:
                 assert_never(never)
 
-    async def restart(self, *, sleep_if_failure: bool) -> None:
+    async def restart(self) -> None:
         """Restart the looper."""
         _ = self._debug and self._logger.debug("%s: restarting...", self)
         self._is_pending_restart.clear()
         async with self._lock:
             self._restart_attempts += 1
-        tear_down = await self.tear_down(sleep_if_failure=False)
-        initialization = await self.initialize(sleep_if_failure=False)
-        match tear_down, initialization, sleep_if_failure:
-            case None, None, bool():
-                _ = self._debug and self._logger.debug("%s: finished restarting", self)
+        tear_down = await self.tear_down(skip_sleep_if_failure=True)
+        initialization = await self.initialize(skip_sleep_if_failure=True)
+        match tear_down, initialization:
+            case None, None:
+                _ = self._debug and self._logger.debug(
+                    "%s: finished restarting; sleeping for %s...", self, self.backoff
+                )
                 async with self._lock:
                     self._restart_successes += 1
-            case Exception(), None, True:
+            case Exception(), None:
                 async with self._lock:
                     self._restart_failures += 1
                 _ = self._logger.warning(
@@ -612,16 +616,7 @@ class Looper(Generic[_T]):
                     repr_error(tear_down),
                     self.backoff,
                 )
-                await sleep(self._backoff)
-            case Exception(), None, False:
-                async with self._lock:
-                    self._restart_failures += 1
-                _ = self._logger.warning(
-                    "%s: encountered %s whilst restarting (tear down)",
-                    self,
-                    repr_error(tear_down),
-                )
-            case None, Exception(), True:
+            case None, Exception():
                 async with self._lock:
                     self._restart_failures += 1
                 _ = self._logger.warning(
@@ -630,16 +625,7 @@ class Looper(Generic[_T]):
                     repr_error(initialization),
                     self.backoff,
                 )
-                await sleep(self._backoff)
-            case None, Exception(), False:
-                async with self._lock:
-                    self._restart_failures += 1
-                _ = self._logger.warning(
-                    "%s: encountered %s whilst restarting (initialize)",
-                    self,
-                    repr_error(initialization),
-                )
-            case Exception(), Exception(), True:
+            case Exception(), Exception():
                 async with self._lock:
                     self._restart_failures += 1
                 _ = self._logger.warning(
@@ -649,18 +635,9 @@ class Looper(Generic[_T]):
                     repr_error(initialization),
                     self.backoff,
                 )
-                await sleep(self._backoff)
-            case Exception(), Exception(), False:
-                async with self._lock:
-                    self._restart_failures += 1
-                _ = self._logger.warning(
-                    "%s: encountered %s (tear down) and then %s (initialization) whilst restarting",
-                    self,
-                    repr_error(tear_down),
-                    repr_error(initialization),
-                )
             case _ as never:
                 assert_never(never)
+        await sleep(self._backoff)
 
     async def run_looper(self) -> None:
         """Run the looper."""
@@ -675,9 +652,9 @@ class Looper(Generic[_T]):
                     ):
                         await self.stop()
                     elif self._is_pending_restart.is_set():
-                        await self.restart(sleep_if_failure=True)
+                        await self.restart()
                     elif not self._is_initialized.is_set():
-                        _ = await self.initialize(sleep_if_failure=True)
+                        _ = await self.initialize()
                     else:
                         _ = self._debug and self._logger.debug(
                             "%s: running core...", self
@@ -695,7 +672,6 @@ class Looper(Generic[_T]):
                             async with self._lock:
                                 self._core_failures += 1
                             self.request_restart()
-                            await sleep(self._backoff)
                         else:
                             async with self._lock:
                                 self._core_successes += 1
@@ -749,7 +725,9 @@ class Looper(Generic[_T]):
             case _ as never:
                 assert_never(never)
 
-    async def tear_down(self, *, sleep_if_failure: bool) -> Exception | None:
+    async def tear_down(
+        self, *, skip_sleep_if_failure: bool = False
+    ) -> Exception | None:
         """Tear down the looper."""
         match self._is_tearing_down.is_set():
             case True:
@@ -766,21 +744,21 @@ class Looper(Generic[_T]):
                     async with self._lock:
                         self._tear_down_failures += 1
                     ret = error
-                    match sleep_if_failure:
+                    match skip_sleep_if_failure:
                         case True:
                             _ = self._logger.warning(
-                                "%s: encountered %s whilst tearing down; sleeping for %s...",
+                                "%s: encountered %s whilst tearing down",
                                 self,
                                 repr_error(error),
-                                self.backoff,
                             )
-                            await sleep(self._backoff)
                         case False:
                             _ = self._logger.warning(
-                                "%s: encountered %s whilst tearing down",
+                                "%s: encountered %s whilst tearing down; sleeping for %s...",
                                 self,
                                 repr_error(error),
+                                self.backoff,
                             )
+                            await sleep(self._backoff)
                         case _ as never:
                             assert_never(never)
                 else: