django-spire 0.16.5__py3-none-any.whl → 0.16.7__py3-none-any.whl

django_spire/auth/group/templates/django_spire/auth/group/navigation/accordion/permission_nav_accordion.html

@@ -8,12 +8,12 @@
 
 {% block accordion_links %}
     {% if perms.django_spire_auth_group.view_authgroup %}
-        {% url 'django_spire_permission:list' as group_list_url %}
+        {% url 'django_spire:auth:group:page:list' as group_list_url %}
         {% include 'django_spire/navigation/elements/nav_link.html' with link_text='Groups' link_icon='bi bi-people' link_url=group_list_url %}
     {% endif %}
 
     {% if perms.django_spire_auth_user.view_authuser %}
-        {% url 'django_spire_permission:user_list' as user_list_url %}
+        {% url 'django_spire:auth:user:page:list' as user_list_url %}
         {% include 'django_spire/navigation/elements/nav_link.html' with link_text='Users' link_icon='bi bi-person-badge' link_url=user_list_url %}
     {% endif %}
 {% endblock %}

django_spire/consts.py

@@ -1,4 +1,4 @@
-__VERSION__ = '0.16.5'
+__VERSION__ = '0.16.7'
 
 
 AI_CHAT_WORKFLOW_SENDER_SETTINGS_NAME = 'AI_CHAT_WORKFLOW_NAME'

django_spire/core/management/commands/spire_startapp.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 import django_spire
 
 from pathlib import Path
-from typing_extensions import TYPE_CHECKING
 
 from django.conf import settings
 from django.core.management.base import BaseCommand, CommandError
@@ -18,9 +17,6 @@ from django_spire.core.management.commands.spire_startapp_pkg.processor import (
 )
 from django_spire.core.management.commands.spire_startapp_pkg.reporter import Reporter
 
-if TYPE_CHECKING:
-    import argparse
-
 
 class Command(BaseCommand):
     help = 'Create a custom Spire app.'

django_spire/core/management/commands/spire_startapp_pkg/processor.py

@@ -24,8 +24,8 @@ class BaseTemplateProcessor:
 
         updated_content = self.apply_replacement(content, replacement)
 
-        with open(path, 'w', encoding='utf-8') as file:
-            file.write(updated_content)
+        with open(path, 'w', encoding='utf-8') as handle:
+            handle.write(updated_content)
 
     def rename_file(self, path: Path, components: list[str]) -> None:
         replacement = generate_replacement_map(components)
@@ -55,10 +55,25 @@ class AppTemplateProcessor(BaseTemplateProcessor):
         self._process_files(
             directory,
             components,
-            '*',
+            '*.template',
             lambda path: path.is_file()
         )
 
+        self._process_files(
+            directory,
+            components,
+            '*.py',
+            lambda path: path.is_file()
+        )
+
+        self._rename_template_files(directory)
+
+    def _rename_template_files(self, directory: Path) -> None:
+        for template_file in directory.rglob('*.py.template'):
+            new_name = template_file.name.replace('.py.template', '.py')
+            new_path = template_file.parent / new_name
+            template_file.rename(new_path)
+
 
 class HTMLTemplateProcessor(BaseTemplateProcessor):
     def replace_template_names(self, directory: Path, components: list[str]) -> None:

django_spire/core/management/commands/spire_startapp_pkg/reporter.py

@@ -26,6 +26,15 @@ class Reporter:
 
         return name
 
+    def _sort_template_items(self, path: Path) -> tuple[bool, str]:
+        return (path.is_file(), path.name.lower())
+
+    def _app_transformation(self, _index: int, component: str) -> str:
+        return component
+
+    def _html_transformation(self, index: int, component: str) -> str:
+        return 'templates' if index == 0 else component
+
     def _report_tree_structure(
         self,
         title: str,
@@ -34,8 +43,11 @@ class Reporter:
         registry: list[str],
         template: Path,
         formatter: Callable[[Path], str],
-        transformation: Callable[[int, str], str] = lambda _, component: component,
+        transformation: Callable[[int, str], str] | None = None,
     ) -> None:
+        if transformation is None:
+            transformation = self._app_transformation
+
         self.command.stdout.write(title)
         current = base
 
@@ -51,11 +63,9 @@ class Reporter:
             self.command.stdout.write(f'{indent}{ICON_FOLDER_OPEN} {component}/')
 
             if i == len(components) - 1 and app not in registry and template.exists():
