enumerific 1.0.7__py3-none-any.whl → 1.0.8__py3-none-any.whl

enumerific/extensible.py

@@ -1459,44 +1459,59 @@ class EnumerationMetaClass(type):
         name: str = None,
         caselessly: bool = False,
         annotation: str = None,
+        **annotations: dict[str, object],
     ) -> 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, unless the class is configured to raise an error for mismatches."""
 
-        if name is None and value is None:
+        if isinstance(annotation, str):
+            annotations[annotation] = value
+
+        if name is None and value is None and len(annotations) == 0:
             raise ValueError(
-                "Either the 'value' or 'name' argument must be specified when calling the 'reconcile' function!"
+                "Either a 'value', 'name' or annotation keyword argument must be specified when calling the 'reconcile' function!"
             )
 
         if not value is None and not isinstance(value, (Enumeration, object)):
             raise TypeError(
-                "The 'value' argument must reference an Enumeration type or have an enumeration value!"
+                "The 'value' argument, if specified, must reference an Enumeration type or have an enumeration value!"
             )
 
         if not name is None and not isinstance(name, str):
-            raise TypeError("The 'name' argument must have a string value!")
+            raise TypeError(
+                "The 'name' argument, if specified, must have a string value!"
+            )
 
         reconciled: Enumeration = None
 
         for attribute, enumeration in self._enumerations.items():
-            if isinstance(annotation, str):
-                if annotation in enumeration._annotations:
-                    if enumeration._annotations[annotation] is value:
-                        reconciled = enumeration
-                        break
-                    elif enumeration._annotations[annotation] == value:
-                        reconciled = enumeration
-                        break
-                else:
-                    raise EnumerationOptionError(
-                        "The enumeration option, %s, has no '%s' annotation!"
-                        % (
-                            enumeration,
-                            annotation,
+            if len(annotations) > 0:
+                comparisons: list[bool] = []
+
+                for annotation, value in annotations.items():
+                    if annotation in enumeration._annotations:
+                        if enumeration._annotations[annotation] is value:
+                            comparisons.append(True)
+                        elif enumeration._annotations[annotation] == value:
+                            comparisons.append(True)
+                        else:
+                            comparisons.append(False)
+                    else:
+                        comparisons.append(False)
+
+                        logger.debug(
+                            "The enumeration option, %s, has no '%s' annotation!"
+                            % (
+                                enumeration,
+                                annotation,
+                            )
                         )
-                    )
+
+                if len(comparisons) == len(annotations) and False not in comparisons:
+                    reconciled = enumeration
+                    break
             elif isinstance(value, Enumeration):
                 if enumeration is value:
                     reconciled = enumeration

enumerific/version.txt

@@ -1 +1 @@
-1.0.7
+1.0.8

{enumerific-1.0.7.dist-info → enumerific-1.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: enumerific
-Version: 1.0.7
+Version: 1.0.8
 Summary: Simplifies working with Python enums.
 Author: Daniel Sissman
 License-Expression: MIT
@@ -690,8 +690,8 @@ class Colors(Enumeration):
 # Ensure that the Colors enumeration subclass is of the expected types
 assert issubclass(Colors, Enumeration)
 
-# Attempt to reconcile a Color against one of its annotations
-color = Colors.reconcile(value=(255, 0, 0), annotation="RGB")
+# Attempt to reconcile a Color against one of its annotations (via annotation keyword)
+color = Colors.reconcile(RGB=(255, 0, 0))
 
 assert isinstance(color, Colors)
 assert isinstance(color, Enumeration)
@@ -699,6 +699,16 @@ assert isinstance(color, Enumeration)
 assert color.name == "RED"
 assert color.value == 1
 assert color.RGB == (255, 0, 0)
+
+# Attempt to reconcile a Color against one of its annotations (via annotation argument)
+color = Colors.reconcile(value=(0, 255, 0), annotation="RGB")
+
+assert isinstance(color, Colors)
+assert isinstance(color, Enumeration)
+
+assert color.name == "GREEN"
+assert color.value == 2
+assert color.RGB == (0, 255, 0)
 ```
 
 # Enumerific Library Enumerations: Classes & Methods

enumerific-1.0.8.dist-info/RECORD

@@ -0,0 +1,12 @@
+enumerific/__init__.py,sha256=K9iFirgxSkrHgXfhocOvgRkskGe0VfWRgxEvppnVWBM,587
+enumerific/exceptions.py,sha256=lvfcH1cz43hDjzSUpgm1-OZjKzxo--fyZ8UsBS-GiZA,359
+enumerific/extensible.py,sha256=o0n9PdgnbC52vw4wbk4kUkmRsFUTN_e7yqe7LA-6Obg,87108
+enumerific/logging.py,sha256=zz1Phnot1BFWMoxwvZ0FlZDsiYZZYhz-_S4IzgPYc40,97
+enumerific/standard.py,sha256=xQhhwlcYZ6-8DmgscbV38g2Ol5Z8_vvBwonz-Ww0I40,3254
+enumerific/version.txt,sha256=phVSvZad-OqKy8Q8pyiMu01dODZaYQyAIaQn4mpRhR0,5
+enumerific-1.0.8.dist-info/licenses/LICENSE.md,sha256=j1XidOCGUhPx7CyXA31uC0XGKDRnvUcZpMp161qHI6g,1077
+enumerific-1.0.8.dist-info/METADATA,sha256=Loee454XK_bhrv_N3PKAEFjDFHATJBQbdG4QZRGzLYg,34237
+enumerific-1.0.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+enumerific-1.0.8.dist-info/top_level.txt,sha256=hyemsMgPYZgSx71XHmFRF-gvc_2Y4rDAESR8e0hbYHU,11
+enumerific-1.0.8.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+enumerific-1.0.8.dist-info/RECORD,,

enumerific-1.0.7.dist-info/RECORD

@@ -1,12 +0,0 @@
-enumerific/__init__.py,sha256=K9iFirgxSkrHgXfhocOvgRkskGe0VfWRgxEvppnVWBM,587
-enumerific/exceptions.py,sha256=lvfcH1cz43hDjzSUpgm1-OZjKzxo--fyZ8UsBS-GiZA,359
-enumerific/extensible.py,sha256=HX-oZ91XtTLk5dmlqFOSFCO71_TEj1zGaO4KSKGwwoY,86507
-enumerific/logging.py,sha256=zz1Phnot1BFWMoxwvZ0FlZDsiYZZYhz-_S4IzgPYc40,97
-enumerific/standard.py,sha256=xQhhwlcYZ6-8DmgscbV38g2Ol5Z8_vvBwonz-Ww0I40,3254
-enumerific/version.txt,sha256=6fmB8RVMkjgdY7ZTz7_Hm-ksP2zJXgkVpeXBnzkkylg,5
-enumerific-1.0.7.dist-info/licenses/LICENSE.md,sha256=j1XidOCGUhPx7CyXA31uC0XGKDRnvUcZpMp161qHI6g,1077
-enumerific-1.0.7.dist-info/METADATA,sha256=AnTj6l-xLoVxh1rQ1dFw1t8_v3Aq2slvwgiL458SBGs,33923
-enumerific-1.0.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-enumerific-1.0.7.dist-info/top_level.txt,sha256=hyemsMgPYZgSx71XHmFRF-gvc_2Y4rDAESR8e0hbYHU,11
-enumerific-1.0.7.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-enumerific-1.0.7.dist-info/RECORD,,