GeneralManager 0.11.0__py3-none-any.whl → 0.11.2__py3-none-any.whl

general_manager/interface/databaseBasedInterface.py

@@ -47,7 +47,7 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
     ):
         """
         Initialize the interface and load the associated model instance by primary key.
-        
+
         If a `search_date` is provided, retrieves the historical record as of that date; otherwise, loads the current record.
         """
         super().__init__(*args, **kwargs)
@@ -136,9 +136,9 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
     def getAttributeTypes(cls) -> dict[str, AttributeTypedDict]:
         """
         Return a dictionary mapping each attribute name of the model to its type information and metadata.
-        
+
         The returned dictionary includes all standard model fields, custom fields, foreign keys, many-to-many, and reverse relation fields, excluding any GenericForeignKey fields. For each attribute, the metadata specifies its Python type (translated from Django field types when possible), whether it is required, editable, derived, and its default value. For related models with a general manager class, the type is set to that class.
-        
+
         Returns:
             dict[str, AttributeTypedDict]: Mapping of attribute names to their type information and metadata.
         """
@@ -248,12 +248,14 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
     def getAttributes(cls) -> dict[str, Callable[[DBBasedInterface], Any]]:
         """
         Return a dictionary mapping attribute names to callables that retrieve values from a DBBasedInterface instance.
-        
+
         The mapping includes accessors for custom fields, standard model fields, foreign keys, many-to-many relations, and reverse relations. For related models with a general manager class, the accessor returns an instance of that class; otherwise, it returns the related object or queryset. Raises a ValueError if a field name conflict is detected.
-         
+
         Returns:
             dict: A dictionary where keys are attribute names and values are callables that extract the corresponding value from a DBBasedInterface instance.
         """
+        from general_manager.manager.generalManager import GeneralManager
+
         field_values: dict[str, Any] = {}
 
         field_name_list, to_ignore_list = cls.handleCustomFields(cls._model)
@@ -274,10 +276,14 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
                 related_model,
                 "_general_manager_class",
             ):
