dycw-utilities 0.126.5__py3-none-any.whl → 0.126.7__py3-none-any.whl

{dycw_utilities-0.126.5.dist-info → dycw_utilities-0.126.7.dist-info}/METADATA

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

{dycw_utilities-0.126.5.dist-info → dycw_utilities-0.126.7.dist-info}/RECORD

@@ -1,10 +1,10 @@
-utilities/__init__.py,sha256=VDrLXzcqWS0oyXCkhWVW6135Pzimt4LjwrWZrMWdt-I,60
+utilities/__init__.py,sha256=k4Q-FdII9KXkuYXSZgXMDtdGhp9lcKoxpPtcuL_YIlQ,60
 utilities/altair.py,sha256=Gpja-flOo-Db0PIPJLJsgzAlXWoKUjPU1qY-DQ829ek,9156
 utilities/asyncio.py,sha256=K5Kj7rsM0nA17-b7d7mrNgPR1U_NbkfQmTruq5LBLRA,51778
 utilities/atomicwrites.py,sha256=geFjn9Pwn-tTrtoGjDDxWli9NqbYfy3gGL6ZBctiqSo,5393
 utilities/atools.py,sha256=IYMuFSFGSKyuQmqD6v5IUtDlz8PPw0Sr87Cub_gRU3M,1168
 utilities/cachetools.py,sha256=C1zqOg7BYz0IfQFK8e3qaDDgEZxDpo47F15RTfJM37Q,2910
-utilities/click.py,sha256=SRVkUkWxyO_7AaYvvDl0hNCzdpneX04lf1O97i9MfPw,14311
+utilities/click.py,sha256=CianelgUj_M2SBpuvhmRPKOGxuvLM04FHllUWtL7hok,14647
 utilities/concurrent.py,sha256=s2scTEd2AhXVTW4hpASU2qxV_DiVLALfms55cCQzCvM,2886
 utilities/contextlib.py,sha256=lpaLJBy3X0UGLWjM98jkQZZq8so4fRmoK-Bheq0uOW4,1027
 utilities/contextvars.py,sha256=RsSGGrbQqqZ67rOydnM7WWIsM2lIE31UHJLejnHJPWY,505
@@ -23,7 +23,7 @@ utilities/getpass.py,sha256=DfN5UgMAtFCqS3dSfFHUfqIMZX2shXvwphOz_6J6f6A,103
 utilities/git.py,sha256=wpt5dZ5Oi5931pN24_VLZYaQOvmR0OcQuVtgHzFUN1k,2359
 utilities/hashlib.py,sha256=SVTgtguur0P4elppvzOBbLEjVM3Pea0eWB61yg2ilxo,309
 utilities/http.py,sha256=WcahTcKYRtZ04WXQoWt5EGCgFPcyHD3EJdlMfxvDt-0,946
-utilities/hypothesis.py,sha256=DwhPpnz9w5H9YxLpoXTRjhTpadDjrX5-yUVT-Kq6Tgc,45216
+utilities/hypothesis.py,sha256=tgUQ3egBETjo_A8xzEmfuYMGYf8o30PtZD8FqBfwsPM,45267
 utilities/importlib.py,sha256=mV1xT_O_zt_GnZZ36tl3xOmMaN_3jErDWY54fX39F6Y,429
 utilities/ipython.py,sha256=V2oMYHvEKvlNBzxDXdLvKi48oUq2SclRg5xasjaXStw,763
 utilities/iterables.py,sha256=mDqw2_0MUVp-P8FklgcaVTi2TXduH0MxbhTDzzhSBho,44915
@@ -61,7 +61,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=U-LN6Li3vPTQ2sGGh85_1eD53payujg4qYX0TfmbLSs,32205
+utilities/redis.py,sha256=XywncvQak9AYgdeN2M3vDJM9MEJsIFSfOiWVCKZVGjY,32697
 utilities/reprlib.py,sha256=Re9bk3n-kC__9DxQmRlevqFA86pE6TtVfWjUgpbVOv0,1849
 utilities/rich.py,sha256=t50MwwVBsoOLxzmeVFSVpjno4OW6Ufum32skXbV8-Bs,1911
 utilities/scipy.py,sha256=X6ROnHwiUhAmPhM0jkfEh0-Fd9iRvwiqtCQMOLmOQF8,945
@@ -91,7 +91,7 @@ utilities/warnings.py,sha256=un1LvHv70PU-LLv8RxPVmugTzDJkkGXRMZTE2-fTQHw,1771
 utilities/whenever.py,sha256=jS31ZAY5OMxFxLja_Yo5Fidi87Pd-GoVZ7Vi_teqVDA,16743
 utilities/zipfile.py,sha256=24lQc9ATcJxHXBPc_tBDiJk48pWyRrlxO2fIsFxU0A8,699
 utilities/zoneinfo.py,sha256=-5j7IQ9nb7gR43rdgA7ms05im-XuqhAk9EJnQBXxCoQ,1874
