jetpytools 2.0.2__py3-none-any.whl → 2.1.1__py3-none-any.whl

jetpytools/_metadata.py

@@ -1,6 +1,6 @@
 """Collection of stuff that's useful in general python programming"""
 
-__version__ = "2.0.2"
+__version__ = "2.1.1"
 
 __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,44 @@
 from __future__ import annotations
 
-from enum import Enum
-from typing import Any, Self
+from abc import ABCMeta
+from enum import Enum, EnumMeta, ReprEnum
+from enum import property as enum_property
+from typing import TYPE_CHECKING, Any, Self
 
-from ..exceptions import CustomValueError, NotFoundEnumValue
-from ..types import FuncExcept
+from ..exceptions import CustomTypeError, NotFoundEnumValueError
+from ..types import FuncExcept, copy_signature
 
-__all__ = ["CustomEnum", "CustomIntEnum", "CustomStrEnum"]
+__all__ = ["CustomEnum", "CustomIntEnum", "CustomStrEnum", "EnumABCMeta"]
+
+
+class EnumABCMeta(EnumMeta, ABCMeta):
+    """Metaclass combining EnumMeta and ABCMeta to support abstract enumerations."""
+
+    @copy_signature(EnumMeta.__new__)
+    def __new__(mcls, *args: Any, **kwargs: Any) -> Any:
+        enum_cls = super().__new__(mcls, *args, **kwargs)
+
+        if len(enum_cls) == 0:
+            return enum_cls
+
+        if enum_cls.__abstractmethods__:
+            raise CustomTypeError(
+                "Can't instantiate abstract class {cls_name} without an implementation "
+                "for abstract method{plural} {methods}.",
+                enum_cls,
+                cls_name=enum_cls.__name__,
+                plural="s" if len(enum_cls.__abstractmethods__) > 1 else "",
+                methods=", ".join(f"'{n}'" for n in sorted(enum_cls.__abstractmethods__)),
+            )
+
+        return enum_cls
 
 
 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 +49,45 @@ 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):
+class CustomIntEnum(int, CustomEnum, ReprEnum):
     """Base class for custom int enums."""
 
+    if TYPE_CHECKING:
+        _value_: int
 
-class CustomStrEnum(str, CustomEnum):
+        @enum_property
+        def value(self) -> int: ...
+
+
+class CustomStrEnum(str, CustomEnum, ReprEnum):
     """Base class for custom str enums."""
+
+    if TYPE_CHECKING:
+        _value_: str
+
+        @enum_property
+        def value(self) -> str: ...

{jetpytools-2.0.2.dist-info → jetpytools-2.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jetpytools
-Version: 2.0.2
+Version: 2.1.1
 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.2.dist-info → jetpytools-2.1.1.dist-info}/RECORD

@@ -1,8 +1,8 @@
 jetpytools/__init__.py,sha256=ha_pCOMqfeIbipDRrtqKOqH3NQEpX4KwN2SskpsCGb4,114
-jetpytools/_metadata.py,sha256=BTjwrbkWnb_tGrAfT27AXcCTiifys4nvvnRB6AJn6ns,414
+jetpytools/_metadata.py,sha256=nZtBcZq3sazGefQvFPr5W5r0xlgs5gx_n6ON6xgLUnk,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=XR5HfZa6mKzqdUvEG5_EG7SpVL2yegbsfLptJFGnjEU,2858
 jetpytools/enums/other.py,sha256=Fwf8J98cqFQbnDsOPV90RTOJ_Ltd72Y3qVbSDzOl5Eg,1346
 jetpytools/exceptions/__init__.py,sha256=0rNEfnOuoSRUyKsutGzHFWQkgiFaK7diOT4VbRVKt9c,105
 jetpytools/exceptions/base.py,sha256=cKvND21z0McwbhpOg9oVYyMvLVa8MDs9m1g4FUbEHvM,6949
@@ -27,7 +27,7 @@ jetpytools/utils/file.py,sha256=3fJxAHjIN5zdyzO0guc3jDspcs5HPG4t4cwB_ZrAhh4,1062
 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.2.dist-info/METADATA,sha256=hGJCLx_FZHmzdIoUMNRrs5Lohi5s544OtjzLoS6UUEI,1198
-jetpytools-2.0.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-jetpytools-2.0.2.dist-info/licenses/LICENSE,sha256=l0PN-qDtXcgOB5aXP_nSUsvCK5V3o9pQCGsTzyZhKL0,1071
-jetpytools-2.0.2.dist-info/RECORD,,
+jetpytools-2.1.1.dist-info/METADATA,sha256=CujBkiLvL5FmBSKCYuppxsokWxzKckz8gp8SLD1BWL4,1198
+jetpytools-2.1.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+jetpytools-2.1.1.dist-info/licenses/LICENSE,sha256=l0PN-qDtXcgOB5aXP_nSUsvCK5V3o9pQCGsTzyZhKL0,1071
+jetpytools-2.1.1.dist-info/RECORD,,