GeneralManager 0.62.0__tar.gz → 0.62.2__tar.gz

{generalmanager-0.62.0/src/GeneralManager.egg-info → generalmanager-0.62.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.62.0
+Version: 0.62.2
 Summary: Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching.
 Author-email: Tim Kleindick <tkleindick@yahoo.de>
 License: MIT License

{generalmanager-0.62.0 → generalmanager-0.62.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GeneralManager"
-version = "0.62.0"
+version = "0.62.2"
 description = "Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching."
 readme = "README.md"
 authors = [{ name = "Tim Kleindick", email = "tkleindick@yahoo.de" }]

{generalmanager-0.62.0 → generalmanager-0.62.2/src/GeneralManager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.62.0
+Version: 0.62.2
 Summary: Modular Django-based data management framework with ORM, GraphQL, fine-grained permissions, rule validation, calculations and caching.
 Author-email: Tim Kleindick <tkleindick@yahoo.de>
 License: MIT License

{generalmanager-0.62.0 → generalmanager-0.62.2}/src/general_manager/rule/rule.py

@@ -10,6 +10,7 @@ from operator import eq, ge, gt, le, lt, ne
 from typing import Callable, Dict, Generic, List, Optional, Tuple, TypeVar, cast
 from decimal import Decimal
 
+from django.core.exceptions import NON_FIELD_ERRORS
 from django.utils.module_loading import import_string
 
 from general_manager.rule.handler import (
@@ -289,12 +290,28 @@ class Rule(Generic[GeneralManagerType]):
         if missing:
             raise MissingErrorTemplateVariableError(missing)
 
+    def _generate_fallback_error_messages(
+        self,
+        message: str | None = None,
+    ) -> Dict[str, str]:
+        """Attach a generic failed-rule message to fields or non-field errors."""
+        variables = self._variables or [NON_FIELD_ERRORS]
+        if message is None:
+            if self._variables:
+                combo = ", ".join(f"[{variable}]" for variable in self._variables)
+                message = f"{combo} combination is not valid"
+            else:
+                message = "Rule validation failed"
+        return {variable: message for variable in variables}
+
     def get_error_message(self) -> Optional[Dict[str, str]]:
         """
-        Constructs error messages for the last failed evaluation and returns them keyed by variable name.
+        Construct error messages for the last failed evaluation.
 
         Returns:
-            dict[str, str] | None: Mapping from each referenced variable name to its error message, or `None` if the predicate passed or was not evaluated.
+            dict[str, str] | None: Mapping keyed by referenced variables or
+            Django's `NON_FIELD_ERRORS` fallback when no variables are available;
+            `None` if the predicate passed or was not evaluated.
 
         Raises:
             ErrorMessageGenerationError: If called before any input has been evaluated.
@@ -330,7 +347,7 @@ class Rule(Generic[GeneralManagerType]):
                     "variables": self._variables,
                 },
             )
-            return {v: formatted for v in self._variables}
+            return self._generate_fallback_error_messages(formatted)
 
         errors = self._generate_error_messages(vals)
         if errors:
@@ -350,7 +367,7 @@ class Rule(Generic[GeneralManagerType]):
                     "manager": manager_class,
                 },
             )
-        return errors or None
+        return errors or self._generate_fallback_error_messages()
 
     def _extract_variables(self) -> List[str]:
         """