dycw-utilities 0.125.5__tar.gz → 0.125.7__tar.gz

{dycw_utilities-0.125.5 → dycw_utilities-0.125.7}/PKG-INFO

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.125.5
+Version: 0.125.7
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12
 Requires-Dist: typing-extensions<4.14,>=4.13.1
 Provides-Extra: test
 Requires-Dist: hypothesis<6.132,>=6.131.28; extra == 'test'
-Requires-Dist: pytest-asyncio<0.27,>=0.26.0; extra == 'test'
+Requires-Dist: pytest-asyncio<1.1,>=1.0.0; extra == 'test'
 Requires-Dist: pytest-cov<6.2,>=6.1.1; extra == 'test'
 Requires-Dist: pytest-instafail<0.6,>=0.5.0; extra == 'test'
 Requires-Dist: pytest-lazy-fixtures<1.2,>=1.1.3; extra == 'test'
@@ -17,7 +17,7 @@ Requires-Dist: pytest-regressions<2.8,>=2.7.0; extra == 'test'
 Requires-Dist: pytest-rerunfailures<16,>=15.1; extra == 'test'
 Requires-Dist: pytest-rng<1.1,>=1.0.0; extra == 'test'
 Requires-Dist: pytest-timeout<2.5,>=2.4.0; extra == 'test'
-Requires-Dist: pytest-xdist<3.7,>=3.6.1; extra == 'test'
+Requires-Dist: pytest-xdist<3.8,>=3.7.0; extra == 'test'
 Requires-Dist: pytest<8.4,>=8.3.5; extra == 'test'
 Requires-Dist: setuptools>=78.0.2; extra == 'test'
 Provides-Extra: zzz-test-altair
@@ -174,7 +174,7 @@ Requires-Dist: scipy<1.16,>=1.15.3; extra == 'zzz-test-scipy'
 Provides-Extra: zzz-test-sentinel
 Provides-Extra: zzz-test-shelve
 Provides-Extra: zzz-test-slack-sdk
-Requires-Dist: aiohttp<3.13,>=3.12.0; extra == 'zzz-test-slack-sdk'
+Requires-Dist: aiohttp<3.12.1,>=3.12.0; extra == 'zzz-test-slack-sdk'
 Requires-Dist: slack-sdk<3.36,>=3.35.0; extra == 'zzz-test-slack-sdk'
 Provides-Extra: zzz-test-socket
 Provides-Extra: zzz-test-sqlalchemy

{dycw_utilities-0.125.5 → dycw_utilities-0.125.7}/pyproject.toml

