dycw-utilities 0.136.2__tar.gz → 0.136.3__tar.gz

{dycw_utilities-0.136.2 → dycw_utilities-0.136.3}/PKG-INFO

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

{dycw_utilities-0.136.2 → dycw_utilities-0.136.3}/pyproject.toml

@@ -106,7 +106,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.136.2"
+version = "0.136.3"
 
 [project.optional-dependencies]
 logging = [
@@ -134,7 +134,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.136.2"
+current_version = "0.136.3"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.136.2 → dycw_utilities-0.136.3}/src/tests/test_asyncio.py

@@ -175,29 +175,6 @@ class TestEnhancedTaskGroup:
             await sleep_td(self.delta)
         assert looper._core_attempts >= 1
 
-    async def test_debug_true(self) -> None:
-        class CustomError(Exception): ...
-
-        async def func() -> None:
-            await sleep_td(self.delta)
-            raise CustomError
-
-        with raises(CustomError):
-            async with EnhancedTaskGroup(debug=True) as tg:
-                _ = await tg.run_or_create_task(func())
-
-    async def test_debug_false(self) -> None:
-        class CustomError(Exception): ...
-
-        async def func() -> None:
-            await sleep_td(self.delta)
-            raise CustomError
-
-        with raises(ExceptionGroup) as exc_info:
-            async with EnhancedTaskGroup(debug=False) as tg:
-                _ = await tg.run_or_create_task(func())
-        assert isinstance(one(exc_info.value.exceptions), CustomError)
-
     async def test_max_tasks_disabled(self) -> None:
         with Timer() as timer:
             async with EnhancedTaskGroup() as tg:
@@ -210,7 +187,39 @@ class TestEnhancedTaskGroup:
             async with EnhancedTaskGroup(max_tasks=2) as tg:
                 for _ in range(10):
                     _ = tg.create_task(sleep_td(self.delta))
-        assert timer >= self.delta
+        assert timer >= 5 * self.delta
+
+    async def test_run_or_create_task_parallel_with_max_tasks_none(self) -> None:
+        with Timer() as timer:
+            async with EnhancedTaskGroup() as tg:
+                assert not tg._is_debug()
+                for _ in range(10):
+                    _ = await tg.run_or_create_task(sleep_td(self.delta))
+        assert timer <= 2 * self.delta
+
+    async def test_run_or_create_task_parallel_with_max_tasks_two(self) -> None:
+        with Timer() as timer:
+            async with EnhancedTaskGroup(max_tasks=2) as tg:
+                assert not tg._is_debug()
+                for _ in range(10):
+                    _ = await tg.run_or_create_task(sleep_td(self.delta))
+        assert timer >= 5 * self.delta
+
+    async def test_run_or_create_task_serial_with_max_tasks_negative(self) -> None:
+        with Timer() as timer:
+            async with EnhancedTaskGroup(max_tasks=-1) as tg:
+                assert tg._is_debug()
+                for _ in range(10):
+                    _ = await tg.run_or_create_task(sleep_td(self.delta))
+        assert timer >= 10 * self.delta
+
+    async def test_run_or_create_task_serial_with_debug(self) -> None:
+        with Timer() as timer:
+            async with EnhancedTaskGroup(debug=True) as tg:
+                assert tg._is_debug()
+                for _ in range(10):
+                    _ = await tg.run_or_create_task(sleep_td(self.delta))
+        assert timer >= 10 * self.delta
 
     async def test_timeout_pass(self) -> None:
         async with EnhancedTaskGroup(timeout=2 * self.delta) as tg:

{dycw_utilities-0.136.2 → dycw_utilities-0.136.3}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.136.2"
+__version__ = "0.136.3"

{dycw_utilities-0.136.2 → dycw_utilities-0.136.3}/src/utilities/asyncio.py

@@ -220,6 +220,7 @@ class EnhancedQueue[T](Queue[T]):
 class EnhancedTaskGroup(TaskGroup):
     """Task group with enhanced features."""
 
+    _max_tasks: int | None
     _semaphore: Semaphore | None
     _timeout: TimeDelta | None
     _error: MaybeType[BaseException]
@@ -237,7 +238,11 @@ class EnhancedTaskGroup(TaskGroup):
         debug: MaybeCallableBool = False,
     ) -> None:
         super().__init__()
-        self._semaphore = None if max_tasks is None else Semaphore(max_tasks)
+        self._max_tasks = max_tasks
+        if (max_tasks is None) or (max_tasks <= 0):
+            self._semaphore = None
+        else:
+            self._semaphore = Semaphore(max_tasks)
         self._timeout = timeout
         self._error = error
         self._debug = debug
@@ -257,7 +262,7 @@ class EnhancedTaskGroup(TaskGroup):
         tb: TracebackType | None,
     ) -> None:
         _ = await self._stack.__aexit__(et, exc, tb)
-        match to_bool(bool_=self._debug):
+        match self._is_debug():
             case True:
                 with suppress(Exception):
                     _ = await super().__aexit__(et, exc, tb)
@@ -293,7 +298,7 @@ class EnhancedTaskGroup(TaskGroup):
         name: str | None = None,
         context: Context | None = None,
     ) -> T | Task[T]:
-        match to_bool(bool_=self._debug):
+        match self._is_debug():
             case True:
                 return await coro
             case False:
@@ -301,6 +306,11 @@ class EnhancedTaskGroup(TaskGroup):
             case _ as never:
                 assert_never(never)
 
+    def _is_debug(self) -> bool:
+        return to_bool(bool_=self._debug) or (
+            (self._max_tasks is not None) and (self._max_tasks <= 0)
+        )
+
     async def _wrap_with_semaphore[T](
         self, semaphore: Semaphore, coroutine: _CoroutineLike[T], /
     ) -> T: