django-fast-treenode 3.0.3__py3-none-any.whl → 3.0.4__py3-none-any.whl

{django_fast_treenode-3.0.3.dist-info → django_fast_treenode-3.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-fast-treenode
-Version: 3.0.3
+Version: 3.0.4
 Summary: Treenode Framework for supporting tree (hierarchical) data structure in Django projects
 Home-page: https://django-fast-treenode.readthedocs.io/
 Author: Timur Kady
@@ -53,7 +53,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: Django>=4.0
+Requires-Dist: Django>=5.0
 Requires-Dist: msgpack>=1.0.0
 Requires-Dist: openpyxl>=3.0.0
 Requires-Dist: pyyaml>=5.1

{django_fast_treenode-3.0.3.dist-info → django_fast_treenode-3.0.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-django_fast_treenode-3.0.3.dist-info/licenses/LICENSE,sha256=SSYqS84FCnAW7tAxmjBKU8qAa8Jv4VGPuSSGeHwWtJE,1095
+django_fast_treenode-3.0.4.dist-info/licenses/LICENSE,sha256=SSYqS84FCnAW7tAxmjBKU8qAa8Jv4VGPuSSGeHwWtJE,1095
 treenode/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 treenode/apps.py,sha256=QlwjNDM9rkUoWB8Vm8-OkS6lNx0-aTByuGZlu9wrQMs,1832
 treenode/cache.py,sha256=2jUiiecfFxwB7QFukpU4u0FnDzGH6hNRfo6KAYvs6vM,8447
@@ -7,18 +7,18 @@ treenode/settings.py,sha256=oSkcKXNVd28HXrlWZIH2VYinCMq-UdCDlX4KD0Qc_Xk,631
 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=UQel-ilvX8HzIC5S8Odk9qyR41TRS2ikVETb9NGTXN0,220
+treenode/version.py,sha256=agtMVvI22kmKiOiAyXlZeP14ej675T1Yd8F0FzHfXXk,220
 treenode/widgets.py,sha256=61ed16bVqb1_R97jekDrbKS5pDVK4nzXSDwL3CDBYEk,4075
 treenode/admin/__init__.py,sha256=XNEYHdF5lKb0vpdlVxdR2fxj5oUgzyx1YyCwsv0gxHw,100
 treenode/admin/admin.py,sha256=9_GC6JjWRiG_G84royRGAr10BSNIAj4N_33JXdzP8IY,7733
 treenode/admin/changelist.py,sha256=KUYS9MaR8Ck_1xmMqupobxWKarrJEqmHuEG32CL01Bo,1662
 treenode/admin/exporter.py,sha256=QE74V6W3tvwA5kCvBt1MmVlLOaWh-o8EU63cgmiwD5Q,5724
 treenode/admin/importer.py,sha256=hK3D-1DZcoowGblRluGzng3n5Bf__hMsbNaIGXRpRdg,6263
-treenode/admin/mixin.py,sha256=yXcSpBEfoMYT7tuAbHhGbuqlVQkCR5RizW2bNWJ0QNM,10639
+treenode/admin/mixin.py,sha256=o83zTETOjvdHRjGR2pGthsY_RO7GVEimNUISgqqOBLs,10642
 treenode/managers/__init__.py,sha256=c7F9Ku9489Hv6lTpUY2nbyBlWFCXBWAkNBm4xTKcjL8,186
 treenode/managers/managers.py,sha256=8OaFxtajyR1d7-UHyiUbifMBEF9cjfHTIEYPkYUWmt0,7166
-treenode/managers/queries.py,sha256=Kepax8SDn7G5tOlPRWBCp5Oyp49O5iMITCMBoNCm_Ak,10655
-treenode/managers/tasks.py,sha256=gqZfqeOrdPtTJZ1q83aCFh6htfxP0XMTOkd1KWL9PVU,5227
+treenode/managers/queries.py,sha256=zZYeDVFXl-Hro9ubv0_zuN7XaVXQhyeeFx_GVZSMi30,10273
+treenode/managers/tasks.py,sha256=b8deUAbCpD1Yov-PpjKNAx49rL4fejkGf64ih5JziF0,7138
 treenode/models/__init__.py,sha256=iR4ksCKoayvkIWWgGk6OUGHZC3D0mzAtgdBcS2vQPBw,188
 treenode/models/decorators.py,sha256=N2dcnWqSCiEXDcYCf0zVijrbGUC8kYlqOLi_GKFmECU,1457
 treenode/models/factory.py,sha256=sPUSrvo1za-r6ny3B8ptwevyjO8-iUpPNrT0eSD2kvI,1786
@@ -75,8 +75,8 @@ treenode/utils/db/__init__.py,sha256=RwicAcJSI1nhIPWLdT7j9TFsgOc9834VDn9lVn54GlY
 treenode/utils/db/compiler.py,sha256=PgD9ybS5H8OUHw1gkFBQHhnrf5HiCx8QXUMRhydwh7o,3824
 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
-treenode/utils/db/sqlquery.py,sha256=KXcfKbbaBF-D134H_2DiPQtjedR79SJNXPJc0msZYEc,1938
+treenode/utils/db/sqlcompat.py,sha256=FTgEMu3kQ1c96nB1sUW-SFOmYEvdl8JlD9HvsRj_dO0,5704
+treenode/utils/db/sqlquery.py,sha256=jHI0gLkdJCD6ulOenO4b0aSjyAxtJ4ZGvsQa0i3Aj8E,2958
 treenode/views/__init__.py,sha256=ppxbBx51TUaKstJFpAd_DTmbKjbZGmVMLNYSpgUKnd0,111
 treenode/views/autoapi.py,sha256=o75e8IFsogbhZN_rbx3BKVnoruD96nWelnC5UzOqUDw,3628
 treenode/views/autocomplete.py,sha256=Z7cBnC4Ihdyxm8zlbnG6CkZdVkM3TOTWRpw5mdhaIVA,1469
@@ -84,7 +84,7 @@ treenode/views/children.py,sha256=bygXaEBExxG3zIPL34_PYHLFFIqlQU2naqPIlyQ6e-s,11
 treenode/views/common.py,sha256=mrmr40R91XVbMWcz5GZT-OjpnQ87F7XQZxu1W6rqpqI,617
 treenode/views/crud.py,sha256=RI5rdyD4hZTszjZFThByxi_lkAeJlqbDCXFkD8iyzKE,7424
 treenode/views/search.py,sha256=c_GyooT3jyoNa96bBxfoWruRN1wIw-ZGYvwGKkGojTs,1501
-django_fast_treenode-3.0.3.dist-info/METADATA,sha256=kbt-jrE-L0YYYUrHJKdvCOMe-GiSnKdT3LhebaWCcqM,10249
-django_fast_treenode-3.0.3.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-django_fast_treenode-3.0.3.dist-info/top_level.txt,sha256=fmgxHbXyx1O2MPi_9kjx8aL9L-8TmV0gre4Go8XgqFk,9
-django_fast_treenode-3.0.3.dist-info/RECORD,,
+django_fast_treenode-3.0.4.dist-info/METADATA,sha256=NbOy_OHnyPjubLhbssbpdM2jwGiModfoiE_CPNvQpM8,10249
+django_fast_treenode-3.0.4.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+django_fast_treenode-3.0.4.dist-info/top_level.txt,sha256=fmgxHbXyx1O2MPi_9kjx8aL9L-8TmV0gre4Go8XgqFk,9
+django_fast_treenode-3.0.4.dist-info/RECORD,,

{django_fast_treenode-3.0.3.dist-info → django_fast_treenode-3.0.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.1)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

treenode/admin/mixin.py

@@ -84,7 +84,7 @@ class AdminMixin(admin.ModelAdmin):
                     value = field(obj)
                     field_name = getattr(field, "__name__", "field")
                 else:
-                    attr, value = lookup_field(field, obj, self)
+                    r, attr, value = lookup_field(field, obj, self)
                     field_name = field
 
                 row_data.append(value)

treenode/managers/queries.py

@@ -5,13 +5,14 @@ Low-level SQL Query Manager.
 Encapsulates all logic to retrieve related primary keys based on relationships
 (e.g., ancestors, children, descendants, siblings, family, root) using raw SQL.
 
-Version: 3.0.0
+Version: 3.0.4
 Author: Timur Kady
 Email: timurkady@yandex.com
 """
 
 
 from django.db import connection
+from ..utils.db.sqlcompat import SQLCompat 
 
 
 class TreeQuery:
@@ -32,19 +33,6 @@ class TreeQuery:
             cursor.execute(sql, params)
             return cursor.fetchall()
 
-    def wrap_union_all(self, queries):
-        """
-        Combine multiple SQL queries using UNION ALL.
-
-        Each query is a tuple: (sql, params).
-        Returns a tuple: (combined_sql, combined_params).
-        """
-        union_query = " UNION ALL ".join(f"({q[0]})" for q in queries)
-        combined_params = []
-        for q in queries:
-            combined_params.extend(q[1])
-        return union_query, combined_params
-
     def order_by(self, sql, order_by_clause):
         """Wrap the SQL in an outer query to enforce ordering."""
         return f"SELECT * FROM ({sql}) AS combined ORDER BY {order_by_clause}"
@@ -76,7 +64,7 @@ class TreeQuery:
         if include_self:
             sql2 = f"SELECT id, priority FROM {self.db_table} WHERE id = %s"
             params2 = [self.node.pk]
-            combined_sql, combined_params = self.wrap_union_all(
+            combined_sql, combined_params = SQLCompat.wrap_union_all(
                 [(sql1, params1), (sql2, params2)])
             sql = self.order_by(combined_sql, "priority")
             return sql, combined_params
@@ -115,7 +103,7 @@ class TreeQuery:
                 FROM {self.db_table}
                 WHERE id = %s
             """
-            union_sql, union_params = self.wrap_union_all([
+            union_sql, union_params = SQLCompat.wrap_union_all([
                 (base_sql, params),
                 (sql_self, [self.node.pk])
             ])
@@ -148,7 +136,7 @@ class TreeQuery:
 
         if include_self:
             sql_self = f"SELECT id, _depth, priority FROM {self.db_table} WHERE id = %s"  # noqa: D501
-            union_sql, union_params = self.wrap_union_all(
+            union_sql, union_params = SQLCompat.wrap_union_all(
                 [(base_sql, params), (sql_self, [self.node.pk])])
         else:
             union_sql, union_params = base_sql, params
@@ -198,7 +186,7 @@ class TreeQuery:
         if include_self:
             sql_self = f"SELECT id, _depth, priority FROM {self.db_table} WHERE id = %s"  # noqa: D501
             queries.append((sql_self, [self.node.pk]))
-        combined_sql, combined_params = self.wrap_union_all(queries)
+        combined_sql, combined_params = SQLCompat.wrap_union_all(queries)
         combined_sql = self.order_by(combined_sql, "_depth, priority")
         return combined_sql, combined_params
 

treenode/managers/tasks.py

@@ -2,24 +2,16 @@
 """
 TreeNode TaskQuery manager
 
-Version: 3.0.0
+Version: 3.0.4
 Author: Timur Kady
 Email: timurkady@yandex.com
 """
 
-from django.db import connection
+import atexit
+from django.db import connection, transaction
 
 from ..utils.db import TreePathCompiler
 
-'''
-try:
-    profile
-except NameError:
-    def profile(func):
-        """Profile."""
-        return func
-'''
-
 
 class TreeTaskQueue:
     """TreeTaskQueue Class."""
@@ -28,31 +20,93 @@ class TreeTaskQueue:
         """Init the task query."""
         self.model = model
         self.queue = []
+        self._running = False
+
+        # Register the execution queue when the interpreter exits
+        atexit.register(self._atexit_run)
+
+    def _atexit_run(self):
+        """Run queue on interpreter exit if pending tasks exist."""
+        if self.queue and not self._running:
+            try:
+                self.run()
+            except Exception as e:
+                # Don't crash on completion, just log
+                print(f"[TreeTaskQueue] Error during atexit: {e}")
 
     def add(self, mode, parent_id):
-        """Add task to the query."""
+        """Add task to the queue.
+
+        Parameters:
+            mode (str): Task type (currently only "update").
+            parent_id (int|None): ID of parent node to update from (None = full tree).
+        """
         self.queue.append({"mode": mode, "parent_id": parent_id})
 
     def run(self):
-        """Run task queue."""
+        """Run task queue.
+
+        This method collects all queued tasks, optimizes them, and performs
+        a recursive rebuild of tree paths and depths using SQL. Locks the
+        required rows before running.
+
+        Uses Django's `transaction.atomic()` to ensure that any recursive CTE
+        execution or SAVEPOINT creation works properly under PostgreSQL.
+        """
         if len(self.queue) == 0:
             return
+
+        self._running = True
         try:
             optimized = self._optimize()
-            for task in optimized:
-                if task["mode"] == "update":
-                    parent_id = task["parent_id"]
-                    TreePathCompiler.update_path(
-                        model=self.model,
-                        parent_id=parent_id
-                    )
+            if not optimized:
+                return
+
+            parent_ids = [t["parent_id"] for t in optimized if t["parent_id"] is not None]
+
+            with transaction.atomic():
+                if any(t["parent_id"] is None for t in optimized):
+                    try:
+                        with connection.cursor() as cursor:
+                            cursor.execute(
+                                f"SELECT id FROM {self.model._meta.db_table} WHERE parent_id IS NULL FOR UPDATE NOWAIT"
+                            )
+                    except Exception as e:
+                        print(f"[TreeTaskQueue] Skipped (root locked): {e}")
+                        return
+                else:
+                    try:
+                        with connection.cursor() as cursor:
+                            for parent_id in parent_ids:
+                                cursor.execute(
+                                    f"SELECT id FROM {self.model._meta.db_table} WHERE id = %s FOR UPDATE NOWAIT",
+                                    [parent_id],
+                                )
+                    except Exception as e:
+                        print(f"[TreeTaskQueue] Skipped (parent locked): {e}")
+                        return
+
+                for task in optimized:
+                    if task["mode"] == "update":
+                        TreePathCompiler.update_path(
+                            model=self.model,
+                            parent_id=task["parent_id"]
+                        )
+
+        except Exception as e:
+            print(f"[TreeTaskQueue] Error in run: {e}")
+            connection.rollback()
         finally:
             self.queue.clear()
             self._running = False
 
-    # @profile
     def _optimize(self):
-        """Return optimized task queue (ID-only logic)."""
+        """Return optimized task queue (ID-only logic).
+
+        Attempts to merge redundant or overlapping subtree updates into
+        the minimal set of unique parent IDs that need to be rebuilt.
+        If it finds a common root, it returns a single task for full rebuild.
+        """
         result_set = set()
         id_set = set()
 
@@ -60,8 +114,6 @@ class TreeTaskQueue:
             if task["mode"] == "update":
                 parent_id = task["parent_id"]
                 if parent_id is None:
-                    # If we are already updating the entire tree, then
-                    # the remaining tasks are meaningless # noqa: D501
                     return [{"mode": "update", "parent_id": None}]
                 else:
                     id_set.add(parent_id)
@@ -74,8 +126,6 @@ class TreeTaskQueue:
             for other in id_list[:]:
                 ancestor = self._get_common_ancestor(current, other)
                 if ancestor is not None:
-                    # If the common ancestor is the root, then we update
-                    # the entire tree
                     if ancestor in self._get_root_ids():
                         return [{"mode": "update", "parent_id": None}]
                     if ancestor not in id_set:
@@ -87,36 +137,25 @@ class TreeTaskQueue:
             if not merged:
                 result_set.add(current)
 
-        return [{"mode": "update", "parent_id": pk} for pk in sorted(result_set)]  # noqa: D501
+        return [{"mode": "update", "parent_id": pk} for pk in sorted(result_set)]
 
     def _get_root_ids(self):
         """Return root node IDs."""
         with connection.cursor() as cursor:
             cursor.execute(
-                f"SELECT id FROM {self.model._meta.db_table} WHERE parent_id IS NULL")  # noqa: D501
+                f"SELECT id FROM {self.model._meta.db_table} WHERE parent_id IS NULL")
             return [row[0] for row in cursor.fetchall()]
 
     def _get_parent_id(self, node_id):
         """Return parent ID for a given node."""
         with connection.cursor() as cursor:
             cursor.execute(
-                f"SELECT parent_id FROM {self.model._meta.db_table} WHERE id = %s", [node_id])  # noqa: D501
+                f"SELECT parent_id FROM {self.model._meta.db_table} WHERE id = %s", [node_id])
             row = cursor.fetchone()
             return row[0] if row else None
 
-    '''
-    def _get_ancestor_path(self, node_id):
-        """Return list of ancestor IDs including the node itself."""
-        path = []
-        while node_id is not None:
-            path.append(node_id)
-            node_id = self._get_parent_id(node_id)
-        return path[::-1]  # root to leaf
-    '''
-
-    # @profile
     def _get_ancestor_path(self, node_id):
-        """Return list of ancestor IDs including the node itself, using recursive SQL."""  # noqa: D501
+        """Return list of ancestor IDs including the node itself, using recursive SQL."""
         table = self.model._meta.db_table
 
         sql = f"""
@@ -140,7 +179,6 @@ class TreeTaskQueue:
 
         return [row[0] for row in rows]
 
-    # @profile
     def _get_common_ancestor(self, id1, id2):
         """Return common ancestor ID between two nodes."""
         path1 = self._get_ancestor_path(id1)

treenode/utils/db/sqlcompat.py

@@ -125,12 +125,44 @@ class SQLCompat:
                     {set_clause};
             """
 
+        elif connection.vendor == "sqlite":
+            # SQLite workaround via temporary table
+            temp_table = "temp_tree_update"
+            cols = ["id"] + [cte_alias.get(f, f) for f in update_fields]
+            col_defs = ", ".join(f"{c} TEXT" for c in cols)
+            insert_cols = ", ".join(cols)
+            select_cols = ", ".join(cols)
+
+            set_clause = ", ".join(
+                f"{qf(f)} = (SELECT t.{cte_alias.get(f, f)} FROM {temp_table} t WHERE t.id = {qt}.id)"  # noqa
+                for f in update_fields
+            )
+
+            return f"""
+                DROP TABLE IF EXISTS {temp_table};
+                CREATE TEMP TABLE {temp_table} ({col_defs});
+
+                WITH RECURSIVE tree_cte {cte_header} AS (
+                    {base_sql}
+                    UNION ALL
+                    {recursive_sql}
+                )
+                INSERT INTO {temp_table} ({insert_cols})
+                SELECT {select_cols} FROM tree_cte;
+
+                UPDATE {qt}
+                SET {set_clause}
+                WHERE id IN (SELECT id FROM {temp_table});
+            """
+
         else:
+            # Fallback: subqueries
+            # (still buggy in SQLite, hence above workaround)
             set_clause = ", ".join(
                 f"{qf(f)} = (SELECT t.{f} FROM tree_cte t WHERE t.id = {qt}.id)"
                 for f in update_fields
             )
-            where_clause = f"id IN (SELECT id FROM tree_cte)"
+            where_clause = "id IN (SELECT id FROM tree_cte)"
             return f"""
                 WITH RECURSIVE tree_cte {cte_header} AS (
                     {base_sql}

treenode/utils/db/sqlquery.py

@@ -66,5 +66,29 @@ class SQLQueue:
                     raise
         self._items.clear()
 
+    @staticmethod
+    def wrap_union_all(queries):
+        """
+        Combine multiple SQL queries using UNION ALL with vendor-specific handling.
+        Each query is a tuple: (sql, params).
+        Returns a tuple: (combined_sql, combined_params).
+        """
+        if is_sqlite():
+            # SQLite требует одинаковое число и порядок столбцов. Добавим к каждому SELECT псевдонимы.
+            def alias_select(sql, alias_prefix, idx):
+                return f"SELECT * FROM ({sql}) AS {alias_prefix}_{idx}"
+
+            wrapped_queries = [
+                alias_select(q[0], "q", i) for i, q in enumerate(queries)
+            ]
+            combined_sql = " UNION ALL ".join(wrapped_queries)
+        else:
+            combined_sql = " UNION ALL ".join(f"({q[0]})" for q in queries)
+
+        combined_params = []
+        for q in queries:
+            combined_params.extend(q[1])
+
+        return combined_sql, combined_params
 
 # The End

treenode/version.py

@@ -9,4 +9,4 @@ Author: Timur Kady
 Email: timurkady@yandex.com
 """
 
-__version__ = '3.0.3'
+__version__ = '3.0.4'