django-spire 0.23.6__py3-none-any.whl → 0.23.8__py3-none-any.whl

django_spire/core/converters/to_pydantic.py

@@ -1,7 +1,9 @@
+from __future__ import annotations
+
 from pydantic import constr, condecimal, create_model
 from pydantic.fields import Field
 
-from typing import Tuple, Type, Any, Optional
+from typing import Any
 
 from django.db import models
 from django.core import validators
@@ -11,13 +13,14 @@ from django_spire.core.maps import MODEL_FIELD_TYPE_TO_TYPE_MAP
 
 
 def django_to_pydantic_model(
-        model_class: Type[models.Model],
-        base_class: Type | None = None,
-        include_fields: str | list| tuple | None = None,
-        exclude_fields: str | list | tuple | None = None
+    model_class: type[models.Model],
+    base_class: type | None = None,
+    include_fields: str | list| tuple | None = None,
+    exclude_fields: str | list | tuple | None = None
 ):
     if not issubclass(model_class, models.Model):
-        raise ValueError("model_class must be a subclass of django.db.models.Model")
+        message = 'model_class must be a subclass of django.db.models.Model'
+        raise TypeError(message)
 
     if include_fields is None:
         include_fields = []
@@ -47,7 +50,6 @@ def django_to_pydantic_model(
 
 
 class DjangoToPydanticFieldConverter:
-
     def __init__(self, model_field: models.Field):
         self.model_field = model_field
         self.kwargs = {}
@@ -60,8 +62,8 @@ class DjangoToPydanticFieldConverter:
     def bool_to_json_schema(value: bool):
         if value:
             return "true"
-        else:
-            return "false"
+
+        return "false"
 
     @property
     def field_handlers(self):
@@ -80,22 +82,20 @@ class DjangoToPydanticFieldConverter:
             str
         )
 
-    def _build_char_field(self) -> Type:
+    def _build_char_field(self) -> type:
         if self.model_field.max_length:
             return constr(max_length=self.model_field.max_length)
         return str
 
-    def _build_date_field(self) -> Type:
-        self.kwargs['example'] = '2022-01-01'
+    def _build_date_field(self) -> type:
         self.kwargs['json_schema_extra']['example'] = '2022-01-01'
         return self._base_type()
 
-    def _build_date_time_field(self) -> Type:
-        self.kwargs['example'] = '2022-01-01 13:37:00'
+    def _build_date_time_field(self) -> type:
         self.kwargs['json_schema_extra']['example'] = '2022-01-01 13:37:00'
         return self._base_type()
 
-    def _build_integer_field(self) -> Type:
+    def _build_integer_field(self) -> type:
         for validator in self.model_field.validators:
             if isinstance(validator, validators.MinValueValidator):
                 self.kwargs['json_schema_extra']['greater_than'] = validator.limit_value
@@ -104,7 +104,7 @@ class DjangoToPydanticFieldConverter:
 
         return self._base_type()
 
-    def _build_decimal_field(self) -> Type:
+    def _build_decimal_field(self) -> type:
         self.kwargs['json_schema_extra']['example'] = '0.00'
         self.kwargs['json_schema_extra']['max_digits'] = self.model_field.max_digits
         self.kwargs['json_schema_extra']['decimal_places'] = self.model_field.decimal_places
@@ -118,21 +118,19 @@ class DjangoToPydanticFieldConverter:
         enum_name = f"{self.model_field.name.capitalize()}Enum"
         return django_choices_to_enums(enum_name, self.model_field.choices)
 
-    def build_field(self) -> Tuple[Type, Any]:
+    def build_field(self) -> tuple[type, Any]:
         """Build and return the Pydantic field type and Field object."""
         return self.field_type, Field(**self.kwargs)
 
     def _build_metadata(self):
-
         # Cannot set a default when providing option to the LLM
+
         # if self.model_field.default is not models.NOT_PROVIDED:
         #     if callable(self.model_field.default):
         #         self.kwargs['default'] = self.model_field.default()
         #     else:
         #         self.kwargs['default'] = self.model_field.default
 
-        self.kwargs['required'] = not self.model_field.null
-
         if self.model_field.null and self.model_field.default is models.NOT_PROVIDED:
             self.kwargs['default'] = None
 
@@ -140,6 +138,7 @@ class DjangoToPydanticFieldConverter:
             self.kwargs['description'] = str(self.model_field.help_text)
 
         self.kwargs['json_schema_extra'] = {
+            'required': self.bool_to_json_schema(not self.model_field.null),
             'is_unique': self.bool_to_json_schema(self.model_field.unique),
             # 'is_required': self.bool_to_json_schema(not self.model_field.null),
             'field_name': self.model_field.name
@@ -151,7 +150,7 @@ class DjangoToPydanticFieldConverter:
                 f"{value} ({label})" for value, label in self.model_field.choices
             ) + "."
 
-    def _get_pydantic_type(self) -> Type:
+    def _get_pydantic_type(self) -> type:
         if self.model_field.choices:
             return self._build_enum_type()
 
@@ -164,6 +163,7 @@ class DjangoToPydanticFieldConverter:
 
     def _wrap_nullable(self):
         pass
+
         # This works better for the LLM
         # if self.model_field.null:
-        #     self.field_type = Optional[self.field_type]
+        #     self.field_type = Optional[self.field_type]

django_spire/core/decorators.py

@@ -1,25 +1,38 @@
-from django.db import connections
+from __future__ import annotations
+
 from functools import wraps
 
-from django.http import JsonResponse
+from typing import Callable, ParamSpec, TypeVar
+
+from django.db import connections
+from django.http import HttpRequest, HttpResponse, JsonResponse
+
 
+P = ParamSpec('P')
+T = TypeVar('T')
 
-def close_db_connections(func):
+
+def close_db_connections(func: Callable[P, T]) -> Callable[P, T]:
     @wraps(func)
-    def inner(*args, **kwargs):
+    def inner(*args: P.args, **kwargs: P.kwargs) -> T:
         try:
             return func(*args, **kwargs)
         finally:
             connections.close_all()
+
     return inner
 
 
-def valid_ajax_request_required(method):
+def valid_ajax_request_required(
+    method: Callable[..., HttpResponse]
+) -> Callable[..., HttpResponse]:
     @wraps(method)
-    def wrapper(request, *args, **kwargs):
+    def wrapper(request: HttpRequest, *args, **kwargs) -> HttpResponse:
         if request.method != 'POST' and request.content_type != 'application/json':
             return JsonResponse(
                 {'type': 'error', 'message': 'Invalid Request'}
             )
+
         return method(request, *args, **kwargs)
+
     return wrapper

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/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