dycw-utilities 0.132.3__tar.gz → 0.133.0__tar.gz

{dycw_utilities-0.132.3 → dycw_utilities-0.133.0}/PKG-INFO

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

{dycw_utilities-0.132.3 → dycw_utilities-0.133.0}/pyproject.toml

@@ -14,6 +14,7 @@ altair-test = [
   "img2pdf",
   "vl-convert-python",
 ]
+arq = ["arq >= 0.26.3, < 0.27"]
 atools = ["atools >= 0.14.2, < 0.15"]
 cachetools = ["cachetools >= 5.5.2, < 5.6"]
 click = ["click >= 8.2.1, < 8.3"]
@@ -74,7 +75,7 @@ pytest-regressions = ["pytest-regressions >= 2.8.0, < 2.9"]
 pytest-regressions-test = ["orjson", "polars-lts-cpu"]
 pytest-test = ["orjson", "pytest-rng", "pytest-rerunfailures"]
 python-dotenv = ["python-dotenv >= 1.1.0, < 1.2"]
-redis = ["redis >= 6.2.0, < 6.3", "orjson"]
+redis = ["redis >= 5.3.0, < 6.0", "orjson"]
 redis-test = ["pytest-rerunfailures"]
 reprlib-test = ["rich"]
 scipy = ["scipy >= 1.15.3, < 1.16"]
