dycw-utilities 0.110.6__tar.gz → 0.110.7__tar.gz

{dycw_utilities-0.110.6 → dycw_utilities-0.110.7}/PKG-INFO

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

{dycw_utilities-0.110.6 → dycw_utilities-0.110.7}/pyproject.toml

@@ -94,7 +94,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.110.6"
+version = "0.110.7"
 
 [project.optional-dependencies]
 test = [
@@ -337,7 +337,7 @@ zzz-test-zoneinfo = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.110.6"
+current_version = "0.110.7"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.110.6 → dycw_utilities-0.110.7}/src/tests/test_functions.py

@@ -12,6 +12,7 @@ from typing import TYPE_CHECKING, Any, ClassVar, ParamSpec, TypeVar, cast
 from hypothesis import given
 from hypothesis.strategies import (
     DataObject,
+    SearchStrategy,
     booleans,
     builds,
     data,
@@ -73,7 +74,7 @@ from utilities.functions import (
     is_dataclass_class,
     is_dataclass_instance,
     is_hashable,
-    is_instance_int_not_bool,
+    is_instance_not_bool_int,
     is_iterable_of,
     is_none,
     is_not_none,
@@ -82,7 +83,7 @@ from utilities.functions import (
     is_sized,
     is_sized_not_str,
     is_string_mapping,
-    is_subclass_int_not_bool,
+    is_subclass_not_bool_int,
     is_tuple,
     is_tuple_or_str_mapping,
     make_isinstance,
@@ -621,14 +622,37 @@ class TestIsHashable:
         assert is_hashable(obj) is expected
 
 
-class TestIsInstanceIntNotBool:
-    @given(int_=integers())
-    def test_int(self, *, int_: int) -> None:
-        assert is_instance_int_not_bool(int_)
+class TestIsInstanceNotIntBool:
+    @given(
+        data=data(),
+        case=sampled_from([
+            (booleans(), bool, True),
+            (booleans(), int, False),
+            (integers(), bool, False),
+            (integers(), int, True),
+            (booleans(), (bool, int), True),
+            (integers(), (bool, int), True),
+        ]),
+    )
+    def test_main(
+        self, *, data: DataObject, case: tuple[SearchStrategy[Any], type[Any], bool]
+    ) -> None:
+        strategy, type_, expected = case
+        value = data.draw(strategy)
+        assert is_instance_not_bool_int(value, type_) is expected
 
     @given(bool_=booleans())
-    def test_bool(self, *, bool_: bool) -> None:
-        assert not is_instance_int_not_bool(bool_)
+    def test_bool_value_vs_custom_int(self, *, bool_: bool) -> None:
+        class MyInt(int): ...
+
+        assert not is_instance_not_bool_int(bool_, MyInt)
+
+    @given(int_=integers())
+    def test_int_value_vs_custom_int(self, *, int_: int) -> None:
+        class MyInt(int): ...
+
+        assert not is_instance_not_bool_int(int_, MyInt)
+        assert is_instance_not_bool_int(MyInt(int_), MyInt)
 
 
 class TestIsIterableOf:
@@ -751,11 +775,29 @@ class TestIsStringMapping:
         assert result is expected
 
 
-class TestIsSubclassIntNotBool:
-    @given(case=sampled_from([(int, True), (bool, False)]))
-    def test_main(self, *, case: tuple[type[Any], bool]) -> None:
-        type_, expected = case
-        assert is_subclass_int_not_bool(type_) is expected
+class TestIsSubclassNotBoolInt:
+    @given(
+        case=sampled_from([
+            (bool, bool, True),
+            (bool, int, False),
+            (int, bool, False),
+            (int, int, True),
+            (bool, (bool, int), True),
+            (int, (bool, int), True),
+        ])
+    )
+    def test_main(self, *, case: tuple[type[Any], type[Any], bool]) -> None:
+        child, parent, expected = case
+        assert is_subclass_not_bool_int(child, parent) is expected
+
+    def test_custom_int(self) -> None:
+        class MyInt(int): ...
+
+        assert not is_subclass_not_bool_int(bool, MyInt)
+        assert not is_subclass_not_bool_int(MyInt, bool)
+        assert not is_subclass_not_bool_int(int, MyInt)
+        assert is_subclass_not_bool_int(MyInt, int)
+        assert is_subclass_not_bool_int(MyInt, MyInt)
 
 
 class TestIsTuple:

{dycw_utilities-0.110.6 → dycw_utilities-0.110.7}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.110.6"
+__version__ = "0.110.7"

{dycw_utilities-0.110.6 → dycw_utilities-0.110.7}/src/utilities/functions.py

@@ -22,6 +22,7 @@ from typing import (
     Literal,
     TypeGuard,
     TypeVar,
+    assert_never,
     cast,
     overload,
     override,
@@ -182,6 +183,8 @@ def ensure_class(
     *,
     nullable: Literal[False] = False,
 ) -> _T1 | _T2 | _T3 | _T4 | _T5: ...
+@overload
+def ensure_class(obj: Any, cls: TypeLike[_T], /, *, nullable: bool = False) -> Any: ...
 def ensure_class(obj: Any, cls: TypeLike[_T], /, *, nullable: bool = False) -> Any:
     """Ensure an object is of the required class."""
     if isinstance(obj, cls) or ((obj is None) and nullable):
@@ -657,9 +660,23 @@ def is_hashable(obj: Any, /) -> TypeGuard[Hashable]:
 ##
 
 
-def is_instance_int_not_bool(obj: Any, /) -> TypeGuard[int]:
-    """Check if an object is an integer, and not a boolean."""
-    return isinstance(obj, int) and not isinstance(obj, bool)
+def is_instance_not_bool_int(
+    obj: Any, class_or_tuple: TypeLike[Any], /
+) -> TypeGuard[int]:
+    """Check if an instance relationship holds, except bool<int."""
+    match class_or_tuple:
+        case type() as type_:
+            return _is_instance_not_bool_int(obj, type_)
+        case tuple() as types:
+            return any(_is_instance_not_bool_int(obj, p) for p in types)
+        case _ as never:
+            assert_never(never)
+
+
+def _is_instance_not_bool_int(obj: Any, type_: type[Any], /) -> bool:
+    return isinstance(obj, type_) and not (
+        isinstance(obj, bool) and issubclass(type_, int) and not issubclass(type_, bool)
+    )
 
 
 ##
@@ -779,9 +796,23 @@ def is_string_mapping(obj: Any, /) -> TypeGuard[StrMapping]:
 ##
 
 
-def is_subclass_int_not_bool(cls: type[Any], /) -> TypeGuard[type[int]]:
-    """Check if a class is an integer, and not a boolean."""
-    return issubclass(cls, int) and not issubclass(cls, bool)
+def is_subclass_not_bool_int(cls: type[Any], class_or_tuple: TypeLike[Any], /) -> bool:
+    """Check if a subclass relationship holds, except bool<int."""
+    match class_or_tuple:
+        case type() as parent:
+            return _is_subclass_int_not_bool_one(cls, parent)
+        case tuple() as parents:
+            return any(_is_subclass_int_not_bool_one(cls, p) for p in parents)
+        case _ as never:
+            assert_never(never)
+
+
+def _is_subclass_int_not_bool_one(cls: type[Any], parent: type[Any], /) -> bool:
+    return issubclass(cls, parent) and not (
+        issubclass(cls, bool)
+        and issubclass(parent, int)
+        and not issubclass(parent, bool)
+    )
 
 
 ##
@@ -1044,7 +1075,7 @@ __all__ = [
     "is_dataclass_class",
     "is_dataclass_instance",
     "is_hashable",
-    "is_instance_int_not_bool",
+    "is_instance_not_bool_int",
     "is_iterable_of",
     "is_none",
     "is_not_none",
@@ -1052,7 +1083,7 @@ __all__ = [
     "is_sized",
     "is_sized_not_str",
     "is_string_mapping",
-    "is_subclass_int_not_bool",
+    "is_subclass_not_bool_int",
     "is_tuple",
     "is_tuple_or_str_mapping",
     "make_isinstance",

{dycw_utilities-0.110.6 → dycw_utilities-0.110.7}/src/utilities/parse.py

@@ -14,7 +14,7 @@ from utilities.datetime import (
     is_subclass_date_not_datetime,
 )
 from utilities.enum import ParseEnumError, parse_enum
-from utilities.functions import is_subclass_int_not_bool
+from utilities.functions import is_subclass_not_bool_int
 from utilities.iterables import OneEmptyError, OneNonUniqueError, one, one_str
 from utilities.math import ParseNumberError, parse_number
 from utilities.re import ExtractGroupError, extract_group
@@ -174,7 +174,7 @@ def _parse_object_type(
             return parse_bool(text)
         except ParseBoolError:
             raise _ParseObjectParseError(type_=cls, text=text) from None
-    if is_subclass_int_not_bool(cls):
+    if is_subclass_not_bool_int(cls, int):
         try:
             return int(text)
         except ValueError: