django-spire 0.16.4__py3-none-any.whl → 0.16.6__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/auth/mfa/views/page_views.py

@@ -18,7 +18,7 @@ def mfa_form_view(request):
         if form.is_valid():
             mfa_code.set_expired()
             profile.set_mfa_grace_period()
-            return HttpResponseRedirect(reverse('home:home'))
+            return HttpResponseRedirect(reverse('home:page:home'))
 
         if 'mfa_code' in form.errors:
             messages.error(request, form.errors['mfa_code'][0])
@@ -33,4 +33,3 @@ def mfa_form_view(request):
         context=context_data,
         template='django_spire/auth/mfa/mfa_form.html'
     )
-

django_spire/auth/templates/django_spire/auth/page/password_change_done_page.html

@@ -7,5 +7,5 @@
 {% block authentication_page_content %}
     <h3>Password Reset</h3>
     <div class="py-2">You have successfully changed your password!</div>
-    <a class="w-100 btn btn-app-primary bg-app-primary mt-2" href="{% url 'home:home' %}">Home</a>
-{% endblock %}
+    <a class="w-100 btn btn-app-primary bg-app-primary mt-2" href="{% url 'home:page:home' %}">Home</a>
+{% endblock %}

django_spire/auth/templates/django_spire/auth/page/password_change_page.html

@@ -4,9 +4,16 @@
     <h5 class="mb-2">Change Password</h5>
     <div>
         <form x-data="{
+            passwords_match: false,
             old_password: new GlueCharField('old_password', {required: true}),
-            new_password1: new GlueCharField('new_password1', {required: true}),
-            new_password2: new GlueCharField('new_password2', {required: true})
+            new_password1: new GlueCharField('new_password1', {required: true, label: 'New Password'}),
+            new_password2: new GlueCharField('new_password2', {required: true, label: 'Confirm New Password'}),
+
+            init() {
+                $watch(() => [this.new_password1, this.new_password2], () => {
+                    this.passwords_match = this.new_password1.value === this.new_password2.value
+                })
+            }
         }" method="post" class="text-app-secondary">
             {% csrf_token %}
             <div class="row">
@@ -26,7 +33,16 @@
             </div>
             <div class="row mt-2">
                 <div class="col">
-                    <button type="submit" class="w-100 btn btn-app-primary bg-app-primary mt-2">Submit</button>
+                    <span x-show="!passwords_match" class="text-app-danger">
+                        Password confirmation does not match new password.
+                    </span>
+                    <button
+                        type="submit"
+                        class="w-100 btn btn-app-primary bg-app-primary mt-2"
+                        :disabled="!passwords_match"
+                    >
+                        Submit
+                    </button>
                 </div>
             </div>
         </form>

django_spire/auth/views/admin_views.py

@@ -18,6 +18,10 @@ class PasswordChangeView(auth_views.PasswordChangeView):
     template_name = 'django_spire/auth/page/password_change_page.html'
     success_url = reverse_lazy('django_spire:auth:admin:password_change_done')
 
+    def form_invalid(self, form):
+        show_form_errors(self.request, form)
+        return super().form_invalid(form)
+
 
 class PasswordChangeDone(auth_views.PasswordChangeDoneView):
     template_name = 'django_spire/auth/page/password_change_done_page.html'
@@ -28,6 +32,10 @@ class PasswordResetView(auth_views.PasswordResetView):
     success_url = reverse_lazy('django_spire:auth:admin:password_reset_done')
     template_name = 'django_spire/auth/page/password_reset_page.html'
 
+    def form_invalid(self, form):
+        show_form_errors(self.request, form)
+        return super().form_invalid(form)
+
 
 class PasswordResetComplete(auth_views.PasswordResetCompleteView):
     template_name = 'django_spire/auth/page/password_reset_complete_page.html'
@@ -45,6 +53,10 @@ class PasswordResetDone(auth_views.PasswordResetDoneView):
 class PasswordResetKeyForm(auth_views.PasswordResetView):
     template_name = 'django_spire/auth/page/password_reset_key_form_page.html'
 
+    def form_invalid(self, form):
+        show_form_errors(self.request, form)
+        return super().form_invalid(form)
+
 
 class PasswordResetKeyFormDone(auth_views.PasswordResetView):
     template_name = 'django_spire/auth/page/password_reset_key_done_page.html'
@@ -52,3 +64,7 @@ class PasswordResetKeyFormDone(auth_views.PasswordResetView):
 
 class PasswordSetForm(auth_views.PasswordResetView):
     template_name = 'django_spire/auth/page/password_set_form_page.html'
+
+    def form_invalid(self, form):
+        show_form_errors(self.request, form)
+        return super().form_invalid(form)

django_spire/consts.py

@@ -1,4 +1,4 @@
-__VERSION__ = '0.16.4'
+__VERSION__ = '0.16.6'
 
 
 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/redirect/generic_redirect.py

@@ -35,4 +35,4 @@ def reverse_generic_relation(content_object: Any, **kwargs) -> HttpResponse | No
     if url_path is not None:
         return reverse(url_path, kwargs=kwargs)
 
-    return HttpResponse('home:home')
+    return HttpResponse('home:page:home')

django_spire/core/static/django_spire/js/theme.js

