dycw-utilities 0.148.0__tar.gz → 0.148.1__tar.gz

{dycw_utilities-0.148.0 → dycw_utilities-0.148.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.148.0
+Version: 0.148.1
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12
@@ -14,7 +14,7 @@ Provides-Extra: test
 Requires-Dist: dycw-pytest-only<2.2,>=2.1.1; extra == 'test'
 Requires-Dist: hypothesis<6.136,>=6.135.24; extra == 'test'
 Requires-Dist: pudb<2025.2,>=2025.1; extra == 'test'
-Requires-Dist: pytest-asyncio<1.1,>=1.0.0; extra == 'test'
+Requires-Dist: pytest-asyncio<1.2,>=1.1.0; extra == 'test'
 Requires-Dist: pytest-cov<6.3,>=6.2.1; extra == 'test'
 Requires-Dist: pytest-instafail<0.6,>=0.5.0; extra == 'test'
 Requires-Dist: pytest-lazy-fixtures<1.2,>=1.1.4; extra == 'test'

{dycw_utilities-0.148.0 → dycw_utilities-0.148.1}/pyproject.toml

@@ -23,7 +23,7 @@ core = [
   "whenever >= 0.8.6, < 0.9",
 ]
 cryptography = ["cryptography >= 45.0.4, < 45.1"]
-cvxpy = ["cvxpy >= 1.6.5, < 1.7"]
+cvxpy = ["cvxpy >= 1.7.0, < 1.8"]
 dataclasses-test = ["orjson", "polars"]
 dev = [
   "coloredlogs >= 15.0.1, < 15.1",
@@ -53,7 +53,7 @@ more-itertools = ["more-itertools >= 10.7.0, < 10.8"]
 numpy = ["numpy >= 2.3.1, < 2.4"]
 operator = ["polars"]
 optuna = ["optuna >= 4.4.0, < 4.5"]
-orjson = ["orjson >= 3.10.18, < 3.11"]
+orjson = ["orjson >= 3.11.0, < 3.12"]
 orjson-test = ["polars"]
 polars = ["polars >= 1.31.0, < 1.32"]
 polars-ols = ["polars-ols >= 0.3.5, < 0.4"]
@@ -67,7 +67,7 @@ pyinstrument = ["pyinstrument >= 5.0.3, < 5.1"]
 pytest = [
   "pudb >= 2025.1, < 2025.2",
   "pytest >= 8.4.1, < 8.5",
-  "pytest-asyncio >= 1.0.0, < 1.1",
+  "pytest-asyncio >= 1.1.0, < 1.2",
   "pytest-randomly >= 3.16.0, < 3.17",
   "pytest-timeout >= 2.4.0, < 2.5",
   "pytest-xdist >= 3.8.0, < 3.9",
@@ -102,7 +102,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.148.0"
+version = "0.148.1"
 
 [project.entry-points.pytest11]
 pytest-randomly = "utilities.pytest_plugins.pytest_randomly"
@@ -117,7 +117,7 @@ test = [
   "hypothesis >= 6.135.24, < 6.136",
   "pudb >= 2025.1, < 2025.2",
   "pytest >= 8.4.1, < 8.5",
-  "pytest-asyncio >= 1.0.0, < 1.1",
+  "pytest-asyncio >= 1.1.0, < 1.2",
   "pytest-cov >= 6.2.1, < 6.3",
   "pytest-instafail >= 0.5.0, < 0.6",
   "pytest-lazy-fixtures >= 1.1.4, < 1.2",
@@ -135,7 +135,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.148.0"
+current_version = "0.148.1"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.148.0 → dycw_utilities-0.148.1}/src/tests/test_asyncio.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from asyncio import Queue, run
+from asyncio import Queue, TaskGroup, run
 from collections.abc import ItemsView, KeysView, ValuesView
 from contextlib import asynccontextmanager
 from re import search
@@ -323,6 +323,8 @@ class TestLoopUntilSucceed:
     async def test_main(
         self, *, caplog: LogCaptureFixture, sleep: TimeDelta | None, use_logger: bool
     ) -> None:
+        class CustomError(Exception): ...
+
         caplog.set_level("DEBUG", logger=(name := unique_str()))
         counter = 0
 
@@ -330,7 +332,7 @@ class TestLoopUntilSucceed:
             nonlocal counter
             counter += 1
             if counter <= 3:
-                raise ValueError
+                raise CustomError
 
         assert await loop_until_succeed(
             lambda: func(), logger=name if use_logger else None, sleep=sleep
@@ -346,16 +348,36 @@ class TestLoopUntilSucceed:
             )
             assert messages == expected
 
-    async def test_error(self) -> None:
+    async def test_error_flat(self) -> None:
+        class CustomError(Exception): ...
+
         counter = 0
 
         async def func() -> None:
             nonlocal counter
             counter += 1
             if counter <= 3:
-                raise ValueError
+                raise CustomError
+
+        assert not await loop_until_succeed(lambda: func(), errors=CustomError)
+        assert counter == 1
+
+    async def test_error_nested(self) -> None:
+        class CustomError(Exception): ...
+
+        counter = 0
+
+        async def func() -> None:
+            async with TaskGroup() as tg:
+                _ = tg.create_task(inner())
+
+        async def inner() -> None:
+            nonlocal counter
+            counter += 1
+            if counter <= 3:
+                raise CustomError
 
-        assert not await loop_until_succeed(lambda: func(), errors=ValueError)
+        assert not await loop_until_succeed(lambda: func(), errors=CustomError)
         assert counter == 1
 
 

{dycw_utilities-0.148.0 → dycw_utilities-0.148.1}/src/tests/test_errors.py

@@ -4,7 +4,7 @@ from asyncio import TaskGroup
 
 from pytest import RaisesGroup, raises
 
-from utilities.errors import ImpossibleCaseError, repr_error
+from utilities.errors import ImpossibleCaseError, is_instance_error, repr_error
 
 
 class TestImpossibleCaseError:
@@ -14,6 +14,38 @@ class TestImpossibleCaseError:
             raise ImpossibleCaseError(case=[f"{x=}"])
 
 
+class TestIsInstanceError:
+    def test_flat(self) -> None:
+        class CustomError(Exception): ...
+
+        with raises(CustomError) as exc_info:
+            raise CustomError
+
+        assert is_instance_error(exc_info.value, CustomError)
+
+    async def test_group(self) -> None:
+        class CustomError(Exception): ...
+
+        async def coroutine() -> None:
+            raise CustomError
+
+        with RaisesGroup(CustomError) as exc_info:
+            async with TaskGroup() as tg:
+                _ = tg.create_task(coroutine())
+
+        assert is_instance_error(exc_info.value, CustomError)
+
+    def test_false(self) -> None:
+        class Custom1Error(Exception): ...
+
+        class Custom2Error(Exception): ...
+
+        with raises(Custom1Error) as exc_info:
+            raise Custom1Error
+
+        assert not is_instance_error(exc_info.value, Custom2Error)
+
+
 class TestReprError:
     def test_class(self) -> None:
         class CustomError(Exception): ...

{dycw_utilities-0.148.0 → dycw_utilities-0.148.1}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.148.0"
+__version__ = "0.148.1"

{dycw_utilities-0.148.0 → dycw_utilities-0.148.1}/src/utilities/asyncio.py

@@ -35,7 +35,7 @@ from typing import (
     override,
 )
 
-from utilities.errors import ImpossibleCaseError
+from utilities.errors import ImpossibleCaseError, is_instance_error
 from utilities.functions import ensure_int, ensure_not_none, to_bool
 from utilities.logging import get_logger
 from utilities.random import SYSTEM_RANDOM
@@ -65,6 +65,7 @@ if TYPE_CHECKING:
     from utilities.types import (
         Coro,
         Delta,
+        ExceptionTypeLike,
         LoggerOrName,
         MaybeCallableBool,
         MaybeType,
@@ -398,7 +399,7 @@ async def loop_until_succeed(
     /,
     *,
     logger: LoggerOrName | None = None,
-    errors: type[Exception] | tuple[type[Exception], ...] | None = None,
+    errors: ExceptionTypeLike[Exception] | None = None,
     sleep: Delta | None = None,
 ) -> bool:
     """Repeatedly call a coroutine until it succeeds."""
@@ -415,7 +416,7 @@ async def loop_until_succeed(
                     case=[f"{exc_type=}", f"{exc_value=}"]
                 ) from None
             sys.excepthook(exc_type, exc_value, traceback)
-            if (errors is not None) and isinstance(error, errors):
+            if (errors is not None) and is_instance_error(error, errors):
                 return False
             if sleep is not None:
                 if logger is not None:

{dycw_utilities-0.148.0 → dycw_utilities-0.148.1}/src/utilities/errors.py

@@ -4,7 +4,7 @@ from dataclasses import dataclass
 from typing import TYPE_CHECKING, assert_never, override
 
 if TYPE_CHECKING:
-    from utilities.types import MaybeType
+    from utilities.types import ExceptionTypeLike, MaybeType
 
 
 @dataclass(kw_only=True, slots=True)
@@ -21,6 +21,20 @@ class ImpossibleCaseError(Exception):
 ##
 
 
+def is_instance_error(
+    error: BaseException, class_or_tuple: ExceptionTypeLike[Exception], /
+) -> bool:
+    """Check if an instance relationship holds, allowing for groups."""
+    if isinstance(error, class_or_tuple):
+        return True
+    if not isinstance(error, BaseExceptionGroup):
+        return False
+    return any(is_instance_error(e, class_or_tuple) for e in error.exceptions)
+
+
+##
+
+
 def repr_error(error: MaybeType[BaseException], /) -> str:
     """Get a string representation of an error."""
     match error:
@@ -36,4 +50,4 @@ def repr_error(error: MaybeType[BaseException], /) -> str:
             assert_never(never)
 
 
-__all__ = ["ImpossibleCaseError", "repr_error"]
+__all__ = ["ImpossibleCaseError", "is_instance_error", "repr_error"]

{dycw_utilities-0.148.0 → dycw_utilities-0.148.1}/src/utilities/types.py

@@ -105,6 +105,10 @@ type MonthInt = Literal[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
 type EnumLike[E: Enum] = MaybeStr[E]
 
 
+# errors
+type ExceptionTypeLike[T: Exception] = type[T] | tuple[type[T], ...]
+
+
 # ipaddress
 IPv4AddressLike = MaybeStr[IPv4Address]
 IPv6AddressLike = MaybeStr[IPv6Address]
@@ -265,6 +269,7 @@ __all__ = [
     "Delta",
     "EnumLike",
     "ExcInfo",
+    "ExceptionTypeLike",
     "IPv4AddressLike",
     "IPv6AddressLike",
     "IterableHashable",