django-spire 0.23.7__py3-none-any.whl → 0.23.9__py3-none-any.whl

django_spire/core/forms/widgets.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import json
 import uuid
 
@@ -7,12 +9,14 @@ from django import forms
 class JsonTreeWidget(forms.Textarea):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+
         self.template_name = 'django_spire/forms/widgets/json_tree_widget.html'
 
     def get_context(self, *args, **kwargs):
         context = super().get_context(*args, **kwargs)
         context['open_dropdowns'] = True
         context['widget_render_uuid'] = uuid.uuid4()
+
         if context['widget']['value'] is None:
             context['json_tree_dict'] = {}
         else:

django_spire/core/management/commands/spire_startapp_pkg/template/app/apps.py.template

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.apps import AppConfig
 
 

django_spire/core/management/commands/spire_startapp_pkg/template/app/urls/__init__.py.template

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.urls.conf import include, path
 
 

django_spire/core/management/commands/spire_startapp_pkg/template/app/urls/form_urls.py.template

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.urls import path
 
 from ${module_path}.views import form_views

django_spire/core/management/commands/spire_startapp_pkg/template/app/urls/page_urls.py.template

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.urls import path
 
 from ${module_path}.views import page_views

django_spire/core/maps.py

@@ -1,6 +1,8 @@
+from __future__ import annotations
+
 import datetime
-from decimal import Decimal
 
+from decimal import Decimal
 from uuid import UUID
 
 from django.db import models

django_spire/core/middleware/maintenance.py

@@ -2,10 +2,10 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING
 
-from django.conf import settings
-from django.template.response import TemplateResponse
+# from django.conf import settings
+# from django.template.response import TemplateResponse
 
-from django_spire.consts import MAINTENANCE_MODE_SETTINGS_NAME
+# from django_spire.consts import MAINTENANCE_MODE_SETTINGS_NAME
 
 if TYPE_CHECKING:
     from django.core.handlers.wsgi import WSGIRequest

django_spire/core/middleware.py

@@ -1,21 +1,22 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Callable
 
-from django.conf import settings
-from django.template.response import TemplateResponse
+# from django.conf import settings
+# from django.template.response import TemplateResponse
 
-from django_spire.consts import MAINTENANCE_MODE_SETTINGS_NAME
+# from django_spire.consts import MAINTENANCE_MODE_SETTINGS_NAME
 
 if TYPE_CHECKING:
     from django.core.handlers.wsgi import WSGIRequest
+    from django.http import HttpResponse
 
 
 class MaintenanceMiddleware:
-    def __init__(self, get_response):
+    def __init__(self, get_response: Callable[[WSGIRequest], HttpResponse]) -> None:
         self.get_response = get_response
 
-    def __call__(self, request: WSGIRequest):
+    def __call__(self, request: WSGIRequest) -> HttpResponse:
         # maintenance_mode = getattr(settings, MAINTENANCE_MODE_SETTINGS_NAME)
         #
         # if maintenance_mode is None:
@@ -27,4 +28,5 @@ class MaintenanceMiddleware:
         #         template='django_spire/page/maintenance_page.html',
         #     )
         #
+
         return self.get_response(request)

django_spire/core/redirect/__init__.py

@@ -1 +1,6 @@
 from django_spire.core.redirect.safe_redirect import safe_redirect_url
+
+
+__all__ = [
+    'safe_redirect_url'
+]

django_spire/core/redirect/generic_redirect.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from operator import attrgetter
 from typing import Any
 
 from django.http import HttpResponse
@@ -7,8 +8,6 @@ from django.urls import reverse
 
 
 def reverse_generic_relation(content_object: Any, **kwargs) -> HttpResponse | None:
