GeneralManager 0.68.0__tar.gz → 0.68.2__tar.gz

{generalmanager-0.68.0/src/GeneralManager.egg-info → generalmanager-0.68.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.68.0
+Version: 0.68.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.68.0 → generalmanager-0.68.2}/pyproject.toml

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.68.0
+Version: 0.68.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.68.0 → generalmanager-0.68.2}/src/general_manager/api/graphql.py

@@ -95,7 +95,7 @@ from general_manager.api.graphql_resolvers import (
     apply_pagination as _apply_pagination_fn,
     apply_grouping as _apply_grouping_fn,
     check_read_permission as _check_read_permission_fn,
-    can_read_instance as _can_read_instance_fn,
+    can_read_instance_for_user as _can_read_instance_for_user_fn,
     create_measurement_resolver as _create_measurement_resolver_fn,
     create_normal_resolver as _create_normal_resolver_fn,
     create_list_resolver as _create_list_resolver_fn,
@@ -1432,6 +1432,29 @@ class GraphQL:
             property_names=property_names,
         )
 
+    @classmethod
+    def _instantiate_readable_manager(
+        cls,
+        manager_class: type[GeneralManager],
+        identification: GraphQLIdentification,
+        user: object,
+        action: str,
+    ) -> GeneralManager | None:
+        try:
+            item, _ = cls._instantiate_manager(manager_class, identification)
+        except SUBSCRIPTION_HYDRATION_ERRORS:
+            return None
+        try:
+            readable = _can_read_instance_for_user_fn(item, user)
+        except Exception as exc:  # noqa: BLE001, RUF100
+            logger.error(  # noqa: TRY400
+                "class subscription permission check failed",
+                context={"manager": manager_class.__name__, "action": action},
+                exc_info=exc,
+            )
+            raise
+        return item if readable else None
+
     @classmethod
     def _add_subscription_field(
         cls,
@@ -1623,6 +1646,7 @@ class GraphQL:
                 cls._class_group_name(generalManagerClass),
                 cls._refresh_group_name(generalManagerClass),
             }
+            subscription_user = info.context.user
 
             async def event_stream() -> AsyncIterator[SubscriptionEvent]:
                 channel_name = cast(str, await channel_layer.new_channel())
@@ -1656,15 +1680,14 @@ class GraphQL:
                         if not isinstance(identification, dict):
                             continue
                         identification_copy = deepcopy(identification)
-                        try:
-                            item, _ = await asyncio.to_thread(
-                                cls._instantiate_manager,
-                                generalManagerClass,
-                                identification_copy,
-                            )
-                        except SUBSCRIPTION_HYDRATION_ERRORS:
-                            continue
-                        if not _can_read_instance_fn(item, info):
+                        item = await asyncio.to_thread(
+                            cls._instantiate_readable_manager,
+                            generalManagerClass,
+                            identification_copy,
+                            subscription_user,
+                            action,
+                        )
+                        if item is None:
                             continue
                         clear_capability_context(info)
                         yield SubscriptionEvent(item=item, action=action)

{generalmanager-0.68.0 → generalmanager-0.68.2}/src/general_manager/api/graphql_resolvers.py

@@ -2,7 +2,7 @@
 Resolver-construction helpers extracted from ``api/graphql.py``.
 
 These standalone functions build Graphene resolver callables and apply
-query modifiers (filtering, pagination, grouping). They hold no reference to the
+query modifiers (filtering, grouping, sorting, pagination). They hold no reference to the
 ``GraphQL`` class and can therefore be imported freely inside the package's
 internal GraphQL implementation without circular imports. This module is not a
 stable public import path.
@@ -143,6 +143,18 @@ def contains_none_relation_filter(input_val: object) -> bool:
 # ---------------------------------------------------------------------------
 
 