-                local_formatter = lambda item: (
-                    item.name
-                    if item.is_dir()
-                    else self._apply_replacement(item.name, replacement)
-                )
+                def local_formatter(item: Path, mapping: dict[str, str] = replacement) -> str:
+                    base_name = formatter(item)
+                    return self._apply_replacement(base_name, mapping)
 
                 self._show_tree_from_template(template, indent + INDENTATION, local_formatter)
 
@@ -67,12 +77,7 @@ class Reporter:
     ) -> None:
         ignore = {'__init__.py', '__pycache__'}
 
-        key = lambda p: (
-            p.is_file(),
-            p.name.lower()
-        )
-
-        items = sorted(template.iterdir(), key=key)
+        items = sorted(template.iterdir(), key=self._sort_template_items)
 
         for item in items:
             if item.name in ignore:
@@ -88,6 +93,15 @@ class Reporter:
                     formatter
                 )
 
+    def _app_formatter(self, item: Path) -> str:
+        return item.name.replace('.py.template', '.py')
+
+    def _html_formatter(self, item: Path, replacement: dict[str, str]) -> str:
+        if item.is_dir():
+            return item.name
+
+        return self._apply_replacement(item.name, replacement)
+
     def report_app_tree_structure(
         self,
         base: Path,
@@ -95,17 +109,14 @@ class Reporter:
         registry: list[str],
         template: Path
     ) -> None:
-        formatter = lambda item: item.name
-        transformation = lambda _, component: component
-
         self._report_tree_structure(
             title='\nThe following app(s) will be created:\n\n',
             base=base,
             components=components,
             registry=registry,
             template=template,
-            formatter=formatter,
-            transformation=transformation,
+            formatter=self._app_formatter,
+            transformation=self._app_transformation,
         )
 
     def report_html_tree_structure(
@@ -117,16 +128,8 @@ class Reporter:
     ) -> None:
         replacement = generate_replacement_map(components)
 
-        formatter = lambda item: (
-            item.name
-            if item.is_dir()
-            else self._apply_replacement(item.name, replacement)
-        )
-
-        transformation = (
-            lambda i, component:
-            'templates' if i == 0 else component
-        )
+        def html_formatter_with_replacement(item: Path) -> str:
+            return self._html_formatter(item, replacement)
 
         self._report_tree_structure(
             title='\nThe following template(s) will be created:\n\n',
@@ -134,8 +137,8 @@ class Reporter:
             components=components,
             registry=registry,
             template=template,
-            formatter=formatter,
-            transformation=transformation,
+            formatter=html_formatter_with_replacement,
+            transformation=self._html_transformation,
         )
 
     def prompt_for_confirmation(self, message: str) -> bool:
@@ -148,7 +151,6 @@ class Reporter:
     def report_installed_apps_suggestion(self, missing_components: list[str]) -> None:
         self.command.stdout.write(self.command.style.NOTICE('\nPlease add the following to INSTALLED_APPS in settings.py:'))
         self.command.stdout.write(f'\n {missing_components[-1]}')
-        # self.command.stdout.write('\n'.join(f'"{app}"' for app in missing_components))
 
     def report_app_creation_success(self, app: str) -> None:
         message = f'Successfully created app: {app}'

django_spire/core/templates/django_spire/element/pagination_element.html

@@ -1,3 +1,5 @@
+{% load pagination_tags %}
+
 {% include 'django_spire/element/divider_element.html' %}
 <div class="row justify-content-between pb-1">
     <div class="col-auto ps-4">

django_spire/knowledge/auth/controller.py

@@ -2,12 +2,22 @@ from django_spire.auth.controller.controller import BaseAuthController
 
 
 class BaseKnowledgeAuthController(BaseAuthController):
+    def can_access_all_collections(self):
+        return self.request.user.has_perm(
+            'django_spire_knowledge.can_access_all_collections'
+        )
+
     def can_add(self):
         return self.request.user.has_perm('django_spire_knowledge.add_collection')
 
     def can_change(self):
         return self.request.user.has_perm('django_spire_knowledge.change_collection')
 
+    def can_change_collection_groups(self):
+        return self.request.user.has_perm(
+            'django_spire_knowledge.can_change_collection_groups'
+        )
+
     def can_delete(self):
         return self.request.user.has_perm('django_spire_knowledge.delete_collection')
 

django_spire/knowledge/collection/admin.py

@@ -1,12 +1,19 @@
 from django.contrib import admin
-from .models import Collection
+from .models import Collection, CollectionGroup
 
 
 @admin.register(Collection)
 class CollectionAdmin(admin.ModelAdmin):
-    list_display = ['name', 'parent', 'is_deleted']
+    list_display = ['id', 'name', 'parent', 'is_deleted']
     list_select_related = ['parent']
     list_filter = ['is_deleted', 'is_active']
