dycw-utilities 0.111.0__py3-none-any.whl → 0.111.1__py3-none-any.whl

{dycw_utilities-0.111.0.dist-info → dycw_utilities-0.111.1.dist-info}/METADATA

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

{dycw_utilities-0.111.0.dist-info → dycw_utilities-0.111.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=fjbCo5KvSkqKWLmPeMS8U77JZlYaYPd9js1ZVmdD1FE,60
+utilities/__init__.py,sha256=j1-gk7DzQOb2e2RhnLMwpl11AV5CfMKamy2OkF4La18,60
 utilities/altair.py,sha256=Gpja-flOo-Db0PIPJLJsgzAlXWoKUjPU1qY-DQ829ek,9156
 utilities/astor.py,sha256=xuDUkjq0-b6fhtwjhbnebzbqQZAjMSHR1IIS5uOodVg,777
 utilities/asyncio.py,sha256=41oQUurWMvadFK5gFnaG21hMM0Vmfn2WS6OpC0R9mas,14757
@@ -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=-sDMqA4nB4CFctc86uIlSoKmIUisTUd3qyBcuUnf1D0,18957
+utilities/parse.py,sha256=hG-y8WAzpATakA61UOF6UlhfuJQ9XbMN-Uub1ZaiBRU,18780
 utilities/pathlib.py,sha256=31WPMXdLIyXgYOMMl_HOI2wlo66MGSE-cgeelk-Lias,1410
 utilities/period.py,sha256=RWfcNVoNlW07RNdU47g_zuLZMKbtgfK4bE6G-9tVjY8,11024
 utilities/pickle.py,sha256=Bhvd7cZl-zQKQDFjUerqGuSKlHvnW1K2QXeU5UZibtg,657
@@ -87,7 +87,7 @@ utilities/warnings.py,sha256=un1LvHv70PU-LLv8RxPVmugTzDJkkGXRMZTE2-fTQHw,1771
 utilities/whenever.py,sha256=TjoTAJ1R27-rKXiXzdE4GzPidmYqm0W58XydDXp-QZM,17786
 utilities/zipfile.py,sha256=24lQc9ATcJxHXBPc_tBDiJk48pWyRrlxO2fIsFxU0A8,699
 utilities/zoneinfo.py,sha256=-DQz5a0Ikw9jfSZtL0BEQkXOMC9yGn_xiJYNCLMiqEc,1989
-dycw_utilities-0.111.0.dist-info/METADATA,sha256=9UDVxMivd6ye3O57NEI2wEddqVpW9OE_rc_uhtMXD-c,13004
-dycw_utilities-0.111.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.111.0.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.111.0.dist-info/RECORD,,
+dycw_utilities-0.111.1.dist-info/METADATA,sha256=kXoTkJKsgrfBYD5eCwE45d4mGIX5CMZhVeNHh9SRiL8,13004
+dycw_utilities-0.111.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.111.1.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.111.1.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.111.0"
+__version__ = "0.111.1"

utilities/parse.py

@@ -60,15 +60,15 @@ def parse_object(
     extra: ParseObjectExtra | None = None,
 ) -> Any:
     """Parse text."""
+    if extra is not None:
+        return _parse_object_extra(type_, text, extra)
     if type_ is None:
         try:
             return parse_none(text)
         except ParseNoneError:
             raise _ParseObjectParseError(type_=type_, text=text) from None
     if isinstance(type_, type):
-        return _parse_object_type(
-            type_, text, case_sensitive=case_sensitive, extra=extra
-        )
+        return _parse_object_type(type_, text, case_sensitive=case_sensitive)
     if is_dict_type(type_):
         return _parse_object_dict_type(
             type_,
@@ -146,17 +146,12 @@ def parse_object(
             extra=extra,
         )
     if is_union_type(type_):
-        return _parse_object_union_type(type_, text, extra=extra)
+        return _parse_object_union_type(type_, text)
     raise _ParseObjectParseError(type_=type_, text=text) from None
 
 
 def _parse_object_type(
-    cls: type[Any],
-    text: str,
-    /,
-    *,
-    case_sensitive: bool = False,
-    extra: ParseObjectExtra | None = None,
+    cls: type[Any], text: str, /, *, case_sensitive: bool = False
 ) -> Any:
     """Parse text."""
     if issubclass(cls, NoneType):
@@ -226,17 +221,6 @@ def _parse_object_type(
             return parse_timedelta(text)
         except ParseTimedeltaError:
             raise _ParseObjectParseError(type_=cls, text=text) from None
-    if extra is not None:
-        try:
-            parser = one(p for c, p in extra.items() if issubclass(cls, c))
-        except OneEmptyError:
-            pass
-        except OneNonUniqueError as error:
-            raise _ParseObjectExtraNonUniqueError(
-                type_=cls, text=text, first=error.first, second=error.second
-            ) from None
-        else:
-            return parser(text)
     raise _ParseObjectParseError(type_=cls, text=text)
 
 
@@ -296,6 +280,21 @@ def _parse_object_dict_type(
         raise _ParseObjectParseError(type_=type_, text=text) from None
 
 
+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:
+        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)
+
+
 def _parse_object_list_type(
     type_: Any,
     text: str,
@@ -368,9 +367,7 @@ def _parse_object_set_type(
         raise _ParseObjectParseError(type_=type_, text=text) from None
 
 
-def _parse_object_union_type(
-    type_: Any, text: str, /, *, extra: ParseObjectExtra | None = None
-) -> Any:
+def _parse_object_union_type(type_: Any, text: str, /) -> Any:
     if type_ is Number:
         try:
             return parse_number(text)
@@ -383,13 +380,6 @@ def _parse_object_union_type(
             return parse_duration(text)
         except ParseDurationError:
             raise _ParseObjectParseError(type_=type_, text=text) from None
-    if extra is not None:
-        try:
-            parser = one(p for c, p in extra.items() if c is type_)
-        except OneEmptyError:
-            pass
-        else:
-            return parser(text)
     raise _ParseObjectParseError(type_=type_, text=text) from None
 
 
@@ -466,6 +456,9 @@ def serialize_object(
     extra: SerializeObjectExtra | None = None,
 ) -> str:
     """Convert an object to text."""
+    if extra is not None:
+        with suppress(_SerializeObjectSerializeError):
+            return _serialize_object_extra(obj, extra)
     if (obj is None) or isinstance(
         obj, bool | int | float | str | Path | Sentinel | Version
     ):
@@ -504,8 +497,6 @@ def serialize_object(
         return _serialize_object_set(
             obj, list_separator=list_separator, pair_separator=pair_separator
         )
-    if extra is not None:
-        return _serialize_object_extra(obj, extra)
     raise _SerializeObjectSerializeError(obj=obj)
 
 
@@ -537,10 +528,7 @@ def _serialize_object_dict(
 def _serialize_object_extra(obj: Any, extra: SerializeObjectExtra, /) -> str:
     try:
         serializer = one(
-            s
-            for c, s in extra.items()
-            if (isinstance(c, type) and isinstance(obj, c))
-            or isinstance(obj, get_args(c))
+            s for c, s in extra.items() if (obj is c) or is_instance_gen(obj, c)
         )
     except OneEmptyError:
         raise _SerializeObjectSerializeError(obj=obj) from None