-dycw_utilities-0.126.5.dist-info/METADATA,sha256=pPt4HJkJRAyBAY-fWmeS5sHMh0ulzqrabQQfnFkOupI,12849
-dycw_utilities-0.126.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.126.5.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.126.5.dist-info/RECORD,,
+dycw_utilities-0.126.7.dist-info/METADATA,sha256=YC7obEXSZCW1WxlqW0Ljgu2ZI8uM1kUwPPrrODeVHvk,12849
+dycw_utilities-0.126.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.126.7.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.126.7.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.126.5"
+__version__ = "0.126.7"

utilities/click.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import datetime as dt
 import pathlib
-from typing import TYPE_CHECKING, Generic, TypeVar, override
+from typing import TYPE_CHECKING, Generic, TypedDict, TypeVar, override
 from uuid import UUID
 
 import click
@@ -49,6 +49,19 @@ ExistingDirPath = click.Path(
 )
 
 
+class _HelpOptionNames(TypedDict):
+    help_option_names: Sequence[str]
+
+
+class _ContextSettings(TypedDict):
+    context_settings: _HelpOptionNames
+
+
+CONTEXT_SETTINGS_HELP_OPTION_NAMES = _ContextSettings(
+    context_settings=_HelpOptionNames(help_option_names=["-h", "--help"])
+)
+
+
 # parameters
 
 
