dycw-utilities 0.125.0__tar.gz → 0.125.2__tar.gz

{dycw_utilities-0.125.0 → dycw_utilities-0.125.2}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.125.0
+Version: 0.125.2
 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.24; extra == 'test'
+Requires-Dist: hypothesis<6.132,>=6.131.27; extra == 'test'
 Requires-Dist: pytest-asyncio<0.27,>=0.26.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'
@@ -78,7 +78,7 @@ Provides-Extra: zzz-test-hypothesis
 Requires-Dist: aiosqlite<0.22,>=0.21.0; extra == 'zzz-test-hypothesis'
 Requires-Dist: asyncpg<0.31,>=0.30.0; extra == 'zzz-test-hypothesis'
 Requires-Dist: greenlet<3.3,>=3.2.0; extra == 'zzz-test-hypothesis'
-Requires-Dist: hypothesis<6.132,>=6.131.24; extra == 'zzz-test-hypothesis'
+Requires-Dist: hypothesis<6.132,>=6.131.27; extra == 'zzz-test-hypothesis'
 Requires-Dist: luigi<3.7,>=3.6.0; extra == 'zzz-test-hypothesis'
 Requires-Dist: numpy<2.3,>=2.2.6; extra == 'zzz-test-hypothesis'
 Requires-Dist: pathvalidate<3.3,>=3.2.3; extra == 'zzz-test-hypothesis'
@@ -144,7 +144,7 @@ Requires-Dist: atomicwrites<1.5,>=1.4.1; extra == 'zzz-test-pydantic'
 Requires-Dist: pydantic<2.12,>=2.11.4; extra == 'zzz-test-pydantic'
 Provides-Extra: zzz-test-pyinstrument
 Requires-Dist: atomicwrites<1.5,>=1.4.1; extra == 'zzz-test-pyinstrument'
-Requires-Dist: pyinstrument<5.1,>=5.0.0; extra == 'zzz-test-pyinstrument'
+Requires-Dist: pyinstrument<5.1,>=5.0.2; extra == 'zzz-test-pyinstrument'
 Requires-Dist: tzlocal<5.4,>=5.3.1; extra == 'zzz-test-pyinstrument'
 Provides-Extra: zzz-test-pyrsistent
 Requires-Dist: pyrsistent<0.21,>=0.20.0; extra == 'zzz-test-pyrsistent'

{dycw_utilities-0.125.0 → dycw_utilities-0.125.2}/pyproject.toml

@@ -25,7 +25,7 @@ dev = [
   "fpdf2 >= 2.8.3, < 2.9",
   "greenlet >= 3.2.0, < 3.3",  # for sqlalchemy async
   "httpx >= 0.28.1, < 0.29",  # for fastapi
-  "hypothesis >= 6.131.24, < 6.132",
+  "hypothesis >= 6.131.27, < 6.132",
   "img2pdf >= 0.6.0, < 0.7",
   "lightweight-charts >= 2.1, < 2.2",
   "loguru >= 0.7.3, < 0.8",
@@ -43,7 +43,7 @@ dev = [
   "pqdm >= 0.2.0, < 0.3",
   "psycopg2-binary >= 2.9.10, < 2.10",  # for sqlalchemy
   "pydantic >= 2.11.4, < 2.12",
-  "pyinstrument >= 5.0.0, < 5.1",
+  "pyinstrument >= 5.0.2, < 5.1",
   "pyrsistent >= 0.20.0, < 0.21",
   "pytest >= 8.3.5, < 8.4",
   "pytest-regressions >= 2.7.0, < 2.8",
@@ -91,11 +91,11 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.125.0"
+version = "0.125.2"
 
 [project.optional-dependencies]
 test = [
-  "hypothesis >= 6.131.24, < 6.132",
+  "hypothesis >= 6.131.27, < 6.132",
   "pytest >= 8.3.5, < 8.4",
   "pytest-asyncio >= 0.26.0, < 0.27",
   "pytest-cov >= 6.1.1, < 6.2",
@@ -172,7 +172,7 @@ zzz-test-hypothesis = [
   "aiosqlite >= 0.21.0, < 0.22",
   "asyncpg >= 0.30.0, < 0.31",  # for sqlalchemy async
   "greenlet >= 3.2.0, < 3.3",  # for sqlalchemy async
-  "hypothesis >= 6.131.24, < 6.132",
+  "hypothesis >= 6.131.27, < 6.132",
   "luigi >= 3.6.0, < 3.7",
   "numpy >= 2.2.6, < 2.3",
   "pathvalidate >= 3.2.3, < 3.3",
@@ -238,7 +238,7 @@ zzz-test-pydantic = [
 ]
 zzz-test-pyinstrument = [
   "atomicwrites >= 1.4.1, < 1.5",
-  "pyinstrument >= 5.0.0, < 5.1",
+  "pyinstrument >= 5.0.2, < 5.1",
   "tzlocal >= 5.3.1, < 5.4",
 ]
 zzz-test-pyrsistent = ["pyrsistent >= 0.20.0, < 0.21"]
@@ -332,7 +332,7 @@ zzz-test-zoneinfo = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.125.0"
+current_version = "0.125.2"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.125.0 → dycw_utilities-0.125.2}/src/tests/test_asyncio.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from asyncio import CancelledError, Event, Queue, run, sleep
+from asyncio import CancelledError, Event, Queue, run, sleep, timeout
 from collections import deque
 from contextlib import asynccontextmanager
 from dataclasses import dataclass, field
@@ -288,7 +288,7 @@ class TestInfiniteLooper:
             async def _core(self) -> None:
                 self.counter += 1
 
-        async with timeout_dur(duration=1.0), Example(sleep_core=0.05) as looper:
+        async with timeout(1.0), Example(sleep_core=0.05) as looper:
             pass
         assert 15 <= looper.counter <= 25
 
@@ -316,10 +316,7 @@ class TestInfiniteLooper:
             async def _teardown(self) -> None:
                 self.teardowns += 1
 
-        async with (
-            timeout_dur(duration=1.0),
-            Example(sleep_core=0.05, sleep_restart=0.05) as looper,
-        ):
+        async with timeout(1.0), Example(sleep_core=0.05, sleep_restart=0.05) as looper:
             pass
         assert 3 <= looper.initializations <= 5
         assert 0 <= looper.counter <= 5
@@ -380,9 +377,9 @@ class TestInfiniteLooper:
         looper = Example()
         for _ in range(2):
             assert not looper.running
-            async with timeout_dur(duration=0.2), looper:
+            async with timeout(0.2), looper:
                 assert looper.running
-                async with timeout_dur(duration=0.1), looper:
+                async with timeout(0.1), looper:
                     assert looper.running
                 assert looper.running
             assert not looper.running
@@ -433,7 +430,7 @@ class TestInfiniteLooper:
                 yield (True, TrueError)
                 yield (False, FalseError)
 
-        async with timeout_dur(duration=1.0), Example(sleep_core=0.05) as looper:
+        async with timeout(1.0), Example(sleep_core=0.05) as looper:
             ...
         match n % 2 == 0:
             case True:
@@ -473,10 +470,7 @@ class TestInfiniteLooper:
             def _yield_coroutines(self) -> Iterator[Callable[[], Coroutine1[None]]]:
                 yield partial(inc_external, self)
 
-        async with (
-            timeout_dur(duration=1.0),
-            Example(sleep_core=0.05, sleep_restart=0.05) as looper,
-        ):
+        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
@@ -508,10 +502,7 @@ class TestInfiniteLooper:
             def _yield_coroutines(self) -> Iterator[Callable[[], Coroutine1[None]]]:
                 yield dummy
 
-        async with (
-            timeout_dur(duration=1.0),
-            Example(sleep_core=0.05, sleep_restart=0.05) as looper,
-        ):
+        async with timeout(1.0), Example(sleep_core=0.05, sleep_restart=0.05) as looper:
             ...
         assert 3 <= looper.initializations <= 5
         assert 0 <= looper.counter <= 5
@@ -551,7 +542,7 @@ class TestInfiniteLooper:
             def _yield_loopers(self) -> Iterator[InfiniteLooper]:
                 yield self.child
 
-        async with timeout_dur(duration=1.0), Parent(sleep_core=0.05) as parent:
+        async with timeout(1.0), Parent(sleep_core=0.05) as parent:
             ...
         assert 15 <= parent.counter <= 25
         assert 15 <= parent.child.counter <= 25
@@ -591,7 +582,7 @@ class TestInfiniteLooper:
                 raise NotImplementedError
 
         async with (
-            timeout_dur(duration=1.0),
+            timeout(1.0),
             Example(sleep_core=0.1, sleep_restart=sleep_restart, logger=logger),
         ):
             ...
@@ -620,7 +611,7 @@ class TestInfiniteLooper:
                 raise CustomError
 
         async with (
-            timeout_dur(duration=1.0),
+            timeout(1.0),
             Example(sleep_core=0.1, sleep_restart=sleep_restart, logger=logger),
         ):
             ...
@@ -665,7 +656,7 @@ class TestInfiniteLooper:
                 yield (None, Custom1Error)
 
         async with (
-            timeout_dur(duration=1.0),
+            timeout(1.0),
             Example(sleep_core=0.1, sleep_restart=sleep_restart, logger=logger),
         ):
             ...
@@ -711,7 +702,7 @@ class TestInfiniteLooper:
                 yield dummy
 
         async with (
-            timeout_dur(duration=1.0),
+            timeout(1.0),
             Example(sleep_core=0.05, sleep_restart=sleep_restart, logger=logger),
         ):
             ...
@@ -756,7 +747,7 @@ class TestInfiniteQueueLooper:
             async def _process_queue(self) -> None:
                 self.counter += len(self._queue.get_all_nowait())
 
-        async with timeout_dur(duration=1.0), Example(sleep_core=0.05) as looper:
+        async with timeout(1.0), Example(sleep_core=0.05) as looper:
             await sleep(0.1)
             for i in range(10):
                 looper.put_right_nowait(i)
@@ -780,7 +771,7 @@ class TestInfiniteQueueLooper:
         assert len(looper) == n
         assert not looper.empty()
 
-    async def test_run_until_empty(self) -> None:
+    async def test_run_until_empty_no_stop(self) -> None:
         @dataclass(kw_only=True)
         class Example(InfiniteQueueLooper[None, int]):
             output: set[int] = field(default_factory=set)
@@ -791,8 +782,22 @@ class TestInfiniteQueueLooper:
 
         looper = Example(sleep_core=0.05)
         looper.put_right_nowait(*range(10))
-        async with looper:
+        async with timeout(1.0), looper:
             await looper.run_until_empty()
+
+    async def test_run_until_empty_stop(self) -> None:
+        @dataclass(kw_only=True)
+        class Example(InfiniteQueueLooper[None, int]):
+            output: set[int] = field(default_factory=set)
+
+            @override
+            async def _process_queue(self) -> None:
+                self.output.update(self._queue.get_all_nowait())
+
+        looper = Example(sleep_core=0.05)
+        looper.put_right_nowait(*range(10))
+        async with looper:
+            await looper.run_until_empty(stop=True)
         assert looper.empty()
 
     @given(logger=just("logger") | none())
@@ -810,10 +815,7 @@ class TestInfiniteQueueLooper:
             async def _process_queue(self) -> None:
                 raise CustomError
 
-        async with (
-            timeout_dur(duration=1.0),
-            Example(sleep_core=0.05, logger=logger) as looper,
-        ):
+        async with timeout(1.0), Example(sleep_core=0.05, logger=logger) as looper:
             looper.put_left_nowait(1)
         if logger is not None:
             message = caplog.messages[0]

{dycw_utilities-0.125.0 → dycw_utilities-0.125.2}/src/tests/test_fastapi.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
 
-from asyncio import sleep
+from asyncio import sleep, timeout
 from re import search
 
 from tests.conftest import SKIPIF_CI
-from utilities.asyncio import timeout_dur
 from utilities.fastapi import PingReceiver
 
 
@@ -14,7 +13,7 @@ class TestPingReceiver:
         port = 5465
         assert await PingReceiver.ping(port) is False
         await sleep(0.1)
-        async with timeout_dur(duration=1.0), PingReceiver(port=port):
+        async with timeout(1.0), PingReceiver(port=port):
             await sleep(0.1)
             result = await PingReceiver.ping(port)
             assert isinstance(result, str)

{dycw_utilities-0.125.0 → dycw_utilities-0.125.2}/src/tests/test_importlib.py

@@ -9,12 +9,14 @@ from utilities.importlib import is_valid_import
 class TestIsValidImport:
     @given(
         case=sampled_from([
+            ("importlib", None, True),
+            ("invalid", None, False),
             ("utilities.importlib", "is_valid_import", True),
             ("utilities.importlib", "invalid", False),
             ("invalid", "invalid", False),
         ])
     )
-    def test_main(self, *, case: tuple[str, str, bool]) -> None:
+    def test_main(self, *, case: tuple[str, str | None, bool]) -> None:
         module, name, expected = case
-        result = is_valid_import(module, name)
+        result = is_valid_import(module, name=name)
         assert result is expected

{dycw_utilities-0.125.0 → dycw_utilities-0.125.2}/src/tests/test_slack_sdk.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from asyncio import timeout
 from logging import getLogger
 from typing import TYPE_CHECKING
 
@@ -7,7 +8,6 @@ from aiohttp import InvalidUrlClientError
 from pytest import mark, raises
 from slack_sdk.webhook.async_client import AsyncWebhookClient
 
-from utilities.asyncio import timeout_dur
 from utilities.datetime import MINUTE
 from utilities.os import get_env_var
 from utilities.pytest import throttle
@@ -49,7 +49,7 @@ class TestSlackHandler:
         logger.addHandler(
             handler := SlackHandler("url", sleep_core=0.05, sender=sender)
         )
-        async with timeout_dur(duration=1.0), handler:
+        async with timeout(1.0), handler:
             logger.warning("message")
         assert messages == ["message"]
 
@@ -59,7 +59,7 @@ class TestSlackHandler:
         url = get_env_var("SLACK")
         logger = getLogger(str(tmp_path))
         logger.addHandler(handler := SlackHandler(url, sleep_core=0.05))
-        async with timeout_dur(duration=1.0), handler:
+        async with timeout(1.0), handler:
             for i in range(10):
                 logger.warning(
                     "message %d from %s", i, TestSlackHandler.test_real.__qualname__

{dycw_utilities-0.125.0 → dycw_utilities-0.125.2}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.125.0"
+__version__ = "0.125.2"

{dycw_utilities-0.125.0 → dycw_utilities-0.125.2}/src/utilities/asyncio.py

@@ -624,11 +624,12 @@ class InfiniteQueueLooper(InfiniteLooper[THashable], Generic[THashable, _T]):
         """Put items into the queue at the end without blocking."""
         self._queue.put_right_nowait(*items)  # pragma: no cover
 
-    async def run_until_empty(self) -> None:
+    async def run_until_empty(self, *, stop: bool = False) -> None:
         """Run until the queue is empty."""
         while not self.empty():
             await self._process_queue()
-        await self.stop()
+        if stop:
+            await self.stop()
 
 
 ##

{dycw_utilities-0.125.0 → dycw_utilities-0.125.2}/src/utilities/importlib.py

@@ -4,11 +4,13 @@ from importlib import import_module
 from importlib.util import find_spec
 
 
-def is_valid_import(module: str, name: str) -> bool:
+def is_valid_import(module: str, /, *, name: str | None = None) -> bool:
     """Check if an import is valid."""
     spec = find_spec(module)
     if spec is None:
         return False
+    if name is None:
+        return True
     mod = import_module(module)
     return hasattr(mod, name)