-    search_fields = ['name', 'description', 'parent__name']
+    search_fields = ['id', 'name', 'description', 'parent__name']
     ordering = ['name']
     autocomplete_fields = ['parent']
+
+
+@admin.register(CollectionGroup)
+class CollectionGroupAdmin(admin.ModelAdmin):
+    list_display = ['id', 'collection', 'auth_group']
+    list_select_related = ['collection', 'auth_group']
+    search_fields = ['id', 'collection__name', 'auth_group__name']

django_spire/knowledge/collection/models.py

@@ -1,9 +1,11 @@
 from django.db import models
 
+from django_spire.auth.group.models import AuthGroup
 from django_spire.contrib.ordering.mixins import OrderingModelMixin
 from django_spire.history.mixins import HistoryModelMixin
 from django_spire.knowledge.collection.querysets import CollectionQuerySet
-from django_spire.knowledge.collection.services.service import CollectionService
+from django_spire.knowledge.collection.services.service import CollectionGroupService, \
+    CollectionService
 
 
 class Collection(HistoryModelMixin, OrderingModelMixin):
@@ -29,3 +31,23 @@ class Collection(HistoryModelMixin, OrderingModelMixin):
         verbose_name = 'Collection'
         verbose_name_plural = 'Collections'
         db_table = 'django_spire_knowledge_collection'
+        permissions = [
+            ('can_access_all_collections', 'Can Access All Collections'),
+            ('can_change_collection_groups', 'Can Change Collection Groups')
+        ]
+
+
+class CollectionGroup(models.Model):
+    collection = models.ForeignKey(
+        Collection,
+        on_delete=models.CASCADE,
+        related_name='groups',
+        related_query_name='group',
+    )
+    auth_group = models.ForeignKey(
+        AuthGroup,
+        on_delete=models.CASCADE,
+        related_name='collection_groups',
+        related_query_name='collection_group',
+    )
+    services = CollectionGroupService()

django_spire/knowledge/collection/querysets.py

@@ -2,12 +2,15 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from django.db.models import Count
+from django.core.handlers.wsgi import WSGIRequest
+from django.db.models import Count, Q
 
+from django_spire.auth.controller.controller import AppAuthController
 from django_spire.contrib.ordering.querysets import OrderingQuerySetMixin
 from django_spire.history.querysets import HistoryQuerySet
 
 if TYPE_CHECKING:
+    from django_spire.auth.user.models import AuthUser
     from django.db.models import QuerySet
     from django_spire.knowledge.collection.models import Collection
 
@@ -25,5 +28,43 @@ class CollectionQuerySet(HistoryQuerySet, OrderingQuerySetMixin):
     def childless(self) -> QuerySet[Collection]:
         return self.annotate(child_count=Count('child')).filter(child_count=0)
 
+    def exclude_children(self, collection: Collection) -> QuerySet[Collection]:
+        descendant_ids = set()
+        current_level_ids = [collection.id]
+
+        while current_level_ids:
+            children = self.filter(parent_id__in=current_level_ids)
+            child_ids = list(children.values_list('id', flat=True))
+
+            if not child_ids:
+                break
+
+            descendant_ids.update(child_ids)
+            current_level_ids = child_ids
+
+        return self.exclude(id__in=descendant_ids)
+
     def parentless(self) -> QuerySet[Collection]:
         return self.filter(parent_id__isnull=True)
+
+    def request_user_has_access(self, request: WSGIRequest) -> QuerySet[Collection]:
+        user = request.user
+
+        if user.is_superuser or AppAuthController('knowledge', request).can_access_all_collections():
+            return self.all()
+
+        direct_access = self.filter(group__auth_group__user=user)
+        accessible_ids = set(direct_access.values_list('id', flat=True))
+
+        current_level_ids = accessible_ids.copy()
+        while current_level_ids:
+            next_level = self.filter(parent_id__in=current_level_ids)
+            new_ids = set(next_level.values_list('id', flat=True)) - accessible_ids
+
+            if not new_ids:
+                break
+
+            accessible_ids.update(new_ids)
+            current_level_ids = new_ids
+
+        return self.filter(id__in=accessible_ids).distinct()

django_spire/knowledge/collection/services/factory_service.py