@@ -480,6 +493,7 @@ def _make_metavar(param: Parameter, desc: str, /) -> str:
 
 
 __all__ = [
+    "CONTEXT_SETTINGS_HELP_OPTION_NAMES",
     "Date",
     "DirPath",
     "Duration",

utilities/hypothesis.py

@@ -24,6 +24,7 @@ from typing import (
     overload,
     override,
 )
+from uuid import uuid4
 
 from hypothesis import HealthCheck, Phase, Verbosity, assume, settings
 from hypothesis.errors import InvalidArgument
@@ -1415,9 +1416,10 @@ def unique_strs(draw: DrawFn, /) -> str:
     """Strategy for generating unique strings."""
     now = get_now_local()
     pid = getpid()
-    ident = get_ident()
-    key = str(draw(uuids())).replace("-", "")
-    return f"{now:%Y%m%d%H%M%S%f}_{pid}_{ident}_{key}"
+    ident = just(get_ident())
+    key = str(uuid4()).replace("-", "")
+    full = f"{now:%Y%m%d%H%M%S%f}_{pid}_{ident}_{key}"
+    return draw(just(full))
 
 
 ##

utilities/redis.py

@@ -35,6 +35,7 @@ from utilities.datetime import (
 from utilities.errors import ImpossibleCaseError
 from utilities.functions import ensure_int, get_class_name, identity
 from utilities.iterables import always_iterable, one
+from utilities.orjson import deserialize, serialize
 
 if TYPE_CHECKING:
     from collections.abc import (
@@ -557,7 +558,7 @@ async def publish(
     data: _T,
     /,
     *,
-    serializer: Callable[[bytes | str | _T], EncodableT],
+    serializer: Callable[[_T], EncodableT],
     timeout: Duration = _PUBLISH_TIMEOUT,
 ) -> ResponseT: ...
 @overload
@@ -577,7 +578,7 @@ async def publish(
     data: bytes | str | _T,
     /,
     *,
-    serializer: Callable[[bytes | str | _T], EncodableT] | None = None,
+    serializer: Callable[[_T], EncodableT] | None = None,
     timeout: Duration = _PUBLISH_TIMEOUT,
 ) -> ResponseT: ...
 async def publish(
@@ -586,18 +587,19 @@ async def publish(
     data: bytes | str | _T,
     /,
     *,
-    serializer: Callable[[bytes | str | _T], EncodableT] | None = None,
+    serializer: Callable[[_T], EncodableT] | None = None,
     timeout: Duration = _PUBLISH_TIMEOUT,
 ) -> ResponseT:
     """Publish an object to a channel."""
-    if isinstance(data, bytes | str) and (  # skipif-ci-and-not-linux
-        serializer is None
-    ):
-        data_use = data
-    elif serializer is not None:  # skipif-ci-and-not-linux
-        data_use = serializer(data)
-    else:  # skipif-ci-and-not-linux
-        raise PublishError(data=data, serializer=serializer)
+    match data, serializer:  # skipif-ci-and-not-linux
+        case bytes() | str() as data_use, _:
+            ...
+        case _, None:
+            raise PublishError(data=data, serializer=serializer)
+        case _, Callable():
+            data_use = serializer(data)
+        case _ as never:
+            assert_never(never)
     async with timeout_dur(duration=timeout):  # skipif-ci-and-not-linux
         return await redis.publish(channel, data_use)  # skipif-ci-and-not-linux
 
@@ -654,7 +656,7 @@ class PublisherError(Exception):
 
 
 @dataclass(kw_only=True)
-class PublishService(Looper[tuple[str, bytes | str | _T]]):
+class PublishService(Looper[tuple[str, _T]]):
     """Service to publish items to Redis."""
 
     # base
@@ -663,7 +665,7 @@ class PublishService(Looper[tuple[str, bytes | str | _T]]):
     empty_upon_exit: bool = field(default=True, repr=False)
     # self
     redis: Redis
-    serializer: Callable[[Any], EncodableT] | None = None
+    serializer: Callable[[_T], EncodableT] = serialize
     publish_timeout: Duration = SECOND
 
     @override
@@ -698,6 +700,7 @@ def subscribe(
     timeout: Duration | None = _SUBSCRIBE_TIMEOUT,
     sleep: Duration = _SUBSCRIBE_SLEEP,
     output: Literal["raw"],
+    filter_: Callable[[_RedisMessage], bool] | None = None,
 ) -> AsyncIterator[Task[None]]: ...
 @overload
 @asynccontextmanager
@@ -710,6 +713,7 @@ def subscribe(
     timeout: Duration | None = _SUBSCRIBE_TIMEOUT,
     sleep: Duration = _SUBSCRIBE_SLEEP,
     output: Literal["bytes"],
+    filter_: Callable[[bytes], bool] | None = None,
 ) -> AsyncIterator[Task[None]]: ...
 @overload
 @asynccontextmanager
@@ -722,6 +726,7 @@ def subscribe(
     timeout: Duration | None = _SUBSCRIBE_TIMEOUT,
     sleep: Duration = _SUBSCRIBE_SLEEP,
     output: Literal["text"] = "text",
+    filter_: Callable[[str], bool] | None = None,
 ) -> AsyncIterator[Task[None]]: ...
 @overload
 @asynccontextmanager
@@ -734,6 +739,7 @@ def subscribe(
     timeout: Duration | None = _SUBSCRIBE_TIMEOUT,
     sleep: Duration = _SUBSCRIBE_SLEEP,
     output: Callable[[bytes], _T],
+    filter_: Callable[[_T], bool] | None = None,
 ) -> AsyncIterator[Task[None]]: ...
 @asynccontextmanager
 async def subscribe(
@@ -745,6 +751,7 @@ async def subscribe(
     timeout: Duration | None = _SUBSCRIBE_TIMEOUT,
     sleep: Duration = _SUBSCRIBE_SLEEP,
     output: Literal["raw", "bytes", "text"] | Callable[[bytes], _T] = "text",
+    filter_: Callable[[Any], bool] | None = None,
 ) -> AsyncIterator[Task[None]]:
     """Subscribe to the data of a given channel(s)."""
     channels = list(always_iterable(channels))  # skipif-ci-and-not-linux
@@ -767,7 +774,15 @@ async def subscribe(
             assert_never(never)
 
     task = create_task(  # skipif-ci-and-not-linux
-        _subscribe_core(redis, channels, transform, queue, timeout=timeout, sleep=sleep)
+        _subscribe_core(
+            redis,
+            channels,
+            transform,
+            queue,
+            timeout=timeout,
+            sleep=sleep,
+            filter_=filter_,
+        )
     )
     try:  # skipif-ci-and-not-linux
         yield task
@@ -786,6 +801,7 @@ async def _subscribe_core(
     *,
     timeout: Duration | None = _SUBSCRIBE_TIMEOUT,
     sleep: Duration = _SUBSCRIBE_SLEEP,
+    filter_: Callable[[Any], bool] | None = None,
 ) -> None:
     timeout_use = (  # skipif-ci-and-not-linux
         None if timeout is None else datetime_duration_to_float(timeout)
@@ -798,10 +814,12 @@ async def _subscribe_core(
         while True:
             message = await pubsub.get_message(timeout=timeout_use)
             if is_subscribe_message(message):
-                if isinstance(queue, EnhancedQueue):
-                    queue.put_right_nowait(transform(message))
-                else:
-                    queue.put_nowait(transform(message))
+                transformed = transform(message)
+                if (filter_ is None) or filter_(transformed):
+                    if isinstance(queue, EnhancedQueue):
+                        queue.put_right_nowait(transformed)
+                    else:
+                        queue.put_nowait(transformed)
             else:
                 await asyncio.sleep(sleep_use)
 
@@ -843,9 +861,10 @@ class SubscribeService(Looper[_T]):
     # self
     redis: Redis
     channel: str
-    deserializer: Callable[[bytes], _T] | None = None
-    subscribe_sleep: Duration = _SUBSCRIBE_SLEEP
+    deserializer: Callable[[bytes], _T] = deserialize
     subscribe_timeout: Duration | None = _SUBSCRIBE_TIMEOUT
+    subscribe_sleep: Duration = _SUBSCRIBE_SLEEP
+    filter_: Callable[[_T], bool] | None = None
     _is_subscribed: Event = field(default_factory=Event, init=False, repr=False)
 
     @override
@@ -864,12 +883,10 @@ class SubscribeService(Looper[_T]):
                         self.redis,
                         self.channel,
                         self._queue,
-                        sleep=self.subscribe_sleep,
                         timeout=self.subscribe_timeout,
-                        output=cast(
-                            "Any",
-                            "text" if self.deserializer is None else self.deserializer,
-                        ),
+                        sleep=self.subscribe_sleep,
+                        output=self.deserializer,
+                        filter_=self.filter_,
                     )
                 )
             case _ as never: