enumerific 1.0.1__py3-none-any.whl → 1.0.2__py3-none-any.whl

enumerific/extensible.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import typing
+import collections
 
 from enumerific.logging import logger
 
@@ -17,7 +18,71 @@ from types import MappingProxyType
 logger = logger.getChild(__name__)
 
 
-class auto(int):
+class anno(collections.abc.Mapping):
+    """The annotations class supports adding annotations to an Enumeration option."""
+
+    _value: object = None
+    _annotations: dict[str, object] = None
+
+    def __init__(self, value: object, **annotations: dict[str, object]):
+        self._value: object = value
+
+        for key, value in annotations.items():
+            if not isinstance(key, str):
+                raise TypeError("All annotation values must have string keys!")
+
+        self._annotations: dict[str, object] = annotations
+
+    def __len__(self) -> int:
+        return len(self._annotations)
+
+    def __iter__(self) -> str:
+        for key in self._annotations.keys():
+            yield key
+
+    def __contains__(self, other: object) -> bool:
+        return other in self._annotations
+
+    def __getitem__(self, key: str) -> object | None:
+        if key in self._annotations:
+            return self._annotations[key]
+        else:
+            raise KeyError(f"The annotation does not have an '{key}' item!")
+
+    def __setitem__(self, key: str, value: object):
+        raise NotImplementedError
+
+    def __delitem__(self, key: str, value: object):
+        raise NotImplementedError
+
+    def __getattr__(self, name: str) -> object | None:
+        if name.startswith("_"):
+            return super().__getattr__(name)
+        elif name in self._annotations:
+            return self._annotations[name]
+        else:
+            raise AttributeError(f"The annotation does not have an '{name}' attribute!")
+
+    def __setattr__(self, name: str, value: object):
+        if name.startswith("_"):
+            return super().__setattr__(name, value)
+        else:
+            raise NotImplementedError
+
+    def __detattr__(self, name: str):
+        raise NotImplementedError
+
+    def get(self, name: str, default: object = None) -> object | None:
+        if name in self._annotations:
+            return self._annotations[name]
+        else:
+            return default
+
+    def unwrap(self) -> object:
+        return self._value
+
+
+class auto(int, anno):
     """Generate an automatically inrementing integer each time the class is instantiated
     based on the previously supplied configuration, which allows the start and steps to
     be configured as well as if the integers should be generated as powers/flags."""
@@ -32,6 +97,7 @@ class auto(int):
         cls,
         start: int = None,
         steps: int = None,
+        times: int = None,
         power: int | bool = None,
         flags: bool = None,
     ):
@@ -57,6 +123,15 @@ class auto(int):
                 "The 'steps' argument, if specified, must have a positive integer value!"
             )
 
+        if times is None:
+            times = 0
+        elif isinstance(times, int) and times >= 0:
+            pass
+        else:
+            raise TypeError(
+                "The 'times' argument, if specified, must have a positive integer value!"
+            )
+
         if power is None:
             power = 0
         elif isinstance(power, bool):
@@ -90,17 +165,21 @@ class auto(int):
 
         cls.steps = steps
 
+        cls.times = times
+
         cls.power = power
 
         cls.value = cls.start
 
-    def __new__(cls):
+    def __new__(cls, **annotations: dict[str, object]):
         """Create a new integer (int) instance upon each call, incrementing the value as
         per the configuration defined before this method is called; the configuration
         can be changed at any time and the next call to this method will generate the
         next value based on the most recently specified configuration options."""
 
-        if cls.power > 0:
+        if cls.times > 0:
+            value = cls.value * cls.times
+        elif cls.power > 0:
             value = pow(cls.power, (cls.value - 1))
         else:
             value = cls.value
@@ -109,6 +188,9 @@ class auto(int):
 
         return super().__new__(cls, value)
 
+    def __init__(self, **annotations: dict[str, object]):
+        super().__init__(self.value, **annotations)
+
 
 class EnumerationConfiguration(object):
     """The EnumerationConfiguration class holds the Enumeration configuration options"""
@@ -121,6 +203,8 @@ class EnumerationConfiguration(object):
     _raises: bool = None
     _flags: bool = None
     _start: int = None
+    _steps: int = None
+    _times: int = None
     _typecast: bool = None
 
     def __init__(
@@ -133,6 +217,8 @@ class EnumerationConfiguration(object):
         raises: bool = None,
         flags: bool = None,
         start: int = None,
+        steps: int = None,
+        times: int = None,
         typecast: bool = None,
     ):
         self.unique = unique
@@ -143,6 +229,8 @@ class EnumerationConfiguration(object):
         self.raises = raises
         self.flags = flags
         self.start = start
+        self.steps = steps
+        self.times = times
         self.typecast = typecast
 
     def __dir__(self) -> list[str]:
@@ -155,6 +243,8 @@ class EnumerationConfiguration(object):
             "raises",
             "flags",
             "start",
+            "steps",
+            "times",
             "typecast",
         ]
 
@@ -291,7 +381,7 @@ class EnumerationConfiguration(object):
         self._flags = flags
 
     @property
-    def start(self) -> bool | None:
+    def start(self) -> int | None:
         return self._start
 
     @start.setter
@@ -304,6 +394,34 @@ class EnumerationConfiguration(object):
             )
         self._start = start
 
+    @property
+    def steps(self) -> int | None:
+        return self._steps
+
+    @steps.setter
+    def steps(self, steps: int | None):
+        if steps is None:
+            pass
+        elif not (isinstance(steps, int) and steps >= 0):
+            raise TypeError(
+                "The 'steps' argument, if specified, must have a positive integer value!"
+            )
+        self._steps = steps
+
+    @property
+    def times(self) -> int | None:
+        return self._times
+
+    @times.setter
+    def times(self, times: int | None):
+        if times is None:
+            pass
+        elif not (isinstance(times, int) and times >= 0):
+            raise TypeError(
+                "The 'times' argument, if specified, must have a positive integer value!"
+            )
+        self._times = times
+
     @property
     def typecast(self) -> bool | None:
         return self._typecast
@@ -351,6 +469,8 @@ class EnumerationMetaClass(type):
         raises: bool = None,
         flags: bool = None,
         start: int = None,
+        steps: int = None,
+        times: int = None,
         typecast: bool = None,
         **kwargs,
     ) -> dict:
@@ -361,7 +481,7 @@ class EnumerationMetaClass(type):
         any other keyword arguments that are included in the class signature call."""
 
         logger.debug(
-            "[EnumerationMetaClass] %s.__prepare__(name: %s, bases: %s, unique: %s, aliased: %s, overwritable: %s, subclassable: %s, removable: %s, raises: %s, flags: %s, start: %s, typecast: %s, kwargs: %s)",
+            "[EnumerationMetaClass] %s.__prepare__(name: %s, bases: %s, unique: %s, aliased: %s, overwritable: %s, subclassable: %s, removable: %s, raises: %s, flags: %s, start: %s, steps: %s, times: %s, typecast: %s, kwargs: %s)",
             name,
             name,
             bases,
@@ -373,6 +493,8 @@ class EnumerationMetaClass(type):
             raises,
             flags,
             start,
+            steps,
+            times,
             typecast,
             kwargs,
         )
@@ -430,9 +552,27 @@ class EnumerationMetaClass(type):
                 "The 'start' argument, if specified, must have a positive integer value!"
             )
 
+        if steps is None:
+            pass
+        elif isinstance(steps, int) and steps >= 1:
+            pass
+        else:
+            raise TypeError(
+                "The 'steps' argument, if specified, must have a positive integer value!"
+            )
+
+        if times is None:
+            pass
+        elif isinstance(times, int) and times >= 1:
+            pass
+        else:
+            raise TypeError(
+                "The 'times' argument, if specified, must have a positive integer value!"
+            )
+
         # Configure the auto() class for subsequent use, resetting the sequence, setting
         # the new start value, and whether values should be flag values (powers of 2)
-        auto.configure(start=start, flags=flags)
+        auto.configure(start=start, steps=steps, times=times, flags=flags)
 
         return dict()
 
@@ -447,6 +587,8 @@ class EnumerationMetaClass(type):
         raises: bool = None,  # False
         flags: bool = None,  # False
         start: int = None,  # None
+        steps: int = None,  # None
+        times: int = None,  # None
         typecast: bool = None,  # True
         **kwargs,
     ):
@@ -513,6 +655,20 @@ class EnumerationMetaClass(type):
                 "The 'start' argument, if specified, must have a positive integer value!"
             )
 
+        if steps is None:
+            pass
+        elif not (isinstance(steps, int) and steps >= 0):
+            raise TypeError(
+                "The 'steps' argument, if specified, must have a positive integer value!"
+            )
+
+        if times is None:
+            pass
+        elif not (isinstance(times, int) and times >= 0):
+            raise TypeError(
+                "The 'times' argument, if specified, must have a positive integer value!"
+            )
+
         if typecast is None:
             pass
         elif not isinstance(typecast, bool):
@@ -529,6 +685,8 @@ class EnumerationMetaClass(type):
             raises=raises,
             flags=flags,
             start=start,
+            steps=steps,
+            times=times,
             typecast=typecast,
         )
 
@@ -543,6 +701,7 @@ class EnumerationMetaClass(type):
             return super().__new__(cls, *args, **kwargs)
 
         enumerations: dict[str, object] = {}  # Keep track of the enumeration options
+        annotations: dict[str, dict] = {}  # Keep track of the enumeration annotations
 
         names: list[object] = []  # Keep track of the option names to check uniqueness
         values: list[object] = []  # Keep track of the option values to check uniqueness
@@ -605,6 +764,12 @@ class EnumerationMetaClass(type):
                         logger.debug(
                             " >>> start        => %s", base_configuration.start
                         )
+                        logger.debug(
+                            " >>> steps        => %s", base_configuration.steps
+                        )
+                        logger.debug(
+                            " >>> times        => %s", base_configuration.times
+                        )
                         logger.debug(
                             " >>> typecast     => %s", base_configuration.typecast
                         )
@@ -646,6 +811,12 @@ class EnumerationMetaClass(type):
                         logger.debug(
                             " >>> (updated) start        => %s", configuration.start
                         )
+                        logger.debug(
+                            " >>> (updated) steps        => %s", configuration.steps
+                        )
+                        logger.debug(
+                            " >>> (updated) times        => %s", configuration.times
+                        )
                         logger.debug(
                             " >>> (updated) typecast     => %s", configuration.typecast
                         )
@@ -681,6 +852,8 @@ class EnumerationMetaClass(type):
             raises=False,
             flags=False,
             start=1,
+            steps=1,
+            times=None,
             typecast=True,
         )
 
@@ -698,6 +871,8 @@ class EnumerationMetaClass(type):
         logger.debug(" >>> (after defaults) raises       => %s", configuration.raises)
         logger.debug(" >>> (after defaults) flags        => %s", configuration.flags)
         logger.debug(" >>> (after defaults) start        => %s", configuration.start)
+        logger.debug(" >>> (after defaults) steps        => %s", configuration.steps)
+        logger.debug(" >>> (after defaults) times        => %s", configuration.times)
         logger.debug(" >>> (after defaults) typecast     => %s", configuration.typecast)
 
         # Iterate over the class attributes, looking for any enumeration options
@@ -709,6 +884,12 @@ class EnumerationMetaClass(type):
                 % (index, attribute, value, type(value))
             )
 
+            if isinstance(value, auto):
+                annotations[attribute] = value
+            elif isinstance(value, anno):
+                annotations[attribute] = value
+                value = value.unwrap()  # unwrap the annotated value
+
             if attribute.startswith("_") or attribute in cls._special:
                 continue
             elif attribute in names:
@@ -730,8 +911,8 @@ class EnumerationMetaClass(type):
                     )
                 else:
                     raise EnumerationNonUniqueError(
-                        "The enumeration option, '%s', has a non-unique value, %r, however, unless either the keyword argument 'unique=False' or 'aliased=True' are passed during class construction, all enumeration options must have unique values!"
-                        % (attribute, value)
+                        "The enumeration option, '%s', has a non-unique value, %r, however, unless either the keyword argument 'unique=False' or 'aliased=True' are passed during class construction, all enumeration options must have unique values; existing values: %s!"
+                        % (attribute, value, values)
                     )
             else:
                 logger.debug(
@@ -763,6 +944,8 @@ class EnumerationMetaClass(type):
         if isinstance(_enumerations, dict):
             attributes["base_enumerations"] = _enumerations
 
+        attributes["annotations"] = annotations
+
         # If the new enumeration class is not subclassing an existing enumeration class
         if configuration.typecast is True and (
             (baseclass is None) or (baseclass is Enumeration)
@@ -840,6 +1023,9 @@ class EnumerationMetaClass(type):
         logger.debug(" >>> removable     => %s", configuration.removable)
         logger.debug(" >>> raises        => %s", configuration.raises)
         logger.debug(" >>> flags         => %s", configuration.flags)
+        logger.debug(" >>> start         => %s", configuration.start)
+        logger.debug(" >>> steps         => %s", configuration.steps)
+        logger.debug(" >>> times         => %s", configuration.times)
         logger.debug(" >>> typecast      => %s", configuration.typecast)
 
         # Store the enumeration class configuration options for future reference
@@ -876,6 +1062,8 @@ class EnumerationMetaClass(type):
         logger.debug("+" * 100)
 
         if isinstance(enumerations := attributes.get("enumerations"), dict):
+            annotations: dict[str, anno] = attributes.get("annotations") or {}
+
             for attribute, value in enumerations.items():
                 if attribute in self._enumerations:
                     continue
@@ -913,6 +1101,7 @@ class EnumerationMetaClass(type):
                             enumeration=self,
                             name=attribute,
                             value=value,
+                            annotations=annotations.get(attribute),
                         )
 
                 logger.debug(
@@ -935,8 +1124,9 @@ class EnumerationMetaClass(type):
         elif self._enumerations and name in self._enumerations:
             return self._enumerations[name]
         else:
+            # EnumerationOptionError subclasses AttributeError so we adhere to convention
             raise EnumerationOptionError(
-                "The '%s' enumeration class, has no '%s' enumeration option!"
+                "The '%s' enumeration class, has no '%s' enumeration option nor annotation property!"
                 % (self.__name__, name)
             )
 
@@ -953,6 +1143,10 @@ class EnumerationMetaClass(type):
         return members
 
     def __contains__(self, other: Enumeration | object) -> bool:
+        logger.debug(
+            "%s(%s).__contains__(other: %s)", self.__class__.__name__, self, other
+        )
+
         contains: bool = False
 
         for name, enumeration in self._enumerations.items():
@@ -1175,11 +1369,12 @@ class EnumerationMetaClass(type):
         self,
         value: Enumeration | object = None,
         name: str = None,
+        caselessly: bool = False,
     ) -> Enumeration | None:
         """The 'reconcile' method can be used to reconcile Enumeration type, enumeration
         values, or enumeration names to their matching Enumeration type instances. If a
