django-fast-treenode 3.2.0__py3-none-any.whl → 3.2.1__py3-none-any.whl

{django_fast_treenode-3.2.0.dist-info → django_fast_treenode-3.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-fast-treenode
-Version: 3.2.0
+Version: 3.2.1
 Summary: Treenode Framework for supporting tree (hierarchical) data structure in Django projects
 Home-page: https://django-fast-treenode.readthedocs.io/
 Author: Timur Kady

{django_fast_treenode-3.2.0.dist-info → django_fast_treenode-3.2.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-django_fast_treenode-3.2.0.dist-info/licenses/LICENSE,sha256=SSYqS84FCnAW7tAxmjBKU8qAa8Jv4VGPuSSGeHwWtJE,1095
+django_fast_treenode-3.2.1.dist-info/licenses/LICENSE,sha256=SSYqS84FCnAW7tAxmjBKU8qAa8Jv4VGPuSSGeHwWtJE,1095
 treenode/__init__.py,sha256=3z1hWpHyy4wg6uz7HCmRi9FaXYeN5CfANVpa77UIoPw,53
 treenode/apps.py,sha256=QlwjNDM9rkUoWB8Vm8-OkS6lNx0-aTByuGZlu9wrQMs,1832
 treenode/cache.py,sha256=2jUiiecfFxwB7QFukpU4u0FnDzGH6hNRfo6KAYvs6vM,8447
@@ -7,7 +7,7 @@ treenode/settings.py,sha256=FRGK7hl_Tnxp4sGbUNxJgEQP9niDJjLhcNBtmloOvHk,741
 treenode/signals.py,sha256=ERrlKjGqhYaPYVKKRk1JBBlPFOmJKpJ6bXsJavcTlo0,518
 treenode/tests.py,sha256=2uDafv3Ns6f7Vy1ekUtgYxCZEi1KRyesZDTAFhYcX-E,63
 treenode/urls.py,sha256=krHvVigc_dxC0z5hEd2rgeH6th8jW7qJY3Qbia-419Y,240
-treenode/version.py,sha256=7TedO4TEmiuyAVChT2JQ953v0toWdhTtfA4d5VIsuCE,220
+treenode/version.py,sha256=2xptvV9MUEglYmGGtVaEX6WiMnY6GLv_F951eiBLmJk,220
 treenode/widgets.py,sha256=3kSby7v-gpyUHmAIFZCENM8hzT1xcHJFB4op8XU6YEQ,4035
 treenode/admin/__init__.py,sha256=XNEYHdF5lKb0vpdlVxdR2fxj5oUgzyx1YyCwsv0gxHw,100
 treenode/admin/admin.py,sha256=cbiqlzXwK-W73DTJqvXo_abtnK1JwEwyBEOl0bmgsa4,7507
@@ -18,21 +18,22 @@ treenode/admin/mixin.py,sha256=7hcjoh8W2_R2in0EorNjVTXakYP3I1mMZKIr65UsU-g,10677
 treenode/managers/__init__.py,sha256=c7F9Ku9489Hv6lTpUY2nbyBlWFCXBWAkNBm4xTKcjL8,186
 treenode/managers/managers.py,sha256=G1dayrqaEX5nQiKsHS_2y6o3iXKIAn66RKArHttN-kU,7174
 treenode/managers/queries.py,sha256=Kepax8SDn7G5tOlPRWBCp5Oyp49O5iMITCMBoNCm_Ak,10655
-treenode/managers/tasks.py,sha256=nVlGDxNnFlZS1-oU8UH_yTXJERcGrAZ9kCmKwKO5WuY,7138
+treenode/managers/tasks.py,sha256=XGV7zei6LQJqQx6Ozg5lWC2A7770wn6rvWJ5jyJ_8pw,7796
 treenode/models/__init__.py,sha256=iR4ksCKoayvkIWWgGk6OUGHZC3D0mzAtgdBcS2vQPBw,188
 treenode/models/decorators.py,sha256=N2dcnWqSCiEXDcYCf0zVijrbGUC8kYlqOLi_GKFmECU,1457
 treenode/models/factory.py,sha256=sPUSrvo1za-r6ny3B8ptwevyjO8-iUpPNrT0eSD2kvI,1786
-treenode/models/models.py,sha256=93AxBPQseV3TaKhYoX173HMgV1wIFDjwGg9YVBvtPNQ,12335
-treenode/models/mixins/__init__.py,sha256=aALVKMGAWbgMAeKWS6s-NF3L5FmRX96mQxtpthOX-Ec,805
+treenode/models/models.py,sha256=ClY1LaxAikqgdLIOiuKfb8srTpj5gUcSGmB50oA6REA,12969
+treenode/models/mixins/__init__.py,sha256=CAef4rue_uYeBdcswPZAOIEwsKqGLhL_XFco7JwcvdI,909
 treenode/models/mixins/ancestors.py,sha256=9g-0nPHoiF_SX2kN4uDLdbWyw-TDCz1YqxLJngwTZOQ,1971
-treenode/models/mixins/children.py,sha256=H9iMqgucSmwLX-3O3QUj1a2PUQTmmWZ4GPPjRZ9a5E4,2399
-treenode/models/mixins/descendants.py,sha256=RKowr29JUUO3E_UDvbLbMLhbn5IUkY2eh3AXfU8XSE8,2165
+treenode/models/mixins/children.py,sha256=H0faiH24ihXCUEWGjTcjoIAKl26E8RQcQaTTkgKFz00,2397
+treenode/models/mixins/descendants.py,sha256=5xoeIdRhZ94K-EMrEjGgD7KW668gyXxp8JyB3t3mFAU,2163
 treenode/models/mixins/family.py,sha256=MB5kWRVvxU_xmSgCekveTP5Vhj4wJki8bU7hzn9RNLE,1673
 treenode/models/mixins/logical.py,sha256=gh5wv5XZDs5GWarU6g9zKXWNwji7SE3zSVNIpywDWjw,2190
 treenode/models/mixins/node.py,sha256=D3lwWsN2eRJeS99O7CaVAhabTYWA_NSY8z60zAhFAs0,8576
 treenode/models/mixins/properties.py,sha256=1O6p2tfvOesBooZeOeuXi8yfEO_o-5gn_agtKqMxU-s,3945
-treenode/models/mixins/roots.py,sha256=2lDjUH22NZFUMVbVZgsdtEqDoUyHhGTiaoeo9h3KRfk,4102
-treenode/models/mixins/siblings.py,sha256=4XvQS7WkgolzEZdnURhIClo-VUcpuqQ-Sc7PDYKGmFw,3069
+treenode/models/mixins/roots.py,sha256=wfuf6jdkcfkEUa42n0bHD_bQDE78AEFK2ZVCeBh7FZw,4100
+treenode/models/mixins/search.py,sha256=ZURelSNFT3wK3A0SnYvfHb2WnfrN_c7BIatp6ffGfsY,1652
+treenode/models/mixins/siblings.py,sha256=o0Iorfe35V1A9iAKwV8CqALPuTjjcQcnEAjAdPE6haI,3067
 treenode/models/mixins/tree.py,sha256=5Cew5c-NtTmz15S_ueDZ-fojHtQKZEKNxmp3W6qlC-8,14512
 treenode/models/mixins/update.py,sha256=oCZkMnfT23n2n3_mnokDrtTLS_jO_lJRwG3ENkH_DE4,4948
 treenode/static/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -79,7 +80,7 @@ treenode/templatetags/treenode_admin.py,sha256=5f5oqAS4zC_f0kkJRsm5MqXHjsKJXn8Gs
 treenode/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 treenode/utils/jwt_auth.py,sha256=LSTMuBFbH1DPJ0pVUnD_T1owb6GurpkJcCxpsXDL4HQ,845
 treenode/utils/db/__init__.py,sha256=RwicAcJSI1nhIPWLdT7j9TFsgOc9834VDn9lVn54GlY,247
-treenode/utils/db/compiler.py,sha256=PgD9ybS5H8OUHw1gkFBQHhnrf5HiCx8QXUMRhydwh7o,3824
+treenode/utils/db/compiler.py,sha256=2evMIg-bqDNbRqZub6ePNlQi9jnS_YbLe3CmOa_4XC0,2519
 treenode/utils/db/db_vendor.py,sha256=4SyEHl51jVCDB3is4omHCf2bTB_QV3RvemUQYxJP5m0,930
 treenode/utils/db/service.py,sha256=PF85Yhz2xUWFFCzpLYotmiNTZXXEH61rhswslSxEUds,2640
 treenode/utils/db/sqlcompat.py,sha256=K71ggkKIvpdTtHQ6Y4qcbo6cj2eYiEfy6DlVBr8Po1E,4460
@@ -91,7 +92,7 @@ treenode/views/children.py,sha256=seO0SNKriRY2FJOO1oZgX42iKolXMf3EF76GrfdJZLQ,11
 treenode/views/common.py,sha256=kUN3IgMZCdNdJ2haxB9MTGcn2rctyFUAHNagzcu9wXk,594
 treenode/views/crud.py,sha256=RI5rdyD4hZTszjZFThByxi_lkAeJlqbDCXFkD8iyzKE,7424
 treenode/views/search.py,sha256=c_GyooT3jyoNa96bBxfoWruRN1wIw-ZGYvwGKkGojTs,1501
-django_fast_treenode-3.2.0.dist-info/METADATA,sha256=q3lF9MZCoD6ZJO9DuApkCEwIEMqPCr75zjvUWOpZakw,10377
-django_fast_treenode-3.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-django_fast_treenode-3.2.0.dist-info/top_level.txt,sha256=fmgxHbXyx1O2MPi_9kjx8aL9L-8TmV0gre4Go8XgqFk,9
-django_fast_treenode-3.2.0.dist-info/RECORD,,
+django_fast_treenode-3.2.1.dist-info/METADATA,sha256=EOaUVLtr2Go1Shmy1qFlVMJ2MKrjr4nkM3VPecw5dgQ,10377
+django_fast_treenode-3.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+django_fast_treenode-3.2.1.dist-info/top_level.txt,sha256=fmgxHbXyx1O2MPi_9kjx8aL9L-8TmV0gre4Go8XgqFk,9
+django_fast_treenode-3.2.1.dist-info/RECORD,,

treenode/managers/tasks.py

@@ -137,7 +137,25 @@ class TreeTaskQueue:
             if not merged:
                 result_set.add(current)
 
-        return [{"mode": "update", "parent_id": pk} for pk in sorted(result_set)]
+        if not result_set:
+            return []
+
+        depth_lookup = {}
+        if result_set:
+            with connection.cursor() as cursor:
+                format_ids = ', '.join(['%s'] * len(result_set))
+                sql = f"""
+                    SELECT id, _depth
+                    FROM {self.model._meta.db_table}
+                    WHERE id IN ({format_ids})
+                """
+                cursor.execute(sql, list(result_set))
+                for node_id, depth in cursor.fetchall():
+                    depth_lookup[node_id] = depth
+
+
+        ordered_pks = sorted(result_set, key=lambda pk: (depth_lookup.get(pk, 0), pk))
+        return [{"mode": "update", "parent_id": pk} for pk in ordered_pks]
 
     def _get_root_ids(self):
         """Return root node IDs."""

treenode/models/mixins/__init__.py

@@ -7,6 +7,7 @@ from .family import TreeNodeFamilyMixin
 from .logical import TreeNodeLogicalMixin
 from .node import TreeNodeNodeMixin
 from .properties import TreeNodePropertiesMixin
+from .search import TreeNodeSearchMixin
 from .roots import TreeNodeRootsMixin
 from .siblings import TreeNodeSiblingsMixin
 from .tree import TreeNodeTreeMixin
@@ -16,7 +17,8 @@ from .update import RawSQLMixin
 __all__ = [
     "TreeNodeAncestorsMixin", "TreeNodeChildrenMixin", "TreeNodeFamilyMixin",
     "TreeNodeDescendantsMixin", "TreeNodeLogicalMixin", "TreeNodeNodeMixin",
-    "TreeNodePropertiesMixin", "TreeNodeRootsMixin", "TreeNodeSiblingsMixin",
+    "TreeNodeSearchMixin", "TreeNodePropertiesMixin", "TreeNodeRootsMixin",
+    "TreeNodeSiblingsMixin", "TreeNodeTreeMixin", "RawSQLMixin"
     "TreeNodeTreeMixin", "RawSQLMixin"
 ]
 

treenode/models/mixins/children.py

@@ -86,4 +86,4 @@ class TreeNodeChildrenMixin(models.Model):
         """Get the last child node or None if it has no children."""
         return self.get_children_queryset().last()
 
-# The End
+# The End

treenode/models/mixins/descendants.py

@@ -74,4 +74,4 @@ class TreeNodeDescendantsMixin(models.Model):
         )
 
 
-# The End
+# The End

treenode/models/mixins/roots.py

@@ -137,4 +137,4 @@ class TreeNodeRootsMixin(models.Model):
             cursor.execute(query, params)
 
 
-# The End
+# The End

treenode/models/mixins/search.py

@@ -0,0 +1,55 @@
+# -*- coding: utf-8 -*-
+"""
+TreeNode Search Mixin
+
+Version: 3.2.1
+Author: Timur Kady
+Email: timurkady@yandex.com
+"""
+
+from django.db import models
+
+
+class TreeNodeSearchMixin(models.Model):
+    """Mixin that provides helper methods for quick node lookup."""
+
+    class Meta:
+        """Mixin Meta Class."""
+        abstract = True
+
+    @classmethod
+    def find_by_path(cls, path, attr="id", delimiter="/"):
+        """Return a node referenced by breadcrumbs path.
+
+        The ``path`` argument may be a string or an iterable of breadcrumb
+        values previously produced by :py:meth:`get_breadcrumbs`.
+        If the path cannot be resolved, ``None`` is returned.
+        """
+        if path is None:
+            return None
+
+        if not isinstance(path, (list, tuple)):
+            path = [p for p in str(path).strip(delimiter).split(delimiter) if p]
+
+        parent = None
+        for token in path:
+            lookup = {attr: token}
+            if parent is None:
+                qs = cls.objects.filter(parent_id__isnull=True, **lookup)
+            else:
+                qs = cls.objects.filter(parent=parent, **lookup)
+            parent = qs.first()
+            if parent is None:
+                return None
+        return parent
+
+    @classmethod
+    def find_in_subtree(cls, parent, value, attr="id"):
+        """Search ``parent`` descendants for attribute ``attr`` equal to ``value``."""
+        if parent is None:
+            return None
+        prefix = parent.get_order() + "."
+        return cls.objects.filter(_path__startswith=prefix, **{attr: value}).first()
+
+
+# The End

treenode/models/mixins/siblings.py

@@ -99,4 +99,4 @@ class TreeNodeSiblingsMixin(models.Model):
         qs = self._meta.model.objects.filter(parent_id=self._parent_id)
         return qs.last()
 
-# The End
+# The End

treenode/models/models.py

@@ -45,8 +45,9 @@ class TreeNodeModel(
         mx.TreeNodeAncestorsMixin, mx.TreeNodeChildrenMixin,
         mx.TreeNodeFamilyMixin, mx.TreeNodeDescendantsMixin,
         mx.TreeNodeLogicalMixin, mx.TreeNodeNodeMixin,
-        mx.TreeNodePropertiesMixin, mx.TreeNodeRootsMixin,
-        mx.TreeNodeSiblingsMixin, mx.TreeNodeTreeMixin, mx.RawSQLMixin,
+        mx.TreeNodeSearchMixin, mx.TreeNodePropertiesMixin,
+        mx.TreeNodeRootsMixin, mx.TreeNodeSiblingsMixin,
+        mx.TreeNodeTreeMixin, mx.RawSQLMixin,
         models.Model, metaclass=TreeNodeModelBase):
     """
     Abstract tree node model.
@@ -186,6 +187,7 @@ class TreeNodeModel(
         is_new = False
         is_shift = False
         is_move = False
+        sorting_changed = False
 
         if self.pk:
             state = self.get_db_state()
@@ -194,6 +196,14 @@ class TreeNodeModel(
                 is_move = self.parent_id != state["parent_id"]
                 if is_move:
                     self._meta.model.tasks.add("update", state["parent_id"])
+
+                if self.sorting_field != "priority":
+                    old_value = self.__class__.objects.filter(
+                        pk=self.pk
+                    ).values_list(self.sorting_field, flat=True).first()
+                    sorting_changed = old_value != getattr(
+                        self, self.sorting_field
+                    )
             else:
                 logger.error(
                     "TreeNodeModel save error: object with pk %s not found in DB",
@@ -231,12 +241,14 @@ class TreeNodeModel(
             pass
         """
 
-        if is_new or is_move or is_shift:
+        if is_new or is_move or is_shift or sorting_changed:
             # Step 1: Shift siblings
             if (is_new or is_move) and (self.priority is not None):
                 self._shift_siblings_forward()
             # Step 2: Update paths for the new parent -> sqlq
-            self._meta.model.tasks.add("update", self.parent_id)
+            path_ids = self.query.get_relative_pks(objects="ancestors", include_self=True)
+            update_root_id = path_ids[0] if path_ids else self.parent_id
+            self._meta.model.tasks.add("update", update_root_id)
             # Step 3: Clear model cache
             self.clear_cache()
 
@@ -245,7 +257,7 @@ class TreeNodeModel(
               disable_signals(post_save, model)):
             super().save(*args, **kwargs)
 
-            if is_new or is_move or is_shift:
+            if is_new or is_move or is_shift or sorting_changed:
                 # Run sql
                 # self.sqlq.flush()
                 setattr(model, 'is_dry', True)

treenode/utils/db/compiler.py

@@ -26,88 +26,47 @@ class TreePathCompiler:
 
     @classmethod
     def update_path(cls, model, parent_id=None):
-        """
-        Rebuild subtree starting from parent_id.
-
-        If parent_id=None, then the whole tree is rebuilt.
-        Uses only fields: parent_id and id. All others (priority, _path,
-        _depth) are recalculated.
-        """
-        db_table = model._meta.db_table
-        # Will eliminate the risk if the user names the model order or user.
-        qname = connection.ops.quote_name(db_table)
-
-        sorting_field = model.sorting_field
-        sorting_fields = ["priority", "id"] if sorting_field == "priority" else [sorting_field]  # noqa: D5017
-        sort_expr = ", ".join([
-            f"c.{field}" if "." not in field else field
-            for field in sorting_fields
-        ])
-
-        cte_header = "(id, parent_id, new_priority, new_path, new_depth)"
-
-        row_number_expr = f"ROW_NUMBER() OVER (ORDER BY {sort_expr}) - 1"
-        hex_expr = SQLCompat.to_hex(row_number_expr)
-        lpad_expr = SQLCompat.lpad(hex_expr, SEGMENT_LENGTH, "'0'")
+        """Rebuild subtree using BFS so parents update before children."""
+        table = model._meta.db_table
+        sort_field = model.sorting_field
+
+        def fetch_children(pid):
+            if pid is None:
+                where = "parent_id IS NULL"
+                params = []
+            else:
+                where = "parent_id = %s"
+                params = [pid]
+            with connection.cursor() as cursor:
+                cursor.execute(
+                    f"SELECT id FROM {table} WHERE {where} ORDER BY {sort_field}, id",
+                    params,
+                )
+                return [row[0] for row in cursor.fetchall()]
+
+        queue = []
 
         if parent_id is None:
-            new_path_expr = lpad_expr
-            base_sql = f"""
-                SELECT
-                    c.id,
-                    c.parent_id,
-                    {row_number_expr} AS new_priority,
-                    {new_path_expr} AS new_path,
-                    0 AS new_depth
-                FROM {qname} AS c
-                WHERE c.parent_id IS NULL
-            """
-            params = []
+            for idx, node_id in enumerate(fetch_children(None)):
+                queue.append((node_id, "", 0, idx))
         else:
-            path_expr = SQLCompat.concat("p._path", "'.'", lpad_expr)
-            base_sql = f"""
-                SELECT
-                    c.id,
-                    c.parent_id,
-                    {row_number_expr} AS new_priority,
-                    {path_expr} AS new_path,
-                    p._depth + 1 AS new_depth
-                FROM {qname} c
-                JOIN {qname} p ON c.parent_id = p.id
-                WHERE p.id = %s
-            """
-            params = [parent_id]
-
-        recursive_row_number_expr = f"ROW_NUMBER() OVER (PARTITION BY c.parent_id ORDER BY {sort_expr}) - 1"
-        recursive_hex_expr = SQLCompat.to_hex(recursive_row_number_expr)
-        recursive_lpad_expr = SQLCompat.lpad(
-            recursive_hex_expr, SEGMENT_LENGTH, "'0'")
-        recursive_path_expr = SQLCompat.concat(
-            "t.new_path", "'.'", recursive_lpad_expr)
-
-        recursive_sql = f"""
-            SELECT
-                c.id,
-                c.parent_id,
-                {recursive_row_number_expr} AS new_priority,
-                {recursive_path_expr} AS new_path,
-                t.new_depth + 1 AS new_depth
-            FROM {qname} c
-            JOIN tree_cte t ON c.parent_id = t.id
-        """
-
-        final_sql = SQLCompat.update_from(
-            db_table=db_table,
-            cte_header=cte_header,
-            base_sql=base_sql,
-            recursive_sql=recursive_sql,
-            update_fields=["priority", "_path", "_depth"]
-        )
-
-        with connection.cursor() as cursor:
-            # Make params read-only
-            params = tuple(params)
-            cursor.execute(final_sql, params)
+            parent_data = model.objects.filter(pk=parent_id).values("_path", "_depth").first()
+            parent_path = parent_data["_path"] if parent_data else ""
+            depth = (parent_data["_depth"] + 1) if parent_data else 0
+            for idx, node_id in enumerate(fetch_children(parent_id)):
+                queue.append((node_id, parent_path, depth, idx))
+
+        while queue:
+            node_id, base_path, depth, index = queue.pop(0)
+            segment = f"{index:0{SEGMENT_LENGTH}X}"
+            path = segment if base_path == "" else f"{base_path}.{segment}"
+            with connection.cursor() as cursor:
+                cursor.execute(
+                    f"UPDATE {table} SET priority=%s, _path=%s, _depth=%s WHERE id=%s",
+                    [index, path, depth, node_id],
+                )
+            for child_idx, child_id in enumerate(fetch_children(node_id)):
+                queue.append((child_id, path, depth + 1, child_idx))
 
 
 # The End

treenode/version.py

@@ -4,9 +4,9 @@ TreeNode Version Module
 
 This module defines the current version of the TreeNode package.
 
-Version: 3.2.0
+Version: 3.2.1
 Author: Timur Kady
 Email: timurkady@yandex.com
 """
 
-__version__ = '3.2.0'
+__version__ = '3.2.1'