jetpytools 2.0.1__py3-none-any.whl → 2.1.0__py3-none-any.whl

jetpytools/_metadata.py

@@ -1,6 +1,6 @@
 """Collection of stuff that's useful in general python programming"""
 
-__version__ = "2.0.1"
+__version__ = "2.1.0"
 
 __author_name__, __author_email__ = "Jaded Encoding Thaumaturgy", "jaded.encoding.thaumaturgy@gmail.com"
 __maintainer_name__, __maintainer_email__ = __author_name__, __author_email__

jetpytools/enums/base.py

@@ -1,23 +1,24 @@
 from __future__ import annotations
 
-from enum import Enum
+from abc import ABCMeta
+from enum import Enum, EnumMeta
 from typing import Any, Self
 
-from ..exceptions import CustomValueError, NotFoundEnumValue
+from ..exceptions import NotFoundEnumValueError
 from ..types import FuncExcept
 
-__all__ = ["CustomEnum", "CustomIntEnum", "CustomStrEnum"]
+__all__ = ["CustomEnum", "CustomIntEnum", "CustomStrEnum", "EnumABCMeta"]
+
+
+class EnumABCMeta(EnumMeta, ABCMeta):
+    """Metaclass combining EnumMeta and ABCMeta to support abstract enumerations."""
 
 
 class CustomEnum(Enum):
     """Base class for custom enums."""
 
     @classmethod
-    def _missing_(cls, value: Any) -> Self | None:
-        return cls.from_param(value)
-
-    @classmethod
-    def from_param(cls, value: Any, func_except: FuncExcept | None = None) -> Self | None:
+    def from_param(cls, value: Any, func_except: FuncExcept | None = None) -> Self:
         """
         Return the enum value from a parameter.
 
@@ -28,44 +29,37 @@ class CustomEnum(Enum):
 
         :raises NotFoundEnumValue:   Variable not found in the given enum.
         """
-
-        if value is None:
-            return None
-
-        if func_except is None:
-            func_except = cls.from_param
-
-        if isinstance(value, cls):
-            return value
-
-        if value is cls:
-            raise CustomValueError("You must select a member, not pass the enum!", func_except)
+        func_except = func_except or cls.from_param
 
         try:
             return cls(value)
-        except Exception:
+        except (ValueError, TypeError):
             pass
 
         if isinstance(func_except, tuple):
             func_name, var_name = func_except
         else:
-            func_name, var_name = func_except, str(cls)
+            func_name, var_name = func_except, repr(cls)
 
-        raise NotFoundEnumValue(
+        raise NotFoundEnumValueError(
             'The given value for "{var_name}" argument must be a valid {enum_name}, not "{value}"!\n'
             "Valid values are: [{readable_enum}].",
             func_name,
             var_name=var_name,
             enum_name=cls,
             value=value,
-            readable_enum=iter([f"{x.name} ({x.value})" for x in cls]),
+            readable_enum=(f"{name} ({value!r})" for name, value in cls.__members__.items()),
             reason=value,
-        )
+        ) from None
 
 
 class CustomIntEnum(int, CustomEnum):
     """Base class for custom int enums."""
 
+    _value_: int
+
 
 class CustomStrEnum(str, CustomEnum):
     """Base class for custom str enums."""
+
+    _value_: str

jetpytools/types/utils.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import sys
 from contextlib import suppress
 from functools import wraps