@@ -8,7 +8,7 @@ requires = ["hatchling"]
 # dependency groups
 [dependency-groups]
 dev = [
-  "aiohttp >= 3.12.0, < 3.13",  # for slack
+  "aiohttp >= 3.12.0, < 3.12.1",  # for slack
   "aiosqlite >= 0.21.0, < 0.22",
   "altair >= 5.5.0, < 5.6",
   "asyncpg >= 0.30.0, < 0.31",  # for sqlalchemy async
@@ -69,7 +69,7 @@ dev = [
   "whenever >= 0.8.2, < 0.9",
   # test
   "coverage-conditional-plugin >= 0.9.0, < 0.10",
-  "pytest-asyncio >= 0.26.0, < 0.27",
+  "pytest-asyncio >= 1.0.0, < 1.1",
   "pytest-cov >= 6.1.1, < 6.2",
   "pytest-instafail >= 0.5.0, < 0.6",
   "pytest-lazy-fixtures >= 1.1.3, < 1.2",
@@ -78,7 +78,7 @@ dev = [
   "pytest-rerunfailures >= 15.1, < 16",
   "pytest-rng >= 1.0.0, < 1.1",
   "pytest-timeout >= 2.4.0, < 2.5",
-  "pytest-xdist >= 3.6.1, < 3.7",
+  "pytest-xdist >= 3.7.0, < 3.8",
   # CI
   "win32_setctime >= 1.2.0, < 1.3",  # https://github.com/Delgan/loguru/issues/147
   "setuptools >= 78.1.0",  # https://github.com/theY4Kman/pytest-only/issues/14
@@ -93,13 +93,13 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.125.5"
+version = "0.125.7"
 
 [project.optional-dependencies]
 test = [
   "hypothesis >= 6.131.28, < 6.132",
   "pytest >= 8.3.5, < 8.4",
-  "pytest-asyncio >= 0.26.0, < 0.27",
+  "pytest-asyncio >= 1.0.0, < 1.1",
   "pytest-cov >= 6.1.1, < 6.2",
   "pytest-instafail >= 0.5.0, < 0.6",
   "pytest-lazy-fixtures >= 1.1.3, < 1.2",
@@ -109,7 +109,7 @@ test = [
   "pytest-rerunfailures >= 15.1, < 16",
   "pytest-rng >= 1.0.0, < 1.1",
   "pytest-timeout >= 2.4.0, < 2.5",
-  "pytest-xdist >= 3.6.1, < 3.7",
+  "pytest-xdist >= 3.7.0, < 3.8",
   "setuptools >= 78.0.2",  # https://github.com/theY4Kman/pytest-only/issues/14
 ]
 zzz-test-altair = [
@@ -270,7 +270,7 @@ zzz-test-scipy = ["scipy >= 1.15.3, < 1.16"]
 zzz-test-sentinel = []
 zzz-test-shelve = []
 zzz-test-slack-sdk = [
-  "aiohttp >= 3.12.0, < 3.13",  # for slack
+  "aiohttp >= 3.12.0, < 3.12.1",  # for slack
   "slack-sdk >= 3.35.0, < 3.36",
 ]
 zzz-test-socket = []
@@ -334,7 +334,7 @@ zzz-test-zoneinfo = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.125.5"
+current_version = "0.125.7"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"
@@ -436,7 +436,6 @@ addopts = [
   "--strict-markers",
   "--timeout=300",
 ]
-asyncio_default_fixture_loop_scope = "function"
 asyncio_mode = "auto"
 filterwarnings = [
   "error",

{dycw_utilities-0.125.5 → dycw_utilities-0.125.7}/src/tests/test_asyncio.py

@@ -322,6 +322,27 @@ class TestInfiniteLooper:
         assert 0 <= looper.counter <= 5
         assert 3 <= looper.teardowns <= 5
 
+    async def test_blacklisted_errors(self) -> None:
+        class CustomError(Exception): ...
+
+        @dataclass(kw_only=True)
+        class Example(InfiniteLooper[None]):
+            counter: int = 0
+
+            @override
+            async def _core(self) -> None:
+                self.counter += 1
+                if self.counter >= 5:
+                    raise CustomError
+
+            @override
+            def _yield_blacklisted_errors(self) -> Iterator[type[Exception]]:
+                yield CustomError
+
+        with raises(CustomError):
+            async with Example(sleep_core=0.05):
+                ...
+
     async def test_cancelled_error(self) -> None:
         @dataclass(kw_only=True)
         class Example(InfiniteLooper[None]):
@@ -417,7 +438,7 @@ class TestInfiniteLooper:
                     self._set_event(event=n % 2 == 0)
 
             @override
-            def _error_upon_core(self, error: Exception, /) -> None:
+            def _error_upon_core(self, error: BaseException, /) -> None:
                 if isinstance(error, TrueError):
                     self.true_counter += 1
                 elif isinstance(error, FalseError):
@@ -440,6 +461,34 @@ class TestInfiniteLooper:
                 assert looper.true_counter == 0
                 assert looper.false_counter >= 1
 
+    async def test_whitelisted_errors(self) -> None:
+        class CustomError(BaseException): ...
+
+        @dataclass(kw_only=True)
+        class Example(InfiniteLooper[None]):
+            initializations: int = 0
+            counter: int = 0
+
+            @override
+            async def _initialize(self) -> None:
+                self.initializations += 1
+                self.counter = 0
+
+            @override
+            async def _core(self) -> None:
+                self.counter += 1
+                if self.counter >= 5:
+                    raise CustomError
+
+            @override
+            def _yield_whitelisted_errors(self) -> Iterator[type[BaseException]]:
+                yield CustomError
+
+        async with timeout(1.0), Example(sleep_core=0.05, sleep_restart=0.05) as looper:
+            ...
+        assert 3 <= looper.initializations <= 7
+        assert 0 <= looper.counter <= 8
+
     async def test_with_coroutine_self_set_event(self) -> None:
         external: int = 0
 

{dycw_utilities-0.125.5 → dycw_utilities-0.125.7}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.125.5"
+__version__ = "0.125.7"

{dycw_utilities-0.125.5 → dycw_utilities-0.125.7}/src/utilities/asyncio.py

@@ -400,6 +400,8 @@ class InfiniteLooper(ABC, Generic[THashable]):
 
     async def _run_looper_by_itself(self) -> None:
         """Run the looper by itself."""
+        whitelisted = tuple(self._yield_whitelisted_errors())
+        blacklisted = tuple(self._yield_blacklisted_errors())
         while True:
             try:
                 self._reset_events()
@@ -423,12 +425,21 @@ class InfiniteLooper(ABC, Generic[THashable]):
                             self._raise_error(event)
             except InfiniteLooperError:
                 raise
-            except Exception as error:  # noqa: BLE001
-                self._error_upon_core(error)
+            except BaseException as error1:
+                match error1:
+                    case Exception():
+                        if isinstance(error1, blacklisted):
+                            raise
+                    case BaseException():
+                        if not isinstance(error1, whitelisted):
+                            raise
+                    case _ as never:
+                        assert_never(never)
+                self._error_upon_core(error1)
                 try:
                     await self._teardown()
-                except Exception as error:  # noqa: BLE001
-                    self._error_upon_teardown(error)
+                except BaseException as error2:  # noqa: BLE001
+                    self._error_upon_teardown(error2)
                 finally:
                     await self._run_sleep(self.sleep_restart)
 
@@ -471,7 +482,7 @@ class InfiniteLooper(ABC, Generic[THashable]):
                 self._sleep_restart_desc,
             )
 
-    def _error_upon_core(self, error: Exception, /) -> None:
+    def _error_upon_core(self, error: BaseException, /) -> None:
         """Handle any errors upon running the core function."""
         if self.logger is not None:
             getLogger(name=self.logger).error(
@@ -481,7 +492,7 @@ class InfiniteLooper(ABC, Generic[THashable]):
                 self._sleep_restart_desc,
             )
 
-    def _error_upon_teardown(self, error: Exception, /) -> None:
+    def _error_upon_teardown(self, error: BaseException, /) -> None:
         """Handle any errors upon tearing down the looper."""
         if self.logger is not None:
             getLogger(name=self.logger).error(
@@ -561,6 +572,14 @@ class InfiniteLooper(ABC, Generic[THashable]):
         """Yield any other loopers which must also be run."""
         yield from []
 
+    def _yield_blacklisted_errors(self) -> Iterator[type[Exception]]:
+        """Yield any exceptions which the looper ought to catch terminate upon."""
+        yield from []
+
+    def _yield_whitelisted_errors(self) -> Iterator[type[BaseException]]:
+        """Yield any exceptions which the looper ought to catch and allow running."""
+        yield from []
+
 
 @dataclass(kw_only=True, slots=True)
 class InfiniteLooperError(Exception):

{dycw_utilities-0.125.5 → dycw_utilities-0.125.7}/src/utilities/errors.py

@@ -20,10 +20,10 @@ class ImpossibleCaseError(Exception):
 ##
 
 
-def repr_error(error: MaybeType[Exception], /) -> str:
+def repr_error(error: MaybeType[BaseException], /) -> str:
     """Get a string representation of an error."""
     match error:
-        case Exception() as error_obj:
+        case BaseException() as error_obj:
             return f"{error_obj.__class__.__name__}({error_obj})"
         case type() as error_cls:
             return error_cls.__name__