GeneralManager 0.41.2__tar.gz → 0.41.4__tar.gz

{generalmanager-0.41.2/src/GeneralManager.egg-info → generalmanager-0.41.4}/PKG-INFO

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.41.2
+Version: 0.41.4
 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.2 → generalmanager-0.41.4}/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.2 → generalmanager-0.41.4}/src/general_manager/interface/capabilities/orm_utils/field_descriptors.py

@@ -36,6 +36,23 @@ class FieldDescriptor:
     accessor: DescriptorAccessor
 
 
+class MissingRelatedFieldsError(RuntimeError):
+    """Raised when a GeneralManager collection relation cannot be scoped."""
+
+    def __init__(
+        self,
+        *,
+        accessor_name: str,
+        related_model: type[models.Model],
+        source_model: type[models.Model],
+    ) -> None:
+        super().__init__(
+            "Unable to resolve related fields for collection relation "
+            f"'{accessor_name}' from {source_model.__name__} to "
+            f"{related_model.__name__}."
+        )
+
+
 TRANSLATION: dict[type[models.Field], type] = {
     models.fields.BigAutoField: int,
     models.AutoField: int,
@@ -691,6 +708,12 @@ def _general_manager_many_accessor(
         """
         filter_kwargs = {field.name: self.pk for field in related_fields}
         manager_cls = cast(Any, general_manager_class)
+        if not filter_kwargs:
+            raise MissingRelatedFieldsError(
+                accessor_name=accessor_name,
+                related_model=related_model,
+                source_model=source_model,
+            )
         return manager_cls.filter(**filter_kwargs)
 
     return getter

{generalmanager-0.41.2 → generalmanager-0.41.4}/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)