dycw-utilities 0.112.4__py3-none-any.whl → 0.112.6__py3-none-any.whl

{dycw_utilities-0.112.4.dist-info → dycw_utilities-0.112.6.dist-info}/METADATA

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

{dycw_utilities-0.112.4.dist-info → dycw_utilities-0.112.6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=oC8D3yQOhG08zuNGgWDntjiYZO1Ow4YdrihVPBjmoiI,60
+utilities/__init__.py,sha256=d0j_69nmkoIKyb6X7hdJ8nRV6_SJJNH1dwhdMB_yAA8,60
 utilities/altair.py,sha256=Gpja-flOo-Db0PIPJLJsgzAlXWoKUjPU1qY-DQ829ek,9156
 utilities/astor.py,sha256=xuDUkjq0-b6fhtwjhbnebzbqQZAjMSHR1IIS5uOodVg,777
 utilities/asyncio.py,sha256=41oQUurWMvadFK5gFnaG21hMM0Vmfn2WS6OpC0R9mas,14757
@@ -11,7 +11,7 @@ utilities/contextlib.py,sha256=OOIIEa5lXKGzFAnauaul40nlQnQko6Na4ryiMJcHkIg,478
 utilities/contextvars.py,sha256=RsSGGrbQqqZ67rOydnM7WWIsM2lIE31UHJLejnHJPWY,505
 utilities/cryptography.py,sha256=HyOewI20cl3uRXsKivhIaeLVDInQdzgXZGaly7hS5dE,771
 utilities/cvxpy.py,sha256=Rv1-fD-XYerosCavRF8Pohop2DBkU3AlFaGTfD8AEAA,13776
-utilities/dataclasses.py,sha256=Q197PVnE_vUMn_SNnqJBCo4eRy4bdHtgMHWRbSJPtFk,26670
+utilities/dataclasses.py,sha256=EG2lZRPU_rmkP3KWR7J5J43r8hr68s9uchSvevxpoZI,27433
 utilities/datetime.py,sha256=OF7jZE702UecnwAbq9D3N-GINpp9gSGoidki1RhimCE,35752
 utilities/enum.py,sha256=HoRwVCWzsnH0vpO9ZEcAAIZLMv0Sn2vJxxA4sYMQgDs,5793
 utilities/errors.py,sha256=BtSNP0JC3ik536ddPyTerLomCRJV9f6kdMe6POz0QHM,361
@@ -41,7 +41,7 @@ utilities/operator.py,sha256=0M2yZJ0PODH47ogFEnkGMBe_cfxwZR02T_92LZVZvHo,3715
 utilities/optuna.py,sha256=loyJGWTzljgdJaoLhP09PT8Jz6o_pwBOwehY33lHkhw,1923
 utilities/orjson.py,sha256=DBm2zPP04kcHpY3l1etL24ksNynu-R3duFyx3U-RjqQ,36948
 utilities/os.py,sha256=D_FyyT-6TtqiN9KSS7c9g1fnUtgxmyMtzAjmYLkk46A,3587
-utilities/parse.py,sha256=cdOKqsT9c0dgFuNWzb1E-dqLDJ8kES9YWvPNpQDLySA,18844
+utilities/parse.py,sha256=Qr8hw14v0Bfxnc0TjFfjZtmYk6FrdVoqLnszb7R27BA,18982
 utilities/pathlib.py,sha256=31WPMXdLIyXgYOMMl_HOI2wlo66MGSE-cgeelk-Lias,1410
 utilities/period.py,sha256=RWfcNVoNlW07RNdU47g_zuLZMKbtgfK4bE6G-9tVjY8,11024
 utilities/pickle.py,sha256=Bhvd7cZl-zQKQDFjUerqGuSKlHvnW1K2QXeU5UZibtg,657
@@ -78,7 +78,7 @@ utilities/threading.py,sha256=GvBOp4CyhHfN90wGXZuA2VKe9fGzMaEa7oCl4f3nnPU,1009
 utilities/timer.py,sha256=Rkc49KSpHuC8s7vUxGO9DU55U9I6yDKnchsQqrUCVBs,4075
 utilities/traceback.py,sha256=secexUnBsecfWV4ZuqP1W4pGF3prOeO1CRyJK-8zQDU,27402
 utilities/types.py,sha256=kVY71hZkcnyYNIlYSse0mLm8yeP3OBkzhDPMME6jXxo,18126
-utilities/typing.py,sha256=Tppx84LCtZFX8oOzDb2PeUIv9tjNqFWQLuMadN_rAes,13514
+utilities/typing.py,sha256=H6ysJkI830aRwLsMKz0SZIw4cpcsm7d6KhQOwr-SDh0,13817
 utilities/tzdata.py,sha256=yCf70NICwAeazN3_JcXhWvRqCy06XJNQ42j7r6gw3HY,1217
 utilities/tzlocal.py,sha256=3upDNFBvGh1l9njmLR2z2S6K6VxQSb7QizYGUbAH3JU,960
 utilities/uuid.py,sha256=jJTFxz-CWgltqNuzmythB7iEQ-Q1mCwPevUfKthZT3c,611
@@ -87,7 +87,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.112.4.dist-info/METADATA,sha256=kt63WFyIE1e7dsPDAxgJfbPryHlzRYSPo_nsFUp8EiI,13004
-dycw_utilities-0.112.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.112.4.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.112.4.dist-info/RECORD,,
+dycw_utilities-0.112.6.dist-info/METADATA,sha256=nVSss8zVsLAitA6xDEcurQtsusPov5dkkpgrD9Q-SBI,13004
+dycw_utilities-0.112.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.112.6.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.112.6.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.112.4"
+__version__ = "0.112.6"

utilities/dataclasses.py

@@ -22,7 +22,12 @@ from utilities.functions import (
 )
 from utilities.iterables import OneStrEmptyError, OneStrNonUniqueError, one_str
 from utilities.operator import is_equal
-from utilities.parse import ParseObjectError, parse_object, serialize_object
+from utilities.parse import (
+    _ParseObjectExtraNonUniqueError,
+    _ParseObjectParseError,
+    parse_object,
+    serialize_object,
+)
 from utilities.re import ExtractGroupError, extract_group
 from utilities.sentinel import Sentinel, sentinel
 from utilities.text import (
@@ -570,8 +575,12 @@ def _parse_dataclass_parse_text(
             case_sensitive=case_sensitive,
             extra=extra,
         )
-    except ParseObjectError:
-        raise _ParseDataClassParseValueError(cls=cls, field=field, text=text) from None
+    except _ParseObjectParseError:
+        raise _ParseDataClassTextParseError(cls=cls, field=field, text=text) from None
+    except _ParseObjectExtraNonUniqueError as error:
+        raise _ParseDataClassTextExtraNonUniqueError(
+            cls=cls, field=field, text=text, first=error.first, second=error.second
+        ) from None
 
 
 @dataclass(kw_only=True, slots=True)
@@ -597,12 +606,23 @@ class _ParseDataClassSplitKeyValuePairsDuplicateKeysError(ParseDataClassError):
 
 
 @dataclass(kw_only=True, slots=True)
-class _ParseDataClassParseValueError(ParseDataClassError[TDataclass]):
+class _ParseDataClassTextParseError(ParseDataClassError[TDataclass]):
+    field: _YieldFieldsClass[Any]
+
+    @override
+    def __str__(self) -> str:
+        return f"Unable to construct {get_class_name(self.cls)!r} since the field {self.field.name!r} of type {self.field.type_!r} could not be parsed; got {self.text!r}"
+
+
+@dataclass(kw_only=True, slots=True)
+class _ParseDataClassTextExtraNonUniqueError(ParseDataClassError[TDataclass]):
     field: _YieldFieldsClass[Any]
+    first: type[Any]
+    second: type[Any]
 
     @override
     def __str__(self) -> str:
-        return f"Unable to construct {get_class_name(self.cls)!r}; unable to parse field {self.field.name!r} of type {self.field.type_!r}; got {self.text!r}"
+        return f"Unable to construct {get_class_name(self.cls)!r} since the field {self.field.name!r} of type {self.field.type_!r} must contain exactly one parent class in `extra`; got {self.first!r}, {self.second!r} and perhaps more"
 
 
 ##

utilities/parse.py

@@ -283,17 +283,19 @@ def _parse_object_dict_type(
 
 def _parse_object_extra(cls: Any, text: str, extra: ParseObjectExtra, /) -> Any:
     try:
-        parser = one(
-            p for c, p in extra.items() if (cls is c) or is_subclass_gen(cls, c)
-        )
-    except (OneEmptyError, TypeError):
-        raise _ParseObjectParseError(type_=cls, text=text) from None
-    except OneNonUniqueError as error:
-        raise _ParseObjectExtraNonUniqueError(
-            type_=cls, text=text, first=error.first, second=error.second
-        ) from None
-    else:
-        return parser(text)
+        parser = extra[cls]
+    except KeyError:
+        try:
+            parser = one(
+                p for c, p in extra.items() if (cls is c) or is_subclass_gen(cls, c)
+            )
+        except (OneEmptyError, TypeError):
+            raise _ParseObjectParseError(type_=cls, text=text) from None
+        except OneNonUniqueError as error:
+            raise _ParseObjectExtraNonUniqueError(
+                type_=cls, text=text, first=error.first, second=error.second
+            ) from None
+    return parser(text)
 
 
 def _parse_object_list_type(
@@ -600,7 +602,7 @@ class SerializeObjectError(Exception):
 class _SerializeObjectSerializeError(SerializeObjectError):
     @override
     def __str__(self) -> str:
-        return f"Unable to serialize object {self.obj!r}"
+        return f"Unable to serialize object {self.obj!r} of type {type(self.obj)!r}"
 
 
 @dataclass
@@ -610,7 +612,7 @@ class _SerializeObjectExtraNonUniqueError(SerializeObjectError):
 
     @override
     def __str__(self) -> str:
-        return f"Unable to serialize object {self.obj!r} since `extra` must contain exactly one parent class; got {self.first!r}, {self.second!r} and perhaps more"
+        return f"Unable to serialize object {self.obj!r} of type {type(self.obj)!r} since `extra` must contain exactly one parent class; got {self.first!r}, {self.second!r} and perhaps more"
 
 
 __all__ = ["parse_object", "serialize_object"]

utilities/typing.py

@@ -108,7 +108,7 @@ class GetTypeClassesError(Exception):
 class _GetTypeClassesTypeError(GetTypeClassesError):
     @override
     def __str__(self) -> str:
-        return f"Object must be a type, tuple or Union type; got {self.obj}"
+        return f"Object must be a type, tuple or Union type; got {self.obj!r} of type {type(self.obj)!r}"
 
 
 @dataclass(kw_only=True, slots=True)
@@ -117,7 +117,7 @@ class _GetTypeClassesTupleError(GetTypeClassesError):
 
     @override
     def __str__(self) -> str:
-        return f"Tuple must contain types, tuples or Union types only; got {self.inner}"
+        return f"Tuple must contain types, tuples or Union types only; got {self.inner} of type {type(self.inner)!r}"
 
 
 ##
@@ -177,7 +177,9 @@ class GetUnionTypeClassesError(Exception):
 class _GetUnionTypeClassesUnionTypeError(GetUnionTypeClassesError):
     @override
     def __str__(self) -> str:
-        return f"Object must be a Union type; got {self.obj}"
+        return (
+            f"Object must be a Union type; got {self.obj!r} of type {type(self.obj)!r}"
+        )
 
 
 @dataclass(kw_only=True, slots=True)
@@ -186,7 +188,7 @@ class _GetUnionTypeClassesInternalTypeError(GetUnionTypeClassesError):
 
     @override
     def __str__(self) -> str:
-        return f"Union type must contain types only; got {self.inner}"
+        return f"Union type must contain types only; got {self.inner} of type {type(self.inner)!r}"
 
 
 ##
@@ -243,6 +245,8 @@ def is_instance_gen(obj: Any, type_: Any, /) -> bool:
         return (len(obj) == len(type_args)) and all(
             is_instance_gen(o, t) for o, t in zip(obj, type_args, strict=True)
         )
+    if isinstance(obj, tuple) is not is_tuple_type(type_):
+        return False
     # basic
     if isinstance(type_, type):
         return any(_is_instance_gen_type(obj, t) for t in get_type_classes(type_))
@@ -272,7 +276,7 @@ class IsInstanceGenError(Exception):
 
     @override
     def __str__(self) -> str:
-        return f"Invalid arguments; got {self.obj!r} and {self.type_!r}"
+        return f"Invalid arguments; got {self.obj!r} of type {type(self.obj)!r} and {self.type_!r} of type {type(self.type_)!r}"
 
 
 ##
@@ -432,7 +436,7 @@ class IsSubclassGenError(Exception):
 
     @override
     def __str__(self) -> str:
-        return f"Argument must be a class; got {self.cls!r}"
+        return f"Argument must be a class; got {self.cls!r} of type {type(self.cls)!r}"
 
 
 ##