dycw-utilities 0.132.2__py3-none-any.whl → 0.132.4__py3-none-any.whl

{dycw_utilities-0.132.2.dist-info → dycw_utilities-0.132.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.132.2
+Version: 0.132.4
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12
@@ -17,7 +17,6 @@ Requires-Dist: pytest-asyncio<1.1,>=1.0.0; extra == 'test'
 Requires-Dist: pytest-cov<6.2,>=6.1.1; extra == 'test'
 Requires-Dist: pytest-instafail<0.6,>=0.5.0; extra == 'test'
 Requires-Dist: pytest-lazy-fixtures<1.2,>=1.1.4; extra == 'test'
-Requires-Dist: pytest-randomly<3.17,>=3.16.0; extra == 'test'
 Requires-Dist: pytest-regressions<2.9,>=2.8.0; extra == 'test'
 Requires-Dist: pytest-rerunfailures<16,>=15.1; extra == 'test'
 Requires-Dist: pytest-rng<1.1,>=1.0.0; extra == 'test'

{dycw_utilities-0.132.2.dist-info → dycw_utilities-0.132.4.dist-info}/RECORD

@@ -1,11 +1,11 @@
-utilities/__init__.py,sha256=RYydFF7hiCzHBA5ftJVJGt--0UCdLtJbhMfwLLE87tk,60
+utilities/__init__.py,sha256=XNt4jtceKkZ5SzTlJ0nWpgaWnxz3PNjWlzmzu1iXOtI,60
 utilities/aiolimiter.py,sha256=mD0wEiqMgwpty4XTbawFpnkkmJS6R4JRsVXFUaoitSU,628
 utilities/altair.py,sha256=HeZBVUocjkrTNwwKrClppsIqgNFF-ykv05HfZSoHYno,9104
 utilities/asyncio.py,sha256=USWMMrHqPVRr20vlIn_n5JLimyqa-5xLhuqDYWJed8A,37586
 utilities/atomicwrites.py,sha256=geFjn9Pwn-tTrtoGjDDxWli9NqbYfy3gGL6ZBctiqSo,5393
 utilities/atools.py,sha256=-bFGIrwYMFR7xl39j02DZMsO_u5x5_Ph7bRlBUFVYyw,1048
 utilities/cachetools.py,sha256=uBtEv4hD-TuCPX_cQy1lOpLF-QqfwnYGSf0o4Soqydc,2826
-utilities/click.py,sha256=jLyep_czA3k-3XWHWrKFEEN79ZbMhVT2H7TGnTa8i44,13314
+utilities/click.py,sha256=DI8yJFlpBpRvnc90Xc0kfLKGQRpFCvj797oOJiaE4k8,14998
 utilities/concurrent.py,sha256=s2scTEd2AhXVTW4hpASU2qxV_DiVLALfms55cCQzCvM,2886
 utilities/contextlib.py,sha256=lpaLJBy3X0UGLWjM98jkQZZq8so4fRmoK-Bheq0uOW4,1027
 utilities/contextvars.py,sha256=RsSGGrbQqqZ67rOydnM7WWIsM2lIE31UHJLejnHJPWY,505
@@ -42,7 +42,7 @@ utilities/operator.py,sha256=DuiWdkmK0D-ddvFqOayDkazTQE1Ysvtl6-UiBN5gns8,3857
 utilities/optuna.py,sha256=loyJGWTzljgdJaoLhP09PT8Jz6o_pwBOwehY33lHkhw,1923
 utilities/orjson.py,sha256=y5ynSGhQjX7vikfvsHh_AklLnH7gjvsSkIC3h5tnx98,36474
 utilities/os.py,sha256=D_FyyT-6TtqiN9KSS7c9g1fnUtgxmyMtzAjmYLkk46A,3587
-utilities/parse.py,sha256=YE2VWYKDm9WYf5wcOWrOxVfM6UWvhkSxSkwdxRQNsA0,17633
+utilities/parse.py,sha256=PCy73pBmXgFzjxV54BC7TzHVhV3caDQvdvfXYqE_UUQ,17642
 utilities/pathlib.py,sha256=PK41rf1c9Wqv7h8f5R7H3_Lhq_gQZTUJD5tu3gMHVaU,3247
 utilities/period.py,sha256=opqpBevBGSGXbA7NYfRJjtthi1JPxdMaZ7QV3xosnTc,4774
 utilities/pickle.py,sha256=MBT2xZCsv0pH868IXLGKnlcqNx2IRVKYNpRcqiQQqxw,653
@@ -55,7 +55,6 @@ utilities/psutil.py,sha256=0j4YxtVb8VjaaKKiHg6UEK95SUPkEcENgPtLgPJsNv0,3760
 utilities/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 utilities/pydantic.py,sha256=aP6OKowg2Md4rgQuQ5qTSF4bTbBuq7WtRb7zS3JSRGY,1841
 utilities/pyinstrument.py,sha256=_Rfq6Gg4NKV2NF0dRYOpK2IRyyePxI7-3UmHIQLYrlQ,852
-utilities/pyrsistent.py,sha256=wVOVIe_68AAaa-lUE9y-TEzDawVp1uEIc_zfoDgr5ww,2287
 utilities/pytest.py,sha256=xSDybvkvdj7Ix-Tpc1INctKZV07qwrQvJlQonSimB7o,8273
 utilities/pytest_regressions.py,sha256=YI55B7EtLjhz7zPJZ6NK9bWrxrKCKabWZJe1cwcbA5o,5082
 utilities/python_dotenv.py,sha256=edXsvHZhZnYeqfMfrsRRpj7_9eJI6uizh3xLx8Q9B3w,3228
@@ -79,7 +78,7 @@ utilities/threading.py,sha256=GvBOp4CyhHfN90wGXZuA2VKe9fGzMaEa7oCl4f3nnPU,1009
 utilities/timer.py,sha256=oYqRQ-G-DMOOHB6a4yP5-PJDVimLnbNkMnkOj_jUmFg,2474
 utilities/traceback.py,sha256=i-790AQbTrDA8MiYyOcYPFpm48I558VR_kL_7x4ypfY,8503
 utilities/typed_settings.py,sha256=DqJsJjSit9wd_OA3KyMDpx2zatKIi5QhuARI9TPl3rk,3701
-utilities/types.py,sha256=fuJQiVjKYKL9g3F5H7oW_98Xm1-R5Xq4t4kU-aHxW0M,18826
+utilities/types.py,sha256=ZkTndROqNbpgUa_MX4pYlkfmU9E8prMqr4UvASruhsE,19013
 utilities/typing.py,sha256=kVWK6ciV8T0MKxnFQcMSEr_XlRisspH5aBTTosMUh30,13872
 utilities/tzdata.py,sha256=fgNVj66yUbCSI_-vrRVzSD3gtf-L_8IEJEPjP_Jel5Y,266
 utilities/tzlocal.py,sha256=KyCXEgCTjqGFx-389JdTuhMRUaT06U1RCMdWoED-qro,728
@@ -89,7 +88,7 @@ utilities/warnings.py,sha256=un1LvHv70PU-LLv8RxPVmugTzDJkkGXRMZTE2-fTQHw,1771
 utilities/whenever.py,sha256=tArX9unVEKhRYdvbUFa83e4hrzdtMKKCEN4QWTaYd8c,19524
 utilities/zipfile.py,sha256=24lQc9ATcJxHXBPc_tBDiJk48pWyRrlxO2fIsFxU0A8,699
 utilities/zoneinfo.py,sha256=oEH-nL3t4h9uawyZqWDtNtDAl6M-CLpLYGI_nI6DulM,1971
-dycw_utilities-0.132.2.dist-info/METADATA,sha256=w5I6ev0jGeLsqltZGkzBTijkicnDJObi8fINbNUcYI4,1584
-dycw_utilities-0.132.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.132.2.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.132.2.dist-info/RECORD,,
+dycw_utilities-0.132.4.dist-info/METADATA,sha256=_AReviYgS7sJRlfoEv0VV19ABmMgXnFz2uWE0Rq3JNI,1522
+dycw_utilities-0.132.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.132.4.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.132.4.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.132.2"
+__version__ = "0.132.4"

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",

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(

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
@@ -112,6 +113,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] = (
@@ -295,6 +301,8 @@ __all__ = [
     "DateTimeRoundUnit",
     "EnumLike",
     "ExcInfo",
+    "IPv4AddressLike",
+    "IPv6AddressLike",
     "IterableHashable",
     "LogLevel",
     "LoggerOrName",

utilities/pyrsistent.py

@@ -1,89 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING, Any, TypeVar, dataclass_transform, overload
-
-from pyrsistent import PRecord as _PRecord
-from pyrsistent import field as _field
-from pyrsistent._field_common import (
-    PFIELD_NO_FACTORY,
-    PFIELD_NO_INITIAL,
-    PFIELD_NO_INVARIANT,
-    PFIELD_NO_SERIALIZER,
-    PFIELD_NO_TYPE,
-)
-
-if TYPE_CHECKING:
-    from collections.abc import Callable
-
-    from utilities.types import TypeLike
-
-
-_T = TypeVar("_T")
-_U = TypeVar("_U")
-
-
-@overload
-def field(
-    *,
-    type: type[_T],
-    invariant: Callable[[Any], tuple[bool, Any]] = ...,
-    default: Any = ...,
-    mandatory: bool = ...,
-    factory: Callable[[_U], _U] = ...,
-    serializer: Callable[[Any, Any], Any] = ...,
-) -> _T: ...
-@overload
-def field(
-    *,
-    type: tuple[type[_T]],
-    invariant: Callable[[Any], tuple[bool, Any]] = ...,
-    default: Any = ...,
-    mandatory: bool = ...,
-    factory: Callable[[_U], _U] = ...,
-    serializer: Callable[[Any, Any], Any] = ...,
-) -> _T: ...
-@overload
-def field(
-    *,
-    type: tuple[type[_T], type[_U]],
-    invariant: Callable[[Any], tuple[bool, Any]] = ...,
-    default: Any = ...,
-    mandatory: bool = ...,
-    factory: Callable[[_U], _U] = ...,
-    serializer: Callable[[Any, Any], Any] = ...,
-) -> _T | _U: ...
-@overload
-def field(
-    *,
-    type: tuple[Any, ...] = ...,
-    invariant: Callable[[Any], tuple[bool, Any]] = ...,
-    default: Any = ...,
-    mandatory: bool = ...,
-    factory: Callable[[_U], _U] = ...,
-    serializer: Callable[[Any, Any], Any] = ...,
-) -> Any: ...
-def field(
-    *,
-    type: TypeLike[_T] = PFIELD_NO_TYPE,  # noqa: A002
-    invariant: Callable[[Any], tuple[bool, Any]] = PFIELD_NO_INVARIANT,
-    default: Any = PFIELD_NO_INITIAL,
-    mandatory: bool = False,
-    factory: Callable[[_U], _U] = PFIELD_NO_FACTORY,
-    serializer: Callable[[Any, Any], Any] = PFIELD_NO_SERIALIZER,
-) -> Any:
-    """Field specification factory for :py:class:`PRecord`."""
-    return _field(
-        type=type,
-        invariant=invariant,
-        initial=default,
-        mandatory=mandatory,
-        factory=factory,
-        serializer=serializer,
-    )
-
-
-@dataclass_transform(kw_only_default=True, field_specifiers=(field,))
-class PRecord(_PRecord): ...
-
-
-__all__ = ["PRecord", "field"]