django-spire 0.22.4__py3-none-any.whl → 0.23.2__py3-none-any.whl

django_spire/auth/group/forms.py

@@ -5,9 +5,6 @@ import json
 from django import forms
 from django.contrib.auth.models import Group, User
 
-from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Column, Layout, Row, Submit
-
 from django_spire.auth.group.factories import bulk_create_groups_from_names
 
 
@@ -28,8 +25,10 @@ class GroupNamesForm(forms.Form):
 class GroupForm(forms.ModelForm):
     def clean_name(self):
         name = self.cleaned_data['name']
+
         if name.lower() == 'all users':
-            raise forms.ValidationError('"All Users" is a reserved name. Please choose another name.')
+            message = '"All Users" is a reserved name. Please choose another name.'
+            raise forms.ValidationError(message)
 
         return name
     class Meta:

django_spire/auth/group/utils.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
-
-from typing_extensions import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from django_spire.auth.permissions.consts import VALID_PERMISSION_LEVELS, PERMISSIONS_LEVEL_CHOICES
 

django_spire/auth/group/views/form_views.py

@@ -1,12 +1,11 @@
 from __future__ import annotations
 
-from django.core.handlers.wsgi import WSGIRequest
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404
-from django.template.response import TemplateResponse
 from django.urls import reverse
 
 import django_glue as dg
+
 from django_spire.auth.group import models, forms
 from django_spire.auth.group.utils import set_group_users
 from django_spire.auth.permissions.decorators import permission_required
@@ -16,12 +15,17 @@ 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.history.activity.utils import add_form_activity
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from django.core.handlers.wsgi import WSGIRequest
+    from django.template.response import TemplateResponse
 
 
 @permission_required('django_spire_auth_group.change_authgroup')
 def form_view(
-        request: WSGIRequest,
-        pk: int = 0
+    request: WSGIRequest,
+    pk: int = 0
 ) -> TemplateResponse | HttpResponseRedirect:
     group = get_object_or_null_obj(models.AuthGroup, pk=pk)
 
