Revert "Documentation: add note about logo file visibility and exif data"

This reverts commit 43b4f36026.

CONTRIBUTING.md

@@ -2,9 +2,11 @@
 
 If you feel like contributing to the project, please do! Bug fixes and improvements are always welcome.
 
+⚠️ Please note: Pull requests that implement a new feature or enhancement _should almost always target an existing feature request_ with evidence of community interest and discussion. This is in order to balance the work of implementing and maintaining new features / enhancements. Pull requests that are opened without meeting this requirement may not be merged.
+
 If you want to implement something big:
 
-- Please start a discussion about that in the issues! Maybe something similar is already in development and we can make it happen together.
+- As above, please start with a discussion! Maybe something similar is already in development and we can make it happen together.
 - When making additions to the project, consider if the majority of users will benefit from your change. If not, you're probably better of forking the project.
 - Also consider if your change will get in the way of other users. A good change is a change that enhances the experience of some users who want that change and does not affect users who do not care about the change.
 - Please see the [paperless-ngx merge process](#merging-prs) below.

src-ui/src/app/components/document-detail/document-detail.component.html

@@ -1,30 +1,7 @@
 <pngx-page-header [(title)]="title">
-
-  @if (document?.versions?.length > 0) {
-    <div class="btn-group" ngbDropdown role="group">
-      <div class="btn-group" ngbDropdown role="group">
-        <button class="btn btn-sm btn-outline-secondary dropdown-toggle" ngbDropdownToggle [disabled]="!hasVersions">
-          <i-bs name="layers"></i-bs>
-          <span class="d-none d-lg-inline ps-1" i18n>Version</span>
-        </button>
-        <div class="dropdown-menu shadow" ngbDropdownMenu>
-          @for (vid of document.versions; track vid) {
-            <button ngbDropdownItem (click)="selectVersion(vid)">
-              <span i18n>Version</span> {{vid}}
-              @if (selectedVersionId === vid) { <span>&nbsp;✓</span> }
-            </button>
-          }
-        </div>
-      </div>
-      <input #versionFileInput type="file" class="visually-hidden" (change)="onVersionFileSelected($event)" />
-      <button class="btn btn-sm btn-outline-secondary" title="Upload new version" i18n-title (click)="versionFileInput.click()" [disabled]="!userIsOwner || !userCanEdit">
-        <i-bs name="file-earmark-plus"></i-bs><span class="visually-hidden" i18n>Upload new version</span>
-      </button>
-    </div>
-  }
   @if (archiveContentRenderType === ContentRenderType.PDF && !useNativePdfViewer) {
     @if (previewNumPages) {
-      <div class="input-group input-group-sm ms-2 d-none d-md-flex">
+      <div class="input-group input-group-sm d-none d-md-flex">
         <div class="input-group-text" i18n>Page</div>
           <input class="form-control flex-grow-0 w-auto" type="number" min="1" [max]="previewNumPages" [(ngModel)]="previewCurrentPage" />
         <div class="input-group-text" i18n>of {{previewNumPages}}</div>

src-ui/src/app/components/document-detail/document-detail.component.ts

@@ -222,8 +222,6 @@ export class DocumentDetailComponent
   titleSubject: Subject<string> = new Subject()
   previewUrl: string
   thumbUrl: string
-  // Versioning: which document ID to use for file preview/download
-  selectedVersionId: number
   previewText: string
   previewLoaded: boolean = false
   tiffURL: string
@@ -272,7 +270,6 @@ export class DocumentDetailComponent
   public readonly DataType = DataType
 
   @ViewChild('nav') nav: NgbNav
-  @ViewChild('versionFileInput') versionFileInput
   @ViewChild('pdfPreview') set pdfPreview(element) {
     // this gets called when component added or removed from DOM
     if (
@@ -405,10 +402,7 @@ export class DocumentDetailComponent
   }
 
   private loadDocument(documentId: number): void {
-    this.selectedVersionId = documentId
+    this.previewUrl = this.documentsService.getPreviewUrl(documentId)
-    this.previewUrl = this.documentsService.getPreviewUrl(
-      this.selectedVersionId
-    )
     this.http
       .get(this.previewUrl, { responseType: 'text' })
       .pipe(
@@ -423,7 +417,7 @@ export class DocumentDetailComponent
             err.message ?? err.toString()
           }`),
       })
-    this.thumbUrl = this.documentsService.getThumbUrl(this.selectedVersionId)
+    this.thumbUrl = this.documentsService.getThumbUrl(documentId)
     this.documentsService
       .get(documentId)
       .pipe(
@@ -644,10 +638,6 @@ export class DocumentDetailComponent
 
   updateComponent(doc: Document) {
     this.document = doc
-    // Default selected version is the newest version
-    this.selectedVersionId = doc.versions?.length
-      ? Math.max(...doc.versions)
-      : doc.id
     this.requiresPassword = false
     this.updateFormForCustomFields()
     if (this.archiveContentRenderType === ContentRenderType.TIFF) {
@@ -712,36 +702,6 @@ export class DocumentDetailComponent
     this.prepareForm(doc)
   }
 
-  get hasVersions(): boolean {
-    return this.document?.versions?.length > 1
-  }
-
-  // Update file preview and download target to a specific version (by document id)
-  selectVersion(versionId: number) {
-    this.selectedVersionId = versionId
-    this.previewUrl = this.documentsService.getPreviewUrl(
-      this.documentId,
-      false,
-      this.selectedVersionId
-    )
-    this.thumbUrl = this.documentsService.getThumbUrl(this.selectedVersionId)
-    // For text previews, refresh content
-    this.http
-      .get(this.previewUrl, { responseType: 'text' })
-      .pipe(
-        first(),
-        takeUntil(this.unsubscribeNotifier),
-        takeUntil(this.docChangeNotifier)
-      )
-      .subscribe({
-        next: (res) => (this.previewText = res.toString()),
-        error: (err) =>
-          (this.previewText = $localize`An error occurred loading content: ${
-            err.message ?? err.toString()
-          }`),
-      })
-  }
-
   get customFieldFormFields(): FormArray {
     return this.documentForm.get('custom_fields') as FormArray
   }
@@ -1089,36 +1049,10 @@ export class DocumentDetailComponent
     })
   }
 
-  onVersionFileSelected(event: Event) {
-    const input = event.target as HTMLInputElement
-    if (!input?.files || input.files.length === 0) return
-    const file = input.files[0]
-    // Reset input to allow re-selection of the same file later
-    input.value = ''
-    this.documentsService
-      .uploadVersion(this.documentId, file)
-      .pipe(first())
-      .subscribe({
-        next: () => {
-          this.toastService.showInfo(
-            $localize`Uploading new version. Processing will happen in the background.`
-          )
-          // Refresh metadata to reflect that versions changed (when ready)
-          this.openDocumentService.refreshDocument(this.documentId)
-        },
-        error: (error) => {
-          this.toastService.showError(
-            $localize`Error uploading new version`,
-            error
-          )
-        },
-      })
-  }
-
   download(original: boolean = false) {
     this.downloading = true
     const downloadUrl = this.documentsService.getDownloadUrl(
-      this.selectedVersionId || this.documentId,
+      this.documentId,
       original
     )
     this.http

src-ui/src/app/data/document.ts

@@ -159,10 +159,6 @@ export interface Document extends ObjectWithPermissions {
 
   page_count?: number
 
-  // Versioning
-  head_version?: number
-  versions?: number[]
-
   // Frontend only
   __changedFields?: string[]
 }

src-ui/src/app/services/rest/document.service.ts

@@ -163,19 +163,12 @@ export class DocumentService extends AbstractPaperlessService<Document> {
     })
   }
 
-  getPreviewUrl(
+  getPreviewUrl(id: number, original: boolean = false): string {
-    id: number,
-    original: boolean = false,
-    versionID: number = null
-  ): string {
     let url = new URL(this.getResourceUrl(id, 'preview'))
     if (this._searchQuery) url.hash = `#search="${this.searchQuery}"`
     if (original) {
       url.searchParams.append('original', 'true')
     }
-    if (versionID) {
-      url.searchParams.append('version', versionID.toString())
-    }
     return url.toString()
   }
 
@@ -191,16 +184,6 @@ export class DocumentService extends AbstractPaperlessService<Document> {
     return url
   }
 
-  uploadVersion(documentId: number, file: File) {
-    const formData = new FormData()
-    formData.append('document', file, file.name)
-    return this.http.post(
-      this.getResourceUrl(documentId, 'update_version'),
-      formData,
-      { reportProgress: true, observe: 'events' }
-    )
-  }
-
   getNextAsn(): Observable<number> {
     return this.http.get<number>(this.getResourceUrl(null, 'next_asn'))
   }

src-ui/src/main.ts

@@ -78,7 +78,6 @@ import {
   fileEarmarkFill,
   fileEarmarkLock,
   fileEarmarkMinus,
-  fileEarmarkPlus,
   fileEarmarkRichtext,
   fileText,
   files,
@@ -95,7 +94,6 @@ import {
   house,
   infoCircle,
   journals,
-  layers,
   link,
   listNested,
   listTask,
@@ -292,7 +290,6 @@ const icons = {
   fileEarmarkFill,
   fileEarmarkLock,
   fileEarmarkMinus,
-  fileEarmarkPlus,
   fileEarmarkRichtext,
   files,
   fileText,
@@ -309,7 +306,6 @@ const icons = {
   house,
   infoCircle,
   journals,
-  layers,
   link,
   listNested,
   listTask,

src/documents/bulk_edit.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import hashlib
 import logging
 import tempfile
 from pathlib import Path
@@ -332,8 +333,10 @@ def rotate(doc_ids: list[int], degrees: int) -> Literal["OK"]:
         f"Attempting to rotate {len(doc_ids)} documents by {degrees} degrees.",
     )
     qs = Document.objects.filter(id__in=doc_ids)
+    affected_docs: list[int] = []
     import pikepdf
 
+    rotate_tasks = []
     for doc in qs:
         if doc.mime_type != "application/pdf":
             logger.warning(
@@ -341,34 +344,28 @@ def rotate(doc_ids: list[int], degrees: int) -> Literal["OK"]:
             )
             continue
         try:
-            # Write rotated output to a temp file and create a new version via consume pipeline
+            with pikepdf.open(doc.source_path, allow_overwriting_input=True) as pdf:
-            filepath: Path = (
-                Path(tempfile.mkdtemp(dir=settings.SCRATCH_DIR))
-                / f"{doc.id}_rotated.pdf"
-            )
-            with pikepdf.open(doc.source_path) as pdf:
                 for page in pdf.pages:
                     page.rotate(degrees, relative=True)
-                pdf.remove_unreferenced_resources()
+                pdf.save()
-                pdf.save(filepath)
+                doc.checksum = hashlib.md5(doc.source_path.read_bytes()).hexdigest()
-
+                doc.save()
-            # Preserve metadata/permissions via overrides; mark as new version
+                rotate_tasks.append(
-            overrides = DocumentMetadataOverrides().from_document(doc)
+                    update_document_content_maybe_archive_file.s(
-
+                        document_id=doc.id,
-            consume_file.delay(
-                ConsumableDocument(
-                    source=DocumentSource.ConsumeFolder,
-                    original_file=filepath,
-                    head_version_id=doc.id,
                     ),
-                overrides,
                 )
                 logger.info(
-                f"Queued new rotated version for document {doc.id} by {degrees} degrees",
+                    f"Rotated document {doc.id} by {degrees} degrees",
                 )
+                affected_docs.append(doc.id)
         except Exception as e:
             logger.exception(f"Error rotating document {doc.id}: {e}")
 
+    if len(affected_docs) > 0:
+        bulk_update_task = bulk_update_documents.si(document_ids=affected_docs)
+        chord(header=rotate_tasks, body=bulk_update_task).delay()
+
     return "OK"
 
 
@@ -531,31 +528,19 @@ def delete_pages(doc_ids: list[int], pages: list[int]) -> Literal["OK"]:
     import pikepdf
 
     try:
-        # Produce edited PDF to a temp file and create a new version
+        with pikepdf.open(doc.source_path, allow_overwriting_input=True) as pdf:
-        filepath: Path = (
-            Path(tempfile.mkdtemp(dir=settings.SCRATCH_DIR))
-            / f"{doc.id}_pages_deleted.pdf"
-        )
-        with pikepdf.open(doc.source_path) as pdf:
             offset = 1  # pages are 1-indexed
             for page_num in pages:
                 pdf.pages.remove(pdf.pages[page_num - offset])
                 offset += 1  # remove() changes the index of the pages
             pdf.remove_unreferenced_resources()
-            pdf.save(filepath)
+            pdf.save()
-
+            doc.checksum = hashlib.md5(doc.source_path.read_bytes()).hexdigest()
-        overrides = DocumentMetadataOverrides().from_document(doc)
+            if doc.page_count is not None:
-        consume_file.delay(
+                doc.page_count = doc.page_count - len(pages)
-            ConsumableDocument(
+            doc.save()
-                source=DocumentSource.ConsumeFolder,
+            update_document_content_maybe_archive_file.delay(document_id=doc.id)
-                original_file=filepath,
+            logger.info(f"Deleted pages {pages} from document {doc.id}")
-                head_version_id=doc.id,
-            ),
-            overrides,
-        )
-        logger.info(
-            f"Queued new version for document {doc.id} after deleting pages {pages}",
-        )
     except Exception as e:
         logger.exception(f"Error deleting pages from document {doc.id}: {e}")
 
@@ -607,29 +592,17 @@ def edit_pdf(
                     dst.pages[-1].rotate(op["rotate"], relative=True)
 
         if update_document:
-            # Create a new version from the edited PDF rather than replacing in-place
+            temp_path = doc.source_path.with_suffix(".tmp.pdf")
             pdf = pdf_docs[0]
             pdf.remove_unreferenced_resources()
-            filepath: Path = (
+            # save the edited PDF to a temporary file in case of errors
-                Path(tempfile.mkdtemp(dir=settings.SCRATCH_DIR))
+            pdf.save(temp_path)
-                / f"{doc.id}_edited.pdf"
+            # replace the original document with the edited one
-            )
+            temp_path.replace(doc.source_path)
-            pdf.save(filepath)
+            doc.checksum = hashlib.md5(doc.source_path.read_bytes()).hexdigest()
-            overrides = (
+            doc.page_count = len(pdf.pages)
-                DocumentMetadataOverrides().from_document(doc)
+            doc.save()
-                if include_metadata
+            update_document_content_maybe_archive_file.delay(document_id=doc.id)
-                else DocumentMetadataOverrides()
-            )
-            if user is not None:
-                overrides.owner_id = user.id
-            consume_file.delay(
-                ConsumableDocument(
-                    source=DocumentSource.ConsumeFolder,
-                    original_file=filepath,
-                    head_version_id=doc.id,
-                ),
-                overrides,
-            )
         else:
             consume_tasks = []
             overrides = (

src/documents/conditionals.py

@@ -14,51 +14,6 @@ from documents.classifier import DocumentClassifier
 from documents.models import Document
 
 
-def _resolve_effective_doc(pk: int, request) -> Document | None:
-    """
-    Resolve which Document row should be considered for caching keys:
-    - If a version is requested, use that version
-    - If pk is a head doc, use its newest child version if present, else the head.
-    - Else, pk is a version, use that version.
-    Returns None if resolution fails (treat as no-cache).
-    """
-    try:
-        request_doc = Document.objects.only("id", "head_version_id").get(pk=pk)
-    except Document.DoesNotExist:
-        return None
-
-    head_doc = (
-        request_doc
-        if request_doc.head_version_id is None
-        else Document.objects.only("id").get(id=request_doc.head_version_id)
-    )
-
-    version_param = (
-        request.query_params.get("version")
-        if hasattr(request, "query_params")
-        else None
-    )
-    if version_param:
-        try:
-            version_id = int(version_param)
-            candidate = Document.objects.only("id", "head_version_id").get(
-                id=version_id,
-            )
-            if candidate.id != head_doc.id and candidate.head_version_id != head_doc.id:
-                return None
-            return candidate
-        except Exception:
-            return None
-
-    # Default behavior: if pk is a head doc, prefer its newest child version
-    if request_doc.head_version_id is None:
-        latest = head_doc.versions.only("id").order_by("id").last()
-        return latest or head_doc
-
-    # pk is already a version
-    return request_doc
-
-
 def suggestions_etag(request, pk: int) -> str | None:
     """
     Returns an optional string for the ETag, allowing browser caching of
@@ -116,10 +71,11 @@ def metadata_etag(request, pk: int) -> str | None:
     Metadata is extracted from the original file, so use its checksum as the
     ETag
     """
-    doc = _resolve_effective_doc(pk, request)
+    try:
-    if doc is None:
+        doc = Document.objects.only("checksum").get(pk=pk)
-        return None
         return doc.checksum
+    except Document.DoesNotExist:  # pragma: no cover
+        return None
     return None
 
 
@@ -129,10 +85,11 @@ def metadata_last_modified(request, pk: int) -> datetime | None:
     not the modification of the original file, but of the database object, but might as well
     error on the side of more cautious
     """
-    doc = _resolve_effective_doc(pk, request)
+    try:
-    if doc is None:
+        doc = Document.objects.only("modified").get(pk=pk)
-        return None
         return doc.modified
+    except Document.DoesNotExist:  # pragma: no cover
+        return None
     return None
 
 
@@ -140,15 +97,15 @@ def preview_etag(request, pk: int) -> str | None:
     """
     ETag for the document preview, using the original or archive checksum, depending on the request
     """
-    doc = _resolve_effective_doc(pk, request)
+    try:
-    if doc is None:
+        doc = Document.objects.only("checksum", "archive_checksum").get(pk=pk)
-        return None
         use_original = (
-        hasattr(request, "query_params")
+            "original" in request.query_params
-        and "original" in request.query_params
             and request.query_params["original"] == "true"
         )
         return doc.checksum if use_original else doc.archive_checksum
+    except Document.DoesNotExist:  # pragma: no cover
+        return None
     return None
 
 
@@ -157,10 +114,11 @@ def preview_last_modified(request, pk: int) -> datetime | None:
     Uses the documents modified time to set the Last-Modified header.  Not strictly
     speaking correct, but close enough and quick
     """
-    doc = _resolve_effective_doc(pk, request)
+    try:
-    if doc is None:
+        doc = Document.objects.only("modified").get(pk=pk)
-        return None
         return doc.modified
+    except Document.DoesNotExist:  # pragma: no cover
+        return None
     return None
 
 
@@ -170,13 +128,10 @@ def thumbnail_last_modified(request, pk: int) -> datetime | None:
     Cache should be (slightly?) faster than filesystem
     """
     try:
-        doc = _resolve_effective_doc(pk, request)
+        doc = Document.objects.only("storage_type").get(pk=pk)
-        if doc is None:
-            return None
         if not doc.thumbnail_path.exists():
             return None
-        # Use the effective document id for cache key
+        doc_key = get_thumbnail_modified_key(pk)
-        doc_key = get_thumbnail_modified_key(doc.id)
 
         cache_hit = cache.get(doc_key)
         if cache_hit is not None:

src/documents/consumer.py

@@ -113,12 +113,6 @@ class ConsumerPluginMixin:
 
         self.filename = self.metadata.filename or self.input_doc.original_file.name
 
-        if input_doc.head_version_id:
-            self.log.debug(f"Document head version id: {input_doc.head_version_id}")
-            head_version = Document.objects.get(pk=input_doc.head_version_id)
-            version_index = head_version.versions.count()
-            self.filename += f"_v{version_index}"
-
     def _send_progress(
         self,
         current_progress: int,
@@ -476,38 +470,6 @@ class ConsumerPlugin(
         try:
             with transaction.atomic():
                 # store the document.
-                if self.input_doc.head_version_id:
-                    # If this is a new version of an existing document, we need
-                    # to make sure we're not creating a new document, but updating
-                    # the existing one.
-                    original_document = Document.objects.get(
-                        pk=self.input_doc.head_version_id,
-                    )
-                    self.log.debug("Saving record for updated version to database")
-                    original_document.pk = None
-                    original_document.head_version = Document.objects.get(
-                        pk=self.input_doc.head_version_id,
-                    )
-                    file_for_checksum = (
-                        self.unmodified_original
-                        if self.unmodified_original is not None
-                        else self.working_copy
-                    )
-                    original_document.checksum = hashlib.md5(
-                        file_for_checksum.read_bytes(),
-                    ).hexdigest()
-                    original_document.content = text
-                    original_document.page_count = page_count
-                    original_document.mime_type = mime_type
-                    original_document.original_filename = self.filename
-                    # Clear unique file path fields so they can be generated uniquely later
-                    original_document.filename = None
-                    original_document.archive_filename = None
-                    original_document.archive_checksum = None
-                    original_document.modified = timezone.now()
-                    original_document.save()
-                    document = original_document
-                else:
                 document = self._store(
                     text=text,
                     date=date,

src/documents/data_models.py

@@ -156,7 +156,6 @@ class ConsumableDocument:
 
     source: DocumentSource
     original_file: Path
-    head_version_id: int | None = None
     mailrule_id: int | None = None
     mime_type: str = dataclasses.field(init=False, default=None)
 

src/documents/migrations/1072_document_head_version.py

@@ -1,26 +0,0 @@
-# Generated by Django 5.1.6 on 2025-02-26 17:08
-
-import django.db.models.deletion
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("documents", "1071_tag_tn_ancestors_count_tag_tn_ancestors_pks_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="document",
-            name="head_version",
-            field=models.ForeignKey(
-                blank=True,
-                null=True,
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="versions",
-                to="documents.document",
-                verbose_name="head version of document",
-            ),
-        ),
-    ]

src/documents/models.py

@@ -313,15 +313,6 @@ class Document(SoftDeleteModel, ModelWithOwner):
         ),
     )
 
-    head_version = models.ForeignKey(
-        "self",
-        blank=True,
-        null=True,
-        related_name="versions",
-        on_delete=models.CASCADE,
-        verbose_name=_("head version of document"),
-    )
-
     class Meta:
         ordering = ("-created",)
         verbose_name = _("document")

src/documents/serialisers.py

@@ -974,8 +974,6 @@ class DocumentSerializer(
     page_count = SerializerMethodField()
 
     notes = NotesSerializer(many=True, required=False, read_only=True)
-    head_version = serializers.PrimaryKeyRelatedField(read_only=True)
-    versions = serializers.PrimaryKeyRelatedField(many=True, read_only=True)
 
     custom_fields = CustomFieldInstanceSerializer(
         many=True,
@@ -1018,10 +1016,6 @@ class DocumentSerializer(
             request.version if request else settings.REST_FRAMEWORK["DEFAULT_VERSION"],
         )
 
-        if doc.get("versions") is not None:
-            doc["versions"] = sorted(doc["versions"], reverse=True)
-            doc["versions"].append(doc["id"])
-
         if api_version < 9:
             # provide created as a datetime for backwards compatibility
             from django.utils import timezone
@@ -1190,8 +1184,6 @@ class DocumentSerializer(
             "remove_inbox_tags",
             "page_count",
             "mime_type",
-            "head_version",
-            "versions",
         )
         list_serializer_class = OwnedObjectListSerializer
 
@@ -1875,15 +1867,6 @@ class PostDocumentSerializer(serializers.Serializer):
             return created.date()
 
 
-class DocumentVersionSerializer(serializers.Serializer):
-    document = serializers.FileField(
-        label="Document",
-        write_only=True,
-    )
-
-    validate_document = PostDocumentSerializer().validate_document
-
-
 class BulkDownloadSerializer(DocumentListSerializer):
     content = serializers.ChoiceField(
         choices=["archive", "originals", "both"],

src/documents/tasks.py

@@ -145,17 +145,13 @@ def consume_file(
     if overrides is None:
         overrides = DocumentMetadataOverrides()
 
-    plugins: list[type[ConsumeTaskPlugin]] = (
+    plugins: list[type[ConsumeTaskPlugin]] = [
-        [ConsumerPreflightPlugin, ConsumerPlugin]
-        if input_doc.head_version_id is not None
-        else [
         ConsumerPreflightPlugin,
         CollatePlugin,
         BarcodePlugin,
         WorkflowTriggerPlugin,
         ConsumerPlugin,
     ]
-    )
 
     with (
         ProgressManager(

src/documents/tests/test_api_app_config.py

@@ -1,4 +1,6 @@
 import json
+from fractions import Fraction
+from io import BytesIO
 from pathlib import Path
 
 from django.contrib.auth.models import User
@@ -6,6 +8,11 @@ from django.core.files.uploadedfile import SimpleUploadedFile
 from rest_framework import status
 from rest_framework.test import APITestCase
 
+try:
+    from PIL import Image
+except ModuleNotFoundError:  # pragma: no cover - Pillow is required in production
+    Image = None  # type: ignore[assignment]
+
 from documents.tests.utils import DirectoriesMixin
 from paperless.models import ApplicationConfiguration
 from paperless.models import ColorConvertChoices
@@ -190,6 +197,74 @@ class TestApiAppConfig(DirectoriesMixin, APITestCase):
         )
         self.assertFalse(Path(old_logo.path).exists())
 
+    def test_api_strips_metadata_from_logo_upload(self):
+        """
+        GIVEN:
+            - An image file containing EXIF metadata including GPS coordinates
+        WHEN:
+            - Uploaded via PATCH to app config
+        THEN:
+            - Stored logo no longer contains EXIF metadata
+        """
+        if Image is None:
+            self.skipTest("Pillow is not installed")
+
+        if not hasattr(Image, "Exif"):
+            self.skipTest("Current Pillow version cannot create EXIF metadata")
+
+        assert Image is not None
+
+        exif = Image.Exif()
+        exif[0x010E] = "Test description"  # ImageDescription
+        exif[0x8825] = {
+            1: "N",  # GPSLatitudeRef
+            2: (Fraction(51, 1), Fraction(30, 1), Fraction(0, 1)),
+            3: "E",  # GPSLongitudeRef
+            4: (Fraction(0, 1), Fraction(7, 1), Fraction(0, 1)),
+        }
+
+        buffer = BytesIO()
+        Image.new("RGB", (8, 8), "white").save(buffer, format="JPEG", exif=exif)
+        buffer.seek(0)
+
+        with Image.open(BytesIO(buffer.getvalue())) as uploaded_image:
+            self.assertGreater(len(uploaded_image.getexif()), 0)
+
+        response = self.client.patch(
+            f"{self.ENDPOINT}1/",
+            {
+                "app_logo": SimpleUploadedFile(
+                    name="with_exif.jpg",
+                    content=buffer.getvalue(),
+                    content_type="image/jpeg",
+                ),
+            },
+        )
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+        config = ApplicationConfiguration.objects.first()
+        stored_logo = Path(config.app_logo.path)
+        self.assertTrue(stored_logo.exists())
+
+        with Image.open(stored_logo) as sanitized:
+            sanitized_exif = sanitized.getexif()
+            self.assertNotEqual(sanitized_exif.get(0x010E), "Test description")
+
+            gps_ifd = None
+            if hasattr(sanitized_exif, "get_ifd"):
+                try:
+                    gps_ifd = sanitized_exif.get_ifd(0x8825)
+                except KeyError:
+                    gps_ifd = None
+            else:
+                gps_ifd = sanitized_exif.get(0x8825)
+
+            if gps_ifd is not None:
+                self.assertEqual(len(gps_ifd), 0, "GPS metadata should be cleared")
+
+            self.assertNotIn("exif", sanitized.info)
+
     def test_api_rejects_malicious_svg_logo(self):
         """
         GIVEN:

src/documents/tests/test_bulk_edit.py

@@ -787,8 +787,10 @@ class TestPDFActions(DirectoriesMixin, TestCase):
 
         mock_consume_file.assert_not_called()
 
-    @mock.patch("documents.tasks.consume_file.delay")
+    @mock.patch("documents.tasks.bulk_update_documents.si")
-    def test_rotate(self, mock_consume_delay):
+    @mock.patch("documents.tasks.update_document_content_maybe_archive_file.s")
+    @mock.patch("celery.chord.delay")
+    def test_rotate(self, mock_chord, mock_update_document, mock_update_documents):
         """
         GIVEN:
             - Existing documents
@@ -799,22 +801,19 @@ class TestPDFActions(DirectoriesMixin, TestCase):
         """
         doc_ids = [self.doc1.id, self.doc2.id]
         result = bulk_edit.rotate(doc_ids, 90)
-        self.assertEqual(mock_consume_delay.call_count, 2)
+        self.assertEqual(mock_update_document.call_count, 2)
-        for call, expected_id in zip(
+        mock_update_documents.assert_called_once()
-            mock_consume_delay.call_args_list,
+        mock_chord.assert_called_once()
-            doc_ids,
-        ):
-            consumable, overrides = call.args
-            self.assertEqual(consumable.head_version_id, expected_id)
-            self.assertIsNotNone(overrides)
         self.assertEqual(result, "OK")
 
-    @mock.patch("documents.tasks.consume_file.delay")
+    @mock.patch("documents.tasks.bulk_update_documents.si")
+    @mock.patch("documents.tasks.update_document_content_maybe_archive_file.s")
     @mock.patch("pikepdf.Pdf.save")
     def test_rotate_with_error(
         self,
         mock_pdf_save,
-        mock_consume_delay,
+        mock_update_archive_file,
+        mock_update_documents,
     ):
         """
         GIVEN:
@@ -833,12 +832,16 @@ class TestPDFActions(DirectoriesMixin, TestCase):
             error_str = cm.output[0]
             expected_str = "Error rotating document"
             self.assertIn(expected_str, error_str)
-            mock_consume_delay.assert_not_called()
+            mock_update_archive_file.assert_not_called()
 
-    @mock.patch("documents.tasks.consume_file.delay")
+    @mock.patch("documents.tasks.bulk_update_documents.si")
+    @mock.patch("documents.tasks.update_document_content_maybe_archive_file.s")
+    @mock.patch("celery.chord.delay")
     def test_rotate_non_pdf(
         self,
-        mock_consume_delay,
+        mock_chord,
+        mock_update_document,
+        mock_update_documents,
     ):
         """
         GIVEN:
@@ -853,16 +856,14 @@ class TestPDFActions(DirectoriesMixin, TestCase):
             output_str = cm.output[1]
             expected_str = "Document 4 is not a PDF, skipping rotation"
             self.assertIn(expected_str, output_str)
-            self.assertEqual(mock_consume_delay.call_count, 1)
+            self.assertEqual(mock_update_document.call_count, 1)
-            consumable, overrides = mock_consume_delay.call_args[0]
+            mock_update_documents.assert_called_once()
-            self.assertEqual(consumable.head_version_id, self.doc2.id)
+            mock_chord.assert_called_once()
-            self.assertIsNotNone(overrides)
             self.assertEqual(result, "OK")
 
-    @mock.patch("documents.tasks.consume_file.delay")
+    @mock.patch("documents.tasks.update_document_content_maybe_archive_file.delay")
     @mock.patch("pikepdf.Pdf.save")
-    @mock.patch("documents.data_models.magic.from_file", return_value="application/pdf")
+    def test_delete_pages(self, mock_pdf_save, mock_update_archive_file):
-    def test_delete_pages(self, mock_magic, mock_pdf_save, mock_consume_delay):
         """
         GIVEN:
             - Existing documents
@@ -870,22 +871,24 @@ class TestPDFActions(DirectoriesMixin, TestCase):
             - Delete pages action is called with 1 document and 2 pages
         THEN:
             - Save should be called once
-            - A new version should be enqueued via consume_file
+            - Archive file should be updated once
+            - The document's page_count should be reduced by the number of deleted pages
         """
         doc_ids = [self.doc2.id]
+        initial_page_count = self.doc2.page_count
         pages = [1, 3]
         result = bulk_edit.delete_pages(doc_ids, pages)
         mock_pdf_save.assert_called_once()
-        mock_consume_delay.assert_called_once()
+        mock_update_archive_file.assert_called_once()
-        consumable, overrides = mock_consume_delay.call_args[0]
-        self.assertEqual(consumable.head_version_id, self.doc2.id)
-        self.assertTrue(str(consumable.original_file).endswith("_pages_deleted.pdf"))
-        self.assertIsNotNone(overrides)
         self.assertEqual(result, "OK")
 
-    @mock.patch("documents.tasks.consume_file.delay")
+        expected_page_count = initial_page_count - len(pages)
+        self.doc2.refresh_from_db()
+        self.assertEqual(self.doc2.page_count, expected_page_count)
+
+    @mock.patch("documents.tasks.update_document_content_maybe_archive_file.delay")
     @mock.patch("pikepdf.Pdf.save")
-    def test_delete_pages_with_error(self, mock_pdf_save, mock_consume_delay):
+    def test_delete_pages_with_error(self, mock_pdf_save, mock_update_archive_file):
         """
         GIVEN:
             - Existing documents
@@ -894,7 +897,7 @@ class TestPDFActions(DirectoriesMixin, TestCase):
             - PikePDF raises an error
         THEN:
             - Save should be called once
-            - No new version should be enqueued
+            - Archive file should not be updated
         """
         mock_pdf_save.side_effect = Exception("Error saving PDF")
         doc_ids = [self.doc2.id]
@@ -905,7 +908,7 @@ class TestPDFActions(DirectoriesMixin, TestCase):
             error_str = cm.output[0]
             expected_str = "Error deleting pages from document"
             self.assertIn(expected_str, error_str)
-            mock_consume_delay.assert_not_called()
+            mock_update_archive_file.assert_not_called()
 
     @mock.patch("documents.bulk_edit.group")
     @mock.patch("documents.tasks.consume_file.s")
@@ -965,18 +968,21 @@ class TestPDFActions(DirectoriesMixin, TestCase):
         self.assertEqual(result, "OK")
         mock_chord.assert_called_once()
 
-    @mock.patch("documents.tasks.consume_file.delay")
+    @mock.patch("documents.tasks.update_document_content_maybe_archive_file.delay")
-    def test_edit_pdf_with_update_document(self, mock_consume_delay):
+    def test_edit_pdf_with_update_document(self, mock_update_document):
         """
         GIVEN:
             - A single existing PDF document
         WHEN:
             - edit_pdf is called with update_document=True and a single output
         THEN:
-            - A version update is enqueued targeting the existing document
+            - The original document is updated in-place
+            - The update_document_content_maybe_archive_file task is triggered
         """
         doc_ids = [self.doc2.id]
         operations = [{"page": 1}, {"page": 2}]
+        original_checksum = self.doc2.checksum
+        original_page_count = self.doc2.page_count
 
         result = bulk_edit.edit_pdf(
             doc_ids,
@@ -986,11 +992,10 @@ class TestPDFActions(DirectoriesMixin, TestCase):
         )
 
         self.assertEqual(result, "OK")
-        mock_consume_delay.assert_called_once()
+        self.doc2.refresh_from_db()
-        consumable, overrides = mock_consume_delay.call_args[0]
+        self.assertNotEqual(self.doc2.checksum, original_checksum)
-        self.assertEqual(consumable.head_version_id, self.doc2.id)
+        self.assertNotEqual(self.doc2.page_count, original_page_count)
-        self.assertTrue(str(consumable.original_file).endswith("_edited.pdf"))
+        mock_update_document.assert_called_once_with(document_id=self.doc2.id)
-        self.assertIsNotNone(overrides)
 
     @mock.patch("documents.bulk_edit.group")
     @mock.patch("documents.tasks.consume_file.s")

src/documents/views.py

@@ -147,7 +147,6 @@ from documents.serialisers import CustomFieldSerializer
 from documents.serialisers import DocumentListSerializer
 from documents.serialisers import DocumentSerializer
 from documents.serialisers import DocumentTypeSerializer
-from documents.serialisers import DocumentVersionSerializer
 from documents.serialisers import NotesSerializer
 from documents.serialisers import PostDocumentSerializer
 from documents.serialisers import RunTaskViewSerializer
@@ -568,7 +567,7 @@ class DocumentViewSet(
     GenericViewSet,
 ):
     model = Document
-    queryset = Document.objects.all()
+    queryset = Document.objects.annotate(num_notes=Count("notes"))
     serializer_class = DocumentSerializer
     pagination_class = StandardPagination
     permission_classes = (IsAuthenticated, PaperlessObjectPermissions)
@@ -597,8 +596,7 @@ class DocumentViewSet(
 
     def get_queryset(self):
         return (
-            Document.objects.filter(head_version__isnull=True)
+            Document.objects.distinct()
-            .distinct()
             .order_by("-created")
             .annotate(num_notes=Count("notes"))
             .select_related("correspondent", "storage_path", "document_type", "owner")
@@ -660,55 +658,18 @@ class DocumentViewSet(
             and request.query_params["original"] == "true"
         )
 
-    def _resolve_file_doc(self, head_doc: Document, request):
-        version_param = request.query_params.get("version")
-        if version_param:
-            try:
-                version_id = int(version_param)
-            except (TypeError, ValueError):
-                raise NotFound("Invalid version parameter")
-            try:
-                candidate = Document.global_objects.select_related("owner").get(
-                    id=version_id,
-                )
-            except Document.DoesNotExist:
-                raise Http404
-            if candidate.id != head_doc.id and candidate.head_version_id != head_doc.id:
-                raise Http404
-            return candidate
-        latest = head_doc.versions.order_by("id").last()
-        return latest or head_doc
-
     def file_response(self, pk, request, disposition):
-        request_doc = Document.global_objects.select_related("owner").get(id=pk)
+        doc = Document.global_objects.select_related("owner").get(id=pk)
-        head_doc = (
-            request_doc
-            if request_doc.head_version_id is None
-            else Document.global_objects.select_related("owner").get(
-                id=request_doc.head_version_id,
-            )
-        )
         if request.user is not None and not has_perms_owner_aware(
             request.user,
             "view_document",
-            head_doc,
+            doc,
         ):
             return HttpResponseForbidden("Insufficient permissions")
-        # If a version is explicitly requested, use it. Otherwise:
-        # - if pk is a head document: serve newest version
-        # - if pk is a version: serve that version
-        if "version" in request.query_params:
-            file_doc = self._resolve_file_doc(head_doc, request)
-        else:
-            file_doc = (
-                self._resolve_file_doc(head_doc, request)
-                if request_doc.head_version_id is None
-                else request_doc
-            )
         return serve_file(
-            doc=file_doc,
+            doc=doc,
             use_archive=not self.original_requested(request)
-            and file_doc.has_archive_version,
+            and doc.has_archive_version,
             disposition=disposition,
         )
 
@@ -743,33 +704,16 @@ class DocumentViewSet(
     )
     def metadata(self, request, pk=None):
         try:
-            request_doc = Document.objects.select_related("owner").get(pk=pk)
+            doc = Document.objects.select_related("owner").get(pk=pk)
-            head_doc = (
-                request_doc
-                if request_doc.head_version_id is None
-                else Document.objects.select_related("owner").get(
-                    id=request_doc.head_version_id,
-                )
-            )
             if request.user is not None and not has_perms_owner_aware(
                 request.user,
                 "view_document",
-                head_doc,
+                doc,
             ):
                 return HttpResponseForbidden("Insufficient permissions")
         except Document.DoesNotExist:
             raise Http404
 
-        # Choose the effective document (newest version by default, or explicit via ?version=)
-        if "version" in request.query_params:
-            doc = self._resolve_file_doc(head_doc, request)
-        else:
-            doc = (
-                self._resolve_file_doc(head_doc, request)
-                if request_doc.head_version_id is None
-                else request_doc
-            )
-
         document_cached_metadata = get_metadata_cache(doc.pk)
 
         archive_metadata = None
@@ -871,36 +815,8 @@ class DocumentViewSet(
     )
     def preview(self, request, pk=None):
         try:
-            request_doc = Document.objects.select_related("owner").get(id=pk)
+            response = self.file_response(pk, request, "inline")
-            head_doc = (
+            return response
-                request_doc
-                if request_doc.head_version_id is None
-                else Document.objects.select_related("owner").get(
-                    id=request_doc.head_version_id,
-                )
-            )
-            if request.user is not None and not has_perms_owner_aware(
-                request.user,
-                "view_document",
-                head_doc,
-            ):
-                return HttpResponseForbidden("Insufficient permissions")
-
-            if "version" in request.query_params:
-                file_doc = self._resolve_file_doc(head_doc, request)
-            else:
-                file_doc = (
-                    self._resolve_file_doc(head_doc, request)
-                    if request_doc.head_version_id is None
-                    else request_doc
-                )
-
-            return serve_file(
-                doc=file_doc,
-                use_archive=not self.original_requested(request)
-                and file_doc.has_archive_version,
-                disposition="inline",
-            )
         except (FileNotFoundError, Document.DoesNotExist):
             raise Http404
 
@@ -909,32 +825,17 @@ class DocumentViewSet(
     @method_decorator(last_modified(thumbnail_last_modified))
     def thumb(self, request, pk=None):
         try:
-            request_doc = Document.objects.select_related("owner").get(id=pk)
+            doc = Document.objects.select_related("owner").get(id=pk)
-            head_doc = (
-                request_doc
-                if request_doc.head_version_id is None
-                else Document.objects.select_related("owner").get(
-                    id=request_doc.head_version_id,
-                )
-            )
             if request.user is not None and not has_perms_owner_aware(
                 request.user,
                 "view_document",
-                head_doc,
+                doc,
             ):
                 return HttpResponseForbidden("Insufficient permissions")
-            if "version" in request.query_params:
+            if doc.storage_type == Document.STORAGE_TYPE_GPG:
-                file_doc = self._resolve_file_doc(head_doc, request)
+                handle = GnuPG.decrypted(doc.thumbnail_file)
             else:
-                file_doc = (
+                handle = doc.thumbnail_file
-                    self._resolve_file_doc(head_doc, request)
-                    if request_doc.head_version_id is None
-                    else request_doc
-                )
-            if file_doc.storage_type == Document.STORAGE_TYPE_GPG:
-                handle = GnuPG.decrypted(file_doc.thumbnail_file)
-            else:
-                handle = file_doc.thumbnail_file
 
             return HttpResponse(handle, content_type="image/webp")
         except (FileNotFoundError, Document.DoesNotExist):
@@ -1202,56 +1103,6 @@ class DocumentViewSet(
                 "Error emailing document, check logs for more detail.",
             )
 
-    @action(methods=["post"], detail=True)
-    def update_version(self, request, pk=None):
-        serializer = DocumentVersionSerializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
-
-        try:
-            doc = Document.objects.select_related("owner").get(pk=pk)
-            if request.user is not None and not has_perms_owner_aware(
-                request.user,
-                "change_document",
-                doc,
-            ):
-                return HttpResponseForbidden("Insufficient permissions")
-        except Document.DoesNotExist:
-            raise Http404
-
-        try:
-            doc_name, doc_data = serializer.validated_data.get("document")
-
-            t = int(mktime(datetime.now().timetuple()))
-
-            settings.SCRATCH_DIR.mkdir(parents=True, exist_ok=True)
-
-            temp_file_path = Path(tempfile.mkdtemp(dir=settings.SCRATCH_DIR)) / Path(
-                pathvalidate.sanitize_filename(doc_name),
-            )
-
-            temp_file_path.write_bytes(doc_data)
-
-            os.utime(temp_file_path, times=(t, t))
-
-            input_doc = ConsumableDocument(
-                source=DocumentSource.ApiUpload,
-                original_file=temp_file_path,
-                head_version_id=doc.pk,
-            )
-
-            async_task = consume_file.delay(
-                input_doc,
-            )
-            logger.debug(
-                f"Updated document {doc.id} with new version",
-            )
-            return Response(async_task.id)
-        except Exception as e:
-            logger.warning(f"An error occurred updating document: {e!s}")
-            return HttpResponseServerError(
-                "Error updating document, check logs for more detail.",
-            )
-
 
 @extend_schema_view(
     list=extend_schema(

src/paperless/serialisers.py

@@ -1,4 +1,5 @@
 import logging
+from io import BytesIO
 
 import magic
 from allauth.mfa.adapter import get_adapter as get_mfa_adapter
@@ -9,6 +10,10 @@ from allauth.socialaccount.models import SocialApp
 from django.contrib.auth.models import Group
 from django.contrib.auth.models import Permission
 from django.contrib.auth.models import User
+from django.core.files.uploadedfile import SimpleUploadedFile
+from PIL import Image
+from PIL import ImageOps
+from PIL import UnidentifiedImageError
 from rest_framework import serializers
 from rest_framework.authtoken.serializers import AuthTokenSerializer
 
@@ -19,6 +24,102 @@ from paperless_mail.serialisers import ObfuscatedPasswordField
 logger = logging.getLogger("paperless.settings")
 
 
+def strip_image_metadata(uploaded_file, mime_type: str | None):
+    """Return a copy of ``uploaded_file`` with EXIF/ICC metadata removed."""
+
+    if uploaded_file is None:
+        return uploaded_file
+
+    original_position = uploaded_file.tell() if hasattr(uploaded_file, "tell") else None
+    image = None
+
+    sanitized = None
+
+    try:
+        if hasattr(uploaded_file, "seek"):
+            uploaded_file.seek(0)
+        image = Image.open(uploaded_file)
+        image.load()
+    except (UnidentifiedImageError, OSError):
+        if hasattr(uploaded_file, "seek") and original_position is not None:
+            uploaded_file.seek(original_position)
+        return uploaded_file
+
+    try:
+        image_format = (image.format or "").upper()
+        image = ImageOps.exif_transpose(image)
+
+        if image_format not in {"JPEG", "JPG", "PNG"}:
+            if hasattr(uploaded_file, "seek") and original_position is not None:
+                uploaded_file.seek(original_position)
+            return uploaded_file
+
+        if hasattr(image, "info"):
+            image.info.pop("exif", None)
+            image.info.pop("icc_profile", None)
+            image.info.pop("comment", None)
+
+        if image_format in {"JPEG", "JPG"}:
+            sanitized = image.convert("RGB")
+            save_kwargs = {
+                "format": "JPEG",
+                "quality": 95,
+                "subsampling": 0,
+                "optimize": True,
+                "exif": b"",
+            }
+        else:  # PNG
+            target_mode = (
+                "RGBA"
+                if ("A" in image.mode or image.info.get("transparency"))
+                else "RGB"
+            )
+            sanitized = image.convert(target_mode)
+            save_kwargs = {
+                "format": "PNG",
+                "optimize": True,
+            }
+
+        buffer = BytesIO()
+        try:
+            sanitized.save(buffer, **save_kwargs)
+        except (OSError, ValueError):
+            buffer = BytesIO()
+            if image_format in {"JPEG", "JPG"}:
+                sanitized.save(
+                    buffer,
+                    format="JPEG",
+                    quality=90,
+                    subsampling=0,
+                    exif=b"",
+                )
+            else:
+                sanitized.save(
+                    buffer,
+                    format="PNG",
+                )
+
+        buffer.seek(0)
+
+        if hasattr(uploaded_file, "close"):
+            try:
+                uploaded_file.close()
+            except Exception:
+                pass
+
+        content_type = getattr(uploaded_file, "content_type", None) or mime_type
+        return SimpleUploadedFile(
+            name=getattr(uploaded_file, "name", "logo"),
+            content=buffer.getvalue(),
+            content_type=content_type,
+        )
+    finally:
+        if sanitized is not None:
+            sanitized.close()
+        if image is not None:
+            image.close()
+
+
 class PaperlessAuthTokenSerializer(AuthTokenSerializer):
     code = serializers.CharField(
         label="MFA Code",
@@ -209,10 +310,23 @@ class ApplicationConfigurationSerializer(serializers.ModelSerializer):
         return super().update(instance, validated_data)
 
     def validate_app_logo(self, file):
-        if file and magic.from_buffer(file.read(2048), mime=True) == "image/svg+xml":
+        if not file:
-            reject_dangerous_svg(file)
             return file
 
+        if hasattr(file, "seek"):
+            file.seek(0)
+        mime_type = magic.from_buffer(file.read(2048), mime=True)
+        if hasattr(file, "seek"):
+            file.seek(0)
+
+        if mime_type == "image/svg+xml":
+            reject_dangerous_svg(file)
+            if hasattr(file, "seek"):
+                file.seek(0)
+            return file
+
+        return strip_image_metadata(file, mime_type)
+
     class Meta:
         model = ApplicationConfiguration
         fields = "__all__"

src/paperless/settings.py

@@ -922,7 +922,7 @@ CELERY_ACCEPT_CONTENT = ["application/json", "application/x-python-serialize"]
 CELERY_BEAT_SCHEDULE = _parse_beat_schedule()
 
 # https://docs.celeryq.dev/en/stable/userguide/configuration.html#beat-schedule-filename
-CELERY_BEAT_SCHEDULE_FILENAME = DATA_DIR / "celerybeat-schedule.db"
+CELERY_BEAT_SCHEDULE_FILENAME = str(DATA_DIR / "celerybeat-schedule.db")
 
 
 # Cachalot: Database read cache.