@@ -0,0 +1,42 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from django.core.handlers.wsgi import WSGIRequest
+
+from django_spire.auth.controller.controller import AppAuthController
+from django_spire.contrib.service import BaseDjangoModelService
+
+if TYPE_CHECKING:
+    from django_spire.knowledge.collection.models import Collection, CollectionGroup
+
+
+class CollectionGroupFactoryService(BaseDjangoModelService['CollectionGroup']):
+    obj: CollectionGroup
+
+    def replace_groups(
+            self,
+            request: WSGIRequest,
+            group_pks: list[int] | None,
+            collection: Collection
+    ) -> list[CollectionGroup]:
+        if not AppAuthController('knowledge', request).can_change_collection_groups():
+            return []
+
+        if group_pks is None:
+            return collection.groups.all().delete()
+
+        old_collection_groups = list(collection.groups.all())
+
+        new_collection_groups = []
+        for group_pk in group_pks:
+            new_collection_groups.append(
+                self.obj_class(auth_group_id=group_pk, collection=collection)
+            )
+
+        self.obj_class.objects.bulk_create(new_collection_groups)
+
+        for collection in old_collection_groups:
+            collection.delete()
+
+        return new_collection_groups

django_spire/knowledge/collection/services/service.py

@@ -4,6 +4,8 @@ from django_spire.contrib.service import BaseDjangoModelService
 
 from typing import TYPE_CHECKING
 
+from django_spire.knowledge.collection.services.factory_service import \
+    CollectionGroupFactoryService
 from django_spire.knowledge.collection.services.ordering_service import \
     CollectionOrderingService
 from django_spire.knowledge.collection.services.processor_service import \
@@ -12,7 +14,7 @@ from django_spire.knowledge.collection.services.transformation_service import \
     CollectionTransformationService
 
 if TYPE_CHECKING:
-    from django_spire.knowledge.collection.models import Collection
+    from django_spire.knowledge.collection.models import Collection, CollectionGroup
 
 
 class CollectionService(BaseDjangoModelService['Collection']):
@@ -40,3 +42,9 @@ class CollectionService(BaseDjangoModelService['Collection']):
         )
 
         return self.obj, created
+
+
+class CollectionGroupService(BaseDjangoModelService['CollectionGroup']):
+    obj: CollectionGroup
+
+    factory = CollectionGroupFactoryService()

django_spire/knowledge/collection/services/transformation_service.py

@@ -4,7 +4,7 @@ import json
 
 from django.conf import settings
 from django.contrib.sites.models import Site
-from django.db.models import QuerySet, Prefetch
+from django.db.models import Prefetch
 from django.urls import reverse
 
 from django_spire.contrib.service import BaseDjangoModelService
@@ -12,28 +12,34 @@ from django_spire.contrib.service import BaseDjangoModelService
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
-    from django.contrib.auth.models import User
+    from django.core.handlers.wsgi import WSGIRequest
     from django_spire.knowledge.collection.models import Collection
 
 
 class CollectionTransformationService(BaseDjangoModelService['Collection']):
     obj: Collection
 
-    @staticmethod
-    def to_hierarchy_json(queryset: QuerySet[Collection], user: User) -> str:
+    def to_hierarchy_json(self, request: WSGIRequest) -> str:
+        collections = (
+            self.obj_class.objects
+            .active()
+            .request_user_has_access(request)
+            .select_related('parent')
+        )
+
         entry_queryset = (
-            queryset.model._meta.fields_map.get('entry')
+            collections.model._meta.fields_map.get('entry')
             .related_model
             .objects
             .active()
             .has_current_version()
-            .user_has_access(user=user)
+            .user_has_access(user=request.user)
             .select_related('current_version__author')
             .order_by('order')
         )
 
         collections = list(
-            queryset.prefetch_related(Prefetch('entries', queryset=entry_queryset))
+            collections.prefetch_related(Prefetch('entries', queryset=entry_queryset))
             .active()
             .order_by('order')
         )
@@ -44,7 +50,7 @@ class CollectionTransformationService(BaseDjangoModelService['Collection']):
 
         tree = []
         for collection in collections:
-            if collection.parent_id:
+            if collection.parent_id and collection.parent_id in collection_map:
                 collection_map[collection.parent_id]['children'].append(
                     collection_map[collection.pk]
                 )