-from inspect import Signature
+from inspect import Signature, get_annotations
 from typing import (
     TYPE_CHECKING,
     Any,
@@ -498,13 +498,13 @@ class inject_kwargs_params(_InjectKwargsParamsBase[_T_co, _P, _R_co]):
 
 
 class _ComplexHash[**P, R]:
-    __slots__ = "func"
+    __slots__ = "_func"
 
     def __init__(self, func: Callable[P, R]) -> None:
-        self.func = func
+        self._func = func
 
     def __call__(self, *args: P.args, **kwargs: P.kwargs) -> R:
-        return self.func(*args, **kwargs)
+        return self._func(*args, **kwargs)
 
     @staticmethod
     def hash(*args: Any) -> int:
@@ -515,8 +515,8 @@ class _ComplexHash[**P, R]:
 
         :return:        Hash of all the combined objects' hashes.
         """
-
         values = list[str]()
+
         for value in args:
             try:
                 new_hash = hash(value)
@@ -531,18 +531,21 @@ class _ComplexHash[**P, R]:
 @_ComplexHash
 def complex_hash[T](cls: type[T]) -> type[T]:
     """
-    Decorator for classes to add a ``__hash__`` method to them.
+    Class decorator that automatically adds a ``__hash__`` method to the target class.
 
-    Especially useful for NamedTuples.
+    The generated ``__hash__`` method computes a hash value derived from:
+    - the class's name
+    - the values of all attributes listed in its type annotations.
+
+    This is particularly useful for immutable data structures (e.g., NamedTuples or dataclasses).
     """
 
     def __hash__(self: T) -> int:  # noqa: N807
-        return complex_hash.hash(self.__class__.__name__, *(getattr(self, key) for key in self.__annotations__))
+        return complex_hash.hash(self.__class__.__name__, *(getattr(self, key) for key in get_annotations(cls)))
 
-    ns = cls.__dict__.copy()
-    ns["__hash__"] = __hash__
+    setattr(cls, __hash__.__name__, __hash__)
 
-    return type(cls.__name__, (cls,), ns)  # pyright: ignore[reportReturnType]
+    return cls
 
 
 def get_subclasses[T](family: type[T], exclude: Sequence[type[T]] = []) -> list[type[T]]:
@@ -794,22 +797,33 @@ class KwargsNotNone(KwargsT):
 
 
 class SingletonMeta(type):
-    _instances: ClassVar[dict[type[Any], Any]] = {}
+    _instances: ClassVar[dict[SingletonMeta, Any]] = {}
     _singleton_init: bool
 
     def __new__[MetaSelf: SingletonMeta](
-        mcls: type[MetaSelf], name: str, bases: tuple[type, ...], namespace: dict[str, Any], **kwargs: Any
+        mcls: type[MetaSelf],
+        name: str,
+        bases: tuple[type, ...],
+        namespace: dict[str, Any],
+        *,
+        init: bool = False,
+        **kwargs: Any,
     ) -> MetaSelf:
-        namespace["_singleton_init"] = kwargs.pop("init", False)
-        return super().__new__(mcls, name, bases, namespace, **kwargs)
+        cls = super().__new__(mcls, name, bases, namespace, **kwargs)
+        cls._singleton_init = init
+        return cls
+
+    if not TYPE_CHECKING:
+
+        def __call__(cls, *args: Any, **kwargs: Any) -> Any:
+            if cls not in cls._instances:
+                cls._instances[cls] = obj = super().__call__(*args, **kwargs)
+                return obj
 
-    def __call__(cls, *args: Any, **kwargs: Any) -> SingletonMeta:
-        if cls not in cls._instances:
-            cls._instances[cls] = super(SingletonMeta, cls).__call__(*args, **kwargs)
-        elif cls._singleton_init:
-            cls._instances[cls].__init__(*args, **kwargs)
+            if cls._singleton_init:
+                cls._instances[cls].__init__(*args, **kwargs)
 
-        return cls._instances[cls]
+            return cls._instances[cls]
 
 
 class Singleton(metaclass=SingletonMeta):

{jetpytools-2.0.1.dist-info → jetpytools-2.1.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jetpytools
-Version: 2.0.1
+Version: 2.1.0
 Summary: Collection of stuff that's useful in general python programming
 Project-URL: Source Code, https://github.com/Jaded-Encoding-Thaumaturgy/jetpytools
 Project-URL: Contact, https://discord.gg/XTpc6Fa9eB

{jetpytools-2.0.1.dist-info → jetpytools-2.1.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
 jetpytools/__init__.py,sha256=ha_pCOMqfeIbipDRrtqKOqH3NQEpX4KwN2SskpsCGb4,114
-jetpytools/_metadata.py,sha256=Sh6w1MTmnsiXSW7bySj3rvnKAj6r6vq0Jf8-TqTi00Q,414
+jetpytools/_metadata.py,sha256=U80yRxxkWvE0J7Cx3_B7F5QU7GPamHpYbuASsOrNYPI,414
 jetpytools/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jetpytools/enums/__init__.py,sha256=TvEt3TWmnzf2TWS_Gd6llyyXAGDKxdhdJsDgSvT7xys,41
-jetpytools/enums/base.py,sha256=Vuzlv84jXUCje7-yoyjucPcgkmfVkLHuuLXcmx4z1Yw,1970
+jetpytools/enums/base.py,sha256=KDKzxj-nN0t6JUTZ7D0ZVqOFEgZEYUEFxkmB_7lDZ5Y,1850
 jetpytools/enums/other.py,sha256=Fwf8J98cqFQbnDsOPV90RTOJ_Ltd72Y3qVbSDzOl5Eg,1346
 jetpytools/exceptions/__init__.py,sha256=0rNEfnOuoSRUyKsutGzHFWQkgiFaK7diOT4VbRVKt9c,105
 jetpytools/exceptions/base.py,sha256=cKvND21z0McwbhpOg9oVYyMvLVa8MDs9m1g4FUbEHvM,6949
@@ -21,13 +21,13 @@ jetpytools/types/file.py,sha256=6hV332qbBtvg3p3g6tNHiSnZGp4DhtcTZm-Vap7M72k,6400
 jetpytools/types/funcs.py,sha256=arlykyVyosdjBhUTrJDfAoGBdkI5zhoJc0yINMQEonw,2804
 jetpytools/types/generic.py,sha256=LlYiD54GPi5ghjdw4wJmulrZiqv5IUnfPfyr-fk-RlA,1138
 jetpytools/types/supports.py,sha256=uZ2N7XxAa5H3QcOKStCH8fp2x6EXvoKwLQZue5xTLFY,3400
-jetpytools/types/utils.py,sha256=GoRx3fjHRbdQ27L4jkUb_oUXAtupGUI2FHHWp8ccEWw,29599
+jetpytools/types/utils.py,sha256=aLepdNRRs5lbuTghqz7Jt_l_sstXl0wJapbUZiqUMI8,29908
 jetpytools/utils/__init__.py,sha256=_rJ-mY5PsGjBfy8Fihx_FYJfAIGSrYAYzI6Td9oFh9A,83
 jetpytools/utils/file.py,sha256=3fJxAHjIN5zdyzO0guc3jDspcs5HPG4t4cwB_ZrAhh4,10622
 jetpytools/utils/funcs.py,sha256=2jOOIUQpifQ_kTuVUSrCAi8hvCmmvieBpMTfF8XuM24,979
 jetpytools/utils/math.py,sha256=ZqsAyVNBT4LD-zqP7QxEkGwWdVfrR7YAkdv87NQTMV0,3460
 jetpytools/utils/ranges.py,sha256=RAknSZkTAYxAXdFn_CKY8xGASu7xS7Gu039DX89ugDc,1293
-jetpytools-2.0.1.dist-info/METADATA,sha256=c0AIK2JpabO43aUHc_3G-4wYSF4X19hcJw2goRGb-Oc,1198
-jetpytools-2.0.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-jetpytools-2.0.1.dist-info/licenses/LICENSE,sha256=l0PN-qDtXcgOB5aXP_nSUsvCK5V3o9pQCGsTzyZhKL0,1071
-jetpytools-2.0.1.dist-info/RECORD,,
+jetpytools-2.1.0.dist-info/METADATA,sha256=Ciw5glQuXiHMS8gkV_vkkS8tp11qmy-Cbz7fa0OIc1Q,1198
+jetpytools-2.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+jetpytools-2.1.0.dist-info/licenses/LICENSE,sha256=l0PN-qDtXcgOB5aXP_nSUsvCK5V3o9pQCGsTzyZhKL0,1071
+jetpytools-2.1.0.dist-info/RECORD,,