Tweakhancement: pass ordering to tag children

pyproject.toml

@@ -18,40 +18,40 @@ classifiers = [
 dependencies = [
   "babel>=2.17",
   "bleach~=6.3.0",
-  "celery[redis]~=5.6.0",
-  "channels~=4.3",
-  "channels-redis~=4.3",
-  "concurrent-log-handler~=0.9.28",
+  "celery[redis]~=5.5.1",
+  "channels~=4.2",
+  "channels-redis~=4.2",
+  "concurrent-log-handler~=0.9.25",
   "dateparser~=1.2",
   # WARNING: django does not use semver.
   #          Only patch versions are guaranteed to not introduce breaking changes.
-  "django==5.2.9",
-  "django-allauth[mfa,socialaccount]~=65.13.1",
+  "django~=5.2.5",
+  "django-allauth[mfa,socialaccount]~=65.12.1",
   "django-auditlog~=3.3.0",
   "django-cachalot~=2.8.0",
   "django-celery-results~=2.6.0",
   "django-compression-middleware~=0.5.0",
   "django-cors-headers~=4.9.0",
   "django-extensions~=4.1",
-  "django-filter~=25.2",
+  "django-filter~=25.1",
   "django-guardian~=3.2.0",
   "django-multiselectfield~=1.0.1",
-  "django-soft-delete~=1.0.22",
-  "django-treenode~=0.23.3",
-  "djangorestframework~=3.16.1",
+  "django-soft-delete~=1.0.18",
+  "django-treenode>=0.23.2",
+  "djangorestframework~=3.16",
   "djangorestframework-guardian~=0.4.0",
-  "drf-spectacular~=0.29",
-  "drf-spectacular-sidecar~=2025.12.1",
-  "drf-writable-nested~=0.7.2",
+  "drf-spectacular~=0.28",
+  "drf-spectacular-sidecar~=2025.10.1",
+  "drf-writable-nested~=0.7.1",
   "filelock~=3.20.0",
   "flower~=2.0.1",
-  "gotenberg-client~=0.13.0",
+  "gotenberg-client~=0.12.0",
   "httpx-oauth~=0.16",
   "imap-tools~=1.11.0",
   "inotifyrecursive~=0.3",
-  "jinja2~=3.1.6",
+  "jinja2~=3.1.5",
   "langdetect~=1.0.9",
-  "nltk~=3.9.2",
+  "nltk~=3.9.1",
   "ocrmypdf~=16.12.0",
   "pathvalidate~=3.3.1",
   "pdf2image~=1.17.0",
@@ -68,7 +68,7 @@ dependencies = [
   "tika-client~=0.10.0",
   "tqdm~=4.67.1",
   "watchdog~=6.0",
-  "whitenoise~=6.11",
+  "whitenoise~=6.9",
   "whoosh-reloaded>=2.7.5",
   "zxing-cpp~=2.3.0",
 ]
@@ -80,10 +80,10 @@ optional-dependencies.postgres = [
   "psycopg[c,pool]==3.2.12",
   # Direct dependency for proper resolution of the pre-built wheels
   "psycopg-c==3.2.12",
-  "psycopg-pool==3.2.8",
+  "psycopg-pool==3.2.7",
 ]
 optional-dependencies.webserver = [
-  "granian[uvloop]~=2.6.0",
+  "granian[uvloop]~=2.5.1",
 ]
 
 [dependency-groups]
@@ -140,7 +140,7 @@ typing = [
 ]
 
 [tool.uv]
-required-version = ">=0.9.0"
+required-version = ">=0.5.14"
 package = false
 environments = [
   "sys_platform == 'darwin'",

src/documents/serialisers.py

@@ -21,6 +21,7 @@ from django.core.validators import MaxLengthValidator
 from django.core.validators import RegexValidator
 from django.core.validators import integer_validator
 from django.db.models import Count
+from django.db.models.functions import Lower
 from django.utils.crypto import get_random_string
 from django.utils.dateparse import parse_datetime
 from django.utils.text import slugify
@@ -38,6 +39,7 @@ from guardian.utils import get_user_obj_perms_model
 from rest_framework import fields
 from rest_framework import serializers
 from rest_framework.fields import SerializerMethodField
+from rest_framework.filters import OrderingFilter
 
 if settings.AUDIT_LOG_ENABLED:
     from auditlog.context import set_actor
@@ -575,18 +577,28 @@ class TagSerializer(MatchingModelSerializer, OwnedObjectSerializer):
     )
     def get_children(self, obj):
         filter_q = self.context.get("document_count_filter")
+        request = self.context.get("request")
         if filter_q is None:
-            request = self.context.get("request")
             user = getattr(request, "user", None) if request else None
             filter_q = get_document_count_filter_for_user(user)
             self.context["document_count_filter"] = filter_q
-        serializer = TagSerializer(
+
+        children_queryset = (
             obj.get_children_queryset()
             .select_related("owner")
-            .annotate(document_count=Count("documents", filter=filter_q)),
-            many=True,
-            context=self.context,
+            .annotate(document_count=Count("documents", filter=filter_q))
         )
+
+        view = self.context.get("view")
+        ordering = (
+            OrderingFilter().get_ordering(request, children_queryset, view)
+            if request and view
+            else None
+        )
+        ordering = ordering or (Lower("name"),)
+        children_queryset = children_queryset.order_by(*ordering)
+
+        serializer = TagSerializer(children_queryset, many=True, context=self.context)
         return serializer.data
 
     # children as nested Tag objects

src/paperless/adapter.py

@@ -137,3 +137,25 @@ class CustomSocialAccountAdapter(DefaultSocialAccountAdapter):
             user.save()
         handle_social_account_updated(None, request, sociallogin)
         return user
+
+    def on_authentication_error(
+        self,
+        request,
+        provider,
+        error=None,
+        exception=None,
+        extra_context=None,
+    ):
+        """
+        Just log errors and pass them along.
+        """
+        logger.warning(
+            f"Social authentication error for provider `{provider!s}`: {error!s} ({exception!s})",
+        )
+        return super().on_authentication_error(
+            request,
+            provider,
+            error,
+            exception,
+            extra_context,
+        )

src/paperless/tests/test_adapter.py

@@ -167,3 +167,17 @@ class TestCustomSocialAccountAdapter(TestCase):
         self.assertEqual(user.groups.count(), 1)
         self.assertTrue(user.groups.filter(name="group1").exists())
         self.assertFalse(user.groups.filter(name="group2").exists())
+
+    def test_error_logged_on_authentication_error(self):
+        adapter = get_social_adapter()
+        request = HttpRequest()
+        with self.assertLogs("paperless.auth", level="INFO") as log_cm:
+            adapter.on_authentication_error(
+                request,
+                provider="test-provider",
+                error="Error",
+                exception="Test authentication error",
+            )
+        self.assertTrue(
+            any("Test authentication error" in message for message in log_cm.output),
+        )