GeneralManager 0.41.3__tar.gz → 0.41.5__tar.gz

{generalmanager-0.41.3/src/GeneralManager.egg-info → generalmanager-0.41.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.41.3
+Version: 0.41.5
 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.41.3 → generalmanager-0.41.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "GeneralManager"
-version = "0.41.3"
+version = "0.41.5"
 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.41.3 → generalmanager-0.41.5/src/GeneralManager.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.41.3
+Version: 0.41.5
 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.41.3 → generalmanager-0.41.5}/src/general_manager/bootstrap.py

@@ -28,7 +28,7 @@ from general_manager.api.graphql import GraphQL
 from general_manager.api.remote_api import add_remote_api_urls
 from general_manager.api.remote_invalidation import ensure_remote_invalidation_route
 from general_manager.conf import get_setting
-from general_manager.api.property import graph_ql_property
+from general_manager.api.property import GraphQLProperty
 from general_manager.logging import get_logger
 from general_manager.interface.infrastructure.startup_hooks import (
     registered_startup_hook_entries,
@@ -272,6 +272,32 @@ def initialize_general_manager_classes(
         resolver.__annotations__ = {"return": manager_cls}
         return resolver
 
+    def _iter_manager_relation_fields(
+        general_manager_class: Type[_GM],
+    ) -> Iterable[tuple[str, Type[_GM]]]:
+        seen: set[str] = set()
+        input_fields = getattr(general_manager_class.Interface, "input_fields", {})
+        for attribute_name, attribute in input_fields.items():
+            if isinstance(attribute, Input) and issubclass(attribute.type, _GM):
+                seen.add(attribute_name)
+                yield attribute_name, attribute.type
+
+        get_attribute_types = getattr(
+            general_manager_class.Interface, "get_attribute_types", None
+        )
+        if not callable(get_attribute_types):
+            return
+        try:
+            attribute_types = get_attribute_types()
+        except NotImplementedError:
+            return
+        for attribute_name, metadata in attribute_types.items():
+            if attribute_name in seen or metadata.get("relation_kind") != "direct":
+                continue
+            field_type = metadata.get("type")
+            if isinstance(field_type, type) and issubclass(field_type, _GM):
+                yield attribute_name, field_type
+
     logger.debug(
         "creating manager attributes",
         context={"pending_attributes": len(pending_attribute_initialization)},
@@ -294,18 +320,18 @@ def initialize_general_manager_classes(
         context={"total_classes": len(all_classes)},
     )
     for general_manager_class in all_classes:
-        attributes = getattr(general_manager_class.Interface, "input_fields", {})
-        for attribute_name, attribute in attributes.items():
-            if isinstance(attribute, Input) and issubclass(attribute.type, _GM):
-                connected_manager = attribute.type
-                resolver = _build_connection_resolver(
-                    attribute_name, general_manager_class
-                )
-                setattr(
-                    connected_manager,
-                    f"{general_manager_class.__name__.lower()}_list",
-                    graph_ql_property(resolver),
-                )
+        for attribute_name, connected_manager in _iter_manager_relation_fields(
+            general_manager_class
+        ):
+            resolver = _build_connection_resolver(attribute_name, general_manager_class)
+            relation_property = GraphQLProperty(resolver)
+            marked_relation_property: Any = relation_property
+            marked_relation_property._general_manager_generated_relation = True
+            setattr(
+                connected_manager,
+                f"{general_manager_class.__name__.lower()}_list",
+                relation_property,
+            )
     for general_manager_class in all_classes:
         check_permission_class(general_manager_class)
 

{generalmanager-0.41.3 → generalmanager-0.41.5}/src/general_manager/bucket/database_bucket.py

@@ -140,6 +140,57 @@ class NonSortablePropertyError(ValueError):
         )
 
 
+class DuplicateDatabaseBucketSnapshotError(ValueError):
+    """Raised when a database bucket snapshot contains duplicate primary keys."""
+
+    def __init__(self) -> None:
+        super().__init__(
+            "DatabaseBucket snapshots cannot contain duplicate primary keys."
+        )
+
+
+def _ensure_unique_primary_keys(primary_keys: tuple[Any, ...]) -> None:
+    if len(primary_keys) != len(set(primary_keys)):
+        raise DuplicateDatabaseBucketSnapshotError()
+
+
+def _restore_database_bucket_from_primary_keys(
+    model: type[models.Model],
+    manager_class: Type[GeneralManagerType],
+    primary_keys: tuple[Any, ...],
+    filter_definitions: dict[str, list[Any]],
+    exclude_definitions: dict[str, list[Any]],
+    database_alias: str | None,
+    search_date: datetime | date | None,
+    sort_keys: tuple[str, ...] | None,
+    sort_reverse: bool,
+) -> DatabaseBucket[GeneralManagerType]:
+    _ensure_unique_primary_keys(primary_keys)
+    manager = model._default_manager
+    if database_alias is not None:
+        manager = manager.db_manager(database_alias)
+    if not primary_keys:
+        queryset = manager.none()
+    else:
+        preserved_order = models.Case(
+            *(
+                models.When(pk=primary_key, then=position)
+                for position, primary_key in enumerate(primary_keys)
+            ),
+            output_field=models.IntegerField(),
+        )
+        queryset = manager.filter(pk__in=primary_keys).order_by(preserved_order)
+    return DatabaseBucket(
+        queryset,
+        manager_class,
+        filter_definitions,
+        exclude_definitions,
+        search_date=search_date,
+        sort_keys=sort_keys,
+        sort_reverse=sort_reverse,
+    )
+
+
 class DatabaseBucket(Bucket[GeneralManagerType]):
     """Bucket implementation backed by Django ORM querysets."""
 
@@ -175,6 +226,28 @@ class DatabaseBucket(Bucket[GeneralManagerType]):
         self._sort_keys = sort_keys
         self._sort_reverse = sort_reverse
 
+    def __reduce__(self) -> str | tuple[Any, ...]:
+        """
+        Preserve a result snapshot without serializing the queryset object.
+        """
+        self._track_effective_dependencies()
+        primary_keys = tuple(self._data.values_list("pk", flat=True))
+        _ensure_unique_primary_keys(primary_keys)
+        return (
+            _restore_database_bucket_from_primary_keys,
+            (
+                self._data.model,
+                self._manager_class,
+                primary_keys,
+                self.filters,
+                self.excludes,
+                self._data.db,
+                self._search_date,
+                self._sort_keys,
+                self._sort_reverse,
+            ),
+        )
+
     def _build_manager(self, pk: Any) -> GeneralManagerType:
         if self._search_date is None:
             return self._manager_class(pk)

{generalmanager-0.41.3 → generalmanager-0.41.5}/src/general_manager/manager/general_manager.py

@@ -196,6 +196,8 @@ class GeneralManager(metaclass=GeneralManagerMeta):
         for name, value in self.__class__.__dict__.items():
             if name == "history":
                 continue
+            if getattr(value, "_general_manager_generated_relation", False):
+                continue
             if isinstance(value, (GraphQLProperty, property)):
                 yield name, getattr(self, name)