-    from operator import attrgetter
-
     model_name = content_object.__class__.__name__.lower()
 
     CONTENT_OBJECT_URL_MAP = {

django_spire/core/redirect/tests/test_generic_redirect.py

@@ -0,0 +1,34 @@
+from __future__ import annotations
+
+import pytest
+
+from unittest.mock import MagicMock
+
+from django.test import TestCase
+
+from django_spire.core.redirect.generic_redirect import reverse_generic_relation
+
+
+class TestReverseGenericRelation(TestCase):
+    def test_model_not_in_map_raises_key_error(self) -> None:
+        """
+        Since CONTENT_OBJECT_URL_MAP is empty by default,
+        any model lookup raises KeyError.
+        """
+
+        content_object = MagicMock()
+        content_object.__class__.__name__ = 'UnknownModel'
+
+        with pytest.raises(KeyError):
+            reverse_generic_relation(content_object)
+
+    def test_uses_lowercase_model_name(self) -> None:
+        """Verifies the model name is lowercased for map lookup."""
+
+        content_object = MagicMock()
+        content_object.__class__.__name__ = 'MyModel'
+
+        with pytest.raises(KeyError) as exc_info:
+            reverse_generic_relation(content_object)
+
+        assert exc_info.value.args[0] == 'mymodel'

django_spire/core/{tests/tests_redirect.py → redirect/tests/test_safe_redirect.py}

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from django.test import override_settings, RequestFactory
-from django.urls import reverse
 
 from django_spire.core.redirect.safe_redirect import (
     is_url_valid_and_safe,
@@ -15,53 +14,28 @@ class UrlsTestCase(BaseTestCase):
     def setUp(self) -> None:
         super().setUp()
 
-    # def test_resolve_valid_url(self) -> None:
-    #     valid_url = 'dummy:home'
-    #     resolved_url = resolve_url(valid_url)
-    #     self.assertEqual(resolved_url, reverse(valid_url))
+    def test_is_url_valid_and_safe_empty_url(self) -> None:
+        assert is_url_valid_and_safe('', {'localhost'}) is False
 
-    def test_resolve_invalid_url(self) -> None:
-        invalid_url = 'invalid:url'
-        resolved_url = resolve_url(invalid_url)
-        self.assertEqual(resolved_url, invalid_url)
+    def test_is_url_valid_and_safe_invalid_host(self) -> None:
+        url = 'http://invalid.com'
 
-    def test_is_url_valid_and_safe_empty_url(self) -> None:
-        self.assertFalse(
-            is_url_valid_and_safe(
-                '',
-                {'localhost'}
-            )
-        )
+        assert is_url_valid_and_safe(url, {'example.com'}) is False
 
     def test_is_url_valid_and_safe_invalid_scheme(self) -> None:
         url = 'ftp://example.com'
 
-        self.assertFalse(
-            is_url_valid_and_safe(
-                url,
-                {'example.com'}
-            )
-        )
-
-    def test_is_url_valid_and_safe_invalid_host(self) -> None:
-        url = 'http://invalid.com'
-
-        self.assertFalse(
-            is_url_valid_and_safe(
-                url,
-                {'example.com'}
-            )
-        )
+        assert is_url_valid_and_safe(url, {'example.com'}) is False
 
     def test_is_url_valid_and_safe_valid_url(self) -> None:
         url = 'http://example.com'
 
-        self.assertTrue(
-            is_url_valid_and_safe(
-                url,
-                {'example.com'}
-            )
-        )
+        assert is_url_valid_and_safe(url, {'example.com'}) is True
+
+    def test_resolve_invalid_url(self) -> None:
+        invalid_url = 'invalid:url'
+        resolved_url = resolve_url(invalid_url)
+        assert resolved_url == invalid_url
 
 
 @override_settings(ALLOWED_HOSTS=['example.com'])
@@ -71,25 +45,25 @@ class ReturnUrlTestCase(BaseTestCase):
 
         self.request_factory = RequestFactory()
 
-    def test_safe_redirect_url_valid_return_url(self) -> None:
+    def test_safe_redirect_url_invalid_return_url(self) -> None:
         request = self.request_factory.get(
             '/some_path',
-            {'return_url': 'http://example.com/valid'}
+            {'return_url': 'http://invalid.com'}
         )
 
         request.META['HTTP_HOST'] = 'example.com'
         response = safe_redirect_url(request)
-        self.assertEqual(response, 'http://example.com/valid')
+        assert response == '/'
 
-    def test_safe_redirect_url_invalid_return_url(self) -> None:
+    def test_safe_redirect_url_return_url_with_encoded_characters(self) -> None:
         request = self.request_factory.get(
             '/some_path',
-            {'return_url': 'http://invalid.com'}
+            {'return_url': 'http://example.com/valid%20path'}
         )
 
         request.META['HTTP_HOST'] = 'example.com'
         response = safe_redirect_url(request)
-        self.assertEqual(response, '/')
+        assert response == 'http://example.com/valid%20path'
 
     def test_safe_redirect_url_return_url_with_invalid_characters(self) -> None:
         request = self.request_factory.get(
@@ -99,17 +73,17 @@ class ReturnUrlTestCase(BaseTestCase):
 
         request.META['HTTP_HOST'] = 'example.com'
         response = safe_redirect_url(request)
-        self.assertEqual(response, '/')
+        assert response == '/'
 
-    def test_safe_redirect_url_return_url_with_encoded_characters(self) -> None:
+    def test_safe_redirect_url_return_url_with_javascript_code(self) -> None:
         request = self.request_factory.get(
             '/some_path',
-            {'return_url': 'http://example.com/valid%20path'}
+            {'return_url': 'javascript:alert("XSS")'}
         )
 
         request.META['HTTP_HOST'] = 'example.com'
         response = safe_redirect_url(request)
-        self.assertEqual(response, 'http://example.com/valid%20path')
+        assert response == '/'
 
     def test_safe_redirect_url_return_url_with_utf8_characters(self) -> None:
         request = self.request_factory.get(
@@ -119,17 +93,17 @@ class ReturnUrlTestCase(BaseTestCase):
 
         request.META['HTTP_HOST'] = 'example.com'
         response = safe_redirect_url(request)
-        self.assertEqual(response, 'http://example.com/ümlaut')
+        assert response == 'http://example.com/ümlaut'
 
-    def test_safe_redirect_url_return_url_with_javascript_code(self) -> None:
+    def test_safe_redirect_url_valid_return_url(self) -> None:
         request = self.request_factory.get(
             '/some_path',
-            {'return_url': 'javascript:alert("XSS")'}
+            {'return_url': 'http://example.com/valid'}
         )
 
         request.META['HTTP_HOST'] = 'example.com'
         response = safe_redirect_url(request)
-        self.assertEqual(response, '/')
+        assert response == 'http://example.com/valid'
 
 
 @override_settings(ALLOWED_HOSTS=['example.com'])
@@ -139,15 +113,13 @@ class RefererTestCase(BaseTestCase):
 
         self.request_factory = RequestFactory()
 
-    def test_safe_redirect_url_valid_return_url(self) -> None:
-        request = self.request_factory.get(
-            '/some_path',
-            {'return_url': 'http://example.com/valid'}
-        )
-
+    def test_safe_redirect_url_invalid_referer(self) -> None:
+        request = self.request_factory.get('/some_path')
         request.META['HTTP_HOST'] = 'example.com'
+        request.META['HTTP_REFERER'] = 'http://invalid.com'
+
         response = safe_redirect_url(request)
-        self.assertEqual(response, 'http://example.com/valid')
+        assert response == '/'
 
     def test_safe_redirect_url_invalid_return_url(self) -> None:
         request = self.request_factory.get(
@@ -157,30 +129,22 @@ class RefererTestCase(BaseTestCase):
 
         request.META['HTTP_HOST'] = 'example.com'
         response = safe_redirect_url(request)
-        self.assertEqual(response, '/')
+        assert response == '/'
 
-    def test_safe_redirect_url_valid_referer(self) -> None:
-        request = self.request_factory.get('/some_path')
-        request.META['HTTP_HOST'] = 'example.com'
-        request.META['HTTP_REFERER'] = 'http://example.com/valid'
-
-        response = safe_redirect_url(request)
-        self.assertEqual(response, 'http://example.com/valid')
-
-    def test_safe_redirect_url_invalid_referer(self) -> None:
+    def test_safe_redirect_url_no_return_url_or_referer(self) -> None:
         request = self.request_factory.get('/some_path')
         request.META['HTTP_HOST'] = 'example.com'
-        request.META['HTTP_REFERER'] = 'http://invalid.com'
 
         response = safe_redirect_url(request)
-        self.assertEqual(response, '/')
+        assert response == '/'
 
-    def test_safe_redirect_url_no_return_url_or_referer(self) -> None:
+    def test_safe_redirect_url_referer_with_encoded_characters(self) -> None:
         request = self.request_factory.get('/some_path')
         request.META['HTTP_HOST'] = 'example.com'
+        request.META['HTTP_REFERER'] = 'http://example.com/valid%20path'
 
         response = safe_redirect_url(request)
-        self.assertEqual(response, '/')
+        assert response == 'http://example.com/valid%20path'
 
     def test_safe_redirect_url_referer_with_invalid_characters(self) -> None:
         request = self.request_factory.get('/some_path')
@@ -188,7 +152,7 @@ class RefererTestCase(BaseTestCase):
         request.META['HTTP_REFERER'] = 'http://example.com/invalid<>chars'
 
         response = safe_redirect_url(request)
-        self.assertEqual(response, '/')
+        assert response == '/'
 
     def test_safe_redirect_url_referer_with_javascript_code(self) -> None:
         request = self.request_factory.get('/some_path')
@@ -196,20 +160,30 @@ class RefererTestCase(BaseTestCase):
         request.META['HTTP_REFERER'] = 'javascript:alert("XSS")'
 
         response = safe_redirect_url(request)
-        self.assertEqual(response, '/')
+        assert response == '/'
 
-    def test_safe_redirect_url_referer_with_encoded_characters(self) -> None:
+    def test_safe_redirect_url_referer_with_utf8_characters(self) -> None:
         request = self.request_factory.get('/some_path')
         request.META['HTTP_HOST'] = 'example.com'
-        request.META['HTTP_REFERER'] = 'http://example.com/valid%20path'
+        request.META['HTTP_REFERER'] = 'http://example.com/ümlaut'
 
         response = safe_redirect_url(request)
-        self.assertEqual(response, 'http://example.com/valid%20path')
+        assert response == 'http://example.com/ümlaut'
 
-    def test_safe_redirect_url_referer_with_utf8_characters(self) -> None:
+    def test_safe_redirect_url_valid_referer(self) -> None:
         request = self.request_factory.get('/some_path')
         request.META['HTTP_HOST'] = 'example.com'
-        request.META['HTTP_REFERER'] = 'http://example.com/ümlaut'
+        request.META['HTTP_REFERER'] = 'http://example.com/valid'
 
         response = safe_redirect_url(request)
-        self.assertEqual(response, 'http://example.com/ümlaut')
+        assert response == 'http://example.com/valid'
+
+    def test_safe_redirect_url_valid_return_url(self) -> None:
+        request = self.request_factory.get(
+            '/some_path',
+            {'return_url': 'http://example.com/valid'}
+        )
+
+        request.META['HTTP_HOST'] = 'example.com'
+        response = safe_redirect_url(request)
+        assert response == 'http://example.com/valid'

django_spire/core/shortcuts.py

@@ -56,7 +56,7 @@ def get_object_or_none(model: type[T], pk: int, **kwargs) -> Model:
         return None
 
 
-def process_request_body(request: HttpRequest, key='data') -> Any:
+def process_request_body(request: HttpRequest, key: str = 'data') -> Any:
     """
     Processes the HTTP request body and returns the 'data' field from the parsed JSON.
 
@@ -68,8 +68,8 @@ def process_request_body(request: HttpRequest, key='data') -> Any:
 
     if key:
         return json.loads(body_unicode)[key]
-    else:
-        return json.loads(body_unicode)
+
+    return json.loads(body_unicode)
 
 
 def model_object_from_app_label(

django_spire/core/static/django_spire/css/app-layout.css

@@ -2,7 +2,7 @@
     --app-footer-height: 70px;
     --app-mobile-navigation-width: 250px;
     --app-side-navigation-width: 250px;
-    --app-side-navigation-top-content-height: 230px;
+    --app-side-navigation-top-content-height: 100px;
     --app-top-navigation-height: 80px;
 
     --app-content-height: calc(100vh - var(--app-top-navigation-height) );

django_spire/core/static/django_spire/css/app-navigation.css

@@ -82,13 +82,13 @@
 }
 
 .side-navigation-fade-bottom {
-    background: linear-gradient(to top, var(--app-side-navigation-bg-color) 0%, transparent 100%);
-    height: 60px;
+    background: linear-gradient(to top, var(--app-side-navigation-bg-color) 0%, var(--app-side-navigation-bg-color) 20%, transparent 75%);
+    height: 20%;
     pointer-events: none;
 }
 
 .side-navigation-fade-top {
-    background: linear-gradient(to bottom, var(--app-side-navigation-bg-color) 0%, transparent 100%);
+    background: linear-gradient(to bottom, var(--app-side-navigation-bg-color) 0%, var(--app-side-navigation-bg-color) 20%, transparent 100%);
     height: 60px;
     pointer-events: none;
 }

django_spire/core/static/django_spire/css/bootstrap-override.css

@@ -287,6 +287,10 @@
     color: var(--app-default-text-color);
 }
 
+.table-container thead.sticky-top {
+    z-index: 1;
+}
+
 .ce-block__content [data-placeholder]:empty::before,
 .ce-block__content [data-placeholder][data-empty="true"]::before {
     color: var(--app-primary) !important;

django_spire/core/tag/admin.py

@@ -0,0 +1,12 @@
+from __future__ import annotations
+
+from django.contrib import admin
+
+from django_spire.core.tag.models import Tag
+
+
+@admin.register(Tag)
+class TagAdmin(admin.ModelAdmin):
+    list_display = ('name',)
+    ordering = ('name',)
+    search_fields = ('name',)

django_spire/core/tag/intelligence/tag_set_bot.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from dandy import Bot, Prompt, BaseListIntel
 from django.utils.text import slugify
 

django_spire/core/tag/mixins.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.db import models
 
 from django_spire.core.tag.models import Tag

django_spire/core/tag/models.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Sequence, Self
 
 from django.db import models

django_spire/core/tag/querysets.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from django.db.models import QuerySet
 from django.utils.text import slugify
 

django_spire/core/tag/service/tag_service.py

@@ -1,7 +1,7 @@
-from abc import abstractmethod, ABC
-from typing import Generic
+from __future__ import annotations
 
-from django.db.models import QuerySet
+from abc import abstractmethod, ABC
+from typing import Generic, TYPE_CHECKING
 
 from django_spire.contrib.constructor.django_model_constructor import TypeDjangoModel
 from django_spire.contrib.service import BaseDjangoModelService
@@ -9,6 +9,9 @@ from django_spire.core.tag import tools
 from django_spire.core.tag.models import Tag
 from django_spire.core.tag.tools import get_score_percentage_from_tag_set_weighted
 
+if TYPE_CHECKING:
+    from django.db.models import QuerySet
+
 
 class BaseTagService(
     BaseDjangoModelService[TypeDjangoModel],

django_spire/core/tag/tests/test_intelligence.py

@@ -1,7 +1,10 @@
+from __future__ import annotations
+
 from unittest import TestCase
 
 from django_spire.core.tag.intelligence.tag_set_bot import TagSetBot
 
+
 TEST_INPUT = """
     I love reading books about science fiction, fantasy, and adventure, especially ones
     that feature artificial intelligence, machine learning, and natural language processing.
@@ -13,16 +16,13 @@ TEST_INPUT = """
 
 
 class TestTagIntelligence(TestCase):
-    def setUp(self):
-        pass
-
     def test_tag_set_bot(self):
         tag_set = TagSetBot().process(TEST_INPUT)
 
-        self.assertIn('science', tag_set)
-        self.assertIn('artificial', tag_set)
-        self.assertIn('fantasy', tag_set)
+        assert 'science' in tag_set
+        assert 'artificial' in tag_set
+        assert 'fantasy' in tag_set
 
-        self.assertNotIn('camping', tag_set)
-        self.assertNotIn('art', tag_set)
-        self.assertNotIn('hate', tag_set)
+        assert 'camping' not in tag_set
+        assert 'art' not in tag_set
+        assert 'hate' not in tag_set