@@ -74,6 +80,14 @@ class CollectionTransformationService(BaseDjangoModelService['Collection']):
                     )
                 }
             ''',
+            'edit_url': f'''
+                {site}{
+                    reverse(
+                        'django_spire:knowledge:collection:form:update',
+                        kwargs={'pk': self.obj.pk},
+                    )
+                }
+            ''',
             'create_entry_url': f'''
                 {site}{
                     reverse(

django_spire/knowledge/collection/tests/test_services/test_transformation_service.py

@@ -2,6 +2,7 @@ import json
 
 from django.contrib.sites.models import Site
 from django.conf import settings
+from django.test import RequestFactory
 
 from django_spire.core.tests.test_cases import BaseTestCase
 from django_spire.knowledge.collection.models import Collection
@@ -29,9 +30,10 @@ class TestCollectionTransformationService(BaseTestCase):
         self.test_collection_2 = Collection.objects.create(name='Parent A1', id=2, parent_id=1)
         self.test_collection_3 = Collection.objects.create(name='Child A1a', id=3, parent_id=2)
 
+        request = RequestFactory().get('/')
+        request.user = self.super_user
         family_tree = Collection.services.transformation.to_hierarchy_json(
-            queryset=Collection.objects.all().select_related('parent'),
-            user=self.super_user
+            request=request
         )
 
         for collection_json in json.loads(family_tree):

django_spire/knowledge/collection/views/form_views.py

@@ -8,10 +8,11 @@ from django.http import HttpResponseRedirect
 from django.urls import reverse
 
 from django_spire.auth.controller.controller import AppAuthController
+from django_spire.auth.group.models import AuthGroup
 from django_spire.contrib.form.utils import show_form_errors
 from django_spire.contrib.generic_views import portal_views
 from django_spire.core.shortcuts import get_object_or_null_obj
-from django_spire.knowledge.collection.models import Collection
+from django_spire.knowledge.collection.models import Collection, CollectionGroup
 from django_spire.knowledge.collection.forms import CollectionForm
 
 if TYPE_CHECKING:
@@ -30,7 +31,19 @@ def form_view(
     dg.glue_query_set(
         request,
         unique_name='collections',
-        target=Collection.objects.active(),
+        target=(
+            Collection.objects
+            .active()
+            .request_user_has_access(request)
+            .exclude(pk=collection.pk)
+            .exclude_children(collection=collection)
+        ),
+        fields=['name']
+    )
+    dg.glue_query_set(
+        request,
+        unique_name='group_query_set',
+        target=AuthGroup.objects.all(),
         fields=['name']
     )
 
@@ -38,7 +51,13 @@ def form_view(
         form = CollectionForm(request.POST, instance=collection)
 
         if form.is_valid():
-            _, _ = collection.services.save_model_obj(**form.cleaned_data)
+            collection, _ = collection.services.save_model_obj(**form.cleaned_data)
+
+            _ = CollectionGroup.services.factory.replace_groups(
+                request=request,
+                group_pks=dict(request.POST).get('groups'),
+                collection=collection,
+            )
 
             return HttpResponseRedirect(
                 reverse('django_spire:knowledge:collection:page:list')
@@ -53,7 +72,10 @@ def form_view(
         form=form,
         obj=collection,
         context_data={
-            'collection': collection
+            'collection': collection,
+            'group_ids': list(
+                collection.groups.all().values_list('auth_group_id', flat=True)
+            ) if collection.id else [],
         },
         template='django_spire/knowledge/collection/page/form_page.html'
     )

django_spire/knowledge/context_processors.py

@@ -11,7 +11,6 @@ def django_spire_knowledge(request: WSGIRequest) -> dict[str, Any]:
 
     return {
         'collection_tree_json': Collection.services.transformation.to_hierarchy_json(
-            queryset=Collection.objects.all().select_related('parent').order_by('name'),
-            user=request.user,
+            request=request,
         )
     }

django_spire/knowledge/entry/views/json_views.py

@@ -41,7 +41,7 @@ def reorder_view(request: WSGIRequest) -> JsonResponse:
         destination_objects=(
             collection.entries
             .has_current_version()
-            .user_has_access(user=request.user)
+            .request_user_has_access(user=request.user)
             .active()
         ),
         position=order,

django_spire/knowledge/migrations/0004_alter_collection_options_collectiongroup.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.2.6 on 2025-09-23 14:11
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('django_spire_auth_group', '0001_initial'),
+        ('django_spire_knowledge', '0003_alter_collection_order_alter_entry_order_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='collection',
+            options={'permissions': [('can_access_all_collections', 'Can Access All Collections'), ('can_change_collection_groups', 'Can Change Collection Groups')], 'verbose_name': 'Collection', 'verbose_name_plural': 'Collections'},
+        ),
+        migrations.CreateModel(
+            name='CollectionGroup',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('auth_group', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='collection_groups', related_query_name='collection_group', to='django_spire_auth_group.authgroup')),
+                ('collection', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='groups', related_query_name='group', to='django_spire_knowledge.collection')),
+            ],
+        ),
+    ]