-        match is found the Enumeration type instance will be returned otherwise None
-        will be returned."""
+        match is found the Enumeration type instance will be returned otherwise None will
+        be returned, unless the class is configured to raise an error for mismatches."""
 
         if name is None and value is None:
             raise ValueError(
@@ -1197,14 +1392,20 @@ class EnumerationMetaClass(type):
         reconciled: Enumeration = None
 
         for attribute, enumeration in self._enumerations.items():
-            if isinstance(name, str) and enumeration.name == name:
-                reconciled = enumeration
-                break
-            elif isinstance(value, Enumeration):
+            if isinstance(value, Enumeration):
                 if enumeration is value:
                     reconciled = enumeration
                     break
-            elif isinstance(value, str) and enumeration.name == value:
+            elif isinstance(name, str) and (
+                (enumeration.name == name)
+                or (caselessly and (enumeration.name.casefold() == name.casefold()))
+            ):
+                reconciled = enumeration
+                break
+            elif isinstance(value, str) and (
+                (enumeration.name == value)
+                or (caselessly and (enumeration.name.casefold() == value.casefold()))
+            ):
                 reconciled = enumeration
                 break
             elif enumeration.value == value:
@@ -1238,6 +1439,11 @@ class EnumerationMetaClass(type):
 
         return not self.reconcile(value=value, name=name) is None
 
+    def options(self) -> MappingProxyType[str, Enumeration]:
+        """The 'options' method returns a read-only mapping proxy of the options."""
+
+        return MappingProxyType(self._enumerations)
+
 
 class Enumeration(metaclass=EnumerationMetaClass):
     """The Enumeration class is the subclass of all enumerations and their subtypes."""
@@ -1245,6 +1451,7 @@ class Enumeration(metaclass=EnumerationMetaClass):
     _metaclass: EnumerationMetaClass = None
     _enumeration: Enumeration = None
     _enumerations: dict[str, Enumeration] = None
+    _annotations: anno = None
     _name: str = None
     _value: object = None
     _aliased: Enumeration = None
@@ -1257,6 +1464,7 @@ class Enumeration(metaclass=EnumerationMetaClass):
         name: str = None,
         value: object = None,
         aliased: Enumeration = None,
+        annotations: anno = None,
         **kwargs,
     ) -> Enumeration | None:
         # Supports reconciling enumeration options via their name/value via __new__ call
