django-fast-treenode 2.0.10__py3-none-any.whl → 2.0.11__py3-none-any.whl

{django_fast_treenode-2.0.10.dist-info → django_fast_treenode-2.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: django-fast-treenode
-Version: 2.0.10
+Version: 2.0.11
 Summary: Application for supporting tree (hierarchical) data structure in Django projects
 Home-page: https://github.com/TimurKady/django-fast-treenode
 Author: Timur Kady
@@ -95,7 +95,7 @@ My idea was to solve these problems by combining the adjacency list with the Clo
 * useful functionality added for some methods (e.g.  the `include_self=False` and `depth` parameters has been added to functions that return lists/querysets);
 * additionally, the package includes a tree view widget for the `tn_parent` field in the change form.
 
-Of course, at large levels of nesting, the use of the Closure Table leads to an increase in resource costs. But at the same time, the combined scheme still generally outperforms the original application in terms of performance.
+Of course, at large levels of nesting, the use of the Closure Table leads to an increase in resource costs. However, the combined approach still outperforms both the original application and other available Django solutions in terms of performance, especially in large trees with over 100k nodes.
 
 ## Theory
 You can get a basic understanding of what is a Closure Table from:

{django_fast_treenode-2.0.10.dist-info → django_fast_treenode-2.0.11.dist-info}/RECORD

@@ -1,19 +1,19 @@
 treenode/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-treenode/admin.py,sha256=VkGuqc8KI1_SPgvM6yynyfYLEmZRfgMm2M5d9OoDxZE,14720
+treenode/admin.py,sha256=fQCB9AOzplpWyfr1TYxUHbi7pCZmK2-tNeZMG90Gp7s,16391
 treenode/apps.py,sha256=M0O9IKEnJZFfhfz12v4wksYJ-0ECyj1Cy3qXrfywos8,472
 treenode/cache.py,sha256=Z_FpaS0vTKXqAI4n1QkZ7A_ILsLU3Q8rLgerA6pYyAA,7210
-treenode/forms.py,sha256=KJOVqIhMt8Z3J38LTl1exO2JyS46mZKzkQJZI-Uem9Q,3573
-treenode/managers.py,sha256=7z8GU64A2_jEonJyQDTyIpdOocaBbM352DkwZTHjdQk,10828
+treenode/forms.py,sha256=nEeOtia1xhlthqAiowSp7DxuBSubyU3uJvKdbrkiRD0,4059
+treenode/managers.py,sha256=BBhttJo6eODlPBEyf9t1DgSx9KVn4GiyLm6XMuYNEXE,18303
 treenode/urls.py,sha256=7N0d4XiI6880sc8P89eWGr-ZjmOqPorA-fWfcnviqAM,876
 treenode/version.py,sha256=-zaHoXRvTvJ0QzwA9ocYp7O38iBtIarACZbCNzwyc4s,222
-treenode/views.py,sha256=vBDIxmYXBwmJxRnInvUVGy75FQmt-XN_HnEaKIu-fVs,3365
-treenode/widgets.py,sha256=4Q6WlPPT5fggEuTXiZ_Z40pjb46CylSp28pa0xBT_Ps,2079
-treenode/docs/Documentation,sha256=6USAESU8MuY1vlj95yY8S6T0o_0RsktGv6S_0SdSkwk,21030
+treenode/views.py,sha256=dqHrr89LunmLu3zJGY0fAXSjqbOzeUQdJ4OAoZt4Aio,3370
+treenode/widgets.py,sha256=P8Xd3uzjilRU0ammsErHJSfZG-XXNMg_cJAfVCo5eOg,2700
+treenode/docs/Documentation,sha256=5JwGCfQV4UmCKJzI3xF9yHER7wnqXMYNGg8jdRncsac,20245
 treenode/models/__init__.py,sha256=gjDwVai0jf-l0hMaeeEBTYLR-DXkxUZMLUMGGs_tnuo,83
 treenode/models/classproperty.py,sha256=IrwBWpmyjsAXpkpfDSOIMsnX6EMcbXql3mZjurHgRcw,556
-treenode/models/closure.py,sha256=N026nzqY62FfP7DsCH-I4j_HLGbbsrJQrQ_-rAUUboA,5361
+treenode/models/closure.py,sha256=5vhi5HgeY9LhocyUsxMvchV90lgj6n3h4vSKQc28sFI,4510
 treenode/models/factory.py,sha256=Wt1szWhbeICPwm0-RUy9p4VovcxltHECVxTSRyCQHc8,2100
-treenode/models/proxy.py,sha256=6BFElk_NL1ARTEAikOOfMneUK5wEjofNnfXQWFSZUsA,21766
+treenode/models/proxy.py,sha256=o0wU_7APj87zC5qWxRMCi9u_tbuT7zgHzax69qLDEd8,22479
 treenode/static/.gitkeep,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 treenode/static/treenode/.gitkeep,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
 treenode/static/treenode/css/.gitkeep,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
@@ -27,15 +27,16 @@ treenode/templates/admin/.gitkeep,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPj
 treenode/templates/admin/export_success.html,sha256=xN2D-BCH249CJB10fo_vHYUyFenQ9mFKqq7UTWcrXS4,747
 treenode/templates/admin/tree_node_changelist.html,sha256=NudAsaO6di_cDWQDewBe-1Bay61FdlGiEFzdvfP_Wk8,314
 treenode/templates/admin/tree_node_export.html,sha256=vJxEoGI-US6VdFddxAFgL5r3MgGt6mgA43vltCsbA2k,1043
-treenode/templates/admin/tree_node_import.html,sha256=ZFoveJ08X99EGiwFCfQowXI9oS9VgcFtRLYVDIWq-Fg,969
+treenode/templates/admin/tree_node_import.html,sha256=unksxTAO2bJbxRkZfrCltHn61MgfqGt2sxIsUOW5dVk,1513
+treenode/templates/admin/tree_node_import_report.html,sha256=azHJ8JFrSRu60lF1Uh22zs9JXQxZdvOjYdwCtlbaE3I,1133
 treenode/templates/widgets/tree_widget.css,sha256=2bEaxu1x7QJZ7erbs2SLMaxeaiMkjQXadfcDEW8wfok,551
 treenode/templates/widgets/tree_widget.html,sha256=GKcCU-B2FkkJ2BSOuXOw9e_PdYTtADcvyITEXqOlZ9Y,723
 treenode/utils/__init__.py,sha256=_eKk3iiiyyk4GB5dupwJxl3RPWDEHZ1DW5vHteDrbVI,343
 treenode/utils/base36.py,sha256=ydgu9hqDaK-WyS8zG-mtSWo7hJqbB4iHqkGz4-IVrb4,834
-treenode/utils/exporter.py,sha256=hCTPnSdFdoE_s7s_iW1Xy6598fWQY5htJzPA0DpnG5s,6199
-treenode/utils/importer.py,sha256=RYtl0CHfH1tZjCbhrFf0-Qp-wm4QJp-DD5Y5nyLK7yQ,12643
-django_fast_treenode-2.0.10.dist-info/LICENSE,sha256=GiiEe4Y9oOCbn9eGuNew1mMYHU_bJWaCK9zOusnKvvU,1091
-django_fast_treenode-2.0.10.dist-info/METADATA,sha256=kQgDgrx9hH6bdz0wwbUZ4VxUQIxZLxFd3CPbvRmmhi0,23274
-django_fast_treenode-2.0.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-django_fast_treenode-2.0.10.dist-info/top_level.txt,sha256=fmgxHbXyx1O2MPi_9kjx8aL9L-8TmV0gre4Go8XgqFk,9
-django_fast_treenode-2.0.10.dist-info/RECORD,,
+treenode/utils/exporter.py,sha256=QiQQONj0wK3Qo_BUgyCAxbW_6DDqkAvCMstOILYhtU0,7246
+treenode/utils/importer.py,sha256=cXgzrnXWr0yaJhEGPjzd1hkdaMVdcNm4TcSsWJAE4zM,12893
+django_fast_treenode-2.0.11.dist-info/LICENSE,sha256=GiiEe4Y9oOCbn9eGuNew1mMYHU_bJWaCK9zOusnKvvU,1091
+django_fast_treenode-2.0.11.dist-info/METADATA,sha256=wxNCnA2bmSAUMYHIZ8FMbNfFawuQZoUNf9LdUX5zPG0,23343
+django_fast_treenode-2.0.11.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+django_fast_treenode-2.0.11.dist-info/top_level.txt,sha256=fmgxHbXyx1O2MPi_9kjx8aL9L-8TmV0gre4Go8XgqFk,9
+django_fast_treenode-2.0.11.dist-info/RECORD,,

treenode/admin.py

@@ -6,7 +6,7 @@ This module provides Django admin integration for the TreeNode model.
 It includes custom tree-based sorting, optimized queries, and
 import/export functionality for hierarchical data structures.
 
-Version: 2.0.10
+Version: 2.0.11
 Author: Timur Kady
 Email: kaduevtr@gmail.com
 """
@@ -17,6 +17,7 @@ import importlib
 import numpy as np
 from datetime import datetime
 from django.contrib import admin
+from django.http import HttpResponseRedirect
 from django.contrib.admin.views.main import ChangeList
 from django.db import models
 from django.shortcuts import render, redirect
@@ -24,6 +25,7 @@ from django.urls import path
 from django.utils.encoding import force_str
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
+from django.contrib import messages
 
 from .forms import TreeNodeForm
 from .widgets import TreeWidget
@@ -63,7 +65,9 @@ class SortedChangeList(ChangeList):
         tn_orders = np.array([obj.tn_order for obj in result_list])
         # Get sorted indices based on tn_order (ascending order).
         # Reorder the original result_list based on the sorted indices.
-        self.result_list = [result_list[int(i)] for i in np.argsort(tn_orders)]
+        self.result_list = [
+            result_list[int(i)] for i in np.argsort(tn_orders)
+        ]
 
 
 class TreeNodeAdminModel(admin.ModelAdmin):
@@ -101,7 +105,7 @@ class TreeNodeAdminModel(admin.ModelAdmin):
         )
 
     def __init__(self, model, admin_site):
-        """Динамически добавляем поле `tn_order` в `list_display`."""
+        """Init method."""
         super().__init__(model, admin_site)
 
         # If `list_display` is empty, take all `fields`
@@ -115,7 +119,8 @@ class TreeNodeAdminModel(admin.ModelAdmin):
         ])
         if not self.import_export:
             check_results = [
-                pkg for pkg in ["openpyxl", "pyyaml", "xlsxwriter"] if importlib.util.find_spec(pkg) is not None
+                pkg for pkg in ["openpyxl", "pyyaml", "xlsxwriter"]
+                if importlib.util.find_spec(pkg) is not None
             ]
             logger.info("Packages" + ", ".join(check_results) + " are \
 not installed. Export and import functions are disabled.")
@@ -178,7 +183,32 @@ not installed. Export and import functions are disabled.")
         """Changelist View."""
         extra_context = extra_context or {}
         extra_context['import_export_enabled'] = self.import_export
-        return super().changelist_view(request, extra_context=extra_context)
+
+        response = super().changelist_view(request, extra_context=extra_context)
+
+        # Если response — это редирект, то нет смысла обновлять ChangeList
+        if isinstance(response, HttpResponseRedirect):
+            return response
+
+        if request.GET.get("import_done"):
+            # Создаём экземпляр ChangeList вручную
+            ChangeListClass = self.get_changelist(request)
+
+            cl = ChangeListClass(
+                request, self.model, self.list_display, self.list_display_links,
+                self.list_filter, self.date_hierarchy, self.search_fields,
+                self.list_select_related, self.list_per_page,
+                self.list_max_show_all, self.list_editable, self
+            )
+
+            # Принудительно обновляем queryset и применяем сортировку
+            cl.get_queryset(request)
+            cl.get_results(request)
+
+            # Добавляем обновлённый ChangeList в контекст
+            response.context_data["cl"] = cl
+
+        return response
 
     def get_ordering(self, request):
         """Get Ordering."""
@@ -294,19 +324,32 @@ packages are not installed."
             # Import data from file
             importer = self.TreeNodeImporter(self.model, file, ext)
             raw_data = importer.import_data()
-            clean_result = importer.clean(raw_data)
-            errors = importer.finalize_import(clean_result)
+            clean_result = importer.finalize(raw_data)
+
+            errors = clean_result.get("errors", [])
+            created_count = len(clean_result.get("create", []))
+            updated_count = len(clean_result.get("update", []))
+
             if errors:
                 return render(
                     request,
-                    "admin/tree_node_import.html",
-                    {"errors": errors}
+                    "admin/tree_node_import_report.html",
+                    {
+                        "errors": errors,
+                        "created_count": created_count,
+                        "updated_count": updated_count,
+                    }
                 )
-            self.message_user(
+
+            # If there are no errors, redirect to the list of objects with
+            # a message
+            messages.success(
                 request,
-                f"Successfully imported {len(clean_result['create'])} records."
+                f"Successfully imported {created_count} records. "
+                f"Successfully updated {updated_count} records."
             )
-            return redirect("..")
+            path = request.path.replace("import/", "") + "?import_done=1"
+            return redirect(path)
 
         # If the request is not POST, simply display the import form
         return render(request, "admin/tree_node_import.html")
@@ -341,7 +384,7 @@ packages are not installed."
             filename = self.model._meta.label + " " + now
             # Init
             exporter = self.TreeNodeExporter(
-                self.get_queryset(),
+                self.get_queryset(request),
                 filename=filename
             )
             # Export working

treenode/docs/Documentation

@@ -33,7 +33,7 @@ My idea was to solve these problems by combining the adjacency list with the Clo
 * useful functionality added for some methods (e.g.  the `include_self=False` and `depth` parameters has been added to functions that return lists/querysets);
 * additionally, the package includes a tree view widget for the `tn_parent` field in the change form.
 
-Of course, at large levels of nesting, the use of the Closure Table leads to an increase in resource costs. But at the same time, the combined scheme still generally outperforms the original application in terms of performance.
+Of course, at large levels of nesting, the use of the Closure Table leads to an increase in resource costs. However, the combined approach still outperforms both the original application and other available Django solutions in terms of performance, especially in large trees with over 100k nodes.
 
 ## Theory
 You can get a basic understanding of what is a Closure Table from:
@@ -128,37 +128,6 @@ class YoursForm(TreeNodeForm):
     # Your code is here
 ```
 
-## Updating to django-fast-treenode 2.X
-### Overview
-If you are upgrading from a previous version, you need to follow these steps to ensure compatibility and proper functionality.
-
-### Update Process
-1. **Upgrade the package**
-   Run the following command to install the latest version:
-
-   ```bash
-   pip install --upgrade django-fast-treenode
-   ```
-
-2. **Apply database migrations**
-   After upgrading, you need to apply the necessary database migrations:
-
-   ```bash
-   python manage.py makemigrations
-   python manage.py migrate
-   ```
-
-3. **Restart the application**
-   Finally, restart your Django application to apply all changes:
-
-   ```bash
-   python manage.py runserver
-   ```
-
-**Important Notes**: Failing to apply migrations (`migrate`) after upgrading may lead to errors when interacting with tree nodes.
-
-By following these steps, you will ensure a smooth transition to the latest version of django-fast-treenode without data inconsistencies.
-
 
 ## Usage
 ### Methods/Properties
@@ -578,7 +547,7 @@ obj.is_sibling_of(target_obj)
 ```
 
 #### `update_tree`
-**Update tree** manually, useful after **bulk updates**:
+**Update tree** manually:
 ```python
 cls.update_tree()
 ```
@@ -592,8 +561,9 @@ In v2.0, the caching mechanism has been improved to prevent excessive memory usa
 ``` python
 TREENODE_CACHE_LIMIT = 100
 ```
-**Automatic Management**: In most cases, users don’t need to manually manage cache operations.
-**Manual Cache Clearing**:
+**Automatic Management**. In most cases, users don’t need to manually manage cache operations.All methods that somehow change the state of models reset the tree cache automatically.
+
+**Manual Cache Clearing**. If for some reason you need to reset the cache, you can do it in two ways:
 - **Clear cache for a single model**: Use `clear_cache()` at the model level:
     ```python
     MyTreeNodeModel.clear_cache()
@@ -637,6 +607,7 @@ python manage.py migrate
 ```
 This will apply any necessary database changes automatically.
 
+
 ## To do
 These improvements aim to enhance usability, performance, and maintainability for all users of `django-fast-treenode`:
 * **Cache Algorithm Optimization**: Testing and integrating more advanced cache eviction strategies.
@@ -647,6 +618,7 @@ Your wishes, objections, comments are welcome.
 
 
 # Django-fast-treenode
+
 ## License
 Released under [MIT License](https://github.com/TimurKady/django-fast-treenode/blob/main/LICENSE).
 

treenode/forms.py

@@ -1,15 +1,16 @@
 """
 TreeNode Form Module.
 
-This module defines the TreeNodeForm class, which dynamically determines the TreeNode model.
-It utilizes TreeWidget and automatically excludes the current node and its descendants
-from the parent choices.
+This module defines the TreeNodeForm class, which dynamically determines
+the TreeNode model.
+It utilizes TreeWidget and automatically excludes the current node and its
+descendants from the parent choices.
 
 Functions:
 - __init__: Initializes the form and filters out invalid parent choices.
 - factory: Dynamically creates a form class for a given TreeNode model.
 
-Version: 2.0.10
+Version: 2.0.11
 Author: Timur Kady
 Email: timurkady@yandex.com
 """
@@ -17,6 +18,7 @@ Email: timurkady@yandex.com
 from django import forms
 import numpy as np
 from django.forms.models import ModelChoiceField, ModelChoiceIterator
+from django.utils.translation import gettext_lazy as _
 
 from .widgets import TreeWidget
 
@@ -43,14 +45,18 @@ class SortedModelChoiceIterator(ModelChoiceIterator):
 class SortedModelChoiceField(ModelChoiceField):
     """ModelChoiceField Class for tn_paret field."""
 
+    to_field_name = None
+
     def _get_choices(self):
-        """Get sorted choices."""
         if hasattr(self, '_choices'):
             return self._choices
-        return SortedModelChoiceIterator(self)
+
+        choices = list(SortedModelChoiceIterator(self))
+        if self.empty_label is not None:
+            choices.insert(0, ("", self.empty_label))
+        return choices
 
     def _set_choices(self, value):
-        """Set choices."""
         self._choices = value
 
     choices = property(_get_choices, _set_choices)
@@ -77,19 +83,26 @@ class TreeNodeForm(forms.ModelForm):
         """Init Method."""
         super().__init__(*args, **kwargs)
 
-        # Use a model bound to a form
         model = self._meta.model
 
-        if "tn_parent" in self.fields and self.instance.pk:
-            excluded_ids = [self.instance.pk] + \
-                list(self.instance.get_descendants_pks())
-            queryset = model.objects.exclude(pk__in=excluded_ids)
+        if "tn_parent" in self.fields:
+            self.fields["tn_parent"].required = False
+            self.fields["tn_parent"].empty_label = _("Root")
+            queryset = model.objects.all()
+
             original_field = self.fields["tn_parent"]
             self.fields["tn_parent"] = SortedModelChoiceField(
                 queryset=queryset,
-                label=self.fields["tn_parent"].label,
-                widget=original_field.widget
+                label=original_field.label,
+                widget=original_field.widget,
+                empty_label=original_field.empty_label,
+                required=False
             )
+            self.fields["tn_parent"].widget.model = queryset.model
+
+            # Если есть текущее значение, устанавливаем его
+            if self.instance and self.instance.pk and self.instance.tn_parent:
+                self.fields["tn_parent"].initial = self.instance.tn_parent
 
     @classmethod
     def factory(cls, model):