dycw-utilities 0.116.4__py3-none-any.whl → 0.116.5__py3-none-any.whl

{dycw_utilities-0.116.4.dist-info → dycw_utilities-0.116.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.116.4
+Version: 0.116.5
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12
@@ -43,7 +43,7 @@ Requires-Dist: whenever<0.8,>=0.7.3; extra == 'zzz-test-click'
 Provides-Extra: zzz-test-contextlib
 Provides-Extra: zzz-test-contextvars
 Provides-Extra: zzz-test-cryptography
-Requires-Dist: cryptography<44.1,>=44.0.2; extra == 'zzz-test-cryptography'
+Requires-Dist: cryptography<46.0,>=45.0.2; extra == 'zzz-test-cryptography'
 Provides-Extra: zzz-test-cvxpy
 Requires-Dist: cvxpy<1.7,>=1.6.5; extra == 'zzz-test-cvxpy'
 Provides-Extra: zzz-test-dataclasses

{dycw_utilities-0.116.4.dist-info → dycw_utilities-0.116.5.dist-info}/RECORD

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=b6XtB99cyX4IZ76DFvF8Igz1IiLess5LdFIaswgC0Ko,60
+utilities/__init__.py,sha256=GXLQ5JDCKi8MkhRcLwoG6sQHEvI7WNjzrUQe35jlk60,60
 utilities/altair.py,sha256=Gpja-flOo-Db0PIPJLJsgzAlXWoKUjPU1qY-DQ829ek,9156
 utilities/astor.py,sha256=xuDUkjq0-b6fhtwjhbnebzbqQZAjMSHR1IIS5uOodVg,777
 utilities/asyncio.py,sha256=7qisjTnEGEKcguy_STXN6qOXij_yzTvcQ5fIbrPeyZ8,23305
@@ -59,7 +59,7 @@ utilities/pytest_regressions.py,sha256=-SVT9647Dg6-JcdsiaDKXe3NdOmmrvGevLKWwGjxq
 utilities/python_dotenv.py,sha256=iWcnpXbH7S6RoXHiLlGgyuH6udCupAcPd_gQ0eAenQ0,3190
 utilities/random.py,sha256=lYdjgxB7GCfU_fwFVl5U-BIM_HV3q6_urL9byjrwDM8,4157
 utilities/re.py,sha256=5J4d8VwIPFVrX2Eb8zfoxImDv7IwiN_U7mJ07wR2Wvs,3958
-utilities/redis.py,sha256=0LAmbQFkwbJ3w6teTqGw1fNCSs1tDivL3DVAqob0S5c,26732
+utilities/redis.py,sha256=P766qKT2SkDeKa9PpPEZIPCnAc2QDIi35ow2EEHGd20,27225
 utilities/reprlib.py,sha256=Re9bk3n-kC__9DxQmRlevqFA86pE6TtVfWjUgpbVOv0,1849
 utilities/rich.py,sha256=t50MwwVBsoOLxzmeVFSVpjno4OW6Ufum32skXbV8-Bs,1911
 utilities/scipy.py,sha256=X6ROnHwiUhAmPhM0jkfEh0-Fd9iRvwiqtCQMOLmOQF8,945
@@ -88,7 +88,7 @@ utilities/warnings.py,sha256=un1LvHv70PU-LLv8RxPVmugTzDJkkGXRMZTE2-fTQHw,1771
 utilities/whenever.py,sha256=iLRP_-8CZtBpHKbGZGu-kjSMg1ZubJ-VSmgSy7Eudxw,17787
 utilities/zipfile.py,sha256=24lQc9ATcJxHXBPc_tBDiJk48pWyRrlxO2fIsFxU0A8,699
 utilities/zoneinfo.py,sha256=-Xm57PMMwDTYpxJdkiJG13wnbwK--I7XItBh5WVhD-o,1874
-dycw_utilities-0.116.4.dist-info/METADATA,sha256=P8hMpiUHgXKsNKT5dTwM4LbirjzE57NNYNB7KdmeZVQ,12943
-dycw_utilities-0.116.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.116.4.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.116.4.dist-info/RECORD,,
+dycw_utilities-0.116.5.dist-info/METADATA,sha256=Prqc-G7Nlh_dk6GIwbMqc91_J8g49NALvLToCr02X28,12943
+dycw_utilities-0.116.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.116.5.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.116.5.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.116.4"
+__version__ = "0.116.5"

utilities/redis.py

@@ -19,6 +19,7 @@ from typing import (
 from uuid import UUID, uuid4
 
 from redis.asyncio import Redis
+from redis.asyncio.client import PubSub
 from redis.typing import EncodableT
 
 from utilities.asyncio import InfiniteQueueLooper, QueueProcessor, timeout_dur
@@ -46,7 +47,6 @@ if TYPE_CHECKING:
     )
 
     from redis.asyncio import ConnectionPool
-    from redis.asyncio.client import PubSub
     from redis.typing import ResponseT
 
     from utilities.iterables import MaybeIterable
@@ -649,7 +649,7 @@ _SUBSCRIBE_SLEEP: Duration = MILLISECOND
 
 @overload
 def subscribe(
-    pubsub: PubSub,
+    redis_or_pubsub: Redis | PubSub,
     channels: MaybeIterable[str],
     /,
     *,
@@ -659,7 +659,7 @@ def subscribe(
 ) -> AsyncIterator[_T]: ...
 @overload
 def subscribe(
-    pubsub: PubSub,
+    redis_or_pubsub: Redis | PubSub,
     channels: MaybeIterable[str],
     /,
     *,
@@ -668,7 +668,7 @@ def subscribe(
     sleep: Duration = _SUBSCRIBE_SLEEP,
 ) -> AsyncIterator[bytes]: ...
 async def subscribe(  # pyright: ignore[reportInconsistentOverload]
-    pubsub: PubSub,
+    redis_or_pubsub: Redis | PubSub,
     channels: MaybeIterable[str],
     /,
     *,
@@ -679,7 +679,7 @@ async def subscribe(  # pyright: ignore[reportInconsistentOverload]
     """Subscribe to the data of a given channel(s)."""
     channels = list(always_iterable(channels))  # skipif-ci-and-not-linux
     messages = subscribe_messages(  # skipif-ci-and-not-linux
-        pubsub, channels, timeout=timeout, sleep=sleep
+        redis_or_pubsub, channels, timeout=timeout, sleep=sleep
     )
     if deserializer is None:  # skipif-ci-and-not-linux
         async for message in messages:
@@ -690,7 +690,7 @@ async def subscribe(  # pyright: ignore[reportInconsistentOverload]
 
 
 async def subscribe_messages(
-    pubsub: PubSub,
+    redis_or_pubsub: Redis | PubSub,
     channels: MaybeIterable[str],
     /,
     *,
@@ -698,28 +698,40 @@ async def subscribe_messages(
     sleep: Duration = _SUBSCRIBE_SLEEP,
 ) -> AsyncIterator[_RedisMessageSubscribe]:
     """Subscribe to the messages of a given channel(s)."""
-    channels = list(always_iterable(channels))  # skipif-ci-and-not-linux
-    for channel in channels:  # skipif-ci-and-not-linux
-        await pubsub.subscribe(channel)
-    channels_bytes = [c.encode() for c in channels]  # skipif-ci-and-not-linux
-    timeout_use = (  # skipif-ci-and-not-linux
-        None if timeout is None else datetime_duration_to_float(timeout)
-    )
-    sleep_use = datetime_duration_to_float(sleep)  # skipif-ci-and-not-linux
-    while True:  # skipif-ci-and-not-linux
-        message = cast(
-            "_RedisMessageSubscribe | _RedisMessageUnsubscribe | None",
-            await pubsub.get_message(timeout=timeout_use),
-        )
-        if (
-            (message is not None)
-            and (message["type"] in {"subscribe", "psubscribe", "message", "pmessage"})
-            and (message["channel"] in channels_bytes)
-            and isinstance(message["data"], bytes)
-        ):
-            yield cast("_RedisMessageSubscribe", message)
-        else:
-            await asyncio.sleep(sleep_use)
+    match redis_or_pubsub:  # skipif-ci-and-not-linux
+        case Redis() as redis:
+            async for msg in subscribe_messages(
+                redis.pubsub(), channels, timeout=timeout, sleep=sleep
+            ):
+                yield msg
+        case PubSub() as pubsub:
+            channels = list(always_iterable(channels))
+            for channel in channels:
+                await pubsub.subscribe(channel)
+            channels_bytes = [c.encode() for c in channels]
+            timeout_use = (
+                None if timeout is None else datetime_duration_to_float(timeout)
+            )
+            sleep_use = datetime_duration_to_float(sleep)
+            while True:
+                message = cast(
+                    "_RedisMessageSubscribe | _RedisMessageUnsubscribe | None",
+                    await pubsub.get_message(timeout=timeout_use),
+                )
+                if (
+                    (message is not None)
+                    and (
+                        message["type"]
+                        in {"subscribe", "psubscribe", "message", "pmessage"}
+                    )
+                    and (message["channel"] in channels_bytes)
+                    and isinstance(message["data"], bytes)
+                ):
+                    yield cast("_RedisMessageSubscribe", message)
+                else:
+                    await asyncio.sleep(sleep_use)
+        case _ as never:
+            assert_never(never)
 
 
 class _RedisMessageSubscribe(TypedDict):