@@ -1264,12 +1472,14 @@ class Enumeration(metaclass=EnumerationMetaClass):
             value = args[0]
 
         logger.debug(
-            "[Enumeration] %s.__new__(args: %s, enumeration: %s, name: %s, value: %s, kwargs: %s)",
+            "[Enumeration] %s.__new__(args: %s, enumeration: %s, name: %s, value: %s, aliased: %s, annotations: %s, kwargs: %s)",
             cls.__name__,
             args,
             enumeration,
             name,
             value,
+            aliased,
+            annotations,
             kwargs,
         )
 
@@ -1298,15 +1508,18 @@ class Enumeration(metaclass=EnumerationMetaClass):
         name: str = None,
         value: object = None,
         aliased: Enumeration = None,
+        annotations: anno = None,
         **kwargs,
     ) -> None:
         logger.debug(
-            "[Enumeration] %s.__init__(args: %s, enumeration: %s, name: %s, value: %s, kwargs: %s)",
+            "[Enumeration] %s.__init__(args: %s, enumeration: %s, name: %s, value: %s, aliased: %s, annotations: %s, kwargs: %s)",
             self.__class__.__name__,
             args,
             enumeration,
             name,
             value,
+            aliased,
+            annotations,
             kwargs,
         )
 
@@ -1340,6 +1553,15 @@ class Enumeration(metaclass=EnumerationMetaClass):
                 "The 'aliased' argument, if specified, must reference an Enumeration class instance!"
             )
 
