dycw-utilities 0.112.1__py3-none-any.whl → 0.112.3__py3-none-any.whl

{dycw_utilities-0.112.1.dist-info → dycw_utilities-0.112.3.dist-info}/METADATA

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

{dycw_utilities-0.112.1.dist-info → dycw_utilities-0.112.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=hV5Btasavyruats4m9DGhq8YssGlUGNVeNJRvxXPIiM,60
+utilities/__init__.py,sha256=z7R-tij8PUsszk8bX9FviCXCNFWurmc0egXzyuNqIdY,60
 utilities/altair.py,sha256=Gpja-flOo-Db0PIPJLJsgzAlXWoKUjPU1qY-DQ829ek,9156
 utilities/astor.py,sha256=xuDUkjq0-b6fhtwjhbnebzbqQZAjMSHR1IIS5uOodVg,777
 utilities/asyncio.py,sha256=41oQUurWMvadFK5gFnaG21hMM0Vmfn2WS6OpC0R9mas,14757
@@ -46,7 +46,7 @@ utilities/pathlib.py,sha256=31WPMXdLIyXgYOMMl_HOI2wlo66MGSE-cgeelk-Lias,1410
 utilities/period.py,sha256=RWfcNVoNlW07RNdU47g_zuLZMKbtgfK4bE6G-9tVjY8,11024
 utilities/pickle.py,sha256=Bhvd7cZl-zQKQDFjUerqGuSKlHvnW1K2QXeU5UZibtg,657
 utilities/platform.py,sha256=NU7ycTvAXAG-fdYmDXaM1m4EOml2cGiaYwaUzfzSqyU,1767
-utilities/polars.py,sha256=lr0l3JE2d5Rj1UbbFtagcv1z3Vw5YXjSfAwzVa9cFXw,58374
+utilities/polars.py,sha256=q8a2hTX9tyPxtxUarIm2BxlnckIwF1RCpcJz03OoIoY,58458
 utilities/polars_ols.py,sha256=efhXf0gjrHUpQrvS6a7g8yJQJWf_ATKtJnqqF2inCOU,5680
 utilities/pqdm.py,sha256=foRytQybmOQ05pjt5LF7ANyzrIa--4ScDE3T2wd31a4,3118
 utilities/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -62,7 +62,7 @@ utilities/redis.py,sha256=fAUbfOlCmxcxhh47PXQX63w0CU5iOFKfdUJ7jDn9ntM,22096
 utilities/reprlib.py,sha256=Re9bk3n-kC__9DxQmRlevqFA86pE6TtVfWjUgpbVOv0,1849
 utilities/rich.py,sha256=t50MwwVBsoOLxzmeVFSVpjno4OW6Ufum32skXbV8-Bs,1911
 utilities/scipy.py,sha256=X6ROnHwiUhAmPhM0jkfEh0-Fd9iRvwiqtCQMOLmOQF8,945
-utilities/sentinel.py,sha256=0X1GWWcnPxGCo7wDgVTOfhU5iKlXdvVZudlMM0iezDw,1246
+utilities/sentinel.py,sha256=3jIwgpMekWgDAxPDA_hXMP2St43cPhciKN3LWiZ7kv0,1248
 utilities/shelve.py,sha256=HZsMwK4tcIfg3sh0gApx4-yjQnrY4o3V3ZRimvRhoW0,738
 utilities/slack_sdk.py,sha256=SeDNMh24IPiEBWoGMdgvrflUaFa9TGlTS03H9-NKaQw,4132
 utilities/socket.py,sha256=K77vfREvzoVTrpYKo6MZakol0EYu2q1sWJnnZqL0So0,118
@@ -73,12 +73,12 @@ utilities/streamlit.py,sha256=U9PJBaKP1IdSykKhPZhIzSPTZsmLsnwbEPZWzNhJPKk,2955
 utilities/sys.py,sha256=h0Xr7Vj86wNalvwJVP1wj5Y0kD_VWm1vzuXZ_jw94mE,2743
 utilities/tempfile.py,sha256=VqmZJAhTJ1OaVywFzk5eqROV8iJbW9XQ_QYAV0bpdRo,1384
 utilities/tenacity.py,sha256=1PUvODiBVgeqIh7G5TRt5WWMSqjLYkEqP53itT97WQc,4914
-utilities/text.py,sha256=hfcBKF22fKT6s_U-ZdP-g5TjFQ0-NrIrQdvIwERWT80,10971
+utilities/text.py,sha256=c65sonE-vMJtBR8-LIntXUqku7wDQC6p4z69DOSur7o,10947
 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=jtc6EiGZGG0E745jo3NeLqo_HdHt7Zdaco3kCAEWIYU,11177
+utilities/typing.py,sha256=Tppx84LCtZFX8oOzDb2PeUIv9tjNqFWQLuMadN_rAes,13514
 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.1.dist-info/METADATA,sha256=0K3rDMRdIWtMVqAXUo7sXWuZjUFz7brciAZ2SbsYANg,13004
-dycw_utilities-0.112.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.112.1.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.112.1.dist-info/RECORD,,
+dycw_utilities-0.112.3.dist-info/METADATA,sha256=t7BNtV2r3OiHx0TWQ9JFxwyrFWjwRWFsAZOMD8HKIDA,13004
+dycw_utilities-0.112.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_utilities-0.112.3.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
+dycw_utilities-0.112.3.dist-info/RECORD,,

utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.112.1"
+__version__ = "0.112.3"

utilities/polars.py

@@ -941,10 +941,9 @@ def dataclass_to_schema(
             dtype = struct_dtype(**dtypes)
         elif field.type_ is dt.datetime:
             dtype = _dataclass_to_schema_datetime(field)
-        elif is_union_type(field.type_) and set(get_args(field.type_)) == {
-            dt.date,
-            dt.datetime,
-        }:
+        elif is_union_type(field.type_) and set(
+            get_args(field.type_, optional_drop_none=True)
+        ) == {dt.date, dt.datetime}:
             if is_instance_gen(field.value, dt.date):
                 dtype = Date
             else:
@@ -1002,7 +1001,7 @@ def _dataclass_to_schema_one(
     if is_literal_type(obj):
         return pl.Enum(get_args(obj))
     if is_optional_type(obj):
-        inner_type = one(get_args(obj))
+        inner_type = one(get_args(obj, optional_drop_none=True))
         return _dataclass_to_schema_one(inner_type, globalns=globalns, localns=localns)
     msg = f"{obj=}"
     raise NotImplementedError(msg)
@@ -1732,7 +1731,9 @@ def _struct_from_dataclass_one(
     ):
         return String
     if is_optional_type(ann):
-        return _struct_from_dataclass_one(one(get_args(ann)), time_zone=time_zone)
+        return _struct_from_dataclass_one(
+            one(get_args(ann, optional_drop_none=True)), time_zone=time_zone
+        )
     if is_frozenset_type(ann) or is_list_type(ann) or is_set_type(ann):
         return List(_struct_from_dataclass_one(one(get_args(ann)), time_zone=time_zone))
     raise _StructFromDataClassTypeError(ann=ann)

utilities/sentinel.py

@@ -40,7 +40,7 @@ sentinel = Sentinel()
 
 def parse_sentinel(text: str, /) -> Sentinel:
     """Parse text into the Sentinel value."""
-    if text == "" or search("Sentinel", text, flags=IGNORECASE):
+    if search("^(|sentinel|<sentinel>)$", text, flags=IGNORECASE):
         return sentinel
     raise ParseSentinelError(text=text)
 

utilities/text.py

@@ -25,9 +25,9 @@ DEFAULT_SEPARATOR = ","
 
 def parse_bool(text: str, /) -> bool:
     """Parse text into a boolean value."""
-    if text == "0" or search("false", text, flags=IGNORECASE):
+    if search(r"^(0|False)$", text, flags=IGNORECASE):
         return False
-    if text == "1" or search("true", text, flags=IGNORECASE):
+    if search(r"^(1|True)$", text, flags=IGNORECASE):
         return True
     raise ParseBoolError(text=text)
 
@@ -46,7 +46,7 @@ class ParseBoolError(Exception):
 
 def parse_none(text: str, /) -> None:
     """Parse text into the None value."""
-    if text == "" or search("None", text, flags=IGNORECASE):
+    if search(r"^(|None)$", text, flags=IGNORECASE):
         return
     raise ParseNoneError(text=text)
 

utilities/typing.py

@@ -48,14 +48,14 @@ def contains_self(obj: Any, /) -> bool:
 ##
 
 
-def get_args(obj: Any, /) -> tuple[Any, ...]:
+def get_args(obj: Any, /, *, optional_drop_none: bool = False) -> tuple[Any, ...]:
     """Get the arguments of an annotation."""
     if isinstance(obj, TypeAliasType):
         return get_args(obj.__value__)
-    if is_optional_type(obj):
-        args = _get_args(obj)
-        return tuple(a for a in args if a is not NoneType)
-    return _get_args(obj)
+    args = _get_args(obj)
+    if is_optional_type(obj) and optional_drop_none:
+        args = tuple(a for a in args if a is not NoneType)
+    return args
 
 
 ##
@@ -230,10 +230,26 @@ def is_instance_gen(
 def is_instance_gen(obj: Any, type_: Any, /) -> bool: ...
 def is_instance_gen(obj: Any, type_: Any, /) -> bool:
     """Check if an instance relationship holds, except bool<int."""
-    return any(_is_instance_gen_one(obj, t) for t in get_type_classes(type_))
+    # parent
+    if isinstance(type_, tuple):
+        return any(is_instance_gen(obj, t) for t in type_)
+    if is_literal_type(type_):
+        return obj in get_args(type_)
+    if is_union_type(type_):
+        return any(is_instance_gen(obj, t) for t in get_args(type_))
+    # tuple vs tuple
+    if isinstance(obj, tuple) and is_tuple_type(type_):
+        type_args = get_args(type_)
+        return (len(obj) == len(type_args)) and all(
+            is_instance_gen(o, t) for o, t in zip(obj, type_args, strict=True)
+        )
+    # basic
+    if isinstance(type_, type):
+        return any(_is_instance_gen_type(obj, t) for t in get_type_classes(type_))
+    raise IsInstanceGenError(obj=obj, type_=type_)
 
 
-def _is_instance_gen_one(obj: Any, type_: type[_T], /) -> TypeGuard[_T]:
+def _is_instance_gen_type(obj: Any, type_: type[_T], /) -> TypeGuard[_T]:
     return (
         isinstance(obj, type_)
         and not (
@@ -249,6 +265,16 @@ def _is_instance_gen_one(obj: Any, type_: type[_T], /) -> TypeGuard[_T]:
     )
 
 
+@dataclass(kw_only=True, slots=True)
+class IsInstanceGenError(Exception):
+    obj: Any
+    type_: Any
+
+    @override
+    def __str__(self) -> str:
+        return f"Invalid arguments; got {self.obj!r} and {self.type_!r}"
+
+
 ##
 
 
@@ -350,13 +376,41 @@ def is_subclass_gen(
     /,
 ) -> TypeGuard[type[_T1 | _T2 | _T3 | _T4 | _T5]]: ...
 @overload
-def is_subclass_gen(cls: type[Any], parent: Any, /) -> bool: ...
-def is_subclass_gen(cls: type[Any], parent: Any, /) -> bool:
+def is_subclass_gen(cls: Any, parent: Any, /) -> bool: ...
+def is_subclass_gen(cls: Any, parent: Any, /) -> bool:
     """Generalized `issubclass`."""
-    return any(_is_subclass_gen_one(cls, p) for p in get_type_classes(parent))
+    # child
+    if isinstance(cls, tuple):
+        return all(is_subclass_gen(c, parent) for c in cls)
+    if is_literal_type(cls):
+        types = tuple(map(type, get_args(cls)))
+        return (
+            is_literal_type(parent) and set(get_args(cls)).issubset(get_args(parent))
+        ) or is_subclass_gen(types, parent)
+    if is_union_type(cls):
+        return all(is_subclass_gen(c, parent) for c in get_args(cls))
+    # parent
+    if isinstance(parent, tuple):
+        return any(is_subclass_gen(cls, p) for p in parent)
+    if is_literal_type(parent):
+        return is_literal_type(cls) and set(get_args(cls)).issubset(get_args(parent))
+    if is_union_type(parent):
+        return any(is_subclass_gen(cls, p) for p in get_args(parent))
+    # tuple vs tuple
+    if is_tuple_type(cls) and is_tuple_type(parent):
+        cls_args, parent_args = get_args(cls), get_args(parent)
+        return (len(cls_args) == len(parent_args)) and all(
+            is_subclass_gen(c, p) for c, p in zip(cls_args, parent_args, strict=True)
+        )
+    if is_tuple_type(cls) is not is_tuple_type(parent):
+        return False
+    # basic
+    if isinstance(cls, type):
+        return any(_is_subclass_gen_type(cls, p) for p in get_type_classes(parent))
+    raise IsSubclassGenError(cls=cls)
 
 
-def _is_subclass_gen_one(cls: type[Any], parent: type[_T], /) -> TypeGuard[type[_T]]:
+def _is_subclass_gen_type(cls: type[Any], parent: type[_T], /) -> TypeGuard[type[_T]]:
     return (
         issubclass(cls, parent)
         and not (
@@ -372,6 +426,15 @@ def _is_subclass_gen_one(cls: type[Any], parent: type[_T], /) -> TypeGuard[type[
     )
 
 
+@dataclass(kw_only=True, slots=True)
+class IsSubclassGenError(Exception):
+    cls: Any
+
+    @override
+    def __str__(self) -> str:
+        return f"Argument must be a class; got {self.cls!r}"
+
+
 ##
 
 
@@ -402,6 +465,8 @@ def _is_annotation_of_type(obj: Any, origin: Any, /) -> bool:
 __all__ = [
     "GetTypeClassesError",
     "GetUnionTypeClassesError",
+    "IsInstanceGenError",
+    "IsSubclassGenError",
     "contains_self",
     "get_literal_elements",
     "get_type_classes",