@@ -36,8 +40,8 @@ def form_view(
 
             return_url = reverse('django_spire:auth:group:page:list')
             return HttpResponseRedirect(return_url)
-        else:
-            show_form_errors(request, form)
+
+        show_form_errors(request, form)
 
     form = forms.GroupForm(instance=group)
 
@@ -54,11 +58,12 @@ def form_view(
 
 @permission_required('django_spire_auth_group.add_authgroup')
 def user_form_view(
-        request: WSGIRequest,
-        pk: int
+    request: WSGIRequest,
+    pk: int
 ) -> TemplateResponse | HttpResponseRedirect:
     group = get_object_or_404(models.AuthGroup, pk=pk)
     user_choices = AuthUser.services.get_user_choices()
+
     selected_user_ids = list(
         AuthUser.objects
         .filter(groups=group)
@@ -84,8 +89,8 @@ def user_form_view(
 
             return_url = reverse('django_spire:auth:group:page:detail', kwargs={'pk': pk})
             return HttpResponseRedirect(return_url)
-        else:
-            show_form_errors(request, form)
+
+        show_form_errors(request, form)
 
     form = forms.GroupUserForm()
 
@@ -124,9 +129,9 @@ def delete_form_view(request: WSGIRequest, pk: int) -> TemplateResponse:
 
 @permission_required('django_spire_auth_group.delete_authgroup')
 def group_remove_user_form_view(
-        request: WSGIRequest,
-        group_pk: int,
-        pk: int
+    request: WSGIRequest,
+    group_pk: int,
+    pk: int
 ) -> HttpResponseRedirect | TemplateResponse:
     group = get_object_or_404(models.AuthGroup, pk=group_pk)
     user = get_object_or_404(AuthUser, pk=pk)
@@ -147,7 +152,10 @@ def group_remove_user_form_view(
             )
 
             return HttpResponseRedirect(
-                reverse('django_spire:auth:group:page:detail', kwargs={'pk': group_pk})
+                reverse(
+                    'django_spire:auth:group:page:detail',
+                    kwargs={'pk': group_pk}
+                )
             )
 
     form = DeleteConfirmationForm(request.GET, obj=user)

django_spire/auth/group/views/page_views.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing_extensions import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from django.shortcuts import get_object_or_404
 

django_spire/auth/mfa/utils.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing_extensions import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from django_spire.auth.mfa.models import MfaCode
 

django_spire/auth/permissions/consts.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
 
-from typing_extensions import Literal
+from typing import Literal
 
 from django_spire.auth.group.models import AuthGroup
 from django_spire.auth.user.models import AuthUser
 
+
 PERMISSIONS_LEVEL_CHOICES = (
     (0, 'None'),
     (1, 'View'),

django_spire/auth/permissions/decorators.py

@@ -1,9 +1,8 @@
 from __future__ import annotations
 
 import functools
-from typing import Sequence
 
-from typing_extensions import TYPE_CHECKING
+from typing import Sequence, TYPE_CHECKING
 
 from django.core.exceptions import PermissionDenied
 from django.http import HttpResponseRedirect

django_spire/auth/permissions/permissions.py

@@ -1,8 +1,6 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
-
-from typing_extensions import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from django.contrib.auth.models import Permission, Group, User
 from django.contrib.contenttypes.models import ContentType

django_spire/comment/factories.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing_extensions import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from django.contrib.auth.models import User

django_spire/comment/mixins.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing_extensions import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from django.contrib.contenttypes.fields import GenericRelation
 from django.db import models

django_spire/comment/views.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing_extensions import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required

django_spire/consts.py

@@ -1,4 +1,4 @@
-__VERSION__ = '0.22.4'
+__VERSION__ = '0.23.2'
 
 MAINTENANCE_MODE_SETTINGS_NAME = 'MAINTENANCE_MODE'
 

django_spire/contrib/breadcrumb/breadcrumbs.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing_extensions import TypedDict
+from typing import TypedDict
 
 
 class BreadcrumbDict(TypedDict):

django_spire/contrib/form/confirmation_forms.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing_extensions import Callable, TYPE_CHECKING
+from typing import Callable, TYPE_CHECKING
 
 from django import forms
 

django_spire/contrib/form/utils.py

@@ -1,30 +1,40 @@
 from __future__ import annotations
 
-from django.forms import Form
-from typing_extensions import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from django.contrib import messages
 
 if TYPE_CHECKING:
     from django.core.handlers.wsgi import WSGIRequest
+    from django.forms import Form
 
 
-def show_form_errors(request: WSGIRequest, *forms: Form) -> None:
-    for form in forms:
-        for field_name, error_list in form.errors.items():
-            for error in error_list.data:
-                error_message = ''
+def form_errors_as_list(form: Form) -> list[str]:
+    form_errors = []
+
+    for field_name, error_list in form.errors.items():
+        for error in error_list.data:
+            error_message = ''
+
+            if field_name != '__all__':
+                error_message += f'{field_name.title()}: '
 
-                if field_name != '__all__':
-                    error_message += f'{field_name.title()}: '
+            if hasattr(error, 'message_responses'):
+                error_message += f'{" ".join(error.message_responses)}'
 
-                if hasattr(error, 'message_responses'):
-                    error_message += f'{" ".join(error.message_responses)}'
+            elif hasattr(error, 'messages'):
+                error_message += f'{" ".join(error.messages)}'
 
-                elif hasattr(error, 'messages'):
-                    error_message += f'{" ".join(error.messages)}'
+            else:
+                message = 'Error message not found.'
+                raise Exception(message)
 
-                else:
-                    raise Exception('Error message not found.')
+            form_errors.append(error_message)
 
-                messages.error(request, error_message)
+    return form_errors
+
+
+def show_form_errors(request: WSGIRequest, *forms: Form) -> None:
+    for form in forms:
+        for error in form_errors_as_list(form):
+            messages.error(request=request, message=error)

django_spire/contrib/generic_views/modal_views.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing_extensions import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from django.http import HttpResponseRedirect
 from django.template.response import TemplateResponse

django_spire/contrib/generic_views/portal_views.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing_extensions import Any, Callable, TYPE_CHECKING
+from typing import Any, Callable, TYPE_CHECKING
 
 from django.db.models import QuerySet
 from django.http import HttpResponseRedirect
@@ -121,34 +121,40 @@ def delete_form_view(
 def infinite_scrolling_view(
     request: WSGIRequest,
     *,
-    context_data: dict[str, Any],
     queryset: QuerySet | list,
     queryset_name: str,
-    template: str
+    template: str,
+    context_data: dict[str, Any] | None = None
 ) -> TemplateResponse:
     if context_data is None:
         context_data = {}
 
-    current_page = int(request.GET.get('page', 1))
-    page_size = int(request.GET.get('page_size', 10))
+    default_batch_size = 25
 
-    start = (current_page - 1) * page_size
-    end = start + page_size
+    page = int(request.GET.get('page', 1))
+
+    batch_size = (
+        context_data.get('batch_size')
+        if 'batch_size' in context_data
+        else request.GET.get('batch_size', default_batch_size)
+    )
 
-    object_list = queryset[start:end]
+    batch_size = int(batch_size)
+    offset = (page - 1) * batch_size
 
-    length = (
+    total_count = (
         queryset.count()
         if isinstance(queryset, QuerySet)
         else len(queryset)
     )
 
-    has_next = end < length
+    object_list = queryset[offset:offset + batch_size]
+    has_next = offset + batch_size < total_count
 
     base_context_data = {
-        'current_page': current_page,
+        'batch_size': batch_size,
         'has_next': has_next,
-        'page_size': page_size,
+        'total_count': total_count,
         queryset_name: object_list
     }
 
@@ -270,49 +276,6 @@ def model_form_view(
     )
 
 
-def table_view(
-    request: WSGIRequest,
-    *,
-    queryset: QuerySet,
-    queryset_name: str,
-    template: str,
-    context_data: dict[str, Any] | None = None
-) -> TemplateResponse:
-    if context_data is None:
-        context_data = {}
-
-    default_batch_size = 25
-
-    page = int(request.GET.get('page', 1))
-
-    batch_size = (
-        context_data.get('batch_size')
-        if 'batch_size' in context_data
-        else request.GET.get('batch_size', default_batch_size)
-    )
-
-    batch_size = int(batch_size)
-    offset = (page - 1) * batch_size
-
-    total_count = queryset.count()
-    object_list = queryset[offset:offset + batch_size]
-    has_next = offset + batch_size < total_count
-
-    base_context_data = {
-        queryset_name: object_list,
-        'has_next': has_next,
-        'total_count': total_count,
-    }
-
-    context_data.update(base_context_data)
-
-    return TemplateResponse(
-        request,
-        context=context_data,
-        template=template
-    )
-
-
 def template_view(
     request: WSGIRequest,
     page_title: str,

django_spire/contrib/ordering/validators.py

@@ -1,15 +1,11 @@
 from __future__ import annotations
 
-
-from typing_extensions import TYPE_CHECKING
-
-from django.db.models import QuerySet
+from typing import TYPE_CHECKING
 
 from django_spire.contrib.ordering.exceptions import OrderingMixinException
 
 if TYPE_CHECKING:
-    from typing import Callable
-    from django.db.models import Model
+    from django.db.models import Model, QuerySet
 
 
 class OrderingMixinValidator:
@@ -37,9 +33,9 @@ class OrderingMixinValidator:
         Validates that the destination and origin and insertion objects and position are valid.
         Returns tuple of validity and applicable error messages.
         """
-        self._validate_position()
 
-        return False if self._errors else True
+        self._validate_position()
+        return not self._errors
 
     def _validate_position(self):
         """Ensure position is valid."""

django_spire/contrib/queryset/enums.py

@@ -1,7 +1,6 @@
-from enum import Enum
+from enum import StrEnum
 
 
-# Todo: Change to string enum
-class SessionFilterActionEnum(Enum):
+class SessionFilterActionEnum(StrEnum):
     CLEAR = 'Clear'
     FILTER = 'Filter'

django_spire/contrib/queryset/mixins.py

@@ -22,24 +22,35 @@ class SessionFilterQuerySetMixin(QuerySet):
     ) -> QuerySet:
         # Session keys must match to process new queryset data
 
-        action = request.GET.get('action')
+        try:
+            action = SessionFilterActionEnum(request.GET.get('action'))
+        except ValueError:
+            action = None
+
         form = form_class(request.GET)
 
         if form.is_valid():
             session = SessionController(request=request, session_key=session_key)
 
-            # Todo: Change actions into an enum
-            if action == SessionFilterActionEnum.CLEAR.value:
+            if action == SessionFilterActionEnum.CLEAR:
                 session.purge()
                 return self
 
-            # The user has submitted the filter form
-            if action == SessionFilterActionEnum.FILTER.value and session_key == request.GET.get('session_filter_key'):
-
+            # Apply filters when the user submits the filter form
+            if (
+                    action == SessionFilterActionEnum.FILTER
+                    and session_key == request.GET.get('session_filter_key')
+            ):
                 # Update session data
                 for key, value in form.cleaned_data.items():
                     session.add_data(key, value)
 
+            # If the session is expired, return the unfiltered queryset
+            if session.is_expired:
+                return self
+
+            # When no new filter data is applied and session is NOT yet expired,
+            # return the original queryset
             return self.bulk_filter(session.data)
         else:
             show_form_errors(request, form)

django_spire/contrib/session/controller.py

@@ -75,7 +75,6 @@ class SessionController:
         self._set_modified()
 
     def _clean(self) -> None:
-
         if self._TIMEOUT_KEY in self.data and self.is_expired:
             self.request.session.pop(self.session_key)
             self._set_modified()

django_spire/core/context_processors.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing_extensions import Any, TYPE_CHECKING
+from typing import Any, TYPE_CHECKING
 
 from django_spire.auth.controller.controller import AppAuthController
 from django_spire.conf import settings

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

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import re
 
-from typing_extensions import TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 from django.core.management.base import CommandError
 

django_spire/core/middleware/maintenance.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from django.conf import settings
 from django.template.response import TemplateResponse
-from typing_extensions import TYPE_CHECKING
 
 from django_spire.consts import MAINTENANCE_MODE_SETTINGS_NAME
 

django_spire/core/middleware.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from django.conf import settings
 from django.template.response import TemplateResponse
-from typing_extensions import TYPE_CHECKING
 
 from django_spire.consts import MAINTENANCE_MODE_SETTINGS_NAME
 

django_spire/core/redirect/generic_redirect.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing_extensions import Any
+from typing import Any
 
 from django.http import HttpResponse
 from django.urls import reverse

django_spire/core/redirect/safe_redirect.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
-from typing_extensions import TYPE_CHECKING
+from typing import TYPE_CHECKING
+
 from urllib.parse import parse_qs, unquote, urlencode, urlparse, urlunparse
 
 from django.urls import reverse, NoReverseMatch

django_spire/core/shortcuts.py

@@ -2,14 +2,16 @@ from __future__ import annotations
 
 import json
 
+from typing import TYPE_CHECKING, TypeVar
+
 from django.contrib.contenttypes.models import ContentType
 from django.db.models import Model
-from typing_extensions import TYPE_CHECKING, TypeVar
 
 if TYPE_CHECKING:
+    from typing import Any
+
     from django.db.models import QuerySet
     from django.http import HttpRequest
-    from typing_extensions import Any
 
 
 T = TypeVar('T', bound=Model)

django_spire/core/table/enums.py

@@ -0,0 +1,18 @@
+from __future__ import annotations
+
+from enum import StrEnum
+
+
+class ResponsiveMode(StrEnum):
+    """
+    It defines how tables handle responsive behavior at different viewport sizes.
+
+    Collapse: Any columns with breakpoint attributes are hidden at smaller viewports
+        and shown at their specified breakpoint.
+
+    Scroll: All columns remain visible regardless of viewport size. The table
+        container enables horizontal scrolling to accommodate the full width.
+    """
+
+    COLLAPSE = 'collapse'
+    SCROLL = 'scroll'