+def apply_sorting(
+    queryset: Bucket[GeneralManager] | GroupBucket[GeneralManager],
+    sort_by: graphene.Enum | None,
+    reverse: bool,
+) -> Bucket[GeneralManager] | GroupBucket[GeneralManager]:
+    """Sort a record or group bucket when a GraphQL sort key is present."""
+    if not sort_by:
+        return queryset
+    sort_by_str = cast(str, getattr(sort_by, "value", sort_by))
+    return queryset.sort(sort_by_str, reverse=reverse)
+
+
 def apply_query_parameters(
     queryset: Bucket[GeneralManager],
     filter_input: GraphQLFilterInput,
@@ -204,11 +216,10 @@ def apply_query_parameters(
     if normalized_excludes:
         queryset = queryset.exclude(**normalized_excludes)
 
-    if sort_by:
-        sort_by_str = cast(str, getattr(sort_by, "value", sort_by))
-        queryset = queryset.sort(sort_by_str, reverse=reverse)
-
-    return queryset
+    return cast(
+        Bucket[GeneralManager],
+        apply_sorting(queryset, sort_by, reverse),
+    )
 
 
 def apply_permission_filters(
@@ -553,12 +564,12 @@ def check_read_permission(
     return True
 
 
-def can_read_instance(
+def can_read_instance_for_user(
     instance: GeneralManager,
-    info: GraphQLResolveInfo,
+    user: object,
 ) -> bool:
     """
-    Return whether the request user may see that *instance* exists.
+    Return whether *user* may see that *instance* exists.
 
     When the manager defines a Permission class, this calls
     ``Permission(instance, user).can_read_instance()``. Managers without a
@@ -566,10 +577,18 @@ def can_read_instance(
     """
     PermissionClass: type[BasePermission] | None = getattr(instance, "Permission", None)
     if PermissionClass:
-        return PermissionClass(instance, info.context.user).can_read_instance()
+        return PermissionClass(instance, user).can_read_instance()
     return True
 
 
+def can_read_instance(
+    instance: GeneralManager,
+    info: GraphQLResolveInfo,
+) -> bool:
+    """Return whether the request user may see that *instance* exists."""
+    return can_read_instance_for_user(instance, info.context.user)
+
+
 # ---------------------------------------------------------------------------
 # Resolver factories
 # ---------------------------------------------------------------------------
@@ -649,9 +668,11 @@ def create_list_resolver(
     capability warmups. The resolver applies permission prefilters and the
     permission row gate before user-supplied query arguments,
     then explicit filters, normalized filter-side excludes, explicit excludes,
-    normalized exclude-side excludes, sorting, optional grouping, and pagination.
-    It computes ``total_count`` after grouping and before pagination. Non-grouped
-    page items are materialized to a list; grouped results remain a
+    normalized exclude-side excludes, optional grouping, sorting, and pagination.
+    Sorting therefore applies to records when grouping is omitted and to grouped
+    manager objects when grouping is active. It computes ``total_count`` after
+    grouping and sorting and before pagination. Non-grouped page items are
+    materialized to a list; grouped results remain a
     ``GroupBucket`` and are returned as the Python-side ``items`` value. When
     grouping is active, pagination slices the group bucket before it is returned.
     Dependency-cache prefetch runs only for materialized item lists when the
@@ -719,15 +740,16 @@ def create_list_resolver(
             qs,
             filter,
             exclude,
-            sort_by,
+            None,
             reverse,
             filter_normalizer=bound_filter_normalizer,
         )
         qs_grouped = apply_grouping(qs, group_by)
+        qs_sorted = apply_sorting(qs_grouped, sort_by, reverse)
 
-        total_count = len(qs_grouped)
+        total_count = len(qs_sorted)
 
-        qs_paginated = apply_pagination(qs_grouped, page, page_size)
+        qs_paginated = apply_pagination(qs_sorted, page, page_size)
         items: object
         if hasattr(qs_paginated, "groups"):
             items = qs_paginated

{generalmanager-0.68.0 → generalmanager-0.68.2}/src/general_manager/bucket/group_bucket.py

@@ -502,7 +502,11 @@ class GroupBucket(Generic[GeneralManagerType]):
                     new_base_data = new_base_data | manager._data
             if new_base_data is None:
                 raise EmptyGroupBucketSliceError()
-            return GroupBucket(self._manager_class, self._group_by_keys, new_base_data)
+            new_bucket = GroupBucket(
+                self._manager_class, self._group_by_keys, new_base_data
+            )
+            new_bucket._data = new_data
+            return new_bucket
         raise InvalidGroupBucketIndexError(type(item))
 
     def __len__(self) -> int: