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

{django_fast_treenode-3.0.2.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.2
+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
@@ -62,16 +62,16 @@ Dynamic: home-page
 Dynamic: license-file
 Dynamic: requires-python
 
-# TreeNode Framework
+# Treenode Framework
 **A hybrid open-source framework for working with trees in Django**
 
 [![Tests](https://github.com/TimurKady/django-fast-treenode/actions/workflows/test.yaml/badge.svg?branch=main)](https://github.com/TimurKady/django-fast-treenode/actions/workflows/test.yaml)
 [![Docs](https://readthedocs.org/projects/django-fast-treenode/badge/?version=latest)](https://django-fast-treenode.readthedocs.io/)
-[![PyPI](https://img.shields.io/pypi/v/django-fast-treenode.svg)](https://pypi.org/project/django-fast-treenode/)
+[![PyPI](https://img.shields.io/pypi/v/django-fast-treenode.svg)](https://pypi.org/project/django-fast-Treenode/)
 [![Published on Django Packages](https://img.shields.io/badge/Published%20on-Django%20Packages-0c3c26)](https://djangopackages.org/packages/p/django-fast-treenode/)
 [![Sponsor](https://img.shields.io/github/sponsors/TimurKady)](https://github.com/sponsors/TimurKady)
 
-## About The TreeNode Framework
+## About The Treenode Framework
 ### Overview
 
 **Treenode Framework** is an advanced tree management system for Django applications.It is designed to handle large-scale, deeply nested, and highly dynamic tree structures while maintaining excellent performance, data integrity, and ease of use.
@@ -87,7 +87,7 @@ Its core philosophy: **maximum scalability, minimum complexity**.
 
 ### Key Features
 #### Common operations
-The `django-fast-treenode` package supports all the basic operations needed to work with tree structures:
+The `django-fast-Treenode` package supports all the basic operations needed to work with tree structures:
 
 - Extracting **ancestors** (queryset, list, pks, count);
 - Extracting **children** (queryset, list, pks, count);
@@ -118,10 +118,10 @@ Typical applications include:
 
 In all these domains, scalable and fast tree management is not a luxury — it's a necessity.
 
-### Why TreeNode Framework?
+### Why Treenode Framework?
 At the moment, django-fast-treeenode is, if not the best, then one of the best packages for working with tree data under Djangjo.
 
-- **High performance**: [tests show](docs/about.md#benchmark-tests) that on trees of 5k-10k nodes with a nesting depth of 500-600 levels, **Treenode Framework** (`django-fast-treenode`) shows **performance 4-7 times better** than the main popular packages.
+- **High performance**: [tests show](docs/about.md#benchmark-tests) that on trees of 5k-10k nodes with a nesting depth of 500-600 levels, **Treenode Framework** (`django-fast-Treenode`) shows **performance 4-7 times better** than the main popular packages.
 - **Flexible API**: today contains the widest set of methods for working with a tree in comparison with other packages.
 - **Convenient administration**: the admin panel interface was developed taking into account the experience of using other packages. It provides convenience and intuitiveness with ease of programming.
 - **Scalability**: **Treenode Framework** suitable for solving simple problems such as menus, directories, parsing arithmetic expressions, as well as complex problems such as program optimization, image layout, multi-step decision making problems, or machine learning..
@@ -134,7 +134,7 @@ To get started quickly, you need to follow these steps:
 
 - Simply install the package via `pip`:
   ```sh
-  pip install django-fast-treenode
+  pip install django-fast-Treenode
   ```
 - Once installed, add `'treenode'` to your `INSTALLED_APPS` in **settings.py**:
   ```python {title="settings.py"}
@@ -147,9 +147,9 @@ To get started quickly, you need to follow these steps:
 
 - Open **models.py** and create your own tree class:
   ```
-  from treenode.models import TreeNodeModel
+  from Treenode.models import TreenodeModel
 
-  class MyTree(TreeNodeModel):
+  class MyTree(TreenodeModel):
     name = models.CharField(max_length=255)
     display_field = "name"
   ```
@@ -157,11 +157,11 @@ To get started quickly, you need to follow these steps:
 - Open **admin.py** and create a model for the admin panel
   ```
   from django.contrib import admin
-  from treenode.admin import TreeNodeModelAdmin
-  from .models import TestNode
+  from Treenode.admin import TreenodeModelAdmin
+  from .models import MyTree
 
-  @admin.register(TestNode)
-  class EntityAdmin(TreeNodeModelAdmin):
+  @admin.register(MyTree)
+  class MyTreeAdmin(TreenodeModelAdmin):
     list_display = ("name",)
     search_fields = ("name",)
   ```
@@ -176,25 +176,24 @@ To get started quickly, you need to follow these steps:
   ```sh
   python manage.py runserver
   ```
-
 Everything is ready, enjoy 🎉!
 
 ## Documentation
-Full documentation is available at **[ReadTheDocs](https://django-fast-treenode.readthedocs.io/)**.
+Full documentation is available at **[ReadTheDocs](https://django-fast-Treenode.readthedocs.io/)**.
 
 Quick access links:
-* [Installation, configuration and fine tuning](https://django-fast-treenode.readthedocs.io/installation/)
-* [Model Inheritance and Extensions](https://django-fast-treenode.readthedocs.io/models/)
-* [Working with Admin Classes](https://django-fast-treenode.readthedocs.io/admin/)
-* [API Reference](https://django-fast-treenode.readthedocs.io/api/)
-* [Import & Export](https://django-fast-treenode.readthedocs.io/import_export/)
-* [Caching and working with cache](https://django-fast-treenode.readthedocs.io/cache/)
-* [Migration and upgrade guide](https://django-fast-treenode.readthedocs.io/migration/)
+* [Installation, configuration and fine tuning](https://django-fast-Treenode.readthedocs.io/installation/)
+* [Model Inheritance and Extensions](https://django-fast-Treenode.readthedocs.io/models/)
+* [Working with Admin Classes](https://django-fast-Treenode.readthedocs.io/admin/)
+* [API Reference](https://django-fast-Treenode.readthedocs.io/api/)
+* [Import & Export](https://django-fast-Treenode.readthedocs.io/import_export/)
+* [Caching and working with cache](https://django-fast-Treenode.readthedocs.io/cache/)
+* [Migration and upgrade guide](https://django-fast-Treenode.readthedocs.io/migration/)
 
 Your wishes, objections, comments are welcome.
 
 ## License
-Released under [MIT License](https://github.com/TimurKady/django-fast-treenode/blob/main/LICENSE).
+Released under [MIT License](https://github.com/TimurKady/django-fast-Treenode/blob/main/LICENSE).
 
 ## Credits
 Thanks to everyone who contributed to the development and testing of this package, as well as the Django community for their inspiration and support. 

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

@@ -1,4 +1,4 @@
-django_fast_treenode-3.0.2.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=TN9nZNpy8llm9fqIJAWYPQd8TagW5fxnW0I69gWD-oY,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=xhf6tT5Ydn6i_upUDA1A6TN_muNndCko8gzM_fNIex4,7707
+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
@@ -44,19 +44,19 @@ treenode/static/js/.gitkeep,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
 treenode/static/js/lz-string.min.js,sha256=TAnTJQd2AlLqT9M2TU7GFjnoj9SIfwLeZnpEtLkP624,4718
 treenode/static/js/tree_widget.js,sha256=2LU8IIJD5TXbWVGjCEgrj5aYnUYtwBZECzj25XLtxNc,9633
 treenode/static/js/treenode_admin.js,sha256=fkxAj50QxwpPVdQxDNxQZ5vR0goUt53h8FzOv_fjxBQ,15945
-treenode/static/vendors/jquery-ui/AUTHORS.txt,sha256=geZ7JfVsTJq8Wgjrcm1p56Zqjxx7PL9FkxhKiN8dQg8,14848
-treenode/static/vendors/jquery-ui/LICENSE.txt,sha256=9kkCXPZcjc2FiLCTeIO6elK9ttNRKUZKNqFgLrACUPE,1818
-treenode/static/vendors/jquery-ui/index.html,sha256=RSv8cA662qJdc02OX-UmpaBJoZrngoQqnNWVZNn9GQQ,24229
-treenode/static/vendors/jquery-ui/jquery-ui.css,sha256=O8mmheetXPeKUa-iDk8fdxDhs096eWIi10qLJb6OXyw,17171
-treenode/static/vendors/jquery-ui/jquery-ui.js,sha256=XtnlPiKuVzMh-cef76mBCNCTPqk2cIlKBgmTHfRBDog,146430
-treenode/static/vendors/jquery-ui/jquery-ui.min.css,sha256=Yv2MureLOGZicbgEv28X9ft9o0SRBZ84PWIgg6h_V2E,15003
-treenode/static/vendors/jquery-ui/jquery-ui.min.js,sha256=FT6F7DDm5J1Qz6B5fv3e8jnmx9QyyfR2qUeTptb73bA,70364
-treenode/static/vendors/jquery-ui/jquery-ui.structure.css,sha256=392jP1trXFqS1OVv2X50px0F8w1DeTyIvvHL9wxNXi0,328
-treenode/static/vendors/jquery-ui/jquery-ui.structure.min.css,sha256=cXLe7UDVCN5SvPpbb3HJdndQIk1hlWMrzyRRYO9rcLs,208
-treenode/static/vendors/jquery-ui/jquery-ui.theme.css,sha256=grsB4hVvwiBxnNsG1c_ocH1YK76CExOav_dn_BsxepU,17140
-treenode/static/vendors/jquery-ui/jquery-ui.theme.min.css,sha256=oW6e3DmGiKSNLzo3HCUnjes9ykGZ6gXEtl3LjiQIkMs,13708
-treenode/static/vendors/jquery-ui/package.json,sha256=AvCATruWzbwY7NsfzcUR2WqPjslGO8M7hHzTj1AYDQY,2122
-treenode/static/vendors/jquery-ui/external/jquery/jquery.js,sha256=eKhayi8LEQwp4NKxN-CfCh-3qOVUtJn3QNZ0TciWLP4,285314
+treenode/static/vendors/jquery-ui/AUTHORS.txt,sha256=7eSHeezBdJ7Qlq0sbIvY4VRvqpMwLCAsm5ur1GqFBV8,15232
+treenode/static/vendors/jquery-ui/LICENSE.txt,sha256=apBrQ--OzcBj7ylvGUYGVfV3jIaoB2ZPm63a1EU0Hko,1861
+treenode/static/vendors/jquery-ui/index.html,sha256=fFm161yOy1n-_mJRFXB5oOYki_8Dlv-4ym3UZlrBiFw,24526
+treenode/static/vendors/jquery-ui/jquery-ui.css,sha256=Q5bjan1qvGRnmfsMY79xzgnzXgNfHpKITyFwDwYDXTE,17609
+treenode/static/vendors/jquery-ui/jquery-ui.js,sha256=wo5jyZcNCjgTOWkHAG5I-AHnELJBiMT7PB86Hkn981w,151652
+treenode/static/vendors/jquery-ui/jquery-ui.min.css,sha256=FS9BPkDJmv5x5xNd4OpSxisTNOEUUC3cry5lZo9TXNU,15009
+treenode/static/vendors/jquery-ui/jquery-ui.min.js,sha256=ymdFCtss_PVmZcIYetqzjnF_jiQur3VPdv4bjqIPA74,70369
+treenode/static/vendors/jquery-ui/jquery-ui.structure.css,sha256=Sc38kpjVG4BhkslXC-wnctVgd7RO4NAVnNinveoLumU,344
+treenode/static/vendors/jquery-ui/jquery-ui.structure.min.css,sha256=3Hh94kZQ7IgAV86zPR-eYJheU0GvPFXXa0ZHldtjim4,212
+treenode/static/vendors/jquery-ui/jquery-ui.theme.css,sha256=0cqVKFAVS9NOQyqhyhpanAO_AQnoPsX715VK0iIMGDE,17579
+treenode/static/vendors/jquery-ui/jquery-ui.theme.min.css,sha256=TdVk-kqTdbRzjVI7AfPMWaIJG2pOIlnZk4hUAW3bl3E,13712
+treenode/static/vendors/jquery-ui/package.json,sha256=bDQqA98dfsEi83upFeZ8RipVtAraPRoxZMxcv244oQo,2204
+treenode/static/vendors/jquery-ui/external/jquery/jquery.js,sha256=6440qEDaqjKqrIVfk4x21neDBVsbef6XUR5dUCKBv_E,296030
 treenode/static/vendors/jquery-ui/images/ui-icons_444444_256x240.png,sha256=YW09ms2dyfoVEOT_NEpaWXMMRLJxVIqu8hku63SoCEA,7107
 treenode/static/vendors/jquery-ui/images/ui-icons_555555_256x240.png,sha256=HP6KoU5aOllbVtaudhmNOLhBIzi_0oCuxBjwyhDATOo,7105
 treenode/static/vendors/jquery-ui/images/ui-icons_777620_256x240.png,sha256=NxKGIMNmb6YYZor0RuijQ7PTK5BoA9b5qXLjYTMFvXo,4615
@@ -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.2.dist-info/METADATA,sha256=Q5sQAXL8xAh-5T9r36G5IsxzvFiQJhK0UxG8xm-xC4o,10255
-django_fast_treenode-3.0.2.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
-django_fast_treenode-3.0.2.dist-info/top_level.txt,sha256=fmgxHbXyx1O2MPi_9kjx8aL9L-8TmV0gre4Go8XgqFk,9
-django_fast_treenode-3.0.2.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.2.dist-info → django_fast_treenode-3.0.4.dist-info}/WHEEL

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

treenode/admin/admin.py

@@ -47,6 +47,7 @@ class TreeNodeModelAdmin(AdminMixin, admin.ModelAdmin):
     }
 
     change_list_template = "admin/treenode_changelist.html"
+    import_export = True
 
     class Media:
         """Meta Class."""

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)