-                generalManagerClass = related_model._general_manager_class  # type: ignore
+                generalManagerClass = cast(
+                    Type[GeneralManager], related_model._general_manager_class
+                )
                 field_values[f"{field_name}"] = (
-                    lambda self, field_name=field_name, manager_class=generalManagerClass: manager_class(
-                        getattr(self._instance, field_name).pk
+                    lambda self, field_name=field_name, manager_class=generalManagerClass: (
+                        manager_class(getattr(self._instance, field_name).pk)
+                        if getattr(self._instance, field_name)
+                        else None
                     )
                 )
             else:
@@ -339,10 +345,10 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
     def _getCustomFields(model: Type[models.Model] | models.Model) -> list[str]:
         """
         Return a list of custom field names defined directly as class attributes on the given Django model.
-        
+
         Parameters:
             model: The Django model class or instance to inspect.
-        
+
         Returns:
             A list of field names for fields declared directly on the model class, excluding those defined via Django's meta system.
         """
@@ -356,7 +362,7 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
     def __getModelFields(cls) -> list[str]:
         """
         Return a list of field names for the model that are neither many-to-many nor related fields.
-        
+
         Fields representing many-to-many relationships or relations to other models are excluded from the result.
         """
         return [
@@ -380,7 +386,7 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
     def __getManyToManyFields(cls) -> list[tuple[str, str]]:
         """
         Return a list of tuples representing all many-to-many fields on the model.
-        
+
         Each tuple contains the field name twice. Fields that are generic foreign keys are excluded.
         """
         return [
@@ -393,7 +399,7 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
     def __getReverseRelations(cls) -> list[tuple[str, str]]:
         """
         Return a list of reverse one-to-many relations for the model, excluding generic foreign keys.
-        
+
         Each tuple contains the related field's name and its default related accessor name (e.g., `fieldname_set`).
         """
         return [
@@ -502,7 +508,7 @@ class DBBasedInterface(InterfaceBase, Generic[MODEL_TYPE]):
     def getFieldType(cls, field_name: str) -> type:
         """
         Return the type associated with a given model field name.
-        
+
         If the field is a relation and its related model has a `_general_manager_class` attribute, that class is returned; otherwise, returns the Django field type.
         """
         field = cls._model._meta.get_field(field_name)

general_manager/interface/models.py

@@ -17,12 +17,12 @@ modelsModel = TypeVar("modelsModel", bound=models.Model)
 def getFullCleanMethode(model: Type[models.Model]) -> Callable[..., None]:
     """
     Return a custom `full_clean` method for a Django model that performs both standard validation and additional rule-based checks.
-    
+
     The generated method first applies Django's built-in model validation, then evaluates custom rules defined in the model's `_meta.rules` attribute. If any validation or rule fails, it raises a `ValidationError` containing all collected errors.
-    
+
     Parameters:
         model (Type[models.Model]): The Django model class for which to generate the custom `full_clean` method.
-    
+
     Returns:
         Callable[..., None]: A `full_clean` method that can be assigned to the model class.
     """
@@ -30,7 +30,7 @@ def getFullCleanMethode(model: Type[models.Model]) -> Callable[..., None]:
     def full_clean(self: models.Model, *args: Any, **kwargs: Any):
         """
         Performs full validation on the model instance, including both standard Django validation and custom rule-based checks.
-        
+
         Aggregates errors from Django's built-in validation and any additional rules defined in the model's `_meta.rules` attribute. Raises a `ValidationError` containing all collected errors if any validation or rule check fails.
         """
         errors: dict[str, Any] = {}
@@ -41,7 +41,7 @@ def getFullCleanMethode(model: Type[models.Model]) -> Callable[..., None]:
 
         rules: list[Rule] = getattr(self._meta, "rules")
         for rule in rules:
-            if not rule.evaluate(self):
+            if rule.evaluate(self) is False:
                 error_message = rule.getErrorMessage()
                 if error_message:
                     errors.update(error_message)
@@ -78,7 +78,7 @@ class GeneralManagerModel(GeneralManagerBasisModel):
     def _history_user(self, value: AbstractUser) -> None:
         """
         Set the user responsible for the most recent change to the model instance.
-        
+
         Parameters:
             value (AbstractUser): The user to associate with the latest modification.
         """

general_manager/manager/generalManager.py

@@ -58,6 +58,19 @@ class GeneralManager(metaclass=GeneralManagerMeta):
         else:
             raise TypeError(f"Unsupported type for union: {type(other)}")
 
+    def __eq__(
+        self,
+        other: object,
+    ) -> bool:
+        """
+        Check equality based on the identification dictionary.
+
+        Returns True if the other object is a GeneralManager with the same identification, otherwise False.
+        """
+        if not isinstance(other, GeneralManager):
+            return False
+        return self.identification == other.identification
+
     @property
     def identification(self):
         return self.__id

{generalmanager-0.11.0.dist-info → generalmanager-0.11.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.11.0
+Version: 0.11.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-Expression: MIT

{generalmanager-0.11.0.dist-info → generalmanager-0.11.2.dist-info}/RECORD

@@ -19,12 +19,12 @@ general_manager/factory/factoryMethods.py,sha256=9Bag891j0XHe3dUBAFi7gUKcKeUwcBZ
 general_manager/interface/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 general_manager/interface/baseInterface.py,sha256=cFsDU-nhj_O6Gir3eO0ukGKNn9Pplhe6gEMccHNi4O0,8648
 general_manager/interface/calculationInterface.py,sha256=fTD3WQpsn3ImaxGW5S-JwVJyJJPoPp2mR6lAambdB8U,4755
-general_manager/interface/databaseBasedInterface.py,sha256=_E4HoHmU8A_5_voSpeGp8AkiWbHGF3ZY1zO9phIezh8,21647
+general_manager/interface/databaseBasedInterface.py,sha256=F-a6P9rvPUmlcoZw1rKSWEAzbYGccQRL6uokv6C46qo,21782
 general_manager/interface/databaseInterface.py,sha256=rhKVXhg0ztdIxKikTWtgjrkA7cwZTOYlEsRh0RWajDQ,6732
-general_manager/interface/models.py,sha256=gGYW5f1AUBpBakV3O0qsZwqMiWxZGdKRYXWaCBjt1oI,3334
+general_manager/interface/models.py,sha256=P4bYb-Q7-moZR-hgIqwruMuftDgUW6FSqjPtWfHW04o,3311
 general_manager/interface/readOnlyInterface.py,sha256=TkfbOeaa2wCq5kCv0a3IwJWcYOTVbtNsdNWmGAz0Mns,11217
 general_manager/manager/__init__.py,sha256=l3RYp62aEhj3Y975_XUTIzo35LUnkTJHkb_hgChnXXI,111
-general_manager/manager/generalManager.py,sha256=24eRdJW8BYPchYySxFNMywwk9LOhrab5Y4QiQWXZWT8,8730
+general_manager/manager/generalManager.py,sha256=4Qn9TYpZpqh5qC95BEAQhpiZgDrRXrAJjO2BbbXUdNg,9129
 general_manager/manager/groupManager.py,sha256=8dpZUfm7aFL4lraUWv4qbbDRClQZaYxw4prclhBZYZs,4367
 general_manager/manager/input.py,sha256=-pJXGJ-g2-OxZfl4Buj3mQkf05fN4p8MsR2Lh9BQcEo,3208
 general_manager/manager/meta.py,sha256=-9celpo-oZmkTb8TnHfvcd_4XWTy1cn2UO-jp13NFmQ,6387
@@ -51,8 +51,8 @@ general_manager/utils/makeCacheKey.py,sha256=UlFsxHXgsYy69AAelkF6GDvY4h7AImT2bBn
 general_manager/utils/noneToZero.py,sha256=KfQtMQnrT6vsYST0K7lv6pVujkDcK3XL8czHYOhgqKQ,539
 general_manager/utils/pathMapping.py,sha256=nrz5owQg2a69Yig1eCXorR9U0NSw7NmBAk5OkeoHTdA,6842
 general_manager/utils/testing.py,sha256=ElZ8p4iZHxsHjDN8Lm5TmI6527CW747ltDOmtY6gAhk,11872
-generalmanager-0.11.0.dist-info/licenses/LICENSE,sha256=YGFm0ieb4KpkMRRt2qnWue6uFh0cUMtobwEBkHwajhc,1450
-generalmanager-0.11.0.dist-info/METADATA,sha256=pMD3IcrqWIx1zEQIsMr2y1gS1nZjP8maVN29k8XSpqA,6206
-generalmanager-0.11.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-generalmanager-0.11.0.dist-info/top_level.txt,sha256=sTDtExP9ga-YP3h3h42yivUY-A2Q23C2nw6LNKOho4I,16
-generalmanager-0.11.0.dist-info/RECORD,,
+generalmanager-0.11.2.dist-info/licenses/LICENSE,sha256=YGFm0ieb4KpkMRRt2qnWue6uFh0cUMtobwEBkHwajhc,1450
+generalmanager-0.11.2.dist-info/METADATA,sha256=zj1UfC74gZUgz9inrRIBqx2FAw0_UlXdxt_Iu-mvCyE,6206
+generalmanager-0.11.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+generalmanager-0.11.2.dist-info/top_level.txt,sha256=sTDtExP9ga-YP3h3h42yivUY-A2Q23C2nw6LNKOho4I,16
+generalmanager-0.11.2.dist-info/RECORD,,