dycw-utilities 0.126.0__tar.gz → 0.126.2__tar.gz

{dycw_utilities-0.126.0 → dycw_utilities-0.126.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.126.0
+Version: 0.126.2
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12
@@ -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.12.5,>=3.12.4; extra == 'zzz-test-slack-sdk'
+Requires-Dist: aiohttp<3.12.7,>=3.12.6; 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.126.0 → dycw_utilities-0.126.2}/pyproject.toml

@@ -8,7 +8,7 @@ requires = ["hatchling"]
 # dependency groups
 [dependency-groups]
 dev = [
-  "aiohttp >= 3.12.4, < 3.12.5",  # for slack
+  "aiohttp >= 3.12.6, < 3.12.7",  # for slack
   "aiosqlite >= 0.21.0, < 0.22",
   "altair >= 5.5.0, < 5.6",
   "asyncpg >= 0.30.0, < 0.31",  # for sqlalchemy async
@@ -94,7 +94,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.126.0"
+version = "0.126.2"
 
 [project.optional-dependencies]
 test = [
@@ -271,7 +271,7 @@ zzz-test-scipy = ["scipy >= 1.15.3, < 1.16"]
 zzz-test-sentinel = []
 zzz-test-shelve = []
 zzz-test-slack-sdk = [
-  "aiohttp >= 3.12.4, < 3.12.5",  # for slack
+  "aiohttp >= 3.12.6, < 3.12.7",  # for slack
   "slack-sdk >= 3.35.0, < 3.36",
 ]
 zzz-test-socket = []
@@ -335,7 +335,7 @@ zzz-test-zoneinfo = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.126.0"
+current_version = "0.126.2"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

dycw_utilities-0.126.2/src/tests/test_errors.py

@@ -0,0 +1,52 @@
+from __future__ import annotations
+
+from asyncio import TaskGroup
+
+from pytest import raises
+
+from utilities.errors import ImpossibleCaseError, repr_error
+
+
+class TestImpossibleCaseError:
+    def test_main(self) -> None:
+        x = None
+        with raises(ImpossibleCaseError, match=r"Case must be possible: x=None\."):
+            raise ImpossibleCaseError(case=[f"{x=}"])
+
+
+class TestReprError:
+    def test_class(self) -> None:
+        class CustomError(Exception): ...
+
+        result = repr_error(CustomError)
+        expected = "CustomError"
+        assert result == expected
+
+    async def test_group(self) -> None:
+        class Custom1Error(Exception): ...
+
+        async def coroutine1() -> None:
+            raise Custom1Error
+
+        class Custom2Error(Exception): ...
+
+        async def coroutine2() -> None:
+            msg = "message2"
+            raise Custom2Error(msg)
+
+        with raises(ExceptionGroup) as exc_info:  # noqa: PT012
+            async with TaskGroup() as tg:
+                _ = tg.create_task(coroutine1())
+                _ = tg.create_task(coroutine2())
+        error = exc_info.value
+        assert isinstance(error, ExceptionGroup)
+        result = repr_error(error)
+        expected = "ExceptionGroup(Custom1Error(), Custom2Error(message2))"
+        assert result == expected
+
+    def test_instance(self) -> None:
+        class CustomError(Exception): ...
+
+        result = repr_error(CustomError("message"))
+        expected = "CustomError(message)"
+        assert result == expected

{dycw_utilities-0.126.0 → dycw_utilities-0.126.2}/src/tests/test_redis.py

@@ -42,9 +42,8 @@ from utilities.redis import (
     PublishError,
     PublishService,
     SubscribeService,
-    _is_subscribe_message,
-    _RedisMessageSubscribe,
-    _RedisMessageUnsubscribe,
+    _is_message,
+    _RedisMessage,
     publish,
     redis_hash_map_key,
     redis_key,
@@ -71,7 +70,7 @@ def channels(draw: DrawFn, /) -> str:
     return f"test_{now}_{key}_{pid}"
 
 
-class TestIsSubscribeMessage:
+class TestIsMessage:
     @mark.parametrize(
         ("message", "channels", "expected"),
         [
@@ -113,13 +112,9 @@ class TestIsSubscribeMessage:
         ],
     )
     def test_main(
-        self,
-        *,
-        message: _RedisMessageSubscribe | _RedisMessageUnsubscribe | None,
-        channels: Sequence[bytes],
-        expected: bool,
+        self, *, message: Any, channels: Sequence[bytes], expected: bool
     ) -> None:
-        result = _is_subscribe_message(message, channels=channels)
+        result = _is_message(message, channels=channels)
         assert result is expected
 
 
@@ -558,7 +553,7 @@ class TestSubscribe:
     @settings_with_reduced_examples(phases={Phase.generate})
     @SKIPIF_CI_AND_NOT_LINUX
     async def test_raw(self, *, channel: str, messages: Sequence[str]) -> None:
-        queue: Queue[_RedisMessageSubscribe] = Queue()
+        queue: Queue[_RedisMessage] = Queue()
         async with (
             yield_redis() as redis,
             subscribe(redis, channel, queue, output="raw"),
@@ -583,7 +578,7 @@ class TestSubscribe:
     @settings_with_reduced_examples(phases={Phase.generate})
     @SKIPIF_CI_AND_NOT_LINUX
     async def test_text(self, *, channel: str, messages: Sequence[str]) -> None:
-        queue: Queue[_RedisMessageSubscribe] = Queue()
+        queue: Queue[_RedisMessage] = Queue()
         async with (
             yield_redis() as redis,
             subscribe(redis, channel, queue, output="raw"),

{dycw_utilities-0.126.0 → dycw_utilities-0.126.2}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.126.0"
+__version__ = "0.126.2"

{dycw_utilities-0.126.0 → dycw_utilities-0.126.2}/src/utilities/errors.py

@@ -24,6 +24,10 @@ class ImpossibleCaseError(Exception):
 def repr_error(error: MaybeType[BaseException], /) -> str:
     """Get a string representation of an error."""
     match error:
+        case ExceptionGroup() as group:
+            descs = list(map(repr_error, group.exceptions))
+            joined = ", ".join(descs)
+            return f"{group.__class__.__name__}({joined})"
         case BaseException() as error_obj:
             return f"{error_obj.__class__.__name__}({error_obj})"
         case type() as error_cls:

{dycw_utilities-0.126.0 → dycw_utilities-0.126.2}/src/utilities/redis.py

@@ -657,7 +657,7 @@ class PublisherError(Exception):
 
 
 @dataclass(kw_only=True)
-class PublishService(Looper[tuple[str, _T]]):
+class PublishService(Looper[tuple[str, bytes | str | _T]]):
     """Service to publish items to Redis."""
 
     # base
@@ -677,7 +677,7 @@ class PublishService(Looper[tuple[str, _T]]):
             _ = await publish(
                 self.redis,
                 channel,
-                cast("Any", data),
+                data,
                 serializer=self.serializer,
                 timeout=self.publish_timeout,
             )
@@ -695,7 +695,7 @@ _SUBSCRIBE_SLEEP: Duration = MILLISECOND
 def subscribe(
     redis: Redis,
     channels: MaybeIterable[str],
-    queue: Queue[_RedisMessageSubscribe],
+    queue: Queue[_RedisMessage],
     /,
     *,
     timeout: Duration | None = _SUBSCRIBE_TIMEOUT,
@@ -742,7 +742,7 @@ def subscribe(
 async def subscribe(
     redis: Redis,
     channels: MaybeIterable[str],
-    queue: Queue[_RedisMessageSubscribe] | Queue[bytes] | Queue[_T],
+    queue: Queue[_RedisMessage] | Queue[bytes] | Queue[_T],
     /,
     *,
     timeout: Duration | None = _SUBSCRIBE_TIMEOUT,
@@ -758,12 +758,12 @@ async def subscribe(
             transform = cast("Any", itemgetter("data"))
         case "text":
 
-            def transform(message: _RedisMessageSubscribe, /) -> str:  # pyright: ignore[reportRedeclaration]
+            def transform(message: _RedisMessage, /) -> str:  # pyright: ignore[reportRedeclaration]
                 return message["data"].decode()
 
         case Callable() as deserialize:
 
-            def transform(message: _RedisMessageSubscribe, /) -> _T:
+            def transform(message: _RedisMessage, /) -> _T:
                 return deserialize(message["data"])
 
         case _ as never:
@@ -783,7 +783,7 @@ async def subscribe(
 async def _subscribe_core(
     redis: Redis,
     channels: MaybeIterable[str],
-    transform: Callable[[_RedisMessageSubscribe], Any],
+    transform: Callable[[_RedisMessage], Any],
     queue: Queue[Any],
     /,
     *,
@@ -795,14 +795,11 @@ async def _subscribe_core(
     )
     sleep_use = datetime_duration_to_float(sleep)  # skipif-ci-and-not-linux
     is_subscribe_message = partial(  # skipif-ci-and-not-linux
-        _is_subscribe_message, channels={c.encode() for c in channels}
+        _is_message, channels={c.encode() for c in channels}
     )
     async with yield_pubsub(redis, channels) as pubsub:  # skipif-ci-and-not-linux
         while True:
-            message = cast(
-                "_RedisMessageSubscribe | _RedisMessageUnsubscribe | None",
-                await pubsub.get_message(timeout=timeout_use),
-            )
+            message = await pubsub.get_message(timeout=timeout_use)
             if is_subscribe_message(message):
                 if isinstance(queue, EnhancedQueue):
                     queue.put_right_nowait(transform(message))
@@ -812,9 +809,9 @@ async def _subscribe_core(
                 await asyncio.sleep(sleep_use)
 
 
-def _is_subscribe_message(
+def _is_message(
     message: Any, /, *, channels: Collection[bytes]
-) -> TypeGuard[_RedisMessageSubscribe]:
+) -> TypeGuard[_RedisMessage]:
     return (
         isinstance(message, Mapping)
         and ("type" in message)
@@ -828,20 +825,13 @@ def _is_subscribe_message(
     )
 
 
-class _RedisMessageSubscribe(TypedDict):
+class _RedisMessage(TypedDict):
     type: Literal["subscribe", "psubscribe", "message", "pmessage"]
     pattern: str | None
     channel: bytes
     data: bytes
 
 
-class _RedisMessageUnsubscribe(TypedDict):
-    type: Literal["unsubscribe", "punsubscribe"]
-    pattern: str | None
-    channel: bytes
-    data: int
-
-
 ##
 
 

dycw_utilities-0.126.0/src/tests/test_errors.py

@@ -1,28 +0,0 @@
-from __future__ import annotations
-
-from pytest import raises
-
-from utilities.errors import ImpossibleCaseError, repr_error
-
-
-class TestImpossibleCaseError:
-    def test_main(self) -> None:
-        x = None
-        with raises(ImpossibleCaseError, match=r"Case must be possible: x=None\."):
-            raise ImpossibleCaseError(case=[f"{x=}"])
-
-
-class TestReprError:
-    def test_class(self) -> None:
-        class CustomError(Exception): ...
-
-        result = repr_error(CustomError)
-        expected = "CustomError"
-        assert result == expected
-
-    def test_instance(self) -> None:
-        class CustomError(Exception): ...
-
-        result = repr_error(CustomError())
-        expected = "CustomError()"
-        assert result == expected