Chore: switch from os.path to pathlib.Path

Tweak: add saved views hint to dashboard

.github/dependabot.yml

@@ -89,3 +89,50 @@ updates:
           - "major"
           - "minor"
           - "patch"
+
+  # Update Dockerfile in root directory
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 5
+    reviewers:
+      - "paperless-ngx/ci-cd"
+    labels:
+      - "ci-cd"
+      - "dependencies"
+    commit-message:
+      prefix: "docker"
+      include: "scope"
+
+  # Update Docker Compose files in docker/compose directory
+  - package-ecosystem: "docker-compose"
+    directory: "/docker/compose/"
+    schedule:
+      interval: "weekly"
+    open-pull-requests-limit: 5
+    reviewers:
+      - "paperless-ngx/ci-cd"
+    labels:
+      - "ci-cd"
+      - "dependencies"
+    commit-message:
+      prefix: "docker-compose"
+      include: "scope"
+    groups:
+      # Individual groups for each image
+      gotenberg:
+        patterns:
+          - "docker.io/gotenberg/gotenberg*"
+      tika:
+        patterns:
+          - "docker.io/apache/tika*"
+      redis:
+        patterns:
+          - "docker.io/library/redis*"
+      mariadb:
+        patterns:
+          - "docker.io/library/mariadb*"
+      postgres:
+        patterns:
+          - "docker.io/library/postgres*"

Dockerfile

@@ -30,7 +30,7 @@ RUN set -eux \
 # Purpose: Installs s6-overlay and rootfs
 # Comments:
 #  - Don't leave anything extra in here either
-FROM ghcr.io/astral-sh/uv:0.6.3-python3.12-bookworm-slim AS s6-overlay-base
+FROM ghcr.io/astral-sh/uv:0.6.5-python3.12-bookworm-slim AS s6-overlay-base
 
 WORKDIR /usr/src/s6
 

docker/compose/docker-compose.portainer.yml

@@ -38,7 +38,7 @@ services:
       - redisdata:/data
 
   db:
-    image: docker.io/library/postgres:16
+    image: docker.io/library/postgres:17
     restart: unless-stopped
     volumes:
       - pgdata:/var/lib/postgresql/data

docker/compose/docker-compose.postgres-tika.yml

@@ -38,7 +38,7 @@ services:
       - redisdata:/data
 
   db:
-    image: docker.io/library/postgres:16
+    image: docker.io/library/postgres:17
     restart: unless-stopped
     volumes:
       - pgdata:/var/lib/postgresql/data

docker/compose/docker-compose.postgres.yml

@@ -34,7 +34,7 @@ services:
       - redisdata:/data
 
   db:
-    image: docker.io/library/postgres:16
+    image: docker.io/library/postgres:17
     restart: unless-stopped
     volumes:
       - pgdata:/var/lib/postgresql/data

pyproject.toml

@@ -37,7 +37,7 @@ dependencies = [
   "djangorestframework~=3.15",
   "djangorestframework-guardian~=0.3.0",
   "drf-spectacular~=0.28",
-  "drf-spectacular-sidecar~=2025.2.1",
+  "drf-spectacular-sidecar~=2025.3.1",
   "drf-writable-nested~=0.7.1",
   "filelock~=3.17.0",
   "flower~=2.0.1",
@@ -48,7 +48,7 @@ dependencies = [
   "jinja2~=3.1.5",
   "langdetect~=1.0.9",
   "nltk~=3.9.1",
-  "ocrmypdf~=16.9.0",
+  "ocrmypdf~=16.10.0",
   "pathvalidate~=3.2.3",
   "pdf2image~=1.17.0",
   "python-dateutil~=2.9.0",
@@ -73,9 +73,9 @@ optional-dependencies.mariadb = [
   "mysqlclient~=2.2.7",
 ]
 optional-dependencies.postgres = [
-  "psycopg[c]==3.2.4",
+  "psycopg[c]==3.2.5",
   # Direct dependency for proper resolution of the pre-built wheels
-  "psycopg-c==3.2.4",
+  "psycopg-c==3.2.5",
 ]
 optional-dependencies.webserver = [
   "granian~=1.7.6",
@@ -227,27 +227,9 @@ lint.per-file-ignores."src/documents/tests/test_consumer.py" = [
 lint.per-file-ignores."src/documents/tests/test_file_handling.py" = [
   "PTH",
 ] # TODO Enable & remove
-lint.per-file-ignores."src/documents/tests/test_management.py" = [
-  "PTH",
-] # TODO Enable & remove
-lint.per-file-ignores."src/documents/tests/test_management_consumer.py" = [
-  "PTH",
-] # TODO Enable & remove
-lint.per-file-ignores."src/documents/tests/test_management_exporter.py" = [
-  "PTH",
-] # TODO Enable & remove
 lint.per-file-ignores."src/documents/tests/test_migration_archive_files.py" = [
   "PTH",
 ] # TODO Enable & remove
-lint.per-file-ignores."src/documents/tests/test_migration_document_pages_count.py" = [
-  "PTH",
-] # TODO Enable & remove
-lint.per-file-ignores."src/documents/tests/test_migration_mime_type.py" = [
-  "PTH",
-] # TODO Enable & remove
-lint.per-file-ignores."src/documents/tests/test_sanity_check.py" = [
-  "PTH",
-] # TODO Enable & remove
 lint.per-file-ignores."src/documents/views.py" = [
   "PTH",
 ] # TODO Enable & remove
@@ -343,8 +325,8 @@ environments = [
 [tool.uv.sources]
 # Markers are chosen to select these almost exclusively when building the Docker image
 psycopg-c = [
-  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.4/psycopg_c-3.2.4-cp312-cp312-linux_x86_64.whl", marker = "sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.12'" },
+  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.5/psycopg_c-3.2.5-cp312-cp312-linux_x86_64.whl", marker = "sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.12'" },
-  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.4/psycopg_c-3.2.4-cp312-cp312-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.12'" },
+  { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.5/psycopg_c-3.2.5-cp312-cp312-linux_aarch64.whl", marker = "sys_platform == 'linux' and platform_machine == 'aarch64' and python_version == '3.12'" },
 ]
 zxing-cpp = [
   { url = "https://github.com/paperless-ngx/builder/releases/download/zxing-2.3.0/zxing_cpp-2.3.0-cp312-cp312-linux_x86_64.whl", marker = "sys_platform == 'linux' and platform_machine == 'x86_64' and python_version == '3.12'" },

src-ui/messages.xlf

@@ -6185,32 +6185,39 @@
           <context context-type="linenumber">43</context>
         </context-group>
       </trans-unit>
+      <trans-unit id="4524189418954028091" datatype="html">
+        <source>Hint: saved views can be created from the <x id="START_LINK" ctype="x-a" equiv-text="&lt;a routerLink=&quot;/documents&quot;&gt;"/>documents list<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a&gt;"/></source>
+        <context-group purpose="location">
+          <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.html</context>
+          <context context-type="linenumber">42</context>
+        </context-group>
+      </trans-unit>
       <trans-unit id="6581372518205328477" datatype="html">
         <source>Hello <x id="PH" equiv-text="this.settingsService.displayName"/>, welcome to <x id="PH_1" equiv-text="environment.appTitle"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
-          <context context-type="linenumber">57</context>
+          <context context-type="linenumber">61</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2901300640157872718" datatype="html">
         <source>Welcome to <x id="PH" equiv-text="environment.appTitle"/></source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
-          <context context-type="linenumber">59</context>
+          <context context-type="linenumber">63</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1325877348738783391" datatype="html">
         <source>Dashboard updated</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
-          <context context-type="linenumber">90</context>
+          <context context-type="linenumber">94</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3214475953924351473" datatype="html">
         <source>Error updating dashboard</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/dashboard/dashboard.component.ts</context>
-          <context context-type="linenumber">93</context>
+          <context context-type="linenumber">97</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2946624699882754313" datatype="html">

src-ui/src/app/components/dashboard/dashboard.component.html

@@ -34,6 +34,17 @@
       }
 
       <ng-container *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.SavedView }">
+        @if (!settingsService.offerTour() && savedViewService.allViews.length === 0) {
+          <div class="col">
+            <div class="card shadow-sm bg-light opacity-50">
+              <div class="card-body">
+                <div class="text-center">
+                  <p class="mb-0 fst-italic"><i-bs name="info-circle" class="me-2"></i-bs><ng-container i18n>Hint: saved views can be created from the <a routerLink="/documents">documents list</a></ng-container></p>
+                </div>
+              </div>
+            </div>
+          </div>
+        }
         @for (v of dashboardViews; track v.id) {
           <div class="col">
             <pngx-saved-view-widget

src-ui/src/app/components/dashboard/dashboard.component.spec.ts

@@ -105,6 +105,7 @@ describe('DashboardComponent', () => {
                 results: saved_views,
               }),
             dashboardViews: saved_views.filter((v) => v.show_on_dashboard),
+            allViews: saved_views,
           },
         },
         provideHttpClient(withInterceptorsFromDi()),

src-ui/src/app/components/dashboard/dashboard.component.ts

@@ -6,6 +6,8 @@ import {
   moveItemInArray,
 } from '@angular/cdk/drag-drop'
 import { Component } from '@angular/core'
+import { RouterModule } from '@angular/router'
+import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { TourNgBootstrapModule, TourService } from 'ngx-ui-tour-ng-bootstrap'
 import { SavedView } from 'src/app/data/saved-view'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
@@ -35,6 +37,8 @@ import { WelcomeWidgetComponent } from './widgets/welcome-widget/welcome-widget.
     IfPermissionsDirective,
     DragDropModule,
     TourNgBootstrapModule,
+    NgxBootstrapIconsModule,
+    RouterModule,
   ],
 })
 export class DashboardComponent extends ComponentWithPermissions {

src-ui/src/app/pipes/custom-date.pipe.spec.ts

@@ -45,7 +45,8 @@ describe('CustomDatePipe', () => {
     if (now.getMonth() === 0) {
       notNow.setFullYear(now.getFullYear() - 1)
     }
-    expect(['Last month', '4 weeks ago']).toContain(
+    // weird options are for february...
+    expect(['Last month', '4 weeks ago', '3 weeks ago']).toContain(
       datePipe.transform(notNow, 'relative')
     )
     expect(datePipe.transform(now, 'relative')).toEqual('Just now')

src/documents/serialisers.py

@@ -43,6 +43,7 @@ from documents.models import CustomFieldInstance
 from documents.models import Document
 from documents.models import DocumentType
 from documents.models import MatchingModel
+from documents.models import Note
 from documents.models import PaperlessTask
 from documents.models import SavedView
 from documents.models import SavedViewFilterRule
@@ -861,6 +862,22 @@ class CustomFieldInstanceSerializer(serializers.ModelSerializer):
         ]
 
 
+class BasicUserSerializer(serializers.ModelSerializer):
+    # Different than paperless.serializers.UserSerializer
+    class Meta:
+        model = User
+        fields = ["id", "username", "first_name", "last_name"]
+
+
+class NotesSerializer(serializers.ModelSerializer):
+    user = BasicUserSerializer()
+
+    class Meta:
+        model = Note
+        fields = ["id", "note", "created", "user"]
+        ordering = ["-created"]
+
+
 class DocumentSerializer(
     OwnedObjectSerializer,
     NestedUpdateMixin,
@@ -876,6 +893,8 @@ class DocumentSerializer(
     created_date = serializers.DateField(required=False)
     page_count = SerializerMethodField()
 
+    notes = NotesSerializer(many=True, required=False)
+
     custom_fields = CustomFieldInstanceSerializer(
         many=True,
         allow_null=False,

src/documents/templates/account/account_inactive.html

@@ -6,7 +6,7 @@
 {% endblock head_title %}
 
 {% block form_top_content %}
-    <h4>{% translate "Account inactve." %}</h4>
+    <h4>{% translate "Account inactive." %}</h4>
 {% endblock form_top_content %}
 
 {% block form_content %}

src/documents/tests/test_api_documents.py

@@ -2170,8 +2170,10 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase):
         GIVEN:
             - A document with a single note
         WHEN:
+            - API request for document
             - API request for document notes is made
         THEN:
+            - Note is included in the document response
             - The associated note is returned
         """
         doc = Document.objects.create(
@@ -2185,6 +2187,18 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase):
             user=self.user,
         )
 
+        response = self.client.get(
+            f"/api/documents/{doc.pk}/",
+            format="json",
+        )
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+        resp_data = response.json()
+        self.assertEqual(len(resp_data["notes"]), 1)
+        self.assertEqual(resp_data["notes"][0]["note"], note.note)
+        self.assertEqual(resp_data["notes"][0]["user"]["username"], self.user.username)
+
         response = self.client.get(
             f"/api/documents/{doc.pk}/notes/",
             format="json",

src/documents/tests/test_management.py

@@ -1,6 +1,5 @@
 import filecmp
 import hashlib
-import os
 import shutil
 import tempfile
 from io import StringIO
@@ -19,7 +18,7 @@ from documents.tasks import update_document_content_maybe_archive_file
 from documents.tests.utils import DirectoriesMixin
 from documents.tests.utils import FileSystemAssertsMixin
 
-sample_file = os.path.join(os.path.dirname(__file__), "samples", "simple.pdf")
+sample_file: Path = Path(__file__).parent / "samples" / "simple.pdf"
 
 
 @override_settings(FILENAME_FORMAT="{correspondent}/{title}")
@@ -34,19 +33,13 @@ class TestArchiver(DirectoriesMixin, FileSystemAssertsMixin, TestCase):
 
     def test_archiver(self):
         doc = self.make_models()
-        shutil.copy(
+        shutil.copy(sample_file, Path(self.dirs.originals_dir) / f"{doc.id:07}.pdf")
-            sample_file,
-            os.path.join(self.dirs.originals_dir, f"{doc.id:07}.pdf"),
-        )
 
         call_command("document_archiver", "--processes", "1")
 
     def test_handle_document(self):
         doc = self.make_models()
-        shutil.copy(
+        shutil.copy(sample_file, Path(self.dirs.originals_dir) / f"{doc.id:07}.pdf")
-            sample_file,
-            os.path.join(self.dirs.originals_dir, f"{doc.id:07}.pdf"),
-        )
 
         update_document_content_maybe_archive_file(doc.pk)
 
@@ -90,11 +83,8 @@ class TestArchiver(DirectoriesMixin, FileSystemAssertsMixin, TestCase):
             mime_type="application/pdf",
             filename="document_01.pdf",
         )
-        shutil.copy(sample_file, os.path.join(self.dirs.originals_dir, "document.pdf"))
+        shutil.copy(sample_file, Path(self.dirs.originals_dir) / "document.pdf")
-        shutil.copy(
+        shutil.copy(sample_file, Path(self.dirs.originals_dir) / "document_01.pdf")
-            sample_file,
-            os.path.join(self.dirs.originals_dir, "document_01.pdf"),
-        )
 
         update_document_content_maybe_archive_file(doc2.pk)
         update_document_content_maybe_archive_file(doc1.pk)
@@ -136,22 +126,22 @@ class TestDecryptDocuments(FileSystemAssertsMixin, TestCase):
         )
 
         shutil.copy(
-            os.path.join(
+            (
-                os.path.dirname(__file__),
+                Path(__file__).parent
-                "samples",
+                / "samples"
-                "documents",
+                / "documents"
-                "originals",
+                / "originals"
-                "0000004.pdf.gpg",
+                / "0000004.pdf.gpg"
             ),
             originals_dir / "0000004.pdf.gpg",
         )
         shutil.copy(
-            os.path.join(
+            (
-                os.path.dirname(__file__),
+                Path(__file__).parent
-                "samples",
+                / "samples"
-                "documents",
+                / "documents"
-                "thumbnails",
+                / "thumbnails"
-                "0000004.webp.gpg",
+                / "0000004.webp.gpg"
             ),
             thumb_dir / f"{doc.id:07}.webp.gpg",
         )
@@ -162,13 +152,13 @@ class TestDecryptDocuments(FileSystemAssertsMixin, TestCase):
 
         self.assertEqual(doc.storage_type, Document.STORAGE_TYPE_UNENCRYPTED)
         self.assertEqual(doc.filename, "0000004.pdf")
-        self.assertIsFile(os.path.join(originals_dir, "0000004.pdf"))
+        self.assertIsFile(Path(originals_dir) / "0000004.pdf")
         self.assertIsFile(doc.source_path)
-        self.assertIsFile(os.path.join(thumb_dir, f"{doc.id:07}.webp"))
+        self.assertIsFile(Path(thumb_dir) / f"{doc.id:07}.webp")
         self.assertIsFile(doc.thumbnail_path)
 
         with doc.source_file as f:
-            checksum = hashlib.md5(f.read()).hexdigest()
+            checksum: str = hashlib.md5(f.read()).hexdigest()
             self.assertEqual(checksum, doc.checksum)
 
 

src/documents/tests/test_management_consumer.py

@@ -1,5 +1,4 @@
 import filecmp
-import os
 import shutil
 from pathlib import Path
 from threading import Thread
@@ -94,13 +93,13 @@ class ConsumerThreadMixin(DocumentConsumeDelayMixin):
             print("Consumed a perfectly valid file.")  # noqa: T201
 
     def slow_write_file(self, target, *, incomplete=False):
-        with open(self.sample_file, "rb") as f:
+        with Path(self.sample_file).open("rb") as f:
             pdf_bytes = f.read()
 
         if incomplete:
             pdf_bytes = pdf_bytes[: len(pdf_bytes) - 100]
 
-        with open(target, "wb") as f:
+        with Path(target).open("wb") as f:
             # this will take 2 seconds, since the file is about 20k.
             print("Start writing file.")  # noqa: T201
             for b in chunked(1000, pdf_bytes):
@@ -116,7 +115,7 @@ class TestConsumer(DirectoriesMixin, ConsumerThreadMixin, TransactionTestCase):
     def test_consume_file(self):
         self.t_start()
 
-        f = Path(os.path.join(self.dirs.consumption_dir, "my_file.pdf"))
+        f = Path(self.dirs.consumption_dir) / "my_file.pdf"
         shutil.copy(self.sample_file, f)
 
         self.wait_for_task_mock_call()
@@ -130,7 +129,7 @@ class TestConsumer(DirectoriesMixin, ConsumerThreadMixin, TransactionTestCase):
     def test_consume_file_invalid_ext(self):
         self.t_start()
 
-        f = os.path.join(self.dirs.consumption_dir, "my_file.wow")
+        f = Path(self.dirs.consumption_dir) / "my_file.wow"
         shutil.copy(self.sample_file, f)
 
         self.wait_for_task_mock_call()
@@ -138,7 +137,7 @@ class TestConsumer(DirectoriesMixin, ConsumerThreadMixin, TransactionTestCase):
         self.consume_file_mock.assert_not_called()
 
     def test_consume_existing_file(self):
-        f = Path(os.path.join(self.dirs.consumption_dir, "my_file.pdf"))
+        f = Path(self.dirs.consumption_dir) / "my_file.pdf"
         shutil.copy(self.sample_file, f)
 
         self.t_start()
@@ -154,7 +153,7 @@ class TestConsumer(DirectoriesMixin, ConsumerThreadMixin, TransactionTestCase):
 
         self.t_start()
 
-        fname = Path(os.path.join(self.dirs.consumption_dir, "my_file.pdf"))
+        fname = Path(self.dirs.consumption_dir) / "my_file.pdf"
 
         self.slow_write_file(fname)
 
@@ -174,8 +173,8 @@ class TestConsumer(DirectoriesMixin, ConsumerThreadMixin, TransactionTestCase):
 
         self.t_start()
 
-        fname = Path(os.path.join(self.dirs.consumption_dir, "my_file.~df"))
+        fname = Path(self.dirs.consumption_dir) / "my_file.~df"
-        fname2 = Path(os.path.join(self.dirs.consumption_dir, "my_file.pdf"))
+        fname2 = Path(self.dirs.consumption_dir) / "my_file.pdf"
 
         self.slow_write_file(fname)
         shutil.move(fname, fname2)
@@ -196,7 +195,7 @@ class TestConsumer(DirectoriesMixin, ConsumerThreadMixin, TransactionTestCase):
 
         self.t_start()
 
-        fname = Path(os.path.join(self.dirs.consumption_dir, "my_file.pdf"))
+        fname = Path(self.dirs.consumption_dir) / "my_file.pdf"
         self.slow_write_file(fname, incomplete=True)
 
         self.wait_for_task_mock_call()
@@ -225,23 +224,23 @@ class TestConsumer(DirectoriesMixin, ConsumerThreadMixin, TransactionTestCase):
 
         shutil.copy(
             self.sample_file,
-            os.path.join(self.dirs.consumption_dir, ".DS_STORE"),
+            Path(self.dirs.consumption_dir) / ".DS_STORE",
         )
         shutil.copy(
             self.sample_file,
-            os.path.join(self.dirs.consumption_dir, "my_file.pdf"),
+            Path(self.dirs.consumption_dir) / "my_file.pdf",
         )
         shutil.copy(
             self.sample_file,
-            os.path.join(self.dirs.consumption_dir, "._my_file.pdf"),
+            Path(self.dirs.consumption_dir) / "._my_file.pdf",
         )
         shutil.copy(
             self.sample_file,
-            os.path.join(self.dirs.consumption_dir, "my_second_file.pdf"),
+            Path(self.dirs.consumption_dir) / "my_second_file.pdf",
         )
         shutil.copy(
             self.sample_file,
-            os.path.join(self.dirs.consumption_dir, "._my_second_file.pdf"),
+            Path(self.dirs.consumption_dir) / "._my_second_file.pdf",
         )
 
         sleep(5)
@@ -259,60 +258,66 @@ class TestConsumer(DirectoriesMixin, ConsumerThreadMixin, TransactionTestCase):
     def test_is_ignored(self):
         test_paths = [
             {
-                "path": os.path.join(self.dirs.consumption_dir, "foo.pdf"),
+                "path": (Path(self.dirs.consumption_dir) / "foo.pdf").as_posix(),
                 "ignore": False,
             },
             {
-                "path": os.path.join(self.dirs.consumption_dir, "foo", "bar.pdf"),
+                "path": (
+                    Path(self.dirs.consumption_dir) / "foo" / "bar.pdf"
+                ).as_posix(),
                 "ignore": False,
             },
             {
-                "path": os.path.join(self.dirs.consumption_dir, ".DS_STORE"),
+                "path": (Path(self.dirs.consumption_dir) / ".DS_STORE").as_posix(),
                 "ignore": True,
             },
             {
-                "path": os.path.join(self.dirs.consumption_dir, ".DS_Store"),
+                "path": (Path(self.dirs.consumption_dir) / ".DS_Store").as_posix(),
                 "ignore": True,
             },
             {
-                "path": os.path.join(self.dirs.consumption_dir, ".stfolder", "foo.pdf"),
+                "path": (
+                    Path(self.dirs.consumption_dir) / ".stfolder" / "foo.pdf"
+                ).as_posix(),
                 "ignore": True,
             },
             {
-                "path": os.path.join(self.dirs.consumption_dir, ".stfolder.pdf"),
+                "path": (Path(self.dirs.consumption_dir) / ".stfolder.pdf").as_posix(),
                 "ignore": False,
             },
             {
-                "path": os.path.join(
+                "path": (
-                    self.dirs.consumption_dir,
+                    Path(self.dirs.consumption_dir) / ".stversions" / "foo.pdf"
-                    ".stversions",
+                ).as_posix(),
-                    "foo.pdf",
-                ),
                 "ignore": True,
             },
             {
-                "path": os.path.join(self.dirs.consumption_dir, ".stversions.pdf"),
+                "path": (
+                    Path(self.dirs.consumption_dir) / ".stversions.pdf"
+                ).as_posix(),
                 "ignore": False,
             },
             {
-                "path": os.path.join(self.dirs.consumption_dir, "._foo.pdf"),
+                "path": (Path(self.dirs.consumption_dir) / "._foo.pdf").as_posix(),
                 "ignore": True,
             },
             {
-                "path": os.path.join(self.dirs.consumption_dir, "my_foo.pdf"),
+                "path": (Path(self.dirs.consumption_dir) / "my_foo.pdf").as_posix(),
                 "ignore": False,
             },
             {
-                "path": os.path.join(self.dirs.consumption_dir, "._foo", "bar.pdf"),
+                "path": (
+                    Path(self.dirs.consumption_dir) / "._foo" / "bar.pdf"
+                ).as_posix(),
                 "ignore": True,
             },
             {
-                "path": os.path.join(
+                "path": (
-                    self.dirs.consumption_dir,
+                    Path(self.dirs.consumption_dir)
-                    "@eaDir",
+                    / "@eaDir"
-                    "SYNO@.fileindexdb",
+                    / "SYNO@.fileindexdb"
-                    "_1jk.fnm",
+                    / "_1jk.fnm"
-                ),
+                ).as_posix(),
                 "ignore": True,
             },
         ]
@@ -332,7 +337,7 @@ class TestConsumer(DirectoriesMixin, ConsumerThreadMixin, TransactionTestCase):
 
         self.t_start()
 
-        f = os.path.join(self.dirs.consumption_dir, "my_file.pdf")
+        f = Path(self.dirs.consumption_dir) / "my_file.pdf"
         shutil.copy(self.sample_file, f)
 
         self.wait_for_task_mock_call()
@@ -380,9 +385,9 @@ class TestConsumerTags(DirectoriesMixin, ConsumerThreadMixin, TransactionTestCas
 
         self.t_start()
 
-        path = os.path.join(self.dirs.consumption_dir, *tag_names)
+        path = Path(self.dirs.consumption_dir) / "/".join(tag_names)
-        os.makedirs(path, exist_ok=True)
+        path.mkdir(parents=True, exist_ok=True)
-        f = Path(os.path.join(path, "my_file.pdf"))
+        f = path / "my_file.pdf"
         # Wait at least inotify read_delay for recursive watchers
         # to be created for the new directories
         sleep(1)

src/documents/tests/test_management_exporter.py

@@ -1,6 +1,5 @@
 import hashlib
 import json
-import os
 import shutil
 import tempfile
 from io import StringIO
@@ -183,16 +182,16 @@ class TestExportImport(
 
         call_command(*args)
 
-        with open(os.path.join(self.target, "manifest.json")) as f:
+        with (self.target / "manifest.json").open() as f:
             manifest = json.load(f)
 
         return manifest
 
     def test_exporter(self, *, use_filename_format=False):
-        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.rmtree(Path(self.dirs.media_dir) / "documents")
         shutil.copytree(
-            os.path.join(os.path.dirname(__file__), "samples", "documents"),
+            Path(__file__).parent / "samples" / "documents",
-            os.path.join(self.dirs.media_dir, "documents"),
+            Path(self.dirs.media_dir) / "documents",
         )
 
         num_permission_objects = Permission.objects.count()
@@ -210,7 +209,7 @@ class TestExportImport(
             4,
         )
 
-        self.assertIsFile(os.path.join(self.target, "manifest.json"))
+        self.assertIsFile((self.target / "manifest.json").as_posix())
 
         self.assertEqual(
             self._get_document_from_manifest(manifest, self.d1.id)["fields"]["title"],
@@ -231,19 +230,17 @@ class TestExportImport(
 
         for element in manifest:
             if element["model"] == "documents.document":
-                fname = os.path.join(
+                fname = (
-                    self.target,
+                    self.target / element[document_exporter.EXPORTER_FILE_NAME]
-                    element[document_exporter.EXPORTER_FILE_NAME],
+                ).as_posix()
-                )
                 self.assertIsFile(fname)
                 self.assertIsFile(
-                    os.path.join(
+                    (
-                        self.target,
+                        self.target / element[document_exporter.EXPORTER_THUMBNAIL_NAME]
-                        element[document_exporter.EXPORTER_THUMBNAIL_NAME],
+                    ).as_posix(),
-                    ),
                 )
 
-                with open(fname, "rb") as f:
+                with Path(fname).open("rb") as f:
                     checksum = hashlib.md5(f.read()).hexdigest()
                 self.assertEqual(checksum, element["fields"]["checksum"])
 
@@ -253,13 +250,12 @@ class TestExportImport(
                 )
 
                 if document_exporter.EXPORTER_ARCHIVE_NAME in element:
-                    fname = os.path.join(
+                    fname = (
-                        self.target,
+                        self.target / element[document_exporter.EXPORTER_ARCHIVE_NAME]
-                        element[document_exporter.EXPORTER_ARCHIVE_NAME],
+                    ).as_posix()
-                    )
                     self.assertIsFile(fname)
 
-                    with open(fname, "rb") as f:
+                    with Path(fname).open("rb") as f:
                         checksum = hashlib.md5(f.read()).hexdigest()
                     self.assertEqual(checksum, element["fields"]["archive_checksum"])
 
@@ -297,10 +293,10 @@ class TestExportImport(
             self.assertEqual(len(messages), 0)
 
     def test_exporter_with_filename_format(self):
-        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.rmtree(Path(self.dirs.media_dir) / "documents")
         shutil.copytree(
-            os.path.join(os.path.dirname(__file__), "samples", "documents"),
+            Path(__file__).parent / "samples" / "documents",
-            os.path.join(self.dirs.media_dir, "documents"),
+            Path(self.dirs.media_dir) / "documents",
         )
 
         with override_settings(
@@ -309,16 +305,16 @@ class TestExportImport(
             self.test_exporter(use_filename_format=True)
 
     def test_update_export_changed_time(self):
-        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.rmtree(Path(self.dirs.media_dir) / "documents")
         shutil.copytree(
-            os.path.join(os.path.dirname(__file__), "samples", "documents"),
+            Path(__file__).parent / "samples" / "documents",
-            os.path.join(self.dirs.media_dir, "documents"),
+            Path(self.dirs.media_dir) / "documents",
         )
 
         self._do_export()
-        self.assertIsFile(os.path.join(self.target, "manifest.json"))
+        self.assertIsFile((self.target / "manifest.json").as_posix())
 
-        st_mtime_1 = os.stat(os.path.join(self.target, "manifest.json")).st_mtime
+        st_mtime_1 = (self.target / "manifest.json").stat().st_mtime
 
         with mock.patch(
             "documents.management.commands.document_exporter.copy_file_with_basic_stats",
@@ -326,8 +322,8 @@ class TestExportImport(
             self._do_export()
             m.assert_not_called()
 
-        self.assertIsFile(os.path.join(self.target, "manifest.json"))
+        self.assertIsFile((self.target / "manifest.json").as_posix())
-        st_mtime_2 = os.stat(os.path.join(self.target, "manifest.json")).st_mtime
+        st_mtime_2 = (self.target / "manifest.json").stat().st_mtime
 
         Path(self.d1.source_path).touch()
 
@@ -337,26 +333,26 @@ class TestExportImport(
             self._do_export()
             self.assertEqual(m.call_count, 1)
 
-        st_mtime_3 = os.stat(os.path.join(self.target, "manifest.json")).st_mtime
+        st_mtime_3 = (self.target / "manifest.json").stat().st_mtime
-        self.assertIsFile(os.path.join(self.target, "manifest.json"))
+        self.assertIsFile((self.target / "manifest.json").as_posix())
 
         self.assertNotEqual(st_mtime_1, st_mtime_2)
         self.assertNotEqual(st_mtime_2, st_mtime_3)
 
         self._do_export(compare_json=True)
-        st_mtime_4 = os.stat(os.path.join(self.target, "manifest.json")).st_mtime
+        st_mtime_4 = (self.target / "manifest.json").stat().st_mtime
         self.assertEqual(st_mtime_3, st_mtime_4)
 
     def test_update_export_changed_checksum(self):
-        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.rmtree(Path(self.dirs.media_dir) / "documents")
         shutil.copytree(
-            os.path.join(os.path.dirname(__file__), "samples", "documents"),
+            Path(__file__).parent / "samples" / "documents",
-            os.path.join(self.dirs.media_dir, "documents"),
+            Path(self.dirs.media_dir) / "documents",
         )
 
         self._do_export()
 
-        self.assertIsFile(os.path.join(self.target, "manifest.json"))
+        self.assertIsFile((self.target / "manifest.json").as_posix())
 
         with mock.patch(
             "documents.management.commands.document_exporter.copy_file_with_basic_stats",
@@ -364,7 +360,7 @@ class TestExportImport(
             self._do_export()
             m.assert_not_called()
 
-        self.assertIsFile(os.path.join(self.target, "manifest.json"))
+        self.assertIsFile((self.target / "manifest.json").as_posix())
 
         self.d2.checksum = "asdfasdgf3"
         self.d2.save()
@@ -375,13 +371,13 @@ class TestExportImport(
             self._do_export(compare_checksums=True)
             self.assertEqual(m.call_count, 1)
 
-        self.assertIsFile(os.path.join(self.target, "manifest.json"))
+        self.assertIsFile((self.target / "manifest.json").as_posix())
 
     def test_update_export_deleted_document(self):
-        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.rmtree(Path(self.dirs.media_dir) / "documents")
         shutil.copytree(
-            os.path.join(os.path.dirname(__file__), "samples", "documents"),
+            Path(__file__).parent / "samples" / "documents",
-            os.path.join(self.dirs.media_dir, "documents"),
+            Path(self.dirs.media_dir) / "documents",
         )
 
         manifest = self._do_export()
@@ -389,7 +385,7 @@ class TestExportImport(
         self.assertTrue(len(manifest), 7)
         doc_from_manifest = self._get_document_from_manifest(manifest, self.d3.id)
         self.assertIsFile(
-            os.path.join(self.target, doc_from_manifest[EXPORTER_FILE_NAME]),
+            (self.target / doc_from_manifest[EXPORTER_FILE_NAME]).as_posix(),
         )
         self.d3.delete()
 
@@ -401,39 +397,39 @@ class TestExportImport(
             self.d3.id,
         )
         self.assertIsFile(
-            os.path.join(self.target, doc_from_manifest[EXPORTER_FILE_NAME]),
+            (self.target / doc_from_manifest[EXPORTER_FILE_NAME]).as_posix(),
         )
 
         manifest = self._do_export(delete=True)
         self.assertIsNotFile(
-            os.path.join(self.target, doc_from_manifest[EXPORTER_FILE_NAME]),
+            (self.target / doc_from_manifest[EXPORTER_FILE_NAME]).as_posix(),
         )
 
         self.assertTrue(len(manifest), 6)
 
     @override_settings(FILENAME_FORMAT="{title}/{correspondent}")
     def test_update_export_changed_location(self):
-        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.rmtree(Path(self.dirs.media_dir) / "documents")
         shutil.copytree(
-            os.path.join(os.path.dirname(__file__), "samples", "documents"),
+            Path(__file__).parent / "samples" / "documents",
-            os.path.join(self.dirs.media_dir, "documents"),
+            Path(self.dirs.media_dir) / "documents",
         )
 
         self._do_export(use_filename_format=True)
-        self.assertIsFile(os.path.join(self.target, "wow1", "c.pdf"))
+        self.assertIsFile((self.target / "wow1" / "c.pdf").as_posix())
 
-        self.assertIsFile(os.path.join(self.target, "manifest.json"))
+        self.assertIsFile((self.target / "manifest.json").as_posix())
 
         self.d1.title = "new_title"
         self.d1.save()
         self._do_export(use_filename_format=True, delete=True)
-        self.assertIsNotFile(os.path.join(self.target, "wow1", "c.pdf"))
+        self.assertIsNotFile((self.target / "wow1" / "c.pdf").as_posix())
-        self.assertIsNotDir(os.path.join(self.target, "wow1"))
+        self.assertIsNotDir((self.target / "wow1").as_posix())
-        self.assertIsFile(os.path.join(self.target, "new_title", "c.pdf"))
+        self.assertIsFile((self.target / "new_title" / "c.pdf").as_posix())
-        self.assertIsFile(os.path.join(self.target, "manifest.json"))
+        self.assertIsFile((self.target / "manifest.json").as_posix())
-        self.assertIsFile(os.path.join(self.target, "wow2", "none.pdf"))
+        self.assertIsFile((self.target / "wow2" / "none.pdf").as_posix())
         self.assertIsFile(
-            os.path.join(self.target, "wow2", "none_01.pdf"),
+            (self.target / "wow2" / "none_01.pdf").as_posix(),
         )
 
     def test_export_missing_files(self):
@@ -458,20 +454,19 @@ class TestExportImport(
             - Zipfile is created
             - Zipfile contains exported files
         """
-        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.rmtree(Path(self.dirs.media_dir) / "documents")
         shutil.copytree(
-            os.path.join(os.path.dirname(__file__), "samples", "documents"),
+            Path(__file__).parent / "samples" / "documents",
-            os.path.join(self.dirs.media_dir, "documents"),
+            Path(self.dirs.media_dir) / "documents",
         )
 
         args = ["document_exporter", self.target, "--zip"]
 
         call_command(*args)
 
-        expected_file = os.path.join(
+        expected_file = (
-            self.target,
+            self.target / f"export-{timezone.localdate().isoformat()}.zip"
-            f"export-{timezone.localdate().isoformat()}.zip",
+        ).as_posix()
-        )
 
         self.assertIsFile(expected_file)
 
@@ -492,10 +487,10 @@ class TestExportImport(
             - Zipfile is created
             - Zipfile contains exported files
         """
-        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.rmtree(Path(self.dirs.media_dir) / "documents")
         shutil.copytree(
-            os.path.join(os.path.dirname(__file__), "samples", "documents"),
+            Path(__file__).parent / "samples" / "documents",
-            os.path.join(self.dirs.media_dir, "documents"),
+            Path(self.dirs.media_dir) / "documents",
         )
 
         args = ["document_exporter", self.target, "--zip", "--use-filename-format"]
@@ -505,10 +500,9 @@ class TestExportImport(
         ):
             call_command(*args)
 
-        expected_file = os.path.join(
+        expected_file = (
-            self.target,
+            self.target / f"export-{timezone.localdate().isoformat()}.zip"
-            f"export-{timezone.localdate().isoformat()}.zip",
+        ).as_posix()
-        )
 
         self.assertIsFile(expected_file)
 
@@ -533,10 +527,10 @@ class TestExportImport(
             - Zipfile contains exported files
             - The existing file and directory in target are removed
         """
-        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.rmtree(Path(self.dirs.media_dir) / "documents")
         shutil.copytree(
-            os.path.join(os.path.dirname(__file__), "samples", "documents"),
+            Path(__file__).parent / "samples" / "documents",
-            os.path.join(self.dirs.media_dir, "documents"),
+            Path(self.dirs.media_dir) / "documents",
         )
 
         # Create stuff in target directory
@@ -552,10 +546,9 @@ class TestExportImport(
 
         call_command(*args)
 
-        expected_file = os.path.join(
+        expected_file = (
-            self.target,
+            self.target / f"export-{timezone.localdate().isoformat()}.zip"
-            f"export-{timezone.localdate().isoformat()}.zip",
+        ).as_posix()
-        )
 
         self.assertIsFile(expected_file)
         self.assertIsNotFile(existing_file)
@@ -610,7 +603,7 @@ class TestExportImport(
             - Error is raised
         """
         with tempfile.TemporaryDirectory() as tmp_dir:
-            os.chmod(tmp_dir, 0o000)
+            Path(tmp_dir).chmod(0o000)
 
             args = ["document_exporter", tmp_dir]
 
@@ -629,10 +622,10 @@ class TestExportImport(
             - Manifest.json doesn't contain information about archive files
             - Documents can be imported again
         """
-        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.rmtree(Path(self.dirs.media_dir) / "documents")
         shutil.copytree(
-            os.path.join(os.path.dirname(__file__), "samples", "documents"),
+            Path(__file__).parent / "samples" / "documents",
-            os.path.join(self.dirs.media_dir, "documents"),
+            Path(self.dirs.media_dir) / "documents",
         )
 
         manifest = self._do_export()
@@ -670,10 +663,10 @@ class TestExportImport(
             - Manifest.json doesn't contain information about thumbnails
             - Documents can be imported again
         """
-        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.rmtree(Path(self.dirs.media_dir) / "documents")
         shutil.copytree(
-            os.path.join(os.path.dirname(__file__), "samples", "documents"),
+            Path(__file__).parent / "samples" / "documents",
-            os.path.join(self.dirs.media_dir, "documents"),
+            Path(self.dirs.media_dir) / "documents",
         )
 
         manifest = self._do_export()
@@ -713,10 +706,10 @@ class TestExportImport(
             - Main manifest.json file doesn't contain information about documents
             - Documents can be imported again
         """
-        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.rmtree(Path(self.dirs.media_dir) / "documents")
         shutil.copytree(
-            os.path.join(os.path.dirname(__file__), "samples", "documents"),
+            Path(__file__).parent / "samples" / "documents",
-            os.path.join(self.dirs.media_dir, "documents"),
+            Path(self.dirs.media_dir) / "documents",
         )
 
         manifest = self._do_export(split_manifest=True)
@@ -744,10 +737,10 @@ class TestExportImport(
         THEN:
             - Documents can be imported again
         """
-        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.rmtree(Path(self.dirs.media_dir) / "documents")
         shutil.copytree(
-            os.path.join(os.path.dirname(__file__), "samples", "documents"),
+            Path(__file__).parent / "samples" / "documents",
-            os.path.join(self.dirs.media_dir, "documents"),
+            Path(self.dirs.media_dir) / "documents",
         )
 
         self._do_export(use_folder_prefix=True)
@@ -769,10 +762,10 @@ class TestExportImport(
             - ContentType & Permission objects are not deleted, db transaction rolled back
         """
 
-        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.rmtree(Path(self.dirs.media_dir) / "documents")
         shutil.copytree(
-            os.path.join(os.path.dirname(__file__), "samples", "documents"),
+            Path(__file__).parent / "samples" / "documents",
-            os.path.join(self.dirs.media_dir, "documents"),
+            Path(self.dirs.media_dir) / "documents",
         )
 
         num_content_type_objects = ContentType.objects.count()
@@ -804,10 +797,10 @@ class TestExportImport(
             self.assertEqual(Permission.objects.count(), num_permission_objects + 1)
 
     def test_exporter_with_auditlog_disabled(self):
-        shutil.rmtree(os.path.join(self.dirs.media_dir, "documents"))
+        shutil.rmtree(Path(self.dirs.media_dir) / "documents")
         shutil.copytree(
-            os.path.join(os.path.dirname(__file__), "samples", "documents"),
+            Path(__file__).parent / "samples" / "documents",
-            os.path.join(self.dirs.media_dir, "documents"),
+            Path(self.dirs.media_dir) / "documents",
         )
 
         with override_settings(

src/documents/tests/test_migration_document_pages_count.py

@@ -1,20 +1,20 @@
-import os
 import shutil
 from pathlib import Path
 
 from django.conf import settings
 
+from documents.tests.utils import DirectoriesMixin
 from documents.tests.utils import TestMigrations
 
 
-def source_path_before(self):
+def source_path_before(self) -> Path:
     if self.filename:
         fname = str(self.filename)
 
-    return os.path.join(settings.ORIGINALS_DIR, fname)
+    return Path(settings.ORIGINALS_DIR) / fname
 
 
-class TestMigrateDocumentPageCount(TestMigrations):
+class TestMigrateDocumentPageCount(DirectoriesMixin, TestMigrations):
     migrate_from = "1052_document_transaction_id"
     migrate_to = "1053_document_page_count"
 

src/documents/tests/test_migration_mime_type.py

@@ -1,5 +1,5 @@
-import os
 import shutil
+from pathlib import Path
 
 from django.conf import settings
 from django.test import override_settings
@@ -20,7 +20,7 @@ def source_path_before(self):
         if self.storage_type == STORAGE_TYPE_GPG:
             fname += ".gpg"
 
-    return os.path.join(settings.ORIGINALS_DIR, fname)
+    return (Path(settings.ORIGINALS_DIR) / fname).as_posix()
 
 
 def file_type_after(self):
@@ -35,7 +35,7 @@ def source_path_after(doc):
         if doc.storage_type == STORAGE_TYPE_GPG:
             fname += ".gpg"  # pragma: no cover
 
-    return os.path.join(settings.ORIGINALS_DIR, fname)
+    return (Path(settings.ORIGINALS_DIR) / fname).as_posix()
 
 
 @override_settings(PASSPHRASE="test")
@@ -52,7 +52,7 @@ class TestMigrateMimeType(DirectoriesMixin, TestMigrations):
         )
         self.doc_id = doc.id
         shutil.copy(
-            os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"),
+            Path(__file__).parent / "samples" / "simple.pdf",
             source_path_before(doc),
         )
 
@@ -63,12 +63,12 @@ class TestMigrateMimeType(DirectoriesMixin, TestMigrations):
         )
         self.doc2_id = doc2.id
         shutil.copy(
-            os.path.join(
+            (
-                os.path.dirname(__file__),
+                Path(__file__).parent
-                "samples",
+                / "samples"
-                "documents",
+                / "documents"
-                "originals",
+                / "originals"
-                "0000004.pdf.gpg",
+                / "0000004.pdf.gpg"
             ),
             source_path_before(doc2),
         )
@@ -97,7 +97,7 @@ class TestMigrateMimeTypeBackwards(DirectoriesMixin, TestMigrations):
         )
         self.doc_id = doc.id
         shutil.copy(
-            os.path.join(os.path.dirname(__file__), "samples", "simple.pdf"),
+            Path(__file__).parent / "samples" / "simple.pdf",
             source_path_after(doc),
         )
 

src/documents/tests/test_sanity_check.py

@@ -1,5 +1,4 @@
 import logging
-import os
 import shutil
 from pathlib import Path
 
@@ -17,34 +16,34 @@ class TestSanityCheck(DirectoriesMixin, TestCase):
         with filelock.FileLock(settings.MEDIA_LOCK):
             # just make sure that the lockfile is present.
             shutil.copy(
-                os.path.join(
+                (
-                    os.path.dirname(__file__),
+                    Path(__file__).parent
-                    "samples",
+                    / "samples"
-                    "documents",
+                    / "documents"
-                    "originals",
+                    / "originals"
-                    "0000001.pdf",
+                    / "0000001.pdf"
                 ),
-                os.path.join(self.dirs.originals_dir, "0000001.pdf"),
+                Path(self.dirs.originals_dir) / "0000001.pdf",
             )
             shutil.copy(
-                os.path.join(
+                (
-                    os.path.dirname(__file__),
+                    Path(__file__).parent
-                    "samples",
+                    / "samples"
-                    "documents",
+                    / "documents"
-                    "archive",
+                    / "archive"
-                    "0000001.pdf",
+                    / "0000001.pdf"
                 ),
-                os.path.join(self.dirs.archive_dir, "0000001.pdf"),
+                Path(self.dirs.archive_dir) / "0000001.pdf",
             )
             shutil.copy(
-                os.path.join(
+                (
-                    os.path.dirname(__file__),
+                    Path(__file__).parent
-                    "samples",
+                    / "samples"
-                    "documents",
+                    / "documents"
-                    "thumbnails",
+                    / "thumbnails"
-                    "0000001.webp",
+                    / "0000001.webp"
                 ),
-                os.path.join(self.dirs.thumbnail_dir, "0000001.webp"),
+                Path(self.dirs.thumbnail_dir) / "0000001.webp",
             )
 
         return Document.objects.create(
@@ -92,25 +91,25 @@ class TestSanityCheck(DirectoriesMixin, TestCase):
 
     def test_no_thumbnail(self):
         doc = self.make_test_data()
-        os.remove(doc.thumbnail_path)
+        Path(doc.thumbnail_path).unlink()
         self.assertSanityError(doc, "Thumbnail of document does not exist")
 
     def test_thumbnail_no_access(self):
         doc = self.make_test_data()
-        os.chmod(doc.thumbnail_path, 0o000)
+        Path(doc.thumbnail_path).chmod(0o000)
         self.assertSanityError(doc, "Cannot read thumbnail file of document")
-        os.chmod(doc.thumbnail_path, 0o777)
+        Path(doc.thumbnail_path).chmod(0o777)
 
     def test_no_original(self):
         doc = self.make_test_data()
-        os.remove(doc.source_path)
+        Path(doc.source_path).unlink()
         self.assertSanityError(doc, "Original of document does not exist.")
 
     def test_original_no_access(self):
         doc = self.make_test_data()
-        os.chmod(doc.source_path, 0o000)
+        Path(doc.source_path).chmod(0o000)
         self.assertSanityError(doc, "Cannot read original file of document")
-        os.chmod(doc.source_path, 0o777)
+        Path(doc.source_path).chmod(0o777)
 
     def test_original_checksum_mismatch(self):
         doc = self.make_test_data()
@@ -120,14 +119,14 @@ class TestSanityCheck(DirectoriesMixin, TestCase):
 
     def test_no_archive(self):
         doc = self.make_test_data()
-        os.remove(doc.archive_path)
+        Path(doc.archive_path).unlink()
         self.assertSanityError(doc, "Archived version of document does not exist.")
 
     def test_archive_no_access(self):
         doc = self.make_test_data()
-        os.chmod(doc.archive_path, 0o000)
+        Path(doc.archive_path).chmod(0o000)
         self.assertSanityError(doc, "Cannot read archive file of document")
-        os.chmod(doc.archive_path, 0o777)
+        Path(doc.archive_path).chmod(0o777)
 
     def test_archive_checksum_mismatch(self):
         doc = self.make_test_data()

src/documents/views.py

@@ -803,33 +803,6 @@ class DocumentViewSet(
         except (FileNotFoundError, Document.DoesNotExist):
             raise Http404
 
-    def getNotes(self, doc):
-        return [
-            {
-                "id": c.pk,
-                "note": c.note,
-                "created": c.created,
-                "user": {
-                    "id": c.user.id,
-                    "username": c.user.username,
-                    "first_name": c.user.first_name,
-                    "last_name": c.user.last_name,
-                },
-            }
-            for c in Note.objects.select_related("user")
-            .only(
-                "pk",
-                "note",
-                "created",
-                "user__id",
-                "user__username",
-                "user__first_name",
-                "user__last_name",
-            )
-            .filter(document=doc)
-            .order_by("-created")
-        ]
-
     @action(
         methods=["get", "post", "delete"],
         detail=True,
@@ -854,9 +827,11 @@ class DocumentViewSet(
         except Document.DoesNotExist:
             raise Http404
 
+        serializer = self.get_serializer(doc)
+
         if request.method == "GET":
             try:
-                notes = self.getNotes(doc)
+                notes = serializer.to_representation(doc).get("notes")
                 return Response(notes)
             except Exception as e:
                 logger.warning(f"An error occurred retrieving notes: {e!s}")
@@ -897,7 +872,7 @@ class DocumentViewSet(
 
                 index.add_or_update_document(doc)
 
-                notes = self.getNotes(doc)
+                notes = serializer.to_representation(doc).get("notes")
 
                 return Response(notes)
             except Exception as e:
@@ -934,7 +909,9 @@ class DocumentViewSet(
 
             index.add_or_update_document(doc)
 
-            return Response(self.getNotes(doc))
+            notes = serializer.to_representation(doc).get("notes")
+
+            return Response(notes)
 
         return Response(
             {

src/locale/en_US/LC_MESSAGES/django.po

@@ -1199,7 +1199,7 @@ msgid "Paperless-ngx account inactive"
 msgstr ""
 
 #: documents/templates/account/account_inactive.html:9
-msgid "Account inactve."
+msgid "Account inactive."
 msgstr ""
 
 #: documents/templates/account/account_inactive.html:14

uv.lock

@@ -880,14 +880,14 @@ wheels = [
 
 [[package]]
 name = "drf-spectacular-sidecar"
-version = "2025.2.1"
+version = "2025.3.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "django", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/7e/4c/6c945509d578f04d19eee2ffeb25bc37e6aeb9713688a87fc4f3b02bc32b/drf_spectacular_sidecar-2025.2.1.tar.gz", hash = "sha256:ca9507c5fe708680d6b8eda96928f3cf3ffc07e8d67678778bcd2e80f9f2baae", size = 2390256 }
+sdist = { url = "https://files.pythonhosted.org/packages/80/5c/85671ba50957e0ab45e2828ca713cd7b5d0d237c398936c1b45bd0286b72/drf_spectacular_sidecar-2025.3.1.tar.gz", hash = "sha256:7425940a409fb68a46c9b024eb504098fab5b4d73d12573efcaef048445d678f", size = 2401986 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/eb/8a/b66f58e92c5752bbc241bb04ce76d2bf92c676af4cb8b94edac3a0e0c701/drf_spectacular_sidecar-2025.2.1-py3-none-any.whl", hash = "sha256:674e1336810c7cf117442300b5c213c4fee1e984ba48689502c947a6ecd25d0c", size = 2409274 },
+    { url = "https://files.pythonhosted.org/packages/5e/09/7382eb93a09f33fac72a8af1fc986f43681d15dd5fda750b238a8aace0e8/drf_spectacular_sidecar-2025.3.1-py3-none-any.whl", hash = "sha256:6b9c96204c8e45a06c39928dad704b18536d3253b61591c478540b63db6bdcea", size = 2422301 },
 ]
 
 [[package]]
@@ -1803,7 +1803,7 @@ wheels = [
 
 [[package]]
 name = "ocrmypdf"
-version = "16.9.0"
+version = "16.10.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "deprecation", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
@@ -1816,9 +1816,9 @@ dependencies = [
     { name = "pluggy", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
     { name = "rich", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/a8/07/d8810415b98718a39b1161720acd925b6ef15743227012809f6da9d3b7bc/ocrmypdf-16.9.0.tar.gz", hash = "sha256:d000a2294cd1478d4bbfe15df5172327f77f4139bb5307404bc53be9bd81f039", size = 6804849 }
+sdist = { url = "https://files.pythonhosted.org/packages/07/cf/d207aea8442a8e5a63b16faae89af2b9e3474d8d5925a5ea8c4f10f73fa9/ocrmypdf-16.10.0.tar.gz", hash = "sha256:d5b907a7b92951f1f3617f0f5ca002d866143d94fd168546a70e51756bf6412e", size = 6809110 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/12/69/e40431c5410eaf0c55588d0d256e27ee32af7622cb7116ac99a2e868bd2f/ocrmypdf-16.9.0-py3-none-any.whl", hash = "sha256:33fec95450727b0d9482ee3851e45dd0219ff8d52a14fd45a8d3d0c71875584e", size = 161863 },
+    { url = "https://files.pythonhosted.org/packages/33/47/10058f54f593f5e618a6796fc3e8dc3e19536128f832e2d3d6e4943e9834/ocrmypdf-16.10.0-py3-none-any.whl", hash = "sha256:5093b9b058e7278b17c0b0978eb5175063b7a5511e3b9068257ece063d91ce8f", size = 162336 },
 ]
 
 [[package]]
@@ -1904,9 +1904,9 @@ mariadb = [
 ]
 postgres = [
     { name = "psycopg", extra = ["c"], marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
-    { name = "psycopg-c", version = "3.2.4", source = { registry = "https://pypi.org/simple" }, marker = "(python_full_version != '3.12.*' and platform_machine == 'aarch64' and sys_platform == 'linux') or (python_full_version != '3.12.*' and platform_machine == 'x86_64' and sys_platform == 'linux') or (platform_machine != 'aarch64' and platform_machine != 'x86_64' and sys_platform == 'linux') or sys_platform == 'darwin'" },
+    { name = "psycopg-c", version = "3.2.5", source = { registry = "https://pypi.org/simple" }, marker = "(python_full_version != '3.12.*' and platform_machine == 'aarch64' and sys_platform == 'linux') or (python_full_version != '3.12.*' and platform_machine == 'x86_64' and sys_platform == 'linux') or (platform_machine != 'aarch64' and platform_machine != 'x86_64' and sys_platform == 'linux') or sys_platform == 'darwin'" },
-    { name = "psycopg-c", version = "3.2.4", source = { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.4/psycopg_c-3.2.4-cp312-cp312-linux_aarch64.whl" }, marker = "python_full_version == '3.12.*' and platform_machine == 'aarch64' and sys_platform == 'linux'" },
+    { name = "psycopg-c", version = "3.2.5", source = { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.5/psycopg_c-3.2.5-cp312-cp312-linux_aarch64.whl" }, marker = "python_full_version == '3.12.*' and platform_machine == 'aarch64' and sys_platform == 'linux'" },
-    { name = "psycopg-c", version = "3.2.4", source = { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.4/psycopg_c-3.2.4-cp312-cp312-linux_x86_64.whl" }, marker = "python_full_version == '3.12.*' and platform_machine == 'x86_64' and sys_platform == 'linux'" },
+    { name = "psycopg-c", version = "3.2.5", source = { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.5/psycopg_c-3.2.5-cp312-cp312-linux_x86_64.whl" }, marker = "python_full_version == '3.12.*' and platform_machine == 'x86_64' and sys_platform == 'linux'" },
 ]
 webserver = [
     { name = "granian", marker = "sys_platform == 'darwin' or sys_platform == 'linux'" },
@@ -1994,7 +1994,7 @@ requires-dist = [
     { name = "djangorestframework", specifier = "~=3.15" },
     { name = "djangorestframework-guardian", specifier = "~=0.3.0" },
     { name = "drf-spectacular", specifier = "~=0.28" },
-    { name = "drf-spectacular-sidecar", specifier = "~=2025.2.1" },
+    { name = "drf-spectacular-sidecar", specifier = "~=2025.3.1" },
     { name = "drf-writable-nested", specifier = "~=0.7.1" },
     { name = "filelock", specifier = "~=3.17.0" },
     { name = "flower", specifier = "~=2.0.1" },
@@ -2007,13 +2007,13 @@ requires-dist = [
     { name = "langdetect", specifier = "~=1.0.9" },
     { name = "mysqlclient", marker = "extra == 'mariadb'", specifier = "~=2.2.7" },
     { name = "nltk", specifier = "~=3.9.1" },
-    { name = "ocrmypdf", specifier = "~=16.9.0" },
+    { name = "ocrmypdf", specifier = "~=16.10.0" },
     { name = "pathvalidate", specifier = "~=3.2.3" },
     { name = "pdf2image", specifier = "~=1.17.0" },
-    { name = "psycopg", extras = ["c"], marker = "extra == 'postgres'", specifier = "==3.2.4" },
+    { name = "psycopg", extras = ["c"], marker = "extra == 'postgres'", specifier = "==3.2.5" },
-    { name = "psycopg-c", marker = "python_full_version == '3.12.*' and platform_machine == 'aarch64' and sys_platform == 'linux' and extra == 'postgres'", url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.4/psycopg_c-3.2.4-cp312-cp312-linux_aarch64.whl" },
+    { name = "psycopg-c", marker = "python_full_version == '3.12.*' and platform_machine == 'aarch64' and sys_platform == 'linux' and extra == 'postgres'", url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.5/psycopg_c-3.2.5-cp312-cp312-linux_aarch64.whl" },
-    { name = "psycopg-c", marker = "python_full_version == '3.12.*' and platform_machine == 'x86_64' and sys_platform == 'linux' and extra == 'postgres'", url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.4/psycopg_c-3.2.4-cp312-cp312-linux_x86_64.whl" },
+    { name = "psycopg-c", marker = "python_full_version == '3.12.*' and platform_machine == 'x86_64' and sys_platform == 'linux' and extra == 'postgres'", url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.5/psycopg_c-3.2.5-cp312-cp312-linux_x86_64.whl" },
-    { name = "psycopg-c", marker = "(python_full_version != '3.12.*' and platform_machine == 'aarch64' and extra == 'postgres') or (python_full_version != '3.12.*' and platform_machine == 'x86_64' and extra == 'postgres') or (platform_machine != 'aarch64' and platform_machine != 'x86_64' and extra == 'postgres') or (sys_platform != 'linux' and extra == 'postgres')", specifier = "==3.2.4" },
+    { name = "psycopg-c", marker = "(python_full_version != '3.12.*' and platform_machine == 'aarch64' and extra == 'postgres') or (python_full_version != '3.12.*' and platform_machine == 'x86_64' and extra == 'postgres') or (platform_machine != 'aarch64' and platform_machine != 'x86_64' and extra == 'postgres') or (sys_platform != 'linux' and extra == 'postgres')", specifier = "==3.2.5" },
     { name = "python-dateutil", specifier = "~=2.9.0" },
     { name = "python-dotenv", specifier = "~=1.0.1" },
     { name = "python-gnupg", specifier = "~=0.5.4" },
@@ -2348,53 +2348,53 @@ wheels = [
 
 [[package]]
 name = "psycopg"
-version = "3.2.4"
+version = "3.2.5"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "typing-extensions", marker = "(python_full_version < '3.13' and sys_platform == 'darwin') or (python_full_version < '3.13' and sys_platform == 'linux')" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/e0/f2/954b1467b3e2ca5945b83b5e320268be1f4df486c3e8ffc90f4e4b707979/psycopg-3.2.4.tar.gz", hash = "sha256:f26f1346d6bf1ef5f5ef1714dd405c67fb365cfd1c6cea07de1792747b167b92", size = 156109 }
+sdist = { url = "https://files.pythonhosted.org/packages/0e/cf/dc1a4d45e3c6222fe272a245c5cea9a969a7157639da606ac7f2ab5de3a1/psycopg-3.2.5.tar.gz", hash = "sha256:f5f750611c67cb200e85b408882f29265c66d1de7f813add4f8125978bfd70e8", size = 156158 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/40/49/15114d5f7ee68983f4e1a24d47e75334568960352a07c6f0e796e912685d/psycopg-3.2.4-py3-none-any.whl", hash = "sha256:43665368ccd48180744cab26b74332f46b63b7e06e8ce0775547a3533883d381", size = 198716 },
+    { url = "https://files.pythonhosted.org/packages/18/f3/14a1370b1449ca875d5e353ef02cb9db6b70bd46ec361c236176837c0be1/psycopg-3.2.5-py3-none-any.whl", hash = "sha256:b782130983e5b3de30b4c529623d3687033b4dafa05bb661fc6bf45837ca5879", size = 198749 },
 ]
 
 [package.optional-dependencies]
 c = [
-    { name = "psycopg-c", version = "3.2.4", source = { registry = "https://pypi.org/simple" }, marker = "(python_full_version != '3.12.*' and implementation_name != 'pypy' and platform_machine == 'aarch64' and sys_platform == 'linux') or (python_full_version != '3.12.*' and implementation_name != 'pypy' and platform_machine == 'x86_64' and sys_platform == 'linux') or (implementation_name != 'pypy' and platform_machine != 'aarch64' and platform_machine != 'x86_64' and sys_platform == 'linux') or (implementation_name != 'pypy' and sys_platform == 'darwin')" },
+    { name = "psycopg-c", version = "3.2.5", source = { registry = "https://pypi.org/simple" }, marker = "(python_full_version != '3.12.*' and implementation_name != 'pypy' and platform_machine == 'aarch64' and sys_platform == 'linux') or (python_full_version != '3.12.*' and implementation_name != 'pypy' and platform_machine == 'x86_64' and sys_platform == 'linux') or (implementation_name != 'pypy' and platform_machine != 'aarch64' and platform_machine != 'x86_64' and sys_platform == 'linux') or (implementation_name != 'pypy' and sys_platform == 'darwin')" },
-    { name = "psycopg-c", version = "3.2.4", source = { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.4/psycopg_c-3.2.4-cp312-cp312-linux_aarch64.whl" }, marker = "python_full_version == '3.12.*' and implementation_name != 'pypy' and platform_machine == 'aarch64' and sys_platform == 'linux'" },
+    { name = "psycopg-c", version = "3.2.5", source = { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.5/psycopg_c-3.2.5-cp312-cp312-linux_aarch64.whl" }, marker = "python_full_version == '3.12.*' and implementation_name != 'pypy' and platform_machine == 'aarch64' and sys_platform == 'linux'" },
-    { name = "psycopg-c", version = "3.2.4", source = { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.4/psycopg_c-3.2.4-cp312-cp312-linux_x86_64.whl" }, marker = "python_full_version == '3.12.*' and implementation_name != 'pypy' and platform_machine == 'x86_64' and sys_platform == 'linux'" },
+    { name = "psycopg-c", version = "3.2.5", source = { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.5/psycopg_c-3.2.5-cp312-cp312-linux_x86_64.whl" }, marker = "python_full_version == '3.12.*' and implementation_name != 'pypy' and platform_machine == 'x86_64' and sys_platform == 'linux'" },
 ]
 
 [[package]]
 name = "psycopg-c"
-version = "3.2.4"
+version = "3.2.5"
 source = { registry = "https://pypi.org/simple" }
 resolution-markers = [
     "sys_platform == 'darwin'",
     "(python_full_version != '3.12.*' and platform_machine == 'aarch64' and sys_platform == 'linux') or (python_full_version != '3.12.*' and platform_machine == 'x86_64' and sys_platform == 'linux') or (platform_machine != 'aarch64' and platform_machine != 'x86_64' and sys_platform == 'linux')",
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/17/76/dbdadd9b93b8ad38cff31402c73a6bb9a23c88a4466fa09655d3c6db4d11/psycopg_c-3.2.4.tar.gz", hash = "sha256:22097a04263efb2efd2cc8b00a51fa90e23f9cd4a2e09903fe4d9c6923dac17a", size = 601853 }
+sdist = { url = "https://files.pythonhosted.org/packages/cf/cb/468dcca82f08b47af59af4681ef39473cf5c0ef2e09775c701ccdf7284d6/psycopg_c-3.2.5.tar.gz", hash = "sha256:57ad4cfd28de278c424aaceb1f2ad5c7910466e315dfe84e403f3c7a0a2ce81b", size = 609318 }
 
 [[package]]
 name = "psycopg-c"
-version = "3.2.4"
+version = "3.2.5"
-source = { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.4/psycopg_c-3.2.4-cp312-cp312-linux_aarch64.whl" }
+source = { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.5/psycopg_c-3.2.5-cp312-cp312-linux_aarch64.whl" }
 resolution-markers = [
     "python_full_version == '3.12.*' and platform_machine == 'aarch64' and sys_platform == 'linux'",
 ]
 wheels = [
-    { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.4/psycopg_c-3.2.4-cp312-cp312-linux_aarch64.whl", hash = "sha256:7a3b1152b676afe4a9113f784257221cf85147812116de86970272553a846f40" },
+    { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.5/psycopg_c-3.2.5-cp312-cp312-linux_aarch64.whl", hash = "sha256:39012b8df2ef34e172d43ab5976017d054f2c2fc549854927a62e73f5253eacc" },
 ]
 
 [[package]]
 name = "psycopg-c"
-version = "3.2.4"
+version = "3.2.5"
-source = { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.4/psycopg_c-3.2.4-cp312-cp312-linux_x86_64.whl" }
+source = { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.5/psycopg_c-3.2.5-cp312-cp312-linux_x86_64.whl" }
 resolution-markers = [
     "python_full_version == '3.12.*' and platform_machine == 'x86_64' and sys_platform == 'linux'",
 ]
 wheels = [
-    { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.4/psycopg_c-3.2.4-cp312-cp312-linux_x86_64.whl", hash = "sha256:d0c0c87699846bd7f8c9259db0d17f0c9d062f3281d07b32be00ca28cdcbd5f3" },
+    { url = "https://github.com/paperless-ngx/builder/releases/download/psycopg-3.2.5/psycopg_c-3.2.5-cp312-cp312-linux_x86_64.whl", hash = "sha256:a0667a62595e355c2d3b6ac05336403c998fbfb31cf6922d73e19018016df1bc" },
 ]
 
 [[package]]