django-fast-treenode 3.0.8__tar.gz → 3.2.0__tar.gz

{django_fast_treenode-3.0.8/django_fast_treenode.egg-info → django_fast_treenode-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-fast-treenode
-Version: 3.0.8
+Version: 3.2.0
 Summary: Treenode Framework for supporting tree (hierarchical) data structure in Django projects
 Home-page: https://django-fast-treenode.readthedocs.io/
 Author: Timur Kady
@@ -57,6 +57,7 @@ Requires-Dist: Django>=5.0
 Requires-Dist: msgpack>=1.0.0
 Requires-Dist: openpyxl>=3.0.0
 Requires-Dist: pyyaml>=5.1
+Requires-Dist: PyJWT>=2.0
 Dynamic: author
 Dynamic: home-page
 Dynamic: license-file
@@ -126,6 +127,7 @@ At the moment, django-fast-treeenode is, if not the best, then one of the best p
 - **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..
 - **Lightweight**: All functionality is implemented within the package without heavyweight dependencies such as `djangorestframework` or `django-import-export`.
+- **Optional JWT authentication**: enable token-based protection for the API with a single setting.
 
 All this makes **Treenode Framework** a prime candidate for your needs.
 

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/README.md

@@ -62,6 +62,7 @@ At the moment, django-fast-treeenode is, if not the best, then one of the best p
 - **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..
 - **Lightweight**: All functionality is implemented within the package without heavyweight dependencies such as `djangorestframework` or `django-import-export`.
+- **Optional JWT authentication**: enable token-based protection for the API with a single setting.
 
 All this makes **Treenode Framework** a prime candidate for your needs.
 

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0/django_fast_treenode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-fast-treenode
-Version: 3.0.8
+Version: 3.2.0
 Summary: Treenode Framework for supporting tree (hierarchical) data structure in Django projects
 Home-page: https://django-fast-treenode.readthedocs.io/
 Author: Timur Kady
@@ -57,6 +57,7 @@ Requires-Dist: Django>=5.0
 Requires-Dist: msgpack>=1.0.0
 Requires-Dist: openpyxl>=3.0.0
 Requires-Dist: pyyaml>=5.1
+Requires-Dist: PyJWT>=2.0
 Dynamic: author
 Dynamic: home-page
 Dynamic: license-file
@@ -126,6 +127,7 @@ At the moment, django-fast-treeenode is, if not the best, then one of the best p
 - **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..
 - **Lightweight**: All functionality is implemented within the package without heavyweight dependencies such as `djangorestframework` or `django-import-export`.
+- **Optional JWT authentication**: enable token-based protection for the API with a single setting.
 
 All this makes **Treenode Framework** a prime candidate for your needs.
 

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/django_fast_treenode.egg-info/SOURCES.txt

@@ -65,33 +65,36 @@ treenode/models/mixins/siblings.py
 treenode/models/mixins/tree.py
 treenode/models/mixins/update.py
 treenode/static/.gitkeep
-treenode/static/css/.gitkeep
-treenode/static/css/tree_widget.css
-treenode/static/css/treenode_admin.css
-treenode/static/css/treenode_tabs.css
-treenode/static/js/.gitkeep
-treenode/static/js/lz-string.min.js
-treenode/static/js/tree_widget.js
-treenode/static/js/treenode_admin.js
-treenode/static/vendors/jquery-ui/AUTHORS.txt
-treenode/static/vendors/jquery-ui/LICENSE.txt
-treenode/static/vendors/jquery-ui/index.html
-treenode/static/vendors/jquery-ui/jquery-ui.css
-treenode/static/vendors/jquery-ui/jquery-ui.js
-treenode/static/vendors/jquery-ui/jquery-ui.min.css
-treenode/static/vendors/jquery-ui/jquery-ui.min.js
-treenode/static/vendors/jquery-ui/jquery-ui.structure.css
-treenode/static/vendors/jquery-ui/jquery-ui.structure.min.css
-treenode/static/vendors/jquery-ui/jquery-ui.theme.css
-treenode/static/vendors/jquery-ui/jquery-ui.theme.min.css
-treenode/static/vendors/jquery-ui/package.json
-treenode/static/vendors/jquery-ui/external/jquery/jquery.js
-treenode/static/vendors/jquery-ui/images/ui-icons_444444_256x240.png
-treenode/static/vendors/jquery-ui/images/ui-icons_555555_256x240.png
-treenode/static/vendors/jquery-ui/images/ui-icons_777620_256x240.png
-treenode/static/vendors/jquery-ui/images/ui-icons_777777_256x240.png
-treenode/static/vendors/jquery-ui/images/ui-icons_cc0000_256x240.png
-treenode/static/vendors/jquery-ui/images/ui-icons_ffffff_256x240.png
+treenode/static/treenode/.gitkeep
+treenode/static/treenode/css/.gitkeep
+treenode/static/treenode/css/tree_widget.css
+treenode/static/treenode/css/treenode_admin.css
+treenode/static/treenode/css/treenode_tabs.css
+treenode/static/treenode/js/.gitkeep
+treenode/static/treenode/js/lz-string.min.js
+treenode/static/treenode/js/tree_widget.js
+treenode/static/treenode/js/treenode_admin.js
+treenode/static/treenode/vendors/.gitkeep
+treenode/static/treenode/vendors/jquery-ui/.gitkeep
+treenode/static/treenode/vendors/jquery-ui/AUTHORS.txt
+treenode/static/treenode/vendors/jquery-ui/LICENSE.txt
+treenode/static/treenode/vendors/jquery-ui/index.html
+treenode/static/treenode/vendors/jquery-ui/jquery-ui.css
+treenode/static/treenode/vendors/jquery-ui/jquery-ui.js
+treenode/static/treenode/vendors/jquery-ui/jquery-ui.min.css
+treenode/static/treenode/vendors/jquery-ui/jquery-ui.min.js
+treenode/static/treenode/vendors/jquery-ui/jquery-ui.structure.css
+treenode/static/treenode/vendors/jquery-ui/jquery-ui.structure.min.css
+treenode/static/treenode/vendors/jquery-ui/jquery-ui.theme.css
+treenode/static/treenode/vendors/jquery-ui/jquery-ui.theme.min.css
+treenode/static/treenode/vendors/jquery-ui/package.json
+treenode/static/treenode/vendors/jquery-ui/external/jquery/jquery.js
+treenode/static/treenode/vendors/jquery-ui/images/ui-icons_444444_256x240.png
+treenode/static/treenode/vendors/jquery-ui/images/ui-icons_555555_256x240.png
+treenode/static/treenode/vendors/jquery-ui/images/ui-icons_777620_256x240.png
+treenode/static/treenode/vendors/jquery-ui/images/ui-icons_777777_256x240.png
+treenode/static/treenode/vendors/jquery-ui/images/ui-icons_cc0000_256x240.png
+treenode/static/treenode/vendors/jquery-ui/images/ui-icons_ffffff_256x240.png
 treenode/templates/.gitkeep
 treenode/templates/treenode/.gitkeep
 treenode/templates/treenode/admin/.gitkeep
@@ -103,6 +106,7 @@ treenode/templates/treenode/widgets/tree_widget.html
 treenode/templatetags/__init__.py
 treenode/templatetags/treenode_admin.py
 treenode/utils/__init__.py
+treenode/utils/jwt_auth.py
 treenode/utils/db/__init__.py
 treenode/utils/db/compiler.py
 treenode/utils/db/db_vendor.py

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/django_fast_treenode.egg-info/requires.txt

@@ -2,3 +2,4 @@ Django>=5.0
 msgpack>=1.0.0
 openpyxl>=3.0.0
 pyyaml>=5.1
+PyJWT>=2.0

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/docs/admin.md

@@ -97,7 +97,7 @@ class CategorySelectionForm(forms.Form):
 
 If you plan to use this widget in non-admin templates, make sure the necessary **JavaScript and CSS files** are included:
 ```html
-<link rel="stylesheet" href="/static/treenode/tree_widget.css">
+<link rel="stylesheet" href="/static/treenode/css/tree_widget.css">
 <script src="/static/treenode/js/tree_widget.js"></script>
 ```
 

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/docs/api.md

@@ -233,7 +233,7 @@ obj.get_depth()
 Returns number of edges on shortest path between two nodes
 
 ```python
-obj.distance_to(targer)
+obj.distance_to(target)
 ```
 
 #### get_level

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/docs/apifirst.md

@@ -111,9 +111,9 @@ No complicated payloads. No custom formats.  **TreeNode Framework** believes tha
 ### Basic Access Control
 TreeNode Framework follows an API-First philosophy: API endpoints are generated automatically for each tree model, without the need to manually register views or routes.
 
-However, API protection is currently basic — based on login sessions using Django's standard authentication system (login_required). This is simple but effective for many internal or admin-side applications.
+By default, API protection uses Django's login sessions (`login_required`).
 
-In the future, full token-based authentication (e.g., JWT) will be introduced for more robust and flexible security.
+Starting from version 3.0.9 you can enable JWT authentication by setting `TREENODE_API_USE_JWT = True` in your project settings. In this mode the API expects an `Authorization: Bearer <token>` header with a token signed using your `SECRET_KEY`.
 
 #### How to Secure Your API Step-by-Step
 Since TreeNode Framework does not provide an authentication system itself, you need to set up basic login endpoints in your project.

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/docs/roadmap.md

@@ -15,7 +15,7 @@ The 3.x release series will focus on strengthening TreeNode Framework in terms o
     - 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**
+* **Version 3.2 — JWT Authentication for API** *(implemented)*
 
     - Introduce optional JWT-based token authentication for the auto-generated API.
     - Allow easy activation through a single setting (`TREENODE_API_USE_JWT = True`).

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "django-fast-treenode"
-version = "3.0.8"
+version = "3.2.0"
 description = "Treenode Framework for supporting tree (hierarchical) data structure in Django projects"
 readme = "README.md"
 authors = [{ name = "Timur Kady", email = "timurkady@yandex.com" }]
@@ -15,6 +15,7 @@ dependencies = [
     'msgpack>=1.0.0',
     'openpyxl>=3.0.0',
     'pyyaml>=5.1',
+    'PyJWT>=2.0',
 ]
 classifiers = [
     'Development Status :: 5 - Production/Stable',

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='django-fast-treenode',
-    version='3.0.8',
+    version='3.2.0',
     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',
@@ -18,6 +18,7 @@ setup(
         'msgpack>=1.0.0',
         'openpyxl>=3.0.0',
         'pyyaml>=5.1',
+        'PyJWT>=2.0',
     ],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
@@ -42,3 +43,4 @@ setup(
     python_requires='>=3.9',
 )
 
+

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/tests/test_suite.py

@@ -89,11 +89,7 @@ class TreeNodeModelTests(TestCase):
 
     def test_delete_subtree(self):
         self.a.delete(cascade=False)
-
-        tree_data = TestModel.get_tree_json()
-
         self.root.check_tree_integrity()
         qs = TestModel.objects.filter(pk__in=[self.a.pk, self.c.pk]).all()
-
         self.assertFalse(TestModel.objects.filter(pk=self.a.pk).exists())
         self.assertTrue(TestModel.objects.filter(pk=self.c.pk).exists())

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/treenode/admin/admin.py

@@ -69,13 +69,13 @@ class TreeNodeModelAdmin(AdminMixin, admin.ModelAdmin):
         """Meta Class."""
 
         css = {"all": (
-            "css/treenode_admin.css",
-            "vendors/jquery-ui/jquery-ui.css",
+            "treenode/css/treenode_admin.css",
+            "treenode/vendors/jquery-ui/jquery-ui.css",
         )}
         js = (
-            "vendors/jquery-ui/jquery-ui.js",
-            # "js/lz-string.min.js",
-            "js/treenode_admin.js",
+            "treenode/vendors/jquery-ui/jquery-ui.js",
+            # "treenode/js/lz-string.min.js",
+            "treenode/js/treenode_admin.js",
         )
 
     def __init__(self, model, admin_site):

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/treenode/admin/mixin.py

@@ -62,7 +62,7 @@ class AdminMixin(admin.ModelAdmin):
         return custom_urls + default_urls
 
     def render_changelist_rows(self, objs: list, request):
-        """Rander rows for incert to changelist."""
+        """Render rows for insert into changelist."""
         list_display = list(self.get_list_display(request))
         checkbox_field_name = ACTION_CHECKBOX_NAME
         if checkbox_field_name not in list_display:
@@ -227,7 +227,7 @@ class AdminMixin(admin.ModelAdmin):
 
     def import_view(self, request):
         """
-        Impoern View.
+        Import View.
 
         Handles file upload and initiates import processing via
         TreeNodeImporter.
@@ -242,14 +242,14 @@ class AdminMixin(admin.ModelAdmin):
             extension = os.path.splitext(filename)[1].lower().lstrip('.')
             if extension not in ['csv', 'tsv', 'json', 'xlsx', 'yaml']:
                 return JsonResponse(
-                    {"error": _(f"Invalid file format ({extension}.")},
+                    {"error": _(f"Invalid file format ({extension}).")},
                     status=200
                 )
             importer = self.TreeNodeImporter(self.model, file, extension)
             importer.parse()
             result = importer.import_tree()
 
-            return render(request, "admin/treenode_import_export.html", {
+            return render(request, "treenode/admin/treenode_import_export.html", {
                 "created_count": result.get("created", 0),
                 "updated_count": result.get("updated", 0),
                 "errors": result.get("errors", []),
@@ -258,7 +258,7 @@ class AdminMixin(admin.ModelAdmin):
 
         return render(
             request,
-            "admin/treenode_import_export.html",
+            "treenode/admin/treenode_import_export.html",
             {"import_active": True}
         )
 
@@ -284,7 +284,7 @@ class AdminMixin(admin.ModelAdmin):
 
         return render(
             request,
-            "admin/treenode_import_export.html",
+            "treenode/admin/treenode_import_export.html",
             {"import_active": False}
         )
 

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/treenode/managers/managers.py

@@ -207,7 +207,7 @@ class TreeNodeManager(models.Manager):
 
         WARNING: Unsafe low-level update bypassing all TreeNode protections.
         Use only when bypassing _path/_depth/priority safety checks is
-        inte
+        intentional.
         """
         return models.QuerySet(self.model, using=self.db)\
             .bulk_update(*args, **kwargs)

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/treenode/models/mixins/node.py

@@ -40,18 +40,18 @@ class TreeNodeNodeMixin(models.Model):
             self.refresh()
         return self._depth
 
-    def distance_to(self, targer):
+    def distance_to(self, target):
         """Return number of edges on shortest path between two nodes."""
         self_path = self.query(objects='ancestors')
-        targer_path = targer.query(objects='ancestors')
+        target_path = target.query(objects='ancestors')
 
         i = 0
-        for a, b in zip(self_path, targer_path):
+        for a, b in zip(self_path, target_path):
             if a != b:
                 break
             i += 1
 
-        return (len(self_path) - i) + (len(targer_path) - i)
+        return (len(self_path) - i) + (len(target_path) - i)
 
     def get_index(self):
         """Get the node index (self, index in node.parent.children list)."""

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/treenode/models/models.py

@@ -14,12 +14,12 @@ Features:
 - Provides a caching mechanism to optimize performance.
 - Includes methods for tree traversal, manipulation, and serialization.
 
+With full support for SQL queues, deferred execution,
+custom sorting, and a sleek architecture without unnecessary duplication.
+
 Version: 3.0.7
 Author: Timur Kady
 Email: timurkady@yandex.com
-
-Причём с абсолютной поддержкой SQL-очередей, deferred execution,
-кастомной сортировки и крутой архитектурой без лишнего дублирования.
 """
 
 from __future__ import annotations
@@ -38,6 +38,8 @@ from ..cache import treenode_cache as cache
 from ..settings import SEGMENT_LENGTH, BASE
 from ..signals import disable_signals
 
+import logging
+logger = logging.getLogger(__name__)
 
 class TreeNodeModel(
         mx.TreeNodeAncestorsMixin, mx.TreeNodeChildrenMixin,
@@ -156,10 +158,10 @@ class TreeNodeModel(
         # Update subtree
         self._update_path(self.parent_id)
         self.sqlq.flush()
-        # Clead cache
+        # Clear cache
         self.clear_cache()
 
-    # Saving and Udating methods ----------------------------------
+    # Saving and Updating methods ----------------------------------
 
     def save(self, *args, **kwargs):
         """
@@ -193,7 +195,10 @@ class TreeNodeModel(
                 if is_move:
                     self._meta.model.tasks.add("update", state["parent_id"])
             else:
-                print("TreeNodeModel error: oject not found in DB! WTF, MF!")
+                logger.error(
+                    "TreeNodeModel save error: object with pk %s not found in DB",
+                    self.pk,
+                )
         else:
             is_new = True
 
@@ -335,11 +340,11 @@ class TreeNodeModel(
             queue.extend(model.objects.filter(parent=node))
 
         if verbose and errors:
-            print("Tree integrity check failed:")
+            logger.error("Tree integrity check failed:")
             for err in errors:
-                print("  -", err)
+                logger.error("  - %s", err)
         elif verbose:
-            print("Tree integrity: OK ✅")
+            logger.info("Tree integrity: OK ✅")
 
         return errors
 

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/treenode/settings.py

@@ -18,11 +18,14 @@ SEGMENT_LENGTH = getattr(settings, "TREENODE_SEGMENT_LENGTH", 3)
 # Serialization dictionary: hexadecimal encoding, fixed segment size
 SEGMENT_BASE = 16
 
-# Nubber children per one tree node
+# Number of children per tree node
 BASE = SEGMENT_BASE ** SEGMENT_LENGTH  # 4096
 
 
 TREENODE_PAD_CHAR = getattr(settings, "TREENODE_PAD_CHAR", "'0'")
 
+# Optional JWT protection for API endpoints
+API_USE_JWT = getattr(settings, "TREENODE_API_USE_JWT", False)
+
 
 # The End

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/treenode/templates/treenode/admin/treenode_import_export.html

@@ -3,8 +3,9 @@
 
 {% block extrastyle %}
   {{ block.super }}
-  <link rel="stylesheet" href="{% static 'admin/css/forms.css' %}">
-  <link rel="stylesheet" href="{% static 'css/treenode_tabs.css' %}">
+  {# Load built-in admin form styles #}
+  <link rel="stylesheet" href="{% static '/admin/css/forms.css' %}">
+  <link rel="stylesheet" href="{% static 'treenode/css/treenode_tabs.css' %}">
 {% endblock %}
 
 {% block content %}

django_fast_treenode-3.2.0/treenode/utils/jwt_auth.py

@@ -0,0 +1,25 @@
+import jwt
+from functools import wraps
+
+from django.conf import settings
+from django.http import JsonResponse
+
+
+def jwt_required(view_func):
+    """Ensure that request has valid JWT token."""
+
+    @wraps(view_func)
+    def _wrapped(request, *args, **kwargs):
+        auth_header = request.META.get("HTTP_AUTHORIZATION", "")
+        if not auth_header.startswith("Bearer "):
+            return JsonResponse({"detail": "Authorization header missing"}, status=401)
+        token = auth_header.split(" ", 1)[1]
+        try:
+            payload = jwt.decode(token, settings.SECRET_KEY, algorithms=["HS256"])
+        except jwt.PyJWTError:
+            return JsonResponse({"detail": "Invalid token"}, status=401)
+        request.jwt_payload = payload
+        return view_func(request, *args, **kwargs)
+
+    return _wrapped
+  

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/treenode/version.py

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

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/treenode/views/autoapi.py

@@ -1,91 +1,95 @@
-# -*- coding: utf-8 -*-
-"""
-Route generator for all models inherited from TreeNodeModel
-
-Version: 3.0.0
-Author: Timur Kady
-Email: timurkady@yandex.com
-"""
-
-
-from django.apps import apps
-from django.urls import path
-from django.conf import settings
-from django.contrib.auth.decorators import login_required
-
-from ..models import TreeNodeModel
-from .autocomplete import TreeNodeAutocompleteView
-from .children import TreeChildrenView
-from .search import TreeSearchView
-from .crud import TreeNodeBaseAPIView
-
-
-class AutoTreeAPI:
-    """Auto-discover and expose TreeNode-based APIs."""
-
-    def __init__(self, base_view=TreeNodeBaseAPIView, base_url="api"):
-        """Init auto-discover."""
-        self.base_view = base_view
-        self.base_url = base_url
-
-    def protect_view(self, view, model):
-        """
-        Protect view.
-
-        Protects view with login_required if needed, based on model attribute
-        or global settings.
-        """
-        if getattr(model, 'api_login_required', None) is True:
-            return login_required(view)
-        if getattr(settings, 'TREENODE_API_LOGIN_REQUIRED', False):
-            return login_required(view)
-        return view
-
-    def discover(self):
-        """Scan models and generate API urls."""
-        urls = [
-            # Admin and Widget end-points
-            path("widget/autocomplete/", TreeNodeAutocompleteView.as_view(), name="tree_autocomplete"),  # noqa: D501
-            path("widget/children/", TreeChildrenView.as_view(), name="tree_children"),  # noqa: D501
-            path("widget/search/", TreeSearchView.as_view(), name="tree_search"),  # noqa: D501
-        ]
-        for model in apps.get_models():
-            if issubclass(model, TreeNodeModel) and model is not TreeNodeModel:
-                model_name = model._meta.model_name
-
-                # Dynamically create an API view class for the model
-                api_view_class = type(
-                    f"{model_name.capitalize()}APIView",
-                    (self.base_view,),
-                    {"model": model}
-                )
-
-                # List of API actions and their corresponding URL patterns
-                action_patterns = [
-                    # List / Create
-                    ("", None, f"{model_name}-list"),
-                    # Retrieve / Update / Delete
-                    ("<int:pk>/", None, f"{model_name}-detail"),
-                    ("tree/", {'action': 'tree'}, f"{model_name}-tree"),
-                    # Direct children
-                    ("<int:pk>/children/", {'action': 'children'}, f"{model_name}-children"),  # noqa: D501
-                    # All descendants
-                    ("<int:pk>/descendants/", {'action': 'descendants'}, f"{model_name}-descendants"),   # noqa: D501
-                    # Ancestors + Self + Descendants
-                    ("<int:pk>/family/", {'action': 'family'}, f"{model_name}-family"),   # noqa: D501
-                ]
-
-                # Create secured view instance once
-                view = self.protect_view(api_view_class.as_view(), model)
-
-                # Automatically build all paths for this model
-                for url_suffix, extra_kwargs, route_name in action_patterns:
-                    urls.append(
-                        path(
-                            f"{self.base_url}/{model_name}/{url_suffix}",
-                            view,
-                            extra_kwargs or {},
-                            name=route_name
-                        )
-                    )
-        return urls
+# -*- coding: utf-8 -*-
+"""
+Route generator for all models inherited from TreeNodeModel
+
+Version: 3.0.0
+Author: Timur Kady
+Email: timurkady@yandex.com
+"""
+
+
+from django.apps import apps
+from django.urls import path
+from django.conf import settings
+from django.contrib.auth.decorators import login_required
+
+from ..models import TreeNodeModel
+from ..settings import API_USE_JWT
+from ..utils.jwt_auth import jwt_required
+from .autocomplete import TreeNodeAutocompleteView
+from .children import TreeChildrenView
+from .crud import TreeNodeBaseAPIView
+from .search import TreeSearchView
+
+
+class AutoTreeAPI:
+    """Auto-discover and expose TreeNode-based APIs."""
+
+    def __init__(self, base_view=TreeNodeBaseAPIView, base_url="api"):
+        """Init auto-discover."""
+        self.base_view = base_view
+        self.base_url = base_url
+
+    def protect_view(self, view, model):
+        """
+        Protect view.
+
+        Protects view with login_required if needed, based on model attribute
+        or global settings.
+        """
+        if API_USE_JWT:
+            return jwt_required(view)
+        if getattr(model, 'api_login_required', None) is True:
+            return login_required(view)
+        if getattr(settings, 'TREENODE_API_LOGIN_REQUIRED', False):
+            return login_required(view)
+        return view
+
+    def discover(self):
+        """Scan models and generate API urls."""
+        urls = [
+            # Admin and Widget end-points
+            path("widget/autocomplete/", TreeNodeAutocompleteView.as_view(), name="tree_autocomplete"),  # noqa: D501
+            path("widget/children/", TreeChildrenView.as_view(), name="tree_children"),  # noqa: D501
+            path("widget/search/", TreeSearchView.as_view(), name="tree_search"),  # noqa: D501
+        ]
+        for model in apps.get_models():
+            if issubclass(model, TreeNodeModel) and model is not TreeNodeModel:
+                model_name = model._meta.model_name
+
+                # Dynamically create an API view class for the model
+                api_view_class = type(
+                    f"{model_name.capitalize()}APIView",
+                    (self.base_view,),
+                    {"model": model}
+                )
+
+                # List of API actions and their corresponding URL patterns
+                action_patterns = [
+                    # List / Create
+                    ("", None, f"{model_name}-list"),
+                    # Retrieve / Update / Delete
+                    ("<int:pk>/", None, f"{model_name}-detail"),
+                    ("tree/", {'action': 'tree'}, f"{model_name}-tree"),
+                    # Direct children
+                    ("<int:pk>/children/", {'action': 'children'}, f"{model_name}-children"),  # noqa: D501
+                    # All descendants
+                    ("<int:pk>/descendants/", {'action': 'descendants'}, f"{model_name}-descendants"),   # noqa: D501
+                    # Ancestors + Self + Descendants
+                    ("<int:pk>/family/", {'action': 'family'}, f"{model_name}-family"),   # noqa: D501
+                ]
+
+                # Create secured view instance once
+                view = self.protect_view(api_view_class.as_view(), model)
+
+                # Automatically build all paths for this model
+                for url_suffix, extra_kwargs, route_name in action_patterns:
+                    urls.append(
+                        path(
+                            f"{self.base_url}/{model_name}/{url_suffix}",
+                            view,
+                            extra_kwargs or {},
+                            name=route_name
+                        )
+                    )
+        return urls

{django_fast_treenode-3.0.8 → django_fast_treenode-3.2.0}/treenode/widgets.py

@@ -24,8 +24,8 @@ class TreeWidget(forms.Widget):
     class Media:
         """Meta class to define required CSS and JS files."""
 
-        css = {"all": ("css/tree_widget.css",)}
-        js = ("js/tree_widget.js",)
+        css = {"all": ("treenode/css/tree_widget.css",)}
+        js = ("treenode/js/tree_widget.js",)
 
     def build_attrs(self, base_attrs, extra_attrs=None):
         """Build attributes for the widget."""