@@ -14,7 +14,7 @@ document.addEventListener('alpine:init', () => {
             try {
                 let response = await ajax_request(
                     'GET',
-                    '/theme/ajax/get_config/'
+                    '/django_spire/theme/json/get_config/'
                 );
 
                 if (response && response.data) {
@@ -142,7 +142,7 @@ document.addEventListener('alpine:init', () => {
         async persist_to_server(value) {
             await ajax_request(
                 'POST',
-                '/theme/ajax/set_theme/',
+                '/django_spire/theme/json/set_theme/',
                 { theme: value }
             );
         },

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/core/templates/django_spire/navigation/top_navigation.html

@@ -23,45 +23,49 @@
         </div>
 
         <div class="col-auto d-flex">
-            <div>
-                {% include 'django_spire/theme/element/theme_selector.html' with icon_size='fs-2' %}
-            </div>
+            {% block top_navigation_icons %}
+                {% block theme_selector %}
+                    <div>
+                        {% include 'django_spire/theme/element/theme_selector.html' with icon_size='fs-2' %}
+                    </div>
+                {% endblock %}
 
-            <div class="dropdown">
-                <i
-                    class="bi bi-person-circle fs-2 mx-2 cursor-pointer"
-                    id="dropdownMenuButton1"
-                    data-bs-toggle="dropdown"
-                    aria-expanded="false"
-                >
-                </i>
-                <ul class="dropdown-menu py-0 bg-app-layer-one" aria-labelledby="dropdownMenuButton1">
-                    {% if request.user.is_superuser %}
-                        <li class="py-0  ">
-                            <a class="dropdown-item fs--1 bg-app-layer-three-hover"
-                               href="{% url 'admin:index' %}" target="_blank">
-                                Admin Panel
+                <div class="dropdown">
+                    <i
+                        class="bi bi-person-circle fs-2 mx-2 cursor-pointer"
+                        id="dropdownMenuButton1"
+                        data-bs-toggle="dropdown"
+                        aria-expanded="false"
+                    >
+                    </i>
+                    <ul class="dropdown-menu py-0 bg-app-layer-one" aria-labelledby="dropdownMenuButton1">
+                        {% if request.user.is_superuser %}
+                            <li class="py-0  ">
+                                <a class="dropdown-item fs--1 bg-app-layer-three-hover"
+                                   href="{% url 'admin:index' %}" target="_blank">
+                                    Admin Panel
+                                </a>
+                            </li>
+                        {% endif %}
+                        <li class="py-0">
+                            <a href="{% url 'django_spire:auth:admin:password_change' %}"
+                               class="dropdown-item fs--1 bg-app-layer-three-hover">
+                                Change Password
                             </a>
                         </li>
-                    {% endif %}
-                    <li class="py-0">
-                        <a href="{% url 'django_spire:auth:admin:password_change' %}"
-                           class="dropdown-item fs--1 bg-app-layer-three-hover">
-                            Change Password
-                        </a>
-                    </li>
-                    <li class="py-0">
-                        <a href="{% url 'django_spire:auth:redirect:logout' %}"
-                           class="dropdown-item fs--1 bg-app-layer-three-hover">
-                            Logout
-                        </a>
-                    </li>
-                </ul>
-            </div>
+                        <li class="py-0">
+                            <a href="{% url 'django_spire:auth:redirect:logout' %}"
+                               class="dropdown-item fs--1 bg-app-layer-three-hover">
+                                Logout
+                            </a>
+                        </li>
+                    </ul>
+                </div>
 
-            <div class="col-auto d-lg-none">
-                {% include 'django_spire/navigation/mobile_navigation.html' %}
-            </div>
+                <div class="col-auto d-lg-none">
+                    {% include 'django_spire/navigation/mobile_navigation.html' %}
+                </div>
+            {% endblock %}
         </div>
     {% endblock %}
 </div>

django_spire/core/templates/django_spire/page/full_page.html

@@ -8,7 +8,7 @@
             {% endblock %}
         </div>
 
-        <div class="full-page-content container-fluid">
+        <div class="d-flex flex-column container-fluid">
             <div class="row sticky-top">
                 <div class="col-12 sticky-top">
                     {% block full_page_top_navigation %}
@@ -17,7 +17,7 @@
                 </div>
             </div>
 
-            <div class="row">
+            <div class="row flex-grow-1">
                 <div class="col-12">
                     {% block full_page_content %}
                     {% endblock %}

django_spire/core/templatetags/json.py

@@ -1,11 +1,14 @@
+from typing import Sequence
+
 from django import template
 import json
 
 register = template.Library()
 
-@register.filter(name='json_loads')
-def json_loads(value):
+
+@register.filter(name='to_json')
+def to_json(value: dict | Sequence) -> str:
     try:
-        return json.loads(value)
+        return json.dumps(value)
     except (TypeError, ValueError) as e:
-        return {}
+        return ''

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,13 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from django.db.models import Count
+from django.db.models import Count, Q
 
 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
 
@@ -27,3 +28,20 @@ class CollectionQuerySet(HistoryQuerySet, OrderingQuerySetMixin):
 
     def parentless(self) -> QuerySet[Collection]:
         return self.filter(parent_id__isnull=True)
+
+    def user_has_access(self, user: AuthUser) -> QuerySet[Collection]:
+        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()