@@ -102,7 +103,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.132.3"
+version = "0.133.0"
 
 [project.optional-dependencies]
 logging = [
@@ -128,7 +129,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.132.3"
+current_version = "0.133.0"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"
@@ -236,6 +237,7 @@ asyncio_mode = "auto"
 filterwarnings = [
   "error",
   "ignore:.*utcfromtimestamp.* is deprecated and scheduled for removal in a future version:DeprecationWarning",  # luigi
+  "ignore:Exception ignored in.* <coroutine object .* at .*>:pytest.PytestUnraisableExceptionWarning",
   "ignore:Implicitly cleaning up <TemporaryDirectory '.*'>:ResourceWarning",
   "ignore:ResourceTracker called reentrantly for resource cleanup, which is unsupported:UserWarning",
   "ignore:Task .* without outputs has no custom complete.* method:UserWarning",  # luigi

dycw_utilities-0.133.0/src/tests/test_arq.py

@@ -0,0 +1,47 @@
+from __future__ import annotations
+
+from asyncio import sleep
+from typing import TYPE_CHECKING, Any, cast
+
+from hypothesis import given
+from hypothesis.strategies import integers
+
+from utilities.arq import Worker, cron_raw
+from utilities.iterables import one
+
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+    from arq.cron import CronJob
+    from arq.typing import WorkerCoroutine
+
+    from utilities.types import CallableCoroutine1
+
+
+class TestWorker:
+    @given(x=integers(), y=integers())
+    async def test_main(self, *, x: int, y: int) -> None:
+        async def func(x: int, y: int, /) -> int:
+            await sleep(0.01)
+            return x + y
+
+        class Example(Worker):
+            functions_raw: Sequence[CallableCoroutine1[Any]] = [func]
+
+        func_use = cast("WorkerCoroutine", one(Example.functions))
+        result = await func_use({}, x, y)
+        assert result == (x + y)
+
+    @given(x=integers(), y=integers())
+    async def test_cron(self, *, x: int, y: int) -> None:
+        async def func(x: int, y: int, /) -> int:
+            await sleep(0.01)
+            return x + y
+
+        class Example(Worker):
+            cron_jobs: Sequence[CronJob] | None = [cron_raw(func, args=(x, y))]
+
+        assert Example.cron_jobs is not None
+        cron_job = one(Example.cron_jobs)
+        result = await cron_job.coroutine({})
+        assert result == (x + y)

{dycw_utilities-0.132.3 → dycw_utilities-0.133.0}/src/tests/test_click.py

@@ -16,6 +16,7 @@ from hypothesis.strategies import (
     booleans,
     data,
     frozensets,
+    ip_addresses,
     lists,
     sampled_from,
 )
@@ -36,6 +37,8 @@ from utilities.click import (
     FrozenSetChoices,
     FrozenSetEnums,
     FrozenSetStrs,
+    IPv4Address,
+    IPv6Address,
     ListEnums,
     ListStrs,
     Month,
@@ -227,6 +230,8 @@ class TestParameters:
                 _lift_serializer(str, sort=True),
                 False,
             ),
+            param(IPv4Address(), "IPV4 ADDRESS", ip_addresses(v=4), str, True),
+            param(IPv6Address(), "IPV6 ADDRESS", ip_addresses(v=6), str, True),
             param(
                 ListEnums(_ExampleEnum),
                 "LIST[ENUM[_ExampleEnum]]",

{dycw_utilities-0.132.3 → dycw_utilities-0.133.0}/src/tests/test_parse.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from collections.abc import Iterable
+from ipaddress import IPv4Address, IPv6Address
 from pathlib import Path
 from types import NoneType
 from typing import Final, Literal
@@ -12,6 +13,7 @@ from hypothesis.strategies import (
     floats,
     frozensets,
     integers,
+    ip_addresses,
     lists,
     none,
     sampled_from,
@@ -110,6 +112,18 @@ class TestSerializeAndParseObject:
         result = parse_object(int, serialized)
         assert result == int_
 
+    @given(address=ip_addresses(v=4))
+    def test_ipv4_address(self, *, address: IPv4Address) -> None:
+        serialized = serialize_object(address)
+        result = parse_object(IPv4Address, serialized)
+        assert result == address
+
+    @given(address=ip_addresses(v=6))
+    def test_ipv6_address(self, *, address: IPv6Address) -> None:
+        serialized = serialize_object(address)
+        result = parse_object(IPv6Address, serialized)
+        assert result == address
+
     @given(ints=lists(int64s()))
     def test_list(self, *, ints: list[int]) -> None:
         serialized = serialize_object(ints)

{dycw_utilities-0.132.3 → dycw_utilities-0.133.0}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.132.3"
+__version__ = "0.133.0"

dycw_utilities-0.133.0/src/utilities/arq.py

@@ -0,0 +1,161 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from functools import wraps
+from itertools import chain
+from typing import TYPE_CHECKING, Any, ParamSpec, TypeVar, cast, override
+
+from arq.constants import default_queue_name, expires_extra_ms
+from arq.cron import cron
+
+if TYPE_CHECKING:
+    from collections.abc import Callable, Iterable, Sequence
+    from datetime import timezone
+
+    from arq.connections import ArqRedis, RedisSettings
+    from arq.cron import CronJob
+    from arq.jobs import Deserializer, Serializer
+    from arq.typing import (
+        OptionType,
+        SecondsTimedelta,
+        StartupShutdown,
+        WeekdayOptionType,
+        WorkerCoroutine,
+    )
+    from arq.worker import Function
+
+    from utilities.types import CallableCoroutine1, Coroutine1, StrMapping
+
+_P = ParamSpec("_P")
+_T = TypeVar("_T")
+
+
+##
+
+
+def cron_raw(
+    coroutine: CallableCoroutine1[Any],
+    /,
+    *,
+    name: str | None = None,
+    month: OptionType = None,
+    day: OptionType = None,
+    weekday: WeekdayOptionType = None,
+    hour: OptionType = None,
+    minute: OptionType = None,
+    second: OptionType = 0,
+    microsecond: int = 123_456,
+    run_at_startup: bool = False,
+    unique: bool = True,
+    job_id: str | None = None,
+    timeout: SecondsTimedelta | None = None,
+    keep_result: float | None = 0,
+    keep_result_forever: bool | None = False,
+    max_tries: int | None = 1,
+    args: Iterable[Any] | None = None,
+    kwargs: StrMapping | None = None,
+) -> CronJob:
+    """Create a cron job with a raw coroutine function."""
+    lifted = _lift_cron(
+        coroutine, *(() if args is None else args), **({} if kwargs is None else kwargs)
+    )
+    return cron(
+        lifted,
+        name=name,
+        month=month,
+        day=day,
+        weekday=weekday,
+        hour=hour,
+        minute=minute,
+        second=second,
+        microsecond=microsecond,
+        run_at_startup=run_at_startup,
+        unique=unique,
+        job_id=job_id,
+        timeout=timeout,
+        keep_result=keep_result,
+        keep_result_forever=keep_result_forever,
+        max_tries=max_tries,
+    )
+
+
+def _lift_cron(
+    func: Callable[_P, Coroutine1[_T]], *args: _P.args, **kwargs: _P.kwargs
+) -> WorkerCoroutine:
+    """Lift a coroutine function & call arg/kwargs for `cron`."""
+
+    @wraps(func)
+    async def wrapped(ctx: StrMapping, /) -> _T:
+        _ = ctx
+        return await func(*args, **kwargs)
+
+    return cast("Any", wrapped)
+
+
+##
+
+
+class _WorkerMeta(type):
+    @override
+    def __new__(
+        mcs: type[_WorkerMeta],
+        name: str,
+        bases: tuple[type, ...],
+        namespace: dict[str, Any],
+        /,
+    ) -> type[Worker]:
+        cls = cast("type[Worker]", super().__new__(mcs, name, bases, namespace))
+        cls.functions = tuple(chain(cls.functions, map(cls._lift, cls.functions_raw)))
+        return cls
+
+    @classmethod
+    def _lift(cls, func: Callable[_P, Coroutine1[_T]]) -> WorkerCoroutine:
+        """Lift a coroutine function to accept the required `ctx` argument."""
+
+        @wraps(func)
+        async def wrapped(ctx: StrMapping, *args: _P.args, **kwargs: _P.kwargs) -> _T:
+            _ = ctx
+            return await func(*args, **kwargs)
+
+        return cast("Any", wrapped)
+
+
+@dataclass(kw_only=True)
+class Worker(metaclass=_WorkerMeta):
+    """Base class for all workers."""
+
+    functions: Sequence[Function | WorkerCoroutine] = ()
+    functions_raw: Sequence[CallableCoroutine1[Any]] = ()
+    queue_name: str | None = default_queue_name
+    cron_jobs: Sequence[CronJob] | None = None
+    redis_settings: RedisSettings | None = None
+    redis_pool: ArqRedis | None = None
+    burst: bool = False
+    on_startup: StartupShutdown | None = None
+    on_shutdown: StartupShutdown | None = None
+    on_job_start: StartupShutdown | None = None
+    on_job_end: StartupShutdown | None = None
+    after_job_end: StartupShutdown | None = None
+    handle_signals: bool = True
+    job_completion_wait: int = 0
+    max_jobs: int = 10
+    job_timeout: SecondsTimedelta = 300
+    keep_result: SecondsTimedelta = 3600
+    keep_result_forever: bool = False
+    poll_delay: SecondsTimedelta = 0.5
+    queue_read_limit: int | None = None
+    max_tries: int = 5
+    health_check_interval: SecondsTimedelta = 3600
+    health_check_key: str | None = None
+    ctx: dict[Any, Any] | None = None
+    retry_jobs: bool = True
+    allow_abort_jobs: bool = False
+    max_burst_jobs: int = -1
+    job_serializer: Serializer | None = None
+    job_deserializer: Deserializer | None = None
+    expires_extra_ms: int = expires_extra_ms
+    timezone: timezone | None = None
+    log_results: bool = True
+
+
+__all__ = ["Worker", "cron"]

{dycw_utilities-0.132.3 → dycw_utilities-0.133.0}/src/utilities/click.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import ipaddress
 import pathlib
 from typing import TYPE_CHECKING, Generic, TypedDict, TypeVar, assert_never, override
 
@@ -12,12 +13,15 @@ import utilities.whenever
 from utilities.enum import EnsureEnumError, ensure_enum
 from utilities.functions import EnsureStrError, ensure_str, get_class_name
 from utilities.iterables import is_iterable_not_str
+from utilities.parse import ParseObjectError, parse_object
 from utilities.text import split_str
 from utilities.types import (
     DateDeltaLike,
     DateLike,
     DateTimeDeltaLike,
     EnumLike,
+    IPv4AddressLike,
+    IPv6AddressLike,
     MaybeStr,
     PlainDateTimeLike,
     TEnum,
@@ -173,6 +177,58 @@ class Enum(ParamType, Generic[TEnum]):
         return _make_metavar(param, desc)
 
 
+class IPv4Address(ParamType):
+    """An IPv4 address-valued parameter."""
+
+    name = "ipv4 address"
+
+    @override
+    def __repr__(self) -> str:
+        return self.name.upper()
+
+    @override
+    def convert(
+        self, value: IPv4AddressLike, param: Parameter | None, ctx: Context | None
+    ) -> ipaddress.IPv4Address:
+        """Convert a value into the `IPv4Address` type."""
+        match value:
+            case ipaddress.IPv4Address():
+                return value
+            case str():
+                try:
+                    return parse_object(ipaddress.IPv4Address, value)
+                except ParseObjectError as error:
+                    self.fail(str(error), param, ctx)
+            case _ as never:
+                assert_never(never)
+
+
+class IPv6Address(ParamType):
+    """An IPv6 address-valued parameter."""
+
+    name = "ipv6 address"
+
+    @override
+    def __repr__(self) -> str:
+        return self.name.upper()
+
+    @override
+    def convert(
+        self, value: IPv6AddressLike, param: Parameter | None, ctx: Context | None
+    ) -> ipaddress.IPv6Address:
+        """Convert a value into the `IPv6Address` type."""
+        match value:
+            case ipaddress.IPv6Address():
+                return value
+            case str():
+                try:
+                    return parse_object(ipaddress.IPv6Address, value)
+                except ParseObjectError as error:
+                    self.fail(str(error), param, ctx)
+            case _ as never:
+                assert_never(never)
+
+
 class Month(ParamType):
     """A month-valued parameter."""
 
@@ -467,6 +523,8 @@ __all__ = [
     "FrozenSetEnums",
     "FrozenSetParameter",
     "FrozenSetStrs",
+    "IPv4Address",
+    "IPv6Address",
     "ListEnums",
     "ListParameter",
     "ListStrs",

{dycw_utilities-0.132.3 → dycw_utilities-0.133.0}/src/utilities/parse.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 from contextlib import suppress
 from dataclasses import dataclass
 from enum import Enum
+from ipaddress import IPv4Address, IPv6Address
 from pathlib import Path
 from re import DOTALL
 from types import NoneType
@@ -176,14 +177,9 @@ def _parse_object_type(
             return parse_bool(text)
         except ParseBoolError:
             raise _ParseObjectParseError(type_=cls, text=text) from None
-    if is_subclass_gen(cls, int):
+    if is_subclass_gen(cls, int | float | IPv4Address | IPv6Address):
         try:
-            return int(text)
-        except ValueError:
-            raise _ParseObjectParseError(type_=cls, text=text) from None
-    if issubclass(cls, float):
-        try:
-            return float(text)
+            return cls(text)
         except ValueError:
             raise _ParseObjectParseError(type_=cls, text=text) from None
     if issubclass(cls, Enum):
@@ -443,7 +439,16 @@ def serialize_object(
         with suppress(_SerializeObjectSerializeError):
             return _serialize_object_extra(obj, extra)
     if (obj is None) or isinstance(
-        obj, bool | int | float | str | Path | Sentinel | Version
+        obj,
+        bool
+        | int
+        | float
+        | str
+        | IPv4Address
+        | IPv6Address
+        | Path
+        | Sentinel
+        | Version,
     ):
         return str(obj)
     if isinstance(

{dycw_utilities-0.132.3 → dycw_utilities-0.133.0}/src/utilities/types.py

@@ -4,6 +4,7 @@ import datetime as dt
 from asyncio import Event
 from collections.abc import Awaitable, Callable, Coroutine, Hashable, Iterable, Mapping
 from enum import Enum
+from ipaddress import IPv4Address, IPv6Address
 from logging import Logger
 from pathlib import Path
 from random import Random
@@ -71,12 +72,16 @@ type Coroutine1[_T] = Coroutine[Any, Any, _T]
 type MaybeAwaitable[_T] = _T | Awaitable[_T]
 type MaybeCallableEvent = MaybeCallable[Event]
 type MaybeCoroutine1[_T] = _T | Coroutine1[_T]
+type CallableCoroutine1[_T] = Callable[..., Coroutine1[_T]]
 
 
 # callable
 TCallable = TypeVar("TCallable", bound=Callable[..., Any])
 TCallable1 = TypeVar("TCallable1", bound=Callable[..., Any])
 TCallable2 = TypeVar("TCallable2", bound=Callable[..., Any])
+TCallableCoroutine1 = TypeVar(
+    "TCallableCoroutine1", bound=Callable[..., Coroutine1[Any]]
+)
 TCallableMaybeCoroutine1None = TypeVar(
     "TCallableMaybeCoroutine1None", bound=Callable[..., MaybeCoroutine1[None]]
 )
@@ -112,6 +117,11 @@ THashable1 = TypeVar("THashable1", bound=Hashable)
 THashable2 = TypeVar("THashable2", bound=Hashable)
 
 
+# ipaddress
+IPv4AddressLike = MaybeStr[IPv4Address]
+IPv6AddressLike = MaybeStr[IPv6Address]
+
+
 # iterables
 type MaybeIterable[_T] = _T | Iterable[_T]
 type IterableHashable[_THashable: Hashable] = (
@@ -286,6 +296,7 @@ type TimeZoneLike = (
 
 
 __all__ = [
+    "CallableCoroutine1",
     "Coroutine1",
     "Dataclass",
     "DateDeltaLike",
@@ -295,6 +306,8 @@ __all__ = [
     "DateTimeRoundUnit",
     "EnumLike",
     "ExcInfo",
+    "IPv4AddressLike",
+    "IPv6AddressLike",
     "IterableHashable",
     "LogLevel",
     "LoggerOrName",
@@ -338,6 +351,7 @@ __all__ = [
     "TCallable",
     "TCallable1",
     "TCallable2",
+    "TCallableCoroutine1",
     "TCallableMaybeCoroutine1None",
     "TDataclass",
     "TEnum",