django-fast-treenode 3.0.3__tar.gz → 3.0.4__tar.gz

{django_fast_treenode-3.0.3/django_fast_treenode.egg-info → django_fast_treenode-3.0.4}/PKG-INFO

@@ -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 → django_fast_treenode-3.0.4/django_fast_treenode.egg-info}/PKG-INFO

@@ -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 → django_fast_treenode-3.0.4}/django_fast_treenode.egg-info/requires.txt

@@ -1,4 +1,4 @@
-Django>=4.0
+Django>=5.0
 msgpack>=1.0.0
 openpyxl>=3.0.0
 pyyaml>=5.1

{django_fast_treenode-3.0.3 → django_fast_treenode-3.0.4}/docs/roadmap.md

@@ -1,6 +1,6 @@
 ## Roadmap
 
-The **`django-fast-treenode`** package will continue to evolve from its original concept—combining the benefits of the hybrid models into a high-performance solution for managing and visualizing hierarchical data in Django projects. 
+The **`django-fast-treenode`** package will continue to evolve from its original concept—combining the benefits of hybrid models into a high-performance solution for managing and visualizing hierarchical data in Django projects.
 
 The focus is on **speed, usability, and flexibility**.
 
@@ -8,32 +8,36 @@ The focus is on **speed, usability, and flexibility**.
 
 The 3.x release series will focus on strengthening TreeNode Framework in terms of security, usability, and performance scalability, while maintaining backward compatibility and architectural cleanliness.
 
+* **Version 3.1 — Background Task Worker (Production Mode)**
 
-* **Version 3.1 — JWT Authentication for API**
+    - Introduce a centralized queue manager with a multiprocessing or Redis-based backend.
+    - Add a built-in worker process for safe and efficient task execution in production environments.
+    - Provide a fallback auto-run mode for DEBUG environments (using `atexit` or thread-based handler).
+    - Ensure task queue consistency across multiple WSGI workers or scripts.
+
+* **Version 3.2 — JWT Authentication for API**
 
     - Introduce optional JWT-based token authentication for the auto-generated API.
     - Allow easy activation through a single setting (`TREENODE_API_USE_JWT = True`).
     - Preserve backward compatibility: API remains open unless explicitly protected.
     - Foundation for future security features (e.g., user-specific trees, audit trails).
 
-* **Version 3.2 — Admin Usability Improvements**
+* **Version 3.3 — Admin Usability Improvements**
 
     Focus: enhance operational safety and optimize workflows for large-scale trees.
 
     - **Safe Import Preview**: Implement a staging layer for imports, allowing users to review and confirm imported data before committing changes.
-
     - **Incremental Export**: Support selective export of nodes modified after a specified date or revision marker.
 
-  
-* **Version 3.3 — Soft Deletion Support**
+* **Version 3.4 — Soft Deletion Support**
 
     Focus: improve real-world resilience without sacrificing performance.
 
     - Add optional support for "soft delete" behavior (`is_deleted` field).
     - Modify core queries and cache invalidation logic to respect soft-deleted nodes.
     - Add a new task type to the internal task queue system for bulk logical deletions.
-  
-* **Version 3.4 — Cache System Enhancements**
+
+* **Version 3.5 — Cache System Enhancements**
 
     Focus: lay the foundation for scaling Treenode Framework to extreme node counts (>100,000 nodes).
 
@@ -45,13 +49,12 @@ Each step in the 3.x roadmap is intended to strengthen the framework's key princ
 
 #### Long-Term Vision
 
+* **Version 4.0 – Improved Architecture**
 
-* **Version 4.0 – Improved architecture**
-
-    The main debut idea of ​​version 4.0 is to further develop the hybrid approach. This version will implement a new new architectural solution that is designed to increase the speed of selecting descendants, and therefore moving subtrees, and remove the existing restrictions on the maximum nesting depth of the tree (currently the recommended value when using up to 1000 levels).
+    The main debut idea of version 4.0 is to further develop the hybrid approach. This version will implement a new architectural solution that is designed to increase the speed of selecting descendants, and therefore moving subtrees, and remove the existing restrictions on the maximum nesting depth of the tree (currently the recommended value when using up to 1000 levels).
 
-    - Speed ​​up the operation of extracting descendants.
-    - Speeding up operations for moving large subtrees.
+    - Speed up the operation of extracting descendants.
+    - Speed up operations for moving large subtrees.
     - Performance optimization when working with trees that have extreme depth (more than 2000 levels).
 
 * **Version 5.0 – Beyond Django ORM**
@@ -67,4 +70,4 @@ So, each milestone is designed to improve performance, scalability, and flexibil
 
 Stay tuned for updates!
 
-Your wishes, objections, and comments are welcome.
+Your wishes, objections, and comments are welcome.

{django_fast_treenode-3.0.3 → django_fast_treenode-3.0.4}/pyproject.toml

@@ -4,14 +4,14 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "django-fast-treenode"
-version = "3.0.3"
+version = "3.0.4"
 description = "Treenode Framework for supporting tree (hierarchical) data structure in Django projects"
 readme = "README.md"
 authors = [{ name = "Timur Kady", email = "timurkady@yandex.com" }]
 license = { file = "LICENSE" }
 requires-python = ">=3.9"
 dependencies = [
-    'Django>=4.0',
+    'Django>=5.0',
     'msgpack>=1.0.0',
     'openpyxl>=3.0.0',
     'pyyaml>=5.1',

{django_fast_treenode-3.0.3 → django_fast_treenode-3.0.4}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='django-fast-treenode',
-    version='3.0.3',
+    version='3.0.4',
     description='Treenode Framework for supporting tree (hierarchical) data structure in Django projects',
     long_description=open('README.md', encoding='utf-8').read(),
     long_description_content_type='text/markdown',
@@ -14,7 +14,7 @@ setup(
     license='MIT',
     license_files=['LICENSE'],
     install_requires=[
-        'Django>=4.0',
+        'Django>=5.0',
         'msgpack>=1.0.0',
         'openpyxl>=3.0.0',
         'pyyaml>=5.1',

{django_fast_treenode-3.0.3 → django_fast_treenode-3.0.4}/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)

{django_fast_treenode-3.0.3 → django_fast_treenode-3.0.4}/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
 

{django_fast_treenode-3.0.3 → django_fast_treenode-3.0.4}/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)

{django_fast_treenode-3.0.3 → django_fast_treenode-3.0.4}/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}

{django_fast_treenode-3.0.3 → django_fast_treenode-3.0.4}/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

{django_fast_treenode-3.0.3 → django_fast_treenode-3.0.4}/treenode/version.py

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