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

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

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

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

@@ -1,4 +1,4 @@
-utilities/__init__.py,sha256=YIZTcfeQmna9ccW7NIqZzcDB03vFiy0xoZl-xVKVNg4,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
@@ -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=i_Ajb8UAOplnhrezb2zk4JaXtUyE0nUyaPR5o9j4YNc,12869
+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.2.dist-info/METADATA,sha256=QmNVwMJdLQtljfZmV0Mg0zLgFYogVdVymaaF1QuOxrc,13004
-dycw_utilities-0.112.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_utilities-0.112.2.dist-info/licenses/LICENSE,sha256=gppZp16M6nSVpBbUBrNL6JuYfvKwZiKgV7XoKKsHzqo,1066
-dycw_utilities-0.112.2.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.2"
+__version__ = "0.112.3"

utilities/typing.py

@@ -230,21 +230,23 @@ 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."""
-    if isinstance(obj, tuple) and isinstance(type_, tuple):
-        return _is_instance_gen_tuple(obj, type_)
+    # parent
+    if isinstance(type_, tuple):
+        return any(is_instance_gen(obj, t) for t in type_)
     if is_literal_type(type_):
-        return _is_instance_gen_literal(obj, type_)
-    return any(_is_instance_gen_type(obj, t) for t in get_type_classes(type_))
-
-
-def _is_instance_gen_tuple(obj: tuple[Any, ...], type_: tuple[Any, ...], /) -> bool:
-    return (len(obj) == len(type_)) and all(
-        is_instance_gen(o, t) for o, t in zip(obj, type_, strict=True)
-    )
-
-
-def _is_instance_gen_literal(obj: Any, type_: type[_T], /) -> TypeGuard[_T]:
-    return obj in get_args(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_type(obj: Any, type_: type[_T], /) -> TypeGuard[_T]:
@@ -263,6 +265,16 @@ def _is_instance_gen_type(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}"
+
+
 ##
 
 
@@ -367,14 +379,32 @@ def is_subclass_gen(
 def is_subclass_gen(cls: Any, parent: Any, /) -> bool: ...
 def is_subclass_gen(cls: Any, parent: Any, /) -> bool:
     """Generalized `issubclass`."""
-    if isinstance(cls, tuple) and isinstance(parent, tuple):
-        return _is_subclass_gen_tuple(cls, parent)
-    if is_literal_type(cls) and is_literal_type(parent):
-        return _is_subclass_gen_literal(cls, parent)
-    if is_literal_type(cls) is not is_literal_type(parent):
-        return False
+    # 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 _is_subclass_gen_union(cls, parent)
+        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)
@@ -396,20 +426,6 @@ def _is_subclass_gen_type(cls: type[Any], parent: type[_T], /) -> TypeGuard[type
     )
 
 
-def _is_subclass_gen_tuple(cls: tuple[Any, ...], parent: tuple[Any, ...], /) -> bool:
-    return (len(cls) == len(parent)) and all(
-        is_subclass_gen(c, p) for c, p in zip(cls, parent, strict=True)
-    )
-
-
-def _is_subclass_gen_literal(cls: Any, parent: Any, /) -> bool:
-    return set(get_args(cls)).issubset(get_args(parent))
-
-
-def _is_subclass_gen_union(cls: Any, parent: Any, /) -> bool:
-    return all(is_subclass_gen(a, parent) for a in get_args(cls))
-
-
 @dataclass(kw_only=True, slots=True)
 class IsSubclassGenError(Exception):
     cls: Any
@@ -449,6 +465,7 @@ def _is_annotation_of_type(obj: Any, origin: Any, /) -> bool:
 __all__ = [
     "GetTypeClassesError",
     "GetUnionTypeClassesError",
+    "IsInstanceGenError",
     "IsSubclassGenError",
     "contains_self",
     "get_literal_elements",