GeneralManager 0.58.0__tar.gz → 0.59.0__tar.gz

{generalmanager-0.58.0/src/GeneralManager.egg-info → generalmanager-0.59.0}/PKG-INFO

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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: GeneralManager
-Version: 0.58.0
+Version: 0.59.0
 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.58.0 → generalmanager-0.59.0}/src/general_manager/interface/capabilities/orm/mutations.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, ClassVar, cast
+from typing import TYPE_CHECKING, Any, ClassVar, cast
 
 from django.contrib.auth import get_user_model
 from django.db import models, transaction
@@ -10,6 +10,9 @@ from django.db.models import NOT_PROVIDED
 
 from general_manager.interface.capabilities.base import CapabilityName
 from general_manager.interface.capabilities.builtin import BaseCapability
+from general_manager.interface.capabilities.orm_utils.payload_normalizer import (
+    PayloadNormalizer,
+)
 from general_manager.interface.utils.database_interface_protocols import (
     SupportsActivation,
 )
@@ -581,10 +584,8 @@ class OrmValidationCapability(BaseCapability):
             """
             support = get_support_capability(interface_cls)
             normalizer = support.get_payload_normalizer(interface_cls)
-            payload_copy = dict(payload)
-            normalizer.validate_keys(payload_copy)
-            simple_kwargs, many_to_many_kwargs = normalizer.split_many_to_many(
-                payload_copy
+            simple_kwargs, many_to_many_kwargs = _validate_and_split_payload(
+                normalizer, payload
             )
             normalized_simple = normalizer.normalize_simple_values(simple_kwargs)
             normalized_many = normalizer.normalize_many_values(many_to_many_kwargs)
@@ -629,9 +630,9 @@ def _normalize_payload(
         )
     support = get_support_capability(interface_cls)
     normalizer = support.get_payload_normalizer(interface_cls)
-    payload_copy = dict(payload)
-    normalizer.validate_keys(payload_copy)
-    simple_kwargs, many_to_many_kwargs = normalizer.split_many_to_many(payload_copy)
+    simple_kwargs, many_to_many_kwargs = _validate_and_split_payload(
+        normalizer, payload
+    )
     normalized_simple = normalizer.normalize_simple_values(simple_kwargs)
     normalized_many = normalizer.normalize_many_values(many_to_many_kwargs)
     return dict(normalized_simple), {
@@ -639,6 +640,31 @@ def _normalize_payload(
     }
 
 
+def _validate_and_split_payload(
+    normalizer: Any,
+    payload: MutationPayload,
+) -> tuple[MutationPayload, MutationPayload]:
+    """Validate and split payloads without exposing caller mappings to mutation."""
+    normalizer_payload = (
+        payload if type(normalizer) is PayloadNormalizer else dict(payload)
+    )
+    normalizer.validate_keys(normalizer_payload)
+    return _split_many_to_many_payload(normalizer, normalizer_payload)
+
+
+def _split_many_to_many_payload(
+    normalizer: Any,
+    payload: MutationPayload,
+) -> tuple[MutationPayload, MutationPayload]:
+    """Split concrete normalizer payloads without mutation; copy for custom normalizers."""
+    if type(normalizer) is PayloadNormalizer:
+        return normalizer.split_many_to_many_non_mutating(payload)
+    return cast(
+        tuple[MutationPayload, MutationPayload],
+        normalizer.split_many_to_many(payload),
+    )
+
+
 def _assign_history_actor(
     instance: models.Model,
     *,

{generalmanager-0.58.0 → generalmanager-0.59.0}/src/general_manager/interface/capabilities/orm_utils/payload_normalizer.py

@@ -88,7 +88,7 @@ class PayloadNormalizer:
         self, kwargs: PayloadMapping
     ) -> tuple[PayloadMapping, PayloadMapping]:
         """
-        Separate many-to-many related entries from a kwargs mapping.
+        Mutate a kwargs mapping by moving many-to-many related entries out of it.
 
         Parameters:
             kwargs: Mapping of field lookups where keys for many-to-many relations are expected to end with `_id_list`.
@@ -106,6 +106,39 @@ class PayloadNormalizer:
                 many_kwargs[f"{base_key}_id_list"] = kwargs.pop(key)
         return kwargs, many_kwargs
 
+    def split_many_to_many_non_mutating(
+        self, kwargs: PayloadMapping
+    ) -> tuple[PayloadMapping, PayloadMapping]:
+        """
+        Return separated many-to-many entries without mutating the input mapping.
+
+        Parameters:
+            kwargs: Mapping of field lookups where keys for many-to-many
+                relations may use either `<relation>_list` or
+                `<relation>_id_list`.
+
+        Returns:
+            tuple: A pair `(remaining_kwargs, many_kwargs)` where both mappings
+                are new dictionaries. `remaining_kwargs` contains non-matching
+                entries from `kwargs`, and `many_kwargs` contains matching
+                many-to-many entries under canonical `<relation>_id_list` keys.
+
+        Notes:
+            This is the non-mutating counterpart to `split_many_to_many()`. If
+            both `<relation>_list` and `<relation>_id_list` are present,
+            iteration order decides the last canonical value stored in
+            `many_kwargs`.
+        """
+        remaining_kwargs: PayloadMapping = {}
+        many_kwargs: PayloadMapping = {}
+        for key, value in kwargs.items():
+            base_key = self._m2m_alias_base_key(key)
+            if base_key in self._many_to_many_fields:
+                many_kwargs[f"{base_key}_id_list"] = value
+            else:
+                remaining_kwargs[key] = value
+        return remaining_kwargs, many_kwargs
+
     def normalize_simple_values(self, kwargs: PayloadMapping) -> PayloadMapping:
         """
         Normalize simple (single-valued) payload entries by converting general-manager objects to their identifier form and adjusting keys.