+        if annotations is None:
+            pass
+        elif isinstance(annotations, anno):
+            self._annotations = annotations
+        else:
+            raise TypeError(
+                "The 'annotations' argument, if specified, must reference an anno class instance!"
+            )
+
     # NOTE: This method is only called if the instance is called via instance(..) syntax
     def __call__(self, *args, **kwargs) -> Enumeration | None:
         logger.debug(
@@ -1361,32 +1583,49 @@ class Enumeration(metaclass=EnumerationMetaClass):
         return id(self)
 
     def __eq__(self, other: Enumeration | object) -> bool:
-        logger.debug("%s.__eq__(other: %s)" % (self.__class__.__name__, other))
+        logger.debug("%s(%s).__eq__(other: %s)", self.__class__.__name__, self, other)
 
         equals: bool = False
 
         if isinstance(other, Enumeration):
-            if self is other:
-                return True
+            equals = self is other
+        elif self.name == other:
+            equals = True
+        elif self.value == other:
+            equals = True
 
-        for attribute, enumeration in self._enumerations.items():
-            logger.info(
-                "%s.__eq__(other: %s) enumeration => %s"
-                % (self.__class__.__name__, other, enumeration)
+        return equals
+
+    def __getattr__(self, name) -> object:
+        """The '__getattr__' method provides support for accessing attribute values that
+        have been assigned to the current enumeration option. If a matching attribute can
+        be found, its value will be returned, otherwise an exception will be raised."""
+
+        logger.debug("%s.__getattr__(name: %s)", self.__class__.__name__, name)
+
+        if name.startswith("_") or name in self.__class__._special or name in dir(self):
+            return object.__getattribute__(self, name)
+        elif self._enumerations and name in self._enumerations:
+            return self._enumerations[name]
+        elif self._annotations and name in self._annotations:
+            return self._annotations[name]
+        else:
+            # EnumerationOptionError subclasses AttributeError so we adhere to convention
+            raise EnumerationOptionError(
+                "The '%s' enumeration class, has no '%s' enumeration option nor annotation property!"
+                % (self.__class__.__name__, name)
             )
 
-            if isinstance(other, Enumeration):
-                if enumeration is other:
-                    equals = True
-                    break
-            elif enumeration.value == other:
-                equals = True
-                break
-            elif enumeration.name == other:
-                equals = True
-                break
+    def get(self, name: str, default: object = None) -> object | None:
+        """The 'get' method provides support for accessing annotation values that may
+        have been assigned to the current enumeration option. If a matching annotation
+        can be found, its value will be returned, otherwise the default value will be
+        returned, which defaults to None, but may be specified as any value."""
 
-        return equals
+        if name in self._annotations:
+            return self._annotations[name]
+        else:
+            return default
 
     @property
     def enumeration(self) -> Enumeration:
@@ -1407,21 +1646,43 @@ class Enumeration(metaclass=EnumerationMetaClass):
     @property
     def aliased(self) -> bool:
         logger.debug(
-            "%s.aliased() >>> id(Colors._enumerations) => %s (%s)",
+            "%s.aliased() >>> id(%s) => %s (%s)",
             self.__class__.__name__,
+            self,
             id(self._enumerations),
             type(self._enumerations),
         )
 
         for name, enumeration in self._enumerations.items():
-            logger.info(" >>> checking for alias: %s => %s", name, enumeration)
+            logger.debug(" >>> checking for alias: %s => %s", name, enumeration)
 
             if isinstance(enumeration, Enumeration):
-                if name != enumeration.name:
+                if self is enumeration and enumeration.name != name:
                     return True
 
         return False
 
+    @property
+    def aliases(self) -> list[Enumeration]:
+        logger.debug(
+            "%s.aliases() >>> id(%s) => %s (%s)",
+            self.__class__.__name__,
+            self,
+            id(self._enumerations),
+            type(self._enumerations),
+        )
+
+        aliases: list[Enumeration] = []
+
+        for name, enumeration in self._enumerations.items():
+            logger.debug(" >>> checking for alias: %s => %s", name, enumeration)
+
+            if isinstance(enumeration, Enumeration):
+                if self is enumeration and enumeration.name != name:
+                    aliases.append(enumeration)
+
+        return aliases
+
 
 class EnumerationType(Enumeration, typecast=False):
     """The EnumerationType class represents the type of value held by an enumeration."""
@@ -1462,6 +1723,15 @@ class EnumerationInteger(int, Enumeration):
     def __repr__(self) -> str:
         return Enumeration.__repr__(self)
 
+    def __hash__(self) -> id:
+        return super().__hash__()
+
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, (int, self.__class__)):
+            return super().__eq__(other)
+        else:
+            return Enumeration.__eq__(self, other)
+
 
 class EnumerationFloat(float, Enumeration):
     """An Enumeration subclass where all values are float values."""
@@ -1505,6 +1775,15 @@ class EnumerationComplex(complex, Enumeration):
     def __repr__(self) -> str:
         return Enumeration.__repr__(self)
 
+    def __hash__(self) -> id:
+        return super().__hash__()
+
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, (float, self.__class__)):
+            return super().__eq__(other)
+        else:
+            return Enumeration.__eq__(self, other)
+
 
 class EnumerationString(str, Enumeration):
     """An Enumeration subclass where all values are string values."""
@@ -1528,6 +1807,15 @@ class EnumerationString(str, Enumeration):
     def __repr__(self) -> str:
         return Enumeration.__repr__(self)
 
+    def __hash__(self) -> id:
+        return super().__hash__()
+
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, (str, self.__class__)):
+            return super().__eq__(other)
+        else:
+            return Enumeration.__eq__(self, other)
+
 
 class EnumerationBytes(bytes, Enumeration):
     """An Enumeration subclass where all values are bytes values."""
@@ -1548,6 +1836,15 @@ class EnumerationBytes(bytes, Enumeration):
     def __repr__(self) -> str:
         return Enumeration.__repr__(self)
 
+    def __hash__(self) -> id:
+        return super().__hash__()
+
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, (bytes, self.__class__)):
+            return super().__eq__(other)
+        else:
+            return Enumeration.__eq__(self, other)
+
 
 class EnumerationTuple(tuple, Enumeration):
     """An Enumeration subclass where all values are tuple values."""
@@ -1568,6 +1865,15 @@ class EnumerationTuple(tuple, Enumeration):
     def __repr__(self) -> str:
         return Enumeration.__repr__(self)
 
+    def __hash__(self) -> id:
+        return super().__hash__()
+
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, (tuple, self.__class__)):
+            return super().__eq__(other)
+        else:
+            return Enumeration.__eq__(self, other)
+
 
 class EnumerationSet(set, Enumeration):
     """An Enumeration subclass where all values are set values."""
@@ -1588,6 +1894,15 @@ class EnumerationSet(set, Enumeration):
     def __repr__(self) -> str:
         return Enumeration.__repr__(self)
 
+    def __hash__(self) -> id:
+        return super().__hash__()
+
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, (set, self.__class__)):
+            return super().__eq__(other)
+        else:
+            return Enumeration.__eq__(self, other)
+
 
 class EnumerationList(list, Enumeration):
     """An Enumeration subclass where all values are list values."""
@@ -1608,6 +1923,15 @@ class EnumerationList(list, Enumeration):
     def __repr__(self) -> str:
         return Enumeration.__repr__(self)
 
+    def __hash__(self) -> id:
+        return super().__hash__()
+
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, (list, self.__class__)):
+            return super().__eq__(other)
+        else:
+            return Enumeration.__eq__(self, other)
+
 
 class EnumerationDictionary(dict, Enumeration):
     """An Enumeration subclass where all values are dictionary values."""
@@ -1631,6 +1955,15 @@ class EnumerationDictionary(dict, Enumeration):
     def __repr__(self) -> str:
         return Enumeration.__repr__(self)
 
+    def __hash__(self) -> id:
+        return super().__hash__()
+
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, (dict, self.__class__)):
+            return super().__eq__(other)
+        else:
+            return Enumeration.__eq__(self, other)
+
 
 class EnumerationFlag(int, Enumeration):
     """An Enumeration subclass where all values are integer values to the power of 2."""
@@ -1772,6 +2105,15 @@ class EnumerationFlag(int, Enumeration):
     def __repr__(self) -> str:
         return Enumeration.__repr__(self)
 
+    def __hash__(self) -> id:
+        return super().__hash__()
+
+    def __eq__(self, other: object) -> bool:
+        if isinstance(other, (int, self.__class__)):
+            return super().__eq__(other)
+        else:
+            return Enumeration.__eq__(self, other)
+
     def __or__(self, other: EnumerationFlag):  # called for: "a | b" (bitwise or)
         """Support performing a bitwise or between the current EnumerationFlag
         instance's bitmask and the 'other' provided EnumerationFlag's bitmask;