Chore: convert test_signals.py from TestCase to pytest style

22 near-duplicate test methods. Converts to plain pytest classes to enable
pytest.mark.parametrize, which collapses those into 9 test functions covering 23 cases,
with mocker/caplog/settings fixtures replacing unittest.mock/assertLogs/override_settings.

The role-sync scenarios (superuser/staff group sync, in various combinations)
share the same setup and assertions, so they're merged into one parametrize
table.

.devcontainer/docker-compose.devcontainer.sqlite-tika.yml

@@ -66,7 +66,7 @@ services:
     command:
       - "gotenberg"
       - "--chromium-disable-javascript=true"
-      - "--chromium-allow-list=^file:///tmp/.*"
+      - "--chromium-allow-list=file:///tmp/.*"
   tika:
     image: docker.io/apache/tika:3.3.1.0
     restart: unless-stopped

.github/actions/apt-install/action.yml

@@ -1,53 +0,0 @@
-name: Install apt packages
-description: >
-  Installs apt packages with a per-attempt timeout and retries. The hosted runner's Azure apt mirror intermittently serves archives at a crawl, which apt's own timeout does not catch. A stuck attempt is killed and retried, which usually lands on a healthy mirror node.
-
-inputs:
-  packages:
-    description: Space separated list of packages to install
-    required: true
-  attempts:
-    description: Maximum number of attempts
-    default: "3"
-  attempt-timeout:
-    description: Seconds before a single attempt is killed
-    default: "180"
-runs:
-  using: composite
-  steps:
-    - name: Install ${{ inputs.packages }}
-      shell: bash
-      env:
-        PACKAGES: ${{ inputs.packages }}
-        ATTEMPTS: ${{ inputs.attempts }}
-        ATTEMPT_TIMEOUT: ${{ inputs.attempt-timeout }}
-      run: |
-        SUDO=""
-        if [ "$(id -u)" -ne 0 ]; then
-          SUDO="sudo"
-        fi
-
-        attempt_install() {
-          $SUDO apt-get update -q
-          # Intentionally unquoted, this is a list of package names
-          $SUDO apt-get install -q --yes --no-install-recommends $PACKAGES
-        }
-        export -f attempt_install
-        export SUDO PACKAGES
-
-        for attempt in $(seq 1 "${ATTEMPTS}"); do
-          echo "::group::apt install attempt ${attempt}/${ATTEMPTS}"
-          start=$(date +%s)
-          if timeout --kill-after=10 "${ATTEMPT_TIMEOUT}" bash -c attempt_install; then
-            echo "::endgroup::"
-            echo "Installed in $(( $(date +%s) - start ))s"
-            exit 0
-          fi
-          echo "::endgroup::"
-          echo "::warning::apt install attempt ${attempt}/${ATTEMPTS} failed or exceeded ${ATTEMPT_TIMEOUT}s"
-          # A killed attempt can leave dpkg half configured
-          $SUDO dpkg --configure -a || true
-        done
-
-        echo "::error::apt install failed after ${ATTEMPTS} attempts"
-        exit 1

.github/dependabot.yml

@@ -59,6 +59,7 @@ updates:
           - "drf-*"
           - "djangorestframework"
           - "whitenoise"
+          - "bleach"
           - "jinja2"
       # Async, Task Queuing & Caching
       async-tasks:

.github/workflows/ci-backend.yml

@@ -80,7 +80,7 @@ jobs:
     needs: changes
     if: needs.changes.outputs.backend_changed == 'true'
     name: "Python ${{ matrix.python-version }}"
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
     strategy:
@@ -102,19 +102,20 @@ jobs:
         with:
           python-version: "${{ matrix.python-version }}"
       - name: Install uv
-        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+        uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0
         with:
           version: ${{ env.DEFAULT_UV_VERSION }}
           enable-cache: true
           python-version: ${{ steps.setup-python.outputs.python-version }}
       - name: Install system dependencies
-        timeout-minutes: 12
+        timeout-minutes: 10
-        uses: $/.github/actions/apt-install
+        run: |
-        with:
+          sudo apt-get update -qq
-          packages: unpaper tesseract-ocr imagemagick ghostscript poppler-utils
+          sudo apt-get install -qq --no-install-recommends \
+            unpaper tesseract-ocr imagemagick ghostscript poppler-utils
       - name: Configure ImageMagick
         run: |
-          sudo cp docker/rootfs/etc/ImageMagick-6/paperless-policy.xml /etc/ImageMagick-7/policy.xml
+          sudo cp docker/rootfs/etc/ImageMagick-6/paperless-policy.xml /etc/ImageMagick-6/policy.xml
       - name: Install Python dependencies
         env:
           PYTHON_VERSION: ${{ steps.setup-python.outputs.python-version }}
@@ -138,13 +139,13 @@ jobs:
             pytest
       - name: Upload test results to Codecov
         if: always()
-        uses: codecov/codecov-action@303a32d7a59b442fa8d48b6a1cc6825c09c847a5 # v7.1.1
+        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
         with:
           flags: backend-python-${{ matrix.python-version }}
           files: junit.xml
           report_type: test_results
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@303a32d7a59b442fa8d48b6a1cc6825c09c847a5 # v7.1.1
+        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
         with:
           flags: backend-python-${{ matrix.python-version }}
           files: coverage.xml
@@ -158,7 +159,7 @@ jobs:
     needs: changes
     if: needs.changes.outputs.backend_changed == 'true'
     name: Check project typing
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
     env:
@@ -175,7 +176,7 @@ jobs:
         with:
           python-version: "${{ env.DEFAULT_PYTHON }}"
       - name: Install uv
-        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+        uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0
         with:
           version: ${{ env.DEFAULT_UV_VERSION }}
           enable-cache: true

.github/workflows/ci-docker.yml

@@ -24,10 +24,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - runner: ubuntu-26.04
+          - runner: ubuntu-24.04
             arch: amd64
             platform: linux/amd64
-          - runner: ubuntu-26.04-arm
+          - runner: ubuntu-24.04-arm
             arch: arm64
             platform: linux/arm64
     runs-on: ${{ matrix.runner }}
@@ -106,7 +106,7 @@ jobs:
           echo "repository=${repo_name}"
           echo "name=${repo_name}" >> $GITHUB_OUTPUT
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1
+        uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
       - name: Login to GitHub Container Registry
         uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
         with:
@@ -132,7 +132,7 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
       - name: Build and push by digest
         id: build
-        uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc # v7.4.0
+        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
         with:
           context: .
           file: ./Dockerfile
@@ -163,7 +163,7 @@ jobs:
           archive: false
   merge-and-push:
     name: Merge and Push Manifest
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     needs: build-arch
     if: needs.build-arch.outputs.should-push == 'true'
     environment: image-publishing
@@ -182,7 +182,7 @@ jobs:
           echo "Downloaded digests:"
           ls -la /tmp/digests/
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1
+        uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
       - name: Login to GitHub Container Registry
         uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f # v4.6.0
         with:

.github/workflows/ci-docs.yml

@@ -65,7 +65,7 @@ jobs:
     needs: changes
     if: needs.changes.outputs.docs_changed == 'true'
     name: Build Documentation
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # v6.0.0
       - name: Checkout
@@ -78,7 +78,7 @@ jobs:
         with:
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
       - name: Install uv
-        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+        uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0
         with:
           version: ${{ env.DEFAULT_UV_VERSION }}
           enable-cache: true
@@ -102,7 +102,7 @@ jobs:
     name: Deploy Documentation
     needs: [changes, build]
     if: github.event_name == 'push' && github.ref == 'refs/heads/main' && needs.changes.outputs.docs_changed == 'true'
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       pages: write
       id-token: write

.github/workflows/ci-frontend.yml

@@ -72,7 +72,7 @@ jobs:
     needs: changes
     if: needs.changes.outputs.frontend_changed == 'true'
     name: Install Dependencies
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
     steps:
@@ -104,7 +104,7 @@ jobs:
     name: Lint
     needs: [changes, install-dependencies]
     if: needs.changes.outputs.frontend_changed == 'true'
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
     steps:
@@ -137,7 +137,7 @@ jobs:
     name: "Unit Tests (${{ matrix.shard-index }}/${{ matrix.shard-count }})"
     needs: [changes, install-dependencies]
     if: needs.changes.outputs.frontend_changed == 'true'
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
     strategy:
@@ -174,13 +174,13 @@ jobs:
         run: cd src-ui && pnpm run test --max-workers=2 --shard=${{ matrix.shard-index }}/${{ matrix.shard-count }}
       - name: Upload test results to Codecov
         if: always()
-        uses: codecov/codecov-action@303a32d7a59b442fa8d48b6a1cc6825c09c847a5 # v7.1.1
+        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
         with:
           flags: frontend-node-${{ matrix.node-version }}
           directory: src-ui/
           report_type: test_results
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@303a32d7a59b442fa8d48b6a1cc6825c09c847a5 # v7.1.1
+        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
         with:
           flags: frontend-node-${{ matrix.node-version }}
           directory: src-ui/coverage/
@@ -188,10 +188,10 @@ jobs:
     name: E2E Tests
     needs: [changes, install-dependencies]
     if: needs.changes.outputs.frontend_changed == 'true'
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
-    container: mcr.microsoft.com/playwright:v1.62.1-resolute
+    container: mcr.microsoft.com/playwright:v1.62.1-noble
     env:
       PLAYWRIGHT_BROWSERS_PATH: /ms-playwright
       PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
@@ -216,7 +216,7 @@ jobs:
         with:
           python-version: '3.12'
       - name: Install uv
-        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+        uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0
         with:
           version: '0.12.x'
           enable-cache: false
@@ -231,10 +231,9 @@ jobs:
       - name: Install dependencies
         run: cd src-ui && pnpm install --frozen-lockfile
       - name: Install backend system dependencies
-        timeout-minutes: 12
+        run: |
-        uses: $/.github/actions/apt-install
+          apt-get update
-        with:
+          apt-get install --yes --quiet --no-install-recommends libmagic1
-          packages: libmagic1
       - name: Install backend dependencies
         env:
           PYTHON_VERSION: ${{ steps.setup-python.outputs.python-version }}
@@ -246,7 +245,7 @@ jobs:
     name: Frontend Build
     needs: [changes, unit-tests, e2e-tests]
     if: needs.changes.outputs.frontend_changed == 'true'
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
     steps:

.github/workflows/ci-release.yml

@@ -14,7 +14,7 @@ permissions: {}
 jobs:
   wait-for-docker:
     name: Wait for Docker Build
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       checks: read
       statuses: read
@@ -30,7 +30,7 @@ jobs:
   build-release:
     name: Build Release
     needs: wait-for-docker
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
     steps:
@@ -59,7 +59,7 @@ jobs:
         with:
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
       - name: Install uv
-        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+        uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0
         with:
           version: ${{ env.DEFAULT_UV_VERSION }}
           enable-cache: false
@@ -70,10 +70,9 @@ jobs:
         run: |
           uv sync --python "${PYTHON_VERSION}" --dev --frozen
       - name: Install system dependencies
-        timeout-minutes: 12
+        run: |
-        uses: $/.github/actions/apt-install
+          sudo apt-get update -qq
-        with:
+          sudo apt-get install -qq --no-install-recommends gettext liblept5
-          packages: gettext libleptonica6
       # ---- Build Documentation ----
       - name: Build documentation
         env:
@@ -145,7 +144,7 @@ jobs:
   publish-release:
     name: Publish Release
     needs: build-release
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: write
       pull-requests: write
@@ -197,7 +196,7 @@ jobs:
     name: Append Changelog
     needs: publish-release
     if: needs.publish-release.outputs.prerelease == 'false'
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: write
       pull-requests: write
@@ -213,7 +212,7 @@ jobs:
         with:
           python-version: ${{ env.DEFAULT_PYTHON_VERSION }}
       - name: Install uv
-        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+        uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0
         with:
           version: ${{ env.DEFAULT_UV_VERSION }}
           enable-cache: false

.github/workflows/ci-static-analysis.yml

@@ -15,7 +15,7 @@ permissions:
 jobs:
   zizmor:
     name: Run zizmor
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
       actions: read
@@ -29,7 +29,7 @@ jobs:
         uses: zizmorcore/zizmor-action@cc914d7f3750a2d13d75c7f184a1060aa0e9d482 # v0.6.4
   semgrep:
     name: Semgrep CE
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     container:
       image: semgrep/semgrep:1.155.0@sha256:cc869c685dcc0fe497c86258da9f205397d8108e56d21a86082ea4886e52784d
     if: github.actor != 'dependabot[bot]'
@@ -44,7 +44,7 @@ jobs:
       - name: Run Semgrep
         run: semgrep scan --config auto --sarif-output results.sarif
       - name: Upload results to GitHub code scanning
-        uses: github/codeql-action/upload-sarif@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
+        uses: github/codeql-action/upload-sarif@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0
         if: always()
         with:
           sarif_file: results.sarif

.github/workflows/cleanup-tags.yml

@@ -17,7 +17,7 @@ jobs:
   cleanup-images:
     name: Cleanup Image Tags for ${{ matrix.primary-name }}
     if: github.repository_owner == 'paperless-ngx'
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     environment: registry-maintenance
     strategy:
       fail-fast: false
@@ -29,7 +29,7 @@ jobs:
     steps:
       - name: Clean temporary images
         if: "${{ env.TOKEN != '' }}"
-        uses: stumpylog/image-cleaner-action/ephemeral@21f875bab2376314e0525c614e923c669434f0e4 # v0.13.0
+        uses: stumpylog/image-cleaner-action/ephemeral@4fe057d991d63b8f6d5d22c40f17c1bca2226537 # v0.12.0
         with:
           token: "${{ env.TOKEN }}"
           owner: "${{ github.repository_owner }}"
@@ -42,7 +42,7 @@ jobs:
   cleanup-untagged-images:
     name: Cleanup Untagged Images Tags for ${{ matrix.primary-name }}
     if: github.repository_owner == 'paperless-ngx'
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     needs:
       - cleanup-images
     environment: registry-maintenance
@@ -56,7 +56,7 @@ jobs:
     steps:
       - name: Clean untagged images
         if: "${{ env.TOKEN != '' }}"
-        uses: stumpylog/image-cleaner-action/untagged@21f875bab2376314e0525c614e923c669434f0e4 # v0.13.0
+        uses: stumpylog/image-cleaner-action/untagged@4fe057d991d63b8f6d5d22c40f17c1bca2226537 # v0.12.0
         with:
           token: "${{ env.TOKEN }}"
           owner: "${{ github.repository_owner }}"

.github/workflows/codeql-analysis.yml

@@ -21,7 +21,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       actions: read
       contents: read
@@ -39,7 +39,7 @@ jobs:
           persist-credentials: false
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
+        uses: github/codeql-action/init@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -47,4 +47,4 @@ jobs:
           # Prefix the list here with "+" to use these queries and those in the config file.
           # queries: ./path/to/local/query, your-org/your-repo/queries@main
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
+        uses: github/codeql-action/analyze@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0

.github/workflows/crowdin.yml

@@ -13,7 +13,7 @@ jobs:
   synchronize-with-crowdin:
     name: Crowdin Sync
     if: github.repository_owner == 'paperless-ngx'
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     environment: translation-sync
     steps:
       - name: Checkout
@@ -22,7 +22,7 @@ jobs:
           token: ${{ secrets.PNGX_BOT_PAT }}
           persist-credentials: false
       - name: crowdin action
-        uses: crowdin/github-action@9c23991700c0ec5256fd41089b9d9d7d540e424e # v3.3.0
+        uses: crowdin/github-action@0d5670f539973aea2f01abce61a8989934df0025 # v3.0.2
         with:
           upload_translations: false
           download_translations: true

.github/workflows/issue-bot.yml

@@ -7,7 +7,7 @@ jobs:
     # Note: peakoss/anti-slop does not support the `issues` event yet (all of its
     # issue inputs are still commented out upstream), so the checks that the PR Bot
     # workflow gets from the action are implemented manually here.
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-latest
     permissions:
       issues: write
     steps:

.github/workflows/pr-bot.yml

@@ -4,7 +4,7 @@ on:
     types: [opened]
 jobs:
   Anti-slop:
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       issues: read
@@ -24,7 +24,7 @@ jobs:
             ASLOP-PR-VERIFY
   pr-bot:
     name: Automated PR Bot
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-latest
     # Runs after Anti-slop so the welcome comment can see whether the PR was closed
     # instead of racing it. Still runs if that job fails, so labeling is not lost.
     needs: Anti-slop
@@ -38,6 +38,16 @@ jobs:
         uses: actions/labeler@bf12e9b00b37c5c0ca2b87b79b2daf7891dbda13 # v7.0.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Label by size
+        uses: Gascon1/pr-size-labeler@deff8ed00a76639a7c0f197525bafa3350ba4c36 # v1.3.0
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          xs_label: 'small-change'
+          xs_diff: '9'
+          s_label: 'non-trivial'
+          s_diff: '99999'
+          fail_if_xl: 'false'
+          excluded_files: /\.lock$/ /\.txt$/ ^src-ui/pnpm-lock\.yaml$ ^src-ui/messages\.xlf$ ^src/locale/en_US/LC_MESSAGES/django\.po$
       - name: Label by PR title
         uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
         with:

.github/workflows/project-actions.yml

@@ -12,7 +12,7 @@ permissions:
 jobs:
   pr_opened_or_reopened:
     name: pr_opened_or_reopened
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-24.04
     permissions:
       # write permission is required for autolabeler
       pull-requests: write

.github/workflows/repo-maintenance.yml

@@ -9,7 +9,7 @@ jobs:
   stale:
     name: 'Stale'
     if: github.repository_owner == 'paperless-ngx'
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       issues: write
       pull-requests: write
@@ -34,7 +34,7 @@ jobs:
   lock-threads:
     name: 'Lock Old Threads'
     if: github.repository_owner == 'paperless-ngx'
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-24.04
     permissions:
       issues: write
       pull-requests: write
@@ -58,7 +58,7 @@ jobs:
   close-answered-discussions:
     name: 'Close Answered Discussions'
     if: github.repository_owner == 'paperless-ngx'
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-24.04
     permissions:
       discussions: write
     steps:
@@ -117,7 +117,7 @@ jobs:
   close-outdated-discussions:
     name: 'Close Outdated Discussions'
     if: github.repository_owner == 'paperless-ngx'
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-24.04
     permissions:
       discussions: write
     steps:
@@ -211,7 +211,7 @@ jobs:
   close-unsupported-feature-requests:
     name: 'Close Unsupported Feature Requests'
     if: github.repository_owner == 'paperless-ngx'
-    runs-on: ubuntu-slim
+    runs-on: ubuntu-24.04
     permissions:
       discussions: write
     steps:

.github/workflows/translate-strings.yml

@@ -8,7 +8,7 @@ env:
 jobs:
   generate-translate-strings:
     name: Generate Translation Strings
-    runs-on: ubuntu-26.04
+    runs-on: ubuntu-latest
     environment: translation-sync
     permissions:
       contents: write
@@ -25,12 +25,11 @@ jobs:
         id: setup-python
         uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
       - name: Install system dependencies
-        timeout-minutes: 12
+        run: |
-        uses: $/.github/actions/apt-install
+          sudo apt-get update -qq
-        with:
+          sudo apt-get install -qq --no-install-recommends gettext
-          packages: gettext
       - name: Install uv
-        uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
+        uses: astral-sh/setup-uv@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0
         with:
           version: ${{ env.DEFAULT_UV_VERSION }}
           enable-cache: true

.pre-commit-config.yaml

@@ -38,7 +38,7 @@ repos:
           - json
   # See https://github.com/prettier/prettier/issues/15742 for the fork reason
   - repo: https://github.com/rbubley/mirrors-prettier
-    rev: 'v3.9.9'
+    rev: 'v3.9.6'
     hooks:
       - id: prettier
         types_or:
@@ -46,11 +46,11 @@ repos:
           - ts
           - markdown
         additional_dependencies:
-          - prettier@3.9.9
+          - prettier@3.9.6
           - 'prettier-plugin-organize-imports@4.3.0'
   # Python hooks
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.16.9
+    rev: v0.16.7
     hooks:
       - id: ruff-check
       - id: ruff-format

CONTRIBUTING.md

@@ -43,17 +43,26 @@ Once you have submitted a **P**ull **R**equest it will be reviewed, approved, an
 
 Important: 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. Instead of opening a PR which does not meet this requirement, please open a feature request instead, to gather feedback from both users and the project maintainers.
 
-## PR Review Process
+## Non-Trivial Requests
 
-Our community review process for PRs is the following:
+PRs deemed `non-trivial` will go through a stricter review process before being merged into `dev`. This is to ensure code quality and complete functionality (free of side effects).
+
+Examples of `non-trivial` PRs might include:
+
+- Additional features
+- Large changes to many distinct files
+- Breaking or deprecation of existing features
+
+Our community review process for `non-trivial` PRs is the following:
 
 1. Must pass usual automated code tests and formatting checks.
 2. The PR will be assigned and pinged to the appropriately experienced team (i.e. @paperless-ngx/backend for backend changes).
 3. Development team will check and test code manually (possibly over several days).
    - You may be asked to make changes or rebase.
-4. One or more members of the team will approve and finally merge the request into `dev` 🎉.
+   - The team may ask for additional testing done by @paperless-ngx/test
+4. **At least two** members of the team will approve and finally merge the request into `dev` 🎉.
 
-This process might be slow as community members have different schedules and time to dedicate to the Paperless project. However it ensures community code reviews are thorough and of high quality.
+This process might be slow as community members have different schedules and time to dedicate to the Paperless project. However it ensures community code reviews are as brilliantly thorough as they once were with @jonaswinkler.
 
 # Use of AI Tools
 

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.12.23-python3.14-trixie-slim AS s6-overlay-base
+FROM ghcr.io/astral-sh/uv:0.12.16-python3.14-trixie-slim AS s6-overlay-base
 
 WORKDIR /usr/src/s6
 
@@ -171,9 +171,7 @@ RUN set -eux \
         && cp /etc/ImageMagick-6/paperless-policy.xml /etc/ImageMagick-6/policy.xml \
       && echo "Cleaning up image layer" \
         && rm --force --verbose *.deb \
-    && rm --recursive --force --verbose /var/lib/apt/lists/* \
+    && rm --recursive --force --verbose /var/lib/apt/lists/*
-    && echo "Configuring interactive shells to source the s6 container environment" \
-      && echo '. /etc/profile.d/contenv.sh' >> /etc/bash.bashrc
 
 WORKDIR /usr/src/paperless/src/
 

README.md

@@ -21,7 +21,7 @@ Paperless-ngx is a document management system that transforms your physical docu
 
 Paperless-ngx is the official successor to the original [Paperless](https://github.com/the-paperless-project/paperless) & [Paperless-ng](https://github.com/jonaswinkler/paperless-ng) projects and is designed to distribute the responsibility of advancing and supporting the project among a team of people. [Consider joining us!](#community-support)
 
-Thanks to the generous folks at [Fyra Stack](https://fyrastack.com), a demo is available at [demo.paperless-ngx.com](https://demo.paperless-ngx.com) using login `demo` / `demo`. _Note: demo content is reset frequently and confidential information should not be uploaded._
+Thanks to the generous folks at [DigitalOcean](https://m.do.co/c/8d70b916d462), a demo is available at [demo.paperless-ngx.com](https://demo.paperless-ngx.com) using login `demo` / `demo`. _Note: demo content is reset frequently and confidential information should not be uploaded._
 
 - [Features](#features)
 - [Getting started](#getting-started)
@@ -33,9 +33,13 @@ Thanks to the generous folks at [Fyra Stack](https://fyrastack.com), a demo is a
 - [Related Projects](#related-projects)
 - [Important Note](#important-note)
 
-<p align="right">Demo hosting provided by:<br/>
+<p align="right">This project is supported by:<br/>
-  <a href="https://fyrastack.com">
+  <a href="https://m.do.co/c/8d70b916d462" style="padding-top: 4px; display: block;">
-    <img src="docs/assets/sponsors/fyra-stack.svg" alt="" width="28px" align="absmiddle"> Fyra Stack
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/SVG/DO_Logo_horizontal_white.svg" width="140px">
+      <source media="(prefers-color-scheme: light)" srcset="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/SVG/DO_Logo_horizontal_blue.svg" width="140px">
+      <img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/SVG/DO_Logo_horizontal_black_.svg" width="140px">
+    </picture>
   </a>
 </p>
 

docker/compose/docker-compose.ci-test.yml

@@ -14,7 +14,7 @@ services:
     command:
       - "gotenberg"
       - "--chromium-disable-javascript=true"
-      - "--chromium-allow-list=^file:///tmp/.*"
+      - "--chromium-allow-list=file:///tmp/.*"
       - "--log-level=warn"
       - "--log-format=text"
   tika:
@@ -24,7 +24,7 @@ services:
     network_mode: host
     restart: unless-stopped
   greenmail:
-    image: docker.io/greenmail/standalone:2.1.14
+    image: docker.io/greenmail/standalone:2.1.13
     hostname: greenmail
     container_name: greenmail
     environment:

docker/compose/docker-compose.mariadb-tika.yml

@@ -40,6 +40,7 @@ services:
     volumes:
       - dbdata:/var/lib/mysql
     environment:
+      MARIADB_HOST: paperless
       MARIADB_DATABASE: paperless
       MARIADB_USER: paperless
       MARIADB_PASSWORD: paperless
@@ -78,7 +79,7 @@ services:
     command:
       - "gotenberg"
       - "--chromium-disable-javascript=true"
-      - "--chromium-allow-list=^file:///tmp/.*"
+      - "--chromium-allow-list=file:///tmp/.*"
   tika:
     image: docker.io/apache/tika:3.3.1.0
     restart: unless-stopped

docker/compose/docker-compose.mariadb.yml

@@ -36,6 +36,7 @@ services:
     volumes:
       - dbdata:/var/lib/mysql
     environment:
+      MARIADB_HOST: paperless
       MARIADB_DATABASE: paperless
       MARIADB_USER: paperless
       MARIADB_PASSWORD: paperless

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

@@ -74,7 +74,7 @@ services:
     command:
       - "gotenberg"
       - "--chromium-disable-javascript=true"
-      - "--chromium-allow-list=^file:///tmp/.*"
+      - "--chromium-allow-list=file:///tmp/.*"
   tika:
     image: docker.io/apache/tika:3.3.1.0
     restart: unless-stopped

docker/compose/docker-compose.sqlite-tika.yml

@@ -63,7 +63,7 @@ services:
     command:
       - "gotenberg"
       - "--chromium-disable-javascript=true"
-      - "--chromium-allow-list=^file:///tmp/.*"
+      - "--chromium-allow-list=file:///tmp/.*"
   tika:
     image: docker.io/apache/tika:3.3.1.0
     restart: unless-stopped

docker/rootfs/etc/profile.d/contenv.sh

@@ -1,18 +0,0 @@
-#!/bin/sh
-# Source s6 container environment for interactive shells.
-# Ensures variables resolved from *_FILE secret injection are visible
-# when using 'docker exec bash'. Does not affect s6 services (those
-# use with-contenv directly). Has no effect in non-container contexts
-# because the directory will not exist.
-# Note: sh/dash shells opened via 'docker exec sh' are not covered;
-# only bash-based sessions benefit from this file.
-_pngx_contenv="/run/s6/container_environment"
-if [ -d "${_pngx_contenv}" ]; then
-	for _pngx_f in "${_pngx_contenv}"/*; do
-		[ -f "${_pngx_f}" ] || continue
-		_pngx_name=$(basename "${_pngx_f}")
-		_pngx_val=$(cat "${_pngx_f}")
-		export "${_pngx_name}=${_pngx_val}"
-	done
-fi
-unset _pngx_contenv _pngx_f _pngx_name _pngx_val

docs/advanced_usage.md

@@ -136,15 +136,13 @@ for suggested generation and embedding models.
 ### AI-assisted suggestions
 
 With AI enabled, Paperless-ngx can suggest a title, tags, correspondent, document type,
-storage path and dates by sending the document to the LLM using "Suggest" button on the document
+storage path and dates by sending the document to the LLM. This is **opt-in per request**
-detail page. You can choose which type of suggestions are requested by default under Settings >
+and surfaces through the "Suggest" control on the document detail page, alongside the
-Documents, either ML (classifier-based) suggestions, AI suggestions, or both. When both are requested
+classic classifier-based suggestions — it does not disable them. Suggestions are requested
-the results are combined.
+automatically when you open a document that carries an inbox tag unless "Automatically request
-
+suggestions for inbox documents" under Settings > Documents is disabled. Suggestion output
-Suggestions are requested automatically when you open a document that carries an inbox tag
+language can be steered with
-unless "Automatically request suggestions for inbox documents" under Settings > Documents is disabled.
+[`PAPERLESS_AI_LLM_OUTPUT_LANGUAGE`](configuration.md#PAPERLESS_AI_LLM_OUTPUT_LANGUAGE)
-
-Suggestion output language can be steered with [`PAPERLESS_AI_LLM_OUTPUT_LANGUAGE`](configuration.md#PAPERLESS_AI_LLM_OUTPUT_LANGUAGE)
 (otherwise it follows the user's UI language).
 
 ### The LLM index (RAG) and similar documents
@@ -1010,19 +1008,6 @@ documents to both separate and categorize them in a single operation.
 **Example:** A 6-page scan with TAG:invoice on page 3 and TAG:receipt on page 5 will create
 three documents: pages 1-2 (no tags), pages 3-4 (tagged "invoice"), and pages 5-6 (tagged "receipt").
 
-### Barcode Contents {#barcode-contents}
-
-By default, Paperless only uses barcodes for splitting, ASNs and tags. With
-[`PAPERLESS_CONSUMER_STORE_BARCODE_VALUES`](configuration.md#PAPERLESS_CONSUMER_STORE_BARCODE_VALUES)
-enabled, it stores the content of every barcode with the document, e.g. payment codes or QR codes.
-
-- Barcodes are listed on the **Metadata** tab with page, type and content, and can be copied.
-- The API returns them in the `barcodes` field of `/api/documents/{id}/metadata/`.
-- They can be [searched](usage.md#searching-barcodes), e.g. `barcodes:DE89370400440532013000`.
-- Only the first [`PAPERLESS_CONSUMER_BARCODE_MAX_PAGES`](configuration.md#PAPERLESS_CONSUMER_BARCODE_MAX_PAGES)
-  pages are scanned. Reprocessing reads the barcodes of existing documents.
-- Each version keeps its own barcodes, and the newest version's are shown and searched.
-
 ## Automatic collation of double-sided documents {#collate}
 
 !!! note

docs/assets/extra.css

@@ -101,32 +101,3 @@ h4 code {
         border-top: .05rem solid var(--md-default-fg-color--lightest);
     }
 }
-
-.md-typeset .demo-sponsor {
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: .35rem;
-    margin-top: -1rem;
-    margin-bottom: 2rem;
-    color: var(--md-default-fg-color--light);
-    font-size: .65rem;
-}
-
-.md-typeset .demo-sponsor a {
-    display: inline-flex;
-    align-items: center;
-    gap: .25rem;
-    color: inherit;
-    font-weight: 600;
-}
-
-.md-typeset .demo-sponsor a:hover {
-    color: var(--md-accent-fg-color);
-}
-
-.md-typeset .demo-sponsor img {
-    width: 1rem;
-    height: 1rem;
-    flex-shrink: 0;
-}

docs/assets/sponsors/fyra-stack.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="666.667" height="666.667" viewBox="0 0 666.667 666.667"><g stroke-width="1.333"><path fill="#fef400" d="m332.66668 418.66668h-84.66667v-85.33334-85.33333h84.66667 84.66667v-85.33334-85.333334h85.33333 85.33334v85.333334 85.33334h-85.33334-85.33333v85.33333 85.33334z"/><path fill="#fe6565" d="m248.00001 589.33335h-170.666674v-170.66667-170.66667h85.333334 85.33334v-85.33334-85.333334h84.66667 84.66667v85.333334 85.33334h85.33333 85.33334v85.33333 85.33334h-84.66667-84.66667v85.33334 85.33333zm84.66667-170.66667h84.66667v-85.33334-85.33333h-84.66667-84.66667v85.33333 85.33334z"/></g></svg>

docs/changelog.md

@@ -1,130 +1,5 @@
 # Changelog
 
-## paperless-ngx 3.3.0
-
-### Features / Enhancements
-
-- Enhancement: more control over suggestion requests [@shamoon](https://github.com/shamoon) ([#14258](https://github.com/paperless-ngx/paperless-ngx/pull/14258))
-- Chorehancement: set manifest CORS for credentials [@shamoon](https://github.com/shamoon) ([#14307](https://github.com/paperless-ngx/paperless-ngx/pull/14307))
-- Enhancement: include Django admin with 2FA [@shamoon](https://github.com/shamoon) ([#14270](https://github.com/paperless-ngx/paperless-ngx/pull/14270))
-- Feature: propagate resolved secrets to interactive container shells [@stumpylog](https://github.com/stumpylog) ([#14254](https://github.com/paperless-ngx/paperless-ngx/pull/14254))
-- Enhancement: support separate embedding API key [@furkanural](https://github.com/furkanural) ([#14067](https://github.com/paperless-ngx/paperless-ngx/pull/14067))
-- Enhancement: support passthrough extra params for LLMs [@shamoon](https://github.com/shamoon) ([#14202](https://github.com/paperless-ngx/paperless-ngx/pull/14202))
-- Feature: store barcode contents, list and search them [@jurassicparkicecream](https://github.com/jurassicparkicecream) ([#14276](https://github.com/paperless-ngx/paperless-ngx/pull/14276))
-
-### Bug Fixes
-
-- Fix: Set the ProcessedMail owner based on the rule owner in all cases [@stumpylog](https://github.com/stumpylog) ([#14356](https://github.com/paperless-ngx/paperless-ngx/pull/14356))
-- Fix: Ensure log rotation settings are converted to integers [@stumpylog](https://github.com/stumpylog) ([#14343](https://github.com/paperless-ngx/paperless-ngx/pull/14343))
-- Fix: Wrap apt calls into a retry so we can ideally jump a slow mirror [@stumpylog](https://github.com/stumpylog) ([#14344](https://github.com/paperless-ngx/paperless-ngx/pull/14344))
-- Fix: ship pdf.js CMaps so CJK documents render in the viewer [@MrOggy85](https://github.com/MrOggy85) ([#14318](https://github.com/paperless-ngx/paperless-ngx/pull/14318))
-- Fix: use version page\_count for versioned document [@shamoon](https://github.com/shamoon) ([#14280](https://github.com/paperless-ngx/paperless-ngx/pull/14280))
-- Fix: allow pointer events for pdf links in pngx viewer [@shamoon](https://github.com/shamoon) ([#14264](https://github.com/paperless-ngx/paperless-ngx/pull/14264))
-- Fix: During a move to the trash directory, only attempt to copy metadata [@stumpylog](https://github.com/stumpylog) ([#14250](https://github.com/paperless-ngx/paperless-ngx/pull/14250))
-- Fix: convert file mtime to the configured time zone directly [@stumpylog](https://github.com/stumpylog) ([#14249](https://github.com/paperless-ngx/paperless-ngx/pull/14249))
-- Fix: ensure documentDeleted subscription is discarded [@shamoon](https://github.com/shamoon) ([#14247](https://github.com/paperless-ngx/paperless-ngx/pull/14247))
-- Chore: Fix bugs in the test suite [@stumpylog](https://github.com/stumpylog) ([#14244](https://github.com/paperless-ngx/paperless-ngx/pull/14244))
-- Fix: ensure bulk operations are checked against version root [@shamoon](https://github.com/shamoon) ([#14246](https://github.com/paperless-ngx/paperless-ngx/pull/14246))
-- Fix: indexing after document-added workflows signal [@shamoon](https://github.com/shamoon) ([#14242](https://github.com/paperless-ngx/paperless-ngx/pull/14242))
-- Fix: Record full tag and custom field lists in bulk edit audit log [@stumpylog](https://github.com/stumpylog) ([#14236](https://github.com/paperless-ngx/paperless-ngx/pull/14236))
-- Chore: update pikepdf for ocrmypdf requirement [@shamoon](https://github.com/shamoon) ([#14235](https://github.com/paperless-ngx/paperless-ngx/pull/14235))
-- Fix: handle legacy bulk edit split page range with missing page\_count [@shamoon](https://github.com/shamoon) ([#14212](https://github.com/paperless-ngx/paperless-ngx/pull/14212))
-- Fix: ignore invalid EXIF orientation when generating image archives [@zhzy0077](https://github.com/zhzy0077) ([#14203](https://github.com/paperless-ngx/paperless-ngx/pull/14203))
-
-### Documentation
-
-- Documentation: correct duplicates info [@shamoon](https://github.com/shamoon) ([#14243](https://github.com/paperless-ngx/paperless-ngx/pull/14243))
-
-### Maintenance
-
-- Chore(deps): Bump the actions group across 1 directory with 4 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14332](https://github.com/paperless-ngx/paperless-ngx/pull/14332))
-- Fix: Wrap apt calls into a retry so we can ideally jump a slow mirror [@stumpylog](https://github.com/stumpylog) ([#14344](https://github.com/paperless-ngx/paperless-ngx/pull/14344))
-- Chore(deps): Bump the actions group across 1 directory with 10 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14301](https://github.com/paperless-ngx/paperless-ngx/pull/14301))
-
-### Dependencies
-
-<details>
-<summary>27 changes</summary>
-
-- Chore(deps): Bump django-filter from 25.2 to 26.1 @[dependabot[bot]](https://github.com/apps/dependabot) ([#14337](https://github.com/paperless-ngx/paperless-ngx/pull/14337))
-- Chore(deps): Bump the utilities-patch group across 1 directory with 2 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14338](https://github.com/paperless-ngx/paperless-ngx/pull/14338))
-- Chore(deps): Bump the pre-commit-dependencies group across 1 directory with 3 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14351](https://github.com/paperless-ngx/paperless-ngx/pull/14351))
-- Chore(deps-dev): Bump types-channels from 4.3.0.20260408 to 4.3.0.20260518 @[dependabot[bot]](https://github.com/apps/dependabot) ([#14335](https://github.com/paperless-ngx/paperless-ngx/pull/14335))
-- docker(deps): Bump astral-sh/uv from 0.12.20-python3.14-trixie-slim to 0.12.23-python3.14-trixie-slim @[dependabot[bot]](https://github.com/apps/dependabot) ([#14327](https://github.com/paperless-ngx/paperless-ngx/pull/14327))
-- Chore(deps): Bump the actions group across 1 directory with 4 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14332](https://github.com/paperless-ngx/paperless-ngx/pull/14332))
-- Chore(deps): Bump the uv group across 1 directory with 2 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14325](https://github.com/paperless-ngx/paperless-ngx/pull/14325))
-- Chore(deps): Bump the frontend-angular-dependencies group across 1 directory with 13 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14329](https://github.com/paperless-ngx/paperless-ngx/pull/14329))
-- Chore(deps-dev): Bump prettier from 3.9.8 to 3.9.9 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#14331](https://github.com/paperless-ngx/paperless-ngx/pull/14331))
-- Chore(deps-dev): Bump the frontend-eslint-dependencies group across 1 directory with 3 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14330](https://github.com/paperless-ngx/paperless-ngx/pull/14330))
-- Chore(deps-dev): Bump zensical from 0.0.64 to 0.0.65 in the development group @[dependabot[bot]](https://github.com/apps/dependabot) ([#14326](https://github.com/paperless-ngx/paperless-ngx/pull/14326))
-- Chore(deps): Bump the uv group across 1 directory with 2 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14314](https://github.com/paperless-ngx/paperless-ngx/pull/14314))
-- Chore(deps): Bump the utilities-minor group across 1 directory with 7 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14305](https://github.com/paperless-ngx/paperless-ngx/pull/14305))
-- docker-compose(deps): bump greenmail/standalone from 2.1.13 to 2.1.14 in /docker/compose @[dependabot[bot]](https://github.com/apps/dependabot) ([#14281](https://github.com/paperless-ngx/paperless-ngx/pull/14281))
-- docker(deps): Bump astral-sh/uv from 0.12.16-python3.14-trixie-slim to 0.12.20-python3.14-trixie-slim @[dependabot[bot]](https://github.com/apps/dependabot) ([#14282](https://github.com/paperless-ngx/paperless-ngx/pull/14282))
-- Chore(deps): Bump the pre-commit-dependencies group across 1 directory with 3 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14283](https://github.com/paperless-ngx/paperless-ngx/pull/14283))
-- Chore(deps): Bump the utilities-patch group across 1 directory with 6 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14297](https://github.com/paperless-ngx/paperless-ngx/pull/14297))
-- Chore(deps): Bump the actions group across 1 directory with 10 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14301](https://github.com/paperless-ngx/paperless-ngx/pull/14301))
-- Chore(deps-dev): Bump the frontend-jest-dependencies group across 1 directory with 2 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14286](https://github.com/paperless-ngx/paperless-ngx/pull/14286))
-- Chore(deps-dev): Bump eslint from 10.10.0 to 10.11.0 in /src-ui in the frontend-eslint-dependencies group across 1 directory @[dependabot[bot]](https://github.com/apps/dependabot) ([#14287](https://github.com/paperless-ngx/paperless-ngx/pull/14287))
-- Chore(deps-dev): Bump @types/node from 26.5.0 to 26.6.2 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#14288](https://github.com/paperless-ngx/paperless-ngx/pull/14288))
-- Chore(deps-dev): Bump prettier from 3.9.6 to 3.9.8 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#14289](https://github.com/paperless-ngx/paperless-ngx/pull/14289))
-- Chore(deps): Bump the frontend-angular-dependencies group across 1 directory with 10 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14285](https://github.com/paperless-ngx/paperless-ngx/pull/14285))
-- Chore: replace bleach with turbohtml [@gaborbernat](https://github.com/gaborbernat) ([#14269](https://github.com/paperless-ngx/paperless-ngx/pull/14269))
-- Chore(deps): Bump autobahn from 25.12.2 to 26.7.1 in the uv group across 1 directory @[dependabot[bot]](https://github.com/apps/dependabot) ([#14231](https://github.com/paperless-ngx/paperless-ngx/pull/14231))
-- Chore: update pikepdf for ocrmypdf requirement [@shamoon](https://github.com/shamoon) ([#14235](https://github.com/paperless-ngx/paperless-ngx/pull/14235))
-- Chore(deps): Bump the pre-commit-dependencies group across 1 directory with 2 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14133](https://github.com/paperless-ngx/paperless-ngx/pull/14133))
-
-</details>
-
-### All App Changes
-
-<details>
-<summary>41 changes</summary>
-
-- Feature: store barcode contents, list and search them [@jurassicparkicecream](https://github.com/jurassicparkicecream) ([#14276](https://github.com/paperless-ngx/paperless-ngx/pull/14276))
-- Fix: Set the ProcessedMail owner based on the rule owner in all cases [@stumpylog](https://github.com/stumpylog) ([#14356](https://github.com/paperless-ngx/paperless-ngx/pull/14356))
-- Chore(deps): Bump django-filter from 25.2 to 26.1 @[dependabot[bot]](https://github.com/apps/dependabot) ([#14337](https://github.com/paperless-ngx/paperless-ngx/pull/14337))
-- Chore(deps): Bump the utilities-patch group across 1 directory with 2 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14338](https://github.com/paperless-ngx/paperless-ngx/pull/14338))
-- Chore(deps-dev): Bump types-channels from 4.3.0.20260408 to 4.3.0.20260518 @[dependabot[bot]](https://github.com/apps/dependabot) ([#14335](https://github.com/paperless-ngx/paperless-ngx/pull/14335))
-- Chore(deps): Bump the uv group across 1 directory with 2 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14325](https://github.com/paperless-ngx/paperless-ngx/pull/14325))
-- Fix: Ensure log rotation settings are converted to integers [@stumpylog](https://github.com/stumpylog) ([#14343](https://github.com/paperless-ngx/paperless-ngx/pull/14343))
-- Chore(deps): Bump the frontend-angular-dependencies group across 1 directory with 13 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14329](https://github.com/paperless-ngx/paperless-ngx/pull/14329))
-- Chore(deps-dev): Bump prettier from 3.9.8 to 3.9.9 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#14331](https://github.com/paperless-ngx/paperless-ngx/pull/14331))
-- Chore(deps-dev): Bump the frontend-eslint-dependencies group across 1 directory with 3 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14330](https://github.com/paperless-ngx/paperless-ngx/pull/14330))
-- Fix: ship pdf.js CMaps so CJK documents render in the viewer [@MrOggy85](https://github.com/MrOggy85) ([#14318](https://github.com/paperless-ngx/paperless-ngx/pull/14318))
-- Chore(deps-dev): Bump zensical from 0.0.64 to 0.0.65 in the development group @[dependabot[bot]](https://github.com/apps/dependabot) ([#14326](https://github.com/paperless-ngx/paperless-ngx/pull/14326))
-- Enhancement: more control over suggestion requests [@shamoon](https://github.com/shamoon) ([#14258](https://github.com/paperless-ngx/paperless-ngx/pull/14258))
-- Chore(deps): Bump the uv group across 1 directory with 2 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14314](https://github.com/paperless-ngx/paperless-ngx/pull/14314))
-- Chore: anchor admin url pattern [@shamoon](https://github.com/shamoon) ([#14316](https://github.com/paperless-ngx/paperless-ngx/pull/14316))
-- Chorehancement: set manifest CORS for credentials [@shamoon](https://github.com/shamoon) ([#14307](https://github.com/paperless-ngx/paperless-ngx/pull/14307))
-- Chore(deps): Bump the utilities-minor group across 1 directory with 7 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14305](https://github.com/paperless-ngx/paperless-ngx/pull/14305))
-- Chore(deps): Bump the utilities-patch group across 1 directory with 6 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14297](https://github.com/paperless-ngx/paperless-ngx/pull/14297))
-- Chore(deps-dev): Bump the frontend-jest-dependencies group across 1 directory with 2 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14286](https://github.com/paperless-ngx/paperless-ngx/pull/14286))
-- Chore(deps-dev): Bump eslint from 10.10.0 to 10.11.0 in /src-ui in the frontend-eslint-dependencies group across 1 directory @[dependabot[bot]](https://github.com/apps/dependabot) ([#14287](https://github.com/paperless-ngx/paperless-ngx/pull/14287))
-- Chore(deps-dev): Bump @types/node from 26.5.0 to 26.6.2 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#14288](https://github.com/paperless-ngx/paperless-ngx/pull/14288))
-- Chore(deps-dev): Bump prettier from 3.9.6 to 3.9.8 in /src-ui @[dependabot[bot]](https://github.com/apps/dependabot) ([#14289](https://github.com/paperless-ngx/paperless-ngx/pull/14289))
-- Chore(deps): Bump the frontend-angular-dependencies group across 1 directory with 10 updates @[dependabot[bot]](https://github.com/apps/dependabot) ([#14285](https://github.com/paperless-ngx/paperless-ngx/pull/14285))
-- Fix: use version page\_count for versioned document [@shamoon](https://github.com/shamoon) ([#14280](https://github.com/paperless-ngx/paperless-ngx/pull/14280))
-- Chore: replace bleach with turbohtml [@gaborbernat](https://github.com/gaborbernat) ([#14269](https://github.com/paperless-ngx/paperless-ngx/pull/14269))
-- Enhancement: include Django admin with 2FA [@shamoon](https://github.com/shamoon) ([#14270](https://github.com/paperless-ngx/paperless-ngx/pull/14270))
-- Fix: allow pointer events for pdf links in pngx viewer [@shamoon](https://github.com/shamoon) ([#14264](https://github.com/paperless-ngx/paperless-ngx/pull/14264))
-- Feature: propagate resolved secrets to interactive container shells [@stumpylog](https://github.com/stumpylog) ([#14254](https://github.com/paperless-ngx/paperless-ngx/pull/14254))
-- Fix: During a move to the trash directory, only attempt to copy metadata [@stumpylog](https://github.com/stumpylog) ([#14250](https://github.com/paperless-ngx/paperless-ngx/pull/14250))
-- Fix: convert file mtime to the configured time zone directly [@stumpylog](https://github.com/stumpylog) ([#14249](https://github.com/paperless-ngx/paperless-ngx/pull/14249))
-- Fix: ensure documentDeleted subscription is discarded [@shamoon](https://github.com/shamoon) ([#14247](https://github.com/paperless-ngx/paperless-ngx/pull/14247))
-- Chore: Fix bugs in the test suite [@stumpylog](https://github.com/stumpylog) ([#14244](https://github.com/paperless-ngx/paperless-ngx/pull/14244))
-- Fix: ensure bulk operations are checked against version root [@shamoon](https://github.com/shamoon) ([#14246](https://github.com/paperless-ngx/paperless-ngx/pull/14246))
-- Enhancement: support separate embedding API key [@furkanural](https://github.com/furkanural) ([#14067](https://github.com/paperless-ngx/paperless-ngx/pull/14067))
-- Enhancement: support passthrough extra params for LLMs [@shamoon](https://github.com/shamoon) ([#14202](https://github.com/paperless-ngx/paperless-ngx/pull/14202))
-- Chore(deps): Bump autobahn from 25.12.2 to 26.7.1 in the uv group across 1 directory @[dependabot[bot]](https://github.com/apps/dependabot) ([#14231](https://github.com/paperless-ngx/paperless-ngx/pull/14231))
-- Fix: indexing after document-added workflows signal [@shamoon](https://github.com/shamoon) ([#14242](https://github.com/paperless-ngx/paperless-ngx/pull/14242))
-- Fix: Record full tag and custom field lists in bulk edit audit log [@stumpylog](https://github.com/stumpylog) ([#14236](https://github.com/paperless-ngx/paperless-ngx/pull/14236))
-- Chore: update pikepdf for ocrmypdf requirement [@shamoon](https://github.com/shamoon) ([#14235](https://github.com/paperless-ngx/paperless-ngx/pull/14235))
-- Fix: handle legacy bulk edit split page range with missing page\_count [@shamoon](https://github.com/shamoon) ([#14212](https://github.com/paperless-ngx/paperless-ngx/pull/14212))
-- Fix: ignore invalid EXIF orientation when generating image archives [@zhzy0077](https://github.com/zhzy0077) ([#14203](https://github.com/paperless-ngx/paperless-ngx/pull/14203))
-
-</details>
-
 ## paperless-ngx 3.2.1
 
 ### Bug Fixes

docs/configuration.md

@@ -1796,13 +1796,6 @@ assigns or creates tags if a properly formatted barcode is detected.
 
     Defaults to false.
 
-#### [`PAPERLESS_CONSUMER_STORE_BARCODE_VALUES=<bool>`](#PAPERLESS_CONSUMER_STORE_BARCODE_VALUES) {#PAPERLESS_CONSUMER_STORE_BARCODE_VALUES}
-
-: Stores the content of every barcode found during consumption, see
-[Barcode Contents](advanced_usage.md#barcode-contents).
-
-    Defaults to false.
-
 ## Audit Trail
 
 #### [`PAPERLESS_AUDIT_LOG_ENABLED=<bool>`](#PAPERLESS_AUDIT_LOG_ENABLED) {#PAPERLESS_AUDIT_LOG_ENABLED}

docs/faq.md

@@ -76,9 +76,7 @@ is not supported by any of the available parsers.
 
 **A:** Not by default. As of v3, a file whose contents match an existing document is still
 consumed, and the duplicate is flagged in the UI — open the document and check the
-**Duplicates** tab to review documents that share the same content, or filter the document
+**Duplicates** tab to review documents that share the same content. If you prefer the old
-list by **Duplicates** to find all of them (see
-[Duplicate documents](usage.md#duplicate-documents)). If you prefer the old
 behavior of rejecting duplicates during consumption, set
 [`PAPERLESS_CONSUMER_DELETE_DUPLICATES`](configuration.md#PAPERLESS_CONSUMER_DELETE_DUPLICATES)
 to `true`.

docs/index.md

@@ -12,10 +12,10 @@ physical documents into a searchable online archive so you can keep, well, _less
 [Get started](setup.md){ .md-button .md-button--primary .index-callout }
 [Demo](https://demo.paperless-ngx.com){ .md-button .md-button--secondary target=\_blank }
 
-<div class="demo-sponsor">
+<div style="display: flex; justify-content: end; margin-top: -1.5rem;">
-  <span>Demo hosting by</span>
+  <a href="https://m.do.co/c/8d70b916d462" target="_blank">
-  <a href="https://fyrastack.com" target="_blank" rel="noopener">
+    <img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/PoweredByDO/DO_Powered_by_Badge_white.svg#only-dark" class="no-lightbox" width="150px">
-    <img src="assets/sponsors/fyra-stack.svg" alt="" class="no-lightbox" width="20" height="20"> Fyra Stack
+    <img src="https://opensource.nyc3.cdn.digitaloceanspaces.com/attribution/assets/PoweredByDO/DO_Powered_by_Badge_black.svg#only-light" class="no-lightbox" width="150px">
   </a>
 </div>
 

docs/troubleshooting.md

@@ -129,7 +129,7 @@ change in the `docker-compose.yml` file:
 command:
   - 'gotenberg'
   - '--chromium-disable-javascript=true'
-  - '--chromium-allow-list=^file:///tmp/.*'
+  - '--chromium-allow-list=file:///tmp/.*'
   - '--api-timeout=60s'
 ```
 
@@ -272,65 +272,6 @@ This error can occur in installations which have upgraded from a version of Pape
 $ python3 manage.py convert_mariadb_uuid
 ```
 
-## MariaDB/MySQL error "Illegal mix of collations"
-
-Consumption or other operations fail with an error like:
-
-```
-(1267, "Illegal mix of collations (utf8mb4_general_ci,IMPLICIT) and
-(utf8mb4_unicode_ci,IMPLICIT) for operation '='")
-```
-
-This happens when the tables in your database do not all use the same
-collation. It is most often seen on databases that existed before a
-MariaDB/MySQL upgrade: older tables keep their original collation, while
-tables created afterwards use the new server default.
-
-To work around it, set the collation your existing tables use (the one in the error
-that is not `utf8mb4_unicode_ci`) with
-[`PAPERLESS_DB_OPTIONS`](configuration.md#PAPERLESS_DB_OPTIONS):
-
-```bash
-PAPERLESS_DB_OPTIONS="collation=utf8mb4_general_ci"
-```
-
-To fix it permanently, back up your database, then convert the database and
-each table to a single collation and remove the override:
-
-```sql
-ALTER DATABASE paperless CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-ALTER TABLE <table_name> CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-```
-
-## PostgreSQL warns about a "collation version mismatch"
-
-The PostgreSQL log shows a warning like:
-
-```
-WARNING:  database "paperless" has a collation version mismatch
-DETAIL:  The database was created using collation version 2.36, but the operating system provides version 2.41.
-HINT:  Rebuild all objects in this database that use the default collation and run ALTER DATABASE paperless REFRESH COLLATION VERSION, or build PostgreSQL with the right library version.
-```
-
-This comes from PostgreSQL, not Paperless-ngx. The `glibc` version that PostgreSQL
-runs against changed, and the existing database was created with an older one. With
-Docker, `glibc` comes from the PostgreSQL image's Debian base, not the host, so this
-commonly happens when a new image is pulled after its base Debian release changed.
-If PostgreSQL is installed directly on a host, it uses the host's `glibc` instead.
-
-The warning is not an error and Paperless-ngx keeps working, but the database's text
-indexes may be built with outdated sorting rules. To resolve it, back up your
-database, then connect to it (for example with `psql -U paperless -d paperless`
-inside the database container) and run:
-
-```sql
-REINDEX DATABASE paperless;
-ALTER DATABASE paperless REFRESH COLLATION VERSION;
-```
-
-To avoid this in the future, pin your PostgreSQL image to a specific Debian release,
-for example `postgres:18-trixie`, rather than `postgres:18`.
-
 ## Platform-Specific Deployment Troubleshooting
 
 A user-maintained wiki page is available to help troubleshoot issues that may arise when trying to deploy Paperless-ngx on specific platforms, for example SELinux. Please see [the wiki](https://github.com/paperless-ngx/paperless-ngx/wiki/Platform%E2%80%90Specific-Troubleshooting).

docs/usage.md

@@ -299,18 +299,19 @@ for details.
 ### Duplicate documents
 
 By default, Paperless-ngx **does not reject duplicates**. If you consume a file whose
-contents match an existing document (same original or archive checksum), the new copy is
+contents exactly match an existing document (same checksum), the new copy is still
-still consumed and a warning is logged.
+consumed and a warning is logged. The task entry for the upload also flags that a
+duplicate was detected and links to the existing document(s).
 
-When a document has duplicates, a **Duplicates** tab appears on its detail page, listing
+To review duplicates, open a document and switch to the **Duplicates** tab on the
-the other documents you can view that share the same content (including any in the trash).
+document detail page. It lists other documents that share the same content, including any
-To find all documents with duplicates, choose **Duplicates** in the document list's text
+that are in the trash (shown with a badge), and links to each so you can decide which to
-filter dropdown, or use `has_duplicates=true` in the REST API.
+keep.
 
 If you would rather reject duplicates at consumption time (the pre-v3 behavior), set
 [`PAPERLESS_CONSUMER_DELETE_DUPLICATES`](configuration.md#PAPERLESS_CONSUMER_DELETE_DUPLICATES)
 to `true`. The duplicate file is then deleted instead of consumed, and the task fails with
-a "Document already exists" message linking to the existing document.
+a "document already exists" message.
 
 ## Document Suggestions
 
@@ -1060,20 +1061,6 @@ notes.user:alice notes.note:insurance
 
 The bare `notes:` prefix is shorthand for `notes.note:`.
 
-#### Searching barcodes
-
-If [barcode contents are stored](advanced_usage.md#barcode-contents), they can be searched by
-content or type, but only with a field name:
-
-```
-barcodes.value:DE89370400440532013000
-barcodes.format:qrcode
-barcodes:wifi barcodes:guest
-```
-
-`barcodes:` is shorthand for `barcodes.value:`. Separators are stripped, so each part of e.g.
-`WIFI:S:Guest;P:secret;;` can be searched on its own.
-
 All of these can be combined. Syntax not described here may not work as expected, and an unknown field name is searched as ordinary text.
 
 !!! note

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "paperless-ngx"
-version = "3.3.1"
+version = "3.2.1"
 description = """\
   A community-supported supercharged document management system: scan, index and archive all your physical documents\
   """
@@ -19,6 +19,7 @@ classifiers = [
 dependencies = [
   "azure-ai-documentintelligence>=1.0.2",
   "babel>=2.17",
+  "bleach~=6.4.0",
   "celery[redis]~=5.6.2",
   "channels~=4.2",
   "channels-redis~=4.2",
@@ -33,8 +34,8 @@ dependencies = [
   "django-compression-middleware~=0.5.0",
   "django-cors-headers~=4.9.0",
   "django-extensions~=4.1",
-  "django-filter>=25.1,<27",
+  "django-filter~=25.1",
-  "django-guardian>=3.3.3,<3.6",
+  "django-guardian>=3.3.3,<3.5",
   "django-multiselectfield~=1.0.1",
   "django-rich~=2.2.0",
   "django-soft-delete~=1.0.18",
@@ -44,7 +45,7 @@ dependencies = [
   "drf-spectacular-sidecar>=2026.7.1,<2026.10",
   "drf-writable-nested~=0.7.1",
   "filelock~=3.32.0",
-  "flower>=2.0.1,<2.3",
+  "flower>=2.0.1,<2.2",
   "gotenberg-client[httpx]~=1.0",
   "httpx-oauth~=0.17",
   "ijson>=3.5.1",
@@ -76,7 +77,6 @@ dependencies = [
   "tantivy~=0.26.0",
   "tika-client[httpx]~=1.0",
   "torch>=2.13,<2.15",
-  "turbohtml~=1.10.0",
   "watchfiles>=1.2",
   "whitenoise~=6.11",
   "whoosh-compat[tantivy]==0.3",
@@ -84,13 +84,13 @@ dependencies = [
 ]
 [project.optional-dependencies]
 mariadb = [
-  "mysqlclient>=2.2.7,<2.4",
+  "mysqlclient~=2.2.7",
 ]
 postgres = [
   "psycopg[c,pool]==3.3.4",
   # Direct dependency for proper resolution of the pre-built wheels
   "psycopg-c==3.3.4",
-  "psycopg-pool==3.3.3",
+  "psycopg-pool==3.3.1",
 ]
 webserver = [
   "granian[uvloop]>=2.7,<2.9",
@@ -112,7 +112,7 @@ lint = [
 testing = [
   "daphne",
   "factory-boy~=3.3.1",
-  "faker>=40.36,<40.40",
+  "faker>=40.36,<40.39",
   "imagehash",
   "pytest~=9.1.1",
   "pytest-cov~=7.1.0",
@@ -136,6 +136,7 @@ typing = [
   "mypy",
   "mypy-baseline",
   "pyrefly",
+  "types-bleach",
   "types-channels",
   "types-colorama",
   "types-dateparser",
@@ -150,7 +151,6 @@ typing = [
 
 [tool.uv]
 required-version = ">=0.9.0"
-prerelease = "disallow"
 environments = [
   "sys_platform == 'darwin'",
   "sys_platform == 'linux'",

scripts/start_services.sh

@@ -2,5 +2,5 @@
 
 docker run -p 5432:5432 -e POSTGRES_PASSWORD=password -v paperless_pgdata:/var/lib/postgresql/data -d postgres:15
 docker run -d -p 6379:6379 redis:latest
-docker run -p 3000:3000 -d gotenberg/gotenberg:7.8 gotenberg --chromium-disable-javascript=true --chromium-allow-list="^file:///tmp/.*"
+docker run -p 3000:3000 -d gotenberg/gotenberg:7.8 gotenberg --chromium-disable-javascript=true --chromium-allow-list="file:///tmp/.*"
 docker run -p 9998:9998 -d docker.io/apache/tika:latest

src-ui/angular.json

@@ -91,11 +91,6 @@
                 "glob": "**/*",
                 "input": "node_modules/pdfjs-dist/iccs/",
                 "output": "/assets/iccs/"
-              },
-              {
-                "glob": "**/*",
-                "input": "node_modules/pdfjs-dist/cmaps/",
-                "output": "/assets/cmaps/"
               }
             ],
             "styles": [

src-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paperless-ngx-ui",
-  "version": "3.3.1",
+  "version": "3.2.1",
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "ng": "ng",
@@ -15,16 +15,16 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/cdk": "^22.2.0",
+    "@angular/cdk": "^22.1.6",
-    "@angular/common": "~22.2.0",
+    "@angular/common": "~22.1.6",
-    "@angular/compiler": "~22.2.0",
+    "@angular/compiler": "~22.1.6",
-    "@angular/core": "~22.2.0",
+    "@angular/core": "~22.1.6",
-    "@angular/forms": "~22.2.0",
+    "@angular/forms": "~22.1.6",
-    "@angular/localize": "~22.2.0",
+    "@angular/localize": "~22.1.6",
-    "@angular/platform-browser": "~22.2.0",
+    "@angular/platform-browser": "~22.1.6",
-    "@angular/router": "~22.2.0",
+    "@angular/router": "~22.1.6",
     "@ng-bootstrap/ng-bootstrap": "^21.0.0",
-    "@ng-select/ng-select": "~24.1.2",
+    "@ng-select/ng-select": "~24.1.1",
     "@ngneat/dirty-check-forms": "^3.0.3",
     "@popperjs/core": "^2.11.8",
     "bootstrap": "^5.3.8",
@@ -45,29 +45,29 @@
   },
   "devDependencies": {
     "@angular-builders/jest": "^22.0.1",
-    "@angular-devkit/core": "^22.2.0",
+    "@angular-devkit/core": "^22.1.8",
-    "@angular-devkit/schematics": "^22.2.0",
+    "@angular-devkit/schematics": "^22.1.8",
     "@angular-eslint/builder": "22.5.0",
     "@angular-eslint/eslint-plugin": "22.5.0",
     "@angular-eslint/eslint-plugin-template": "22.5.0",
     "@angular-eslint/schematics": "22.5.0",
     "@angular-eslint/template-parser": "22.5.0",
-    "@angular/build": "22.2.0",
+    "@angular/build": "22.1.8",
-    "@angular/cli": "22.2.0",
+    "@angular/cli": "22.1.8",
-    "@angular/compiler-cli": "~22.2.0",
+    "@angular/compiler-cli": "~22.1.6",
     "@playwright/test": "^1.62.1",
     "@types/jest": "^30.0.0",
-    "@types/node": "^26.6.2",
+    "@types/node": "^26.5.0",
-    "@typescript-eslint/eslint-plugin": "^8.70.1",
+    "@typescript-eslint/eslint-plugin": "^8.70.0",
-    "@typescript-eslint/parser": "^8.70.1",
+    "@typescript-eslint/parser": "^8.70.0",
-    "@typescript-eslint/utils": "^8.70.1",
+    "@typescript-eslint/utils": "^8.70.0",
-    "eslint": "^10.11.0",
+    "eslint": "^10.10.0",
-    "jest": "30.5.2",
+    "jest": "30.5.1",
-    "jest-environment-jsdom": "^30.5.2",
+    "jest-environment-jsdom": "^30.5.1",
     "jest-junit": "^17.0.0",
     "jest-preset-angular": "^17.0.0",
     "jest-websocket-mock": "^2.5.0",
-    "prettier": "^3.9.9",
+    "prettier": "^3.9.6",
     "prettier-plugin-organize-imports": "^4.3.0",
     "ts-node": "~10.9.2",
     "typescript": "^6.0.3"

src-ui/src/app/components/admin/settings/settings.component.html

@@ -253,24 +253,6 @@
               </div>
             </div>
 
-            @if (aiEnabled) {
-              <div class="row mb-3">
-                <div class="col-md-3 col-form-label pt-0">
-                  <span i18n>Suggestions default to</span>
-                </div>
-                <div class="col">
-                  <fieldset class="btn-group btn-group-sm">
-                    <input type="radio" class="btn-check" id="suggestionSourceBoth" [value]="SuggestionSource.Both" formControlName="documentEditingSuggestionSource">
-                    <label class="btn btn-outline-primary" for="suggestionSourceBoth"><ng-container i18n>Both</ng-container></label>
-                    <input type="radio" class="btn-check" id="suggestionSourceML" [value]="SuggestionSource.ML" formControlName="documentEditingSuggestionSource">
-                    <label class="btn btn-outline-primary" for="suggestionSourceML"><i-bs class="me-1" name="cpu"></i-bs><ng-container i18n>ML only</ng-container></label>
-                    <input type="radio" class="btn-check" id="suggestionSourceAI" [value]="SuggestionSource.AI" formControlName="documentEditingSuggestionSource">
-                    <label class="btn btn-outline-primary" for="suggestionSourceAI"><i-bs class="me-1" name="stars"></i-bs><ng-container i18n>AI only</ng-container></label>
-                  </fieldset>
-                </div>
-              </div>
-            }
-
             <div class="row">
               <div class="col">
                 <pngx-input-check i18n-title title="Automatically request suggestions for inbox documents" i18n-hint hint="If un-checked, suggestions must be requested via the Suggest button." formControlName="documentEditingAutoSuggest"></pngx-input-check>

src-ui/src/app/components/admin/settings/settings.component.spec.ts

@@ -307,7 +307,7 @@ describe('SettingsComponent', () => {
     expect(toastErrorSpy).toHaveBeenCalled()
     expect(storeSpy).toHaveBeenCalled()
     expect(appearanceSettingsSpy).not.toHaveBeenCalled()
-    expect(setSpy).toHaveBeenCalledTimes(35)
+    expect(setSpy).toHaveBeenCalledTimes(34)
     expect(setSpy).toHaveBeenCalledWith(SETTINGS_KEYS.SIDEBAR_HIDDEN_ITEMS, [
       HideableSidebarItemID.Workflows,
     ])

src-ui/src/app/components/admin/settings/settings.component.ts

@@ -44,7 +44,6 @@ import {
   HIDEABLE_SIDEBAR_ITEM_IDS,
   HideableSidebarItemID,
   SETTINGS_KEYS,
-  SuggestionSource,
 } from 'src/app/data/ui-settings'
 import { User } from 'src/app/data/user'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
@@ -185,7 +184,6 @@ export class SettingsComponent
     documentEditingRemoveInboxTags: new FormControl(null),
     documentEditingOverlayThumbnail: new FormControl(null),
     documentEditingAutoSuggest: new FormControl(null),
-    documentEditingSuggestionSource: new FormControl(null),
     documentDetailsHiddenFields: new FormControl([]),
     searchDbOnly: new FormControl(null),
     searchLink: new FormControl(null),
@@ -219,11 +217,6 @@ export class SettingsComponent
   public readonly PdfZoomScale = PdfZoomScale
 
   public readonly PdfEditorEditMode = PdfEditorEditMode
-  public readonly SuggestionSource = SuggestionSource
-
-  get aiEnabled(): boolean {
-    return this.settings.get(SETTINGS_KEYS.AI_ENABLED)
-  }
 
   public readonly documentDetailFieldOptions = documentDetailFieldOptions
   public readonly sidebarItemOptions = HIDEABLE_SIDEBAR_ITEM_IDS.map((id) => ({
@@ -411,9 +404,6 @@ export class SettingsComponent
       documentEditingAutoSuggest: this.settings.get(
         SETTINGS_KEYS.DOCUMENT_EDITING_AUTO_SUGGEST
       ),
-      documentEditingSuggestionSource: this.settings.get(
-        SETTINGS_KEYS.DOCUMENT_EDITING_SUGGESTION_SOURCE
-      ),
       documentDetailsHiddenFields: this.settings.get(
         SETTINGS_KEYS.DOCUMENT_DETAILS_HIDDEN_FIELDS
       ),
@@ -635,10 +625,6 @@ export class SettingsComponent
       SETTINGS_KEYS.DOCUMENT_EDITING_AUTO_SUGGEST,
       this.settingsForm.value.documentEditingAutoSuggest
     )
-    this.settings.set(
-      SETTINGS_KEYS.DOCUMENT_EDITING_SUGGESTION_SOURCE,
-      this.settingsForm.value.documentEditingSuggestionSource
-    )
     this.settings.set(
       SETTINGS_KEYS.DOCUMENT_DETAILS_HIDDEN_FIELDS,
       this.settingsForm.value.documentDetailsHiddenFields

src-ui/src/app/components/common/pdf-viewer/pdf-viewer.component.scss

@@ -154,29 +154,11 @@
   & section {
     position: absolute;
     text-align: initial;
-    pointer-events: auto;
     box-sizing: border-box;
     transform-origin: 0 0;
   }
 
-  & :is(.linkAnnotation, .buttonWidgetAnnotation.pushButton) > a {
-    position: absolute;
-    inset: 0;
-    font-size: 1em;
-    transition: none;
-  }
-
-  & :is(.linkAnnotation, .buttonWidgetAnnotation.pushButton):not(.hasBorder)
-    > a:hover {
-    opacity: 0.2;
-    background-color: rgb(255 255 0);
-  }
-
   & .annotationTextContent {
     opacity: 0;
   }
 }
-
-:host ::ng-deep .textLayer.selecting ~ .annotationLayer section {
-  pointer-events: none;
-}

src-ui/src/app/components/common/pdf-viewer/pdf-viewer.component.spec.ts

@@ -1,11 +1,7 @@
 import { SimpleChange } from '@angular/core'
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import * as pdfjs from 'pdfjs-dist/legacy/build/pdf.mjs'
-import {
+import { PDFSinglePageViewer, PDFViewer } from 'pdfjs-dist/web/pdf_viewer.mjs'
-  LinkTarget,
-  PDFSinglePageViewer,
-  PDFViewer,
-} from 'pdfjs-dist/web/pdf_viewer.mjs'
 import { PngxPdfViewerComponent } from './pdf-viewer.component'
 import { PdfRenderMode, PdfZoomLevel, PdfZoomScale } from './pdf-viewer.types'
 
@@ -62,16 +58,6 @@ describe('PngxPdfViewerComponent', () => {
     expect((component as any).pdfViewer).toBeInstanceOf(PDFViewer)
   })
 
-  it('opens external links in a new tab', () => {
-    const linkService = (component as any).linkService
-    expect(linkService.options).toEqual(
-      expect.objectContaining({
-        externalLinkTarget: LinkTarget.BLANK,
-        externalLinkRel: 'noopener noreferrer nofollow',
-      })
-    )
-  })
-
   it('resolves the worker source relative to the document base URI', async () => {
     setBaseHref('/paperless/')
     const getDocumentSpy = jest.spyOn(pdfjs, 'getDocument')
@@ -90,7 +76,6 @@ describe('PngxPdfViewerComponent', () => {
       withCredentials: true,
       wasmUrl: expect.stringContaining('/paperless/assets/wasm/'),
       iccUrl: expect.stringContaining('/paperless/assets/iccs/'),
-      cMapUrl: expect.stringContaining('/paperless/assets/cmaps/'),
     })
   })
 

src-ui/src/app/components/common/pdf-viewer/pdf-viewer.component.ts

@@ -21,7 +21,6 @@ import {
 } from 'pdfjs-dist/legacy/build/pdf.mjs'
 import {
   EventBus,
-  LinkTarget,
   PDFFindController,
   PDFLinkService,
   PDFSinglePageViewer,
@@ -76,11 +75,7 @@ export class PngxPdfViewerComponent
   private lastViewerPage?: number
 
   private readonly eventBus = new EventBus()
-  private readonly linkService = new PDFLinkService({
+  private readonly linkService = new PDFLinkService({ eventBus: this.eventBus })
-    eventBus: this.eventBus,
-    externalLinkTarget: LinkTarget.BLANK,
-    externalLinkRel: 'noopener noreferrer nofollow',
-  })
   private readonly findController = new PDFFindController({
     eventBus: this.eventBus,
     linkService: this.linkService,
@@ -190,7 +185,6 @@ export class PngxPdfViewerComponent
       withCredentials: true,
       wasmUrl: new URL('assets/wasm/', this.document.baseURI).toString(),
       iccUrl: new URL('assets/iccs/', this.document.baseURI).toString(),
-      cMapUrl: new URL('assets/cmaps/', this.document.baseURI).toString(),
     }
     this.loadingTask = getDocument(initOptions)
     try {

src-ui/src/app/components/common/suggestions-dropdown/suggestions-dropdown.component.html

@@ -1,84 +1,58 @@
-<div class="d-flex align-items-center">
+<div class="btn-group">
-  <div class="btn-group">
+  <button type="button" class="btn btn-sm btn-outline-primary" (click)="clickSuggest()" [disabled]="disabled() || loading() || (suggestions() && !aiEnabled())" [aria-label]="noSuggestions ? 'No suggestions' : 'Suggest'" i18n-aria-label>
-    <button type="button" class="btn btn-sm btn-outline-primary" (click)="clickSuggest()" [disabled]="disabled() || loading() || (suggestions() && !aiEnabled())" [aria-label]="noSuggestions ? 'No suggestions' : 'Suggest'" i18n-aria-label>
+    @if (loading()) {
-      @if (loading()) {
+      <div class="spinner-border spinner-border-sm" role="status"></div>
-        <div class="spinner-border spinner-border-sm" role="status"></div>
+    } @else if (noSuggestions) {
-      } @else if (noSuggestions) {
+      <i-bs width="1.2em" height="1.2em" name="check-circle"></i-bs>
-        <i-bs width="1.2em" height="1.2em" name="check-circle"></i-bs>
+    } @else {
-      } @else {
+      <i-bs width="1.2em" height="1.2em" name="stars"></i-bs>
-        <i-bs width="1.2em" height="1.2em" name="lightbulb"></i-bs>
-      }
-      @if (noSuggestions) {
-        <span class="d-none d-lg-inline ps-1" i18n>No suggestions</span>
-      } @else {
-        <span class="d-none d-lg-inline ps-1" i18n>Suggest</span>
-      }
-      @if (totalSuggestions > 0) {
-        <span class="badge bg-primary ms-2">{{ totalSuggestions }}</span>
-      }
-    </button>
-
-    @if (aiEnabled()) {
-      <div class="btn-group" ngbDropdown #dropdown="ngbDropdown" [popperOptions]="popperOptions">
-        <button type="button" class="btn btn-sm btn-outline-primary" ngbDropdownToggle [disabled]="disabled() || loading() || !suggestions()" aria-expanded="false" aria-controls="suggestionsDropdown" aria-label="Suggestions dropdown">
-          <span class="visually-hidden" i18n>Show suggestions</span>
-        </button>
-
-        <div ngbDropdownMenu aria-labelledby="suggestionsDropdown" class="shadow suggestions-dropdown">
-          <div class="list-group list-group-flush small pb-0">
-            @if (novelSuggestions === 0 && fieldSuggestions === 0) {
-              <div class="list-group-item text-muted fst-italic">
-                <small class="text-muted small fst-italic" i18n>No novel suggestions</small>
-              </div>
-            }
-            @if (suggestions()?.suggested_tags?.length > 0) {
-              <small class="list-group-item text-uppercase text-muted small"><i-bs class="me-2" name="tags"></i-bs><ng-container i18n>Tags</ng-container></small>
-              @for (tag of suggestions().suggested_tags; track tag) {
-                <button type="button" class="list-group-item list-group-item-action bg-light" (click)="addTag.emit(tag)">{{ tag }}</button>
-              }
-            }
-            @if (suggestions()?.suggested_document_types?.length > 0) {
-              <div class="list-group-item text-uppercase text-muted small"><i-bs class="me-2" name="hash"></i-bs><ng-container i18n>Document Types</ng-container></div>
-              @for (type of suggestions().suggested_document_types; track type) {
-                <button type="button" class="list-group-item list-group-item-action bg-light" (click)="addDocumentType.emit(type)">{{ type }}</button>
-              }
-            }
-            @if (suggestions()?.suggested_correspondents?.length > 0) {
-              <div class="list-group-item text-uppercase text-muted small"><i-bs class="me-2" name="person"></i-bs><ng-container i18n>Correspondents</ng-container></div>
-              @for (correspondent of suggestions().suggested_correspondents; track correspondent) {
-                <button type="button" class="list-group-item list-group-item-action bg-light" (click)="addCorrespondent.emit(correspondent)">{{ correspondent }}</button>
-              }
-            }
-            @if (fieldSuggestions > 0) {
-              <div class="list-group-item text-muted fst-italic">
-                <small class="text-muted small fst-italic" i18n>{fieldSuggestions, plural, =1 {1 suggestion available below} other {{{fieldSuggestions}} suggestions available below}}</small>
-              </div>
-            }
-          </div>
-        </div>
-      </div>
     }
-  </div>
+    @if (noSuggestions) {
+      <span class="d-none d-lg-inline ps-1" i18n>No suggestions</span>
+    } @else {
+      <span class="d-none d-lg-inline ps-1" i18n>Suggest</span>
+    }
+    @if (totalSuggestions > 0) {
+      <span class="badge bg-primary ms-2">{{ totalSuggestions }}</span>
+    }
+  </button>
 
   @if (aiEnabled()) {
-    <div ngbDropdown autoClose="outside" placement="bottom-end" [popperOptions]="popperOptions">
+    <div class="btn-group" ngbDropdown #dropdown="ngbDropdown" [popperOptions]="popperOptions">
-      <button type="button" class="btn btn-sm btn-link position-relative" ngbDropdownToggle [disabled]="disabled() || loading()" i18n-title title="Suggestion options">
+      <button type="button" class="btn btn-sm btn-outline-primary" ngbDropdownToggle [disabled]="disabled() || loading() || !suggestions()" aria-expanded="false" aria-controls="suggestionsDropdown" aria-label="Suggestions dropdown">
-        <i-bs name="three-dots"></i-bs>
+        <span class="visually-hidden" i18n>Show suggestions</span>
-        @if (source() !== defaultSource()) {
-          <span class="position-absolute top-0 start-100 translate-middle p-1 bg-primary border border-light rounded-circle">
-            <span class="visually-hidden" i18n>Not using default</span>
-          </span>
-        }
       </button>
-      <div ngbDropdownMenu class="shadow p-3">
+
-        <div class="small text-muted mb-2" i18n>Suggest using:</div>
+      <div ngbDropdownMenu aria-labelledby="suggestionsDropdown" class="shadow suggestions-dropdown">
-        <div class="form-check small">
+        <div class="list-group list-group-flush small pb-0">
-          <input class="form-check-input" type="checkbox" id="suggestionSourceML" [checked]="useML" [disabled]="useML && !useAI" (change)="setSources($event.target.checked, useAI)">
+          @if (novelSuggestions === 0 && reusableSuggestions === 0) {
-          <label class="form-check-label d-inline-flex align-items-center gap-1" for="suggestionSourceML"><i-bs name="cpu"></i-bs><ng-container i18n>ML</ng-container></label>
+            <div class="list-group-item text-muted fst-italic">
-        </div>
+              <small class="text-muted small fst-italic" i18n>No novel suggestions</small>
-        <div class="form-check small">
+            </div>
-          <input class="form-check-input" type="checkbox" id="suggestionSourceAI" [checked]="useAI" [disabled]="useAI && !useML" (change)="setSources(useML, $event.target.checked)">
+          }
-          <label class="form-check-label d-inline-flex align-items-center gap-1" for="suggestionSourceAI"><i-bs name="stars"></i-bs><ng-container i18n>AI</ng-container></label>
+          @if (suggestions()?.suggested_tags?.length > 0) {
+            <small class="list-group-item text-uppercase text-muted small"><i-bs class="me-2" name="tags"></i-bs><ng-container i18n>Tags</ng-container></small>
+            @for (tag of suggestions().suggested_tags; track tag) {
+              <button type="button" class="list-group-item list-group-item-action bg-light" (click)="addTag.emit(tag)">{{ tag }}</button>
+            }
+          }
+          @if (suggestions()?.suggested_document_types?.length > 0) {
+            <div class="list-group-item text-uppercase text-muted small"><i-bs class="me-2" name="hash"></i-bs><ng-container i18n>Document Types</ng-container></div>
+            @for (type of suggestions().suggested_document_types; track type) {
+              <button type="button" class="list-group-item list-group-item-action bg-light" (click)="addDocumentType.emit(type)">{{ type }}</button>
+            }
+          }
+          @if (suggestions()?.suggested_correspondents?.length > 0) {
+            <div class="list-group-item text-uppercase text-muted small"><i-bs class="me-2" name="person"></i-bs><ng-container i18n>Correspondents</ng-container></div>
+            @for (correspondent of suggestions().suggested_correspondents; track correspondent) {
+              <button type="button" class="list-group-item list-group-item-action bg-light" (click)="addCorrespondent.emit(correspondent)">{{ correspondent }}</button>
+            }
+          }
+          @if (reusableSuggestions > 0) {
+            <div class="list-group-item text-muted fst-italic">
+              <small class="text-muted small fst-italic" i18n>{reusableSuggestions, plural, =1 {1 existing value suggested below} other {{{reusableSuggestions}} existing values suggested below}}</small>
+            </div>
+          }
         </div>
       </div>
     </div>

src-ui/src/app/components/common/suggestions-dropdown/suggestions-dropdown.component.scss

@@ -1,7 +1,3 @@
 .suggestions-dropdown {
   min-width: 250px;
 }
-
-.btn-link.dropdown-toggle::after {
-  display: none;
-}

src-ui/src/app/components/common/suggestions-dropdown/suggestions-dropdown.component.spec.ts

@@ -1,7 +1,6 @@
 import { ComponentFixture, TestBed } from '@angular/core/testing'
 import { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
-import { SuggestionSource } from 'src/app/data/ui-settings'
 import { SuggestionsDropdownComponent } from './suggestions-dropdown.component'
 
 describe('SuggestionsDropdownComponent', () => {
@@ -84,7 +83,7 @@ describe('SuggestionsDropdownComponent', () => {
     fixture.detectChanges()
 
     expect(fixture.nativeElement.textContent).toContain(
-      '2 suggestions available below'
+      '2 existing values suggested below'
     )
     expect(fixture.nativeElement.textContent).not.toContain(
       'No novel suggestions'
@@ -108,7 +107,7 @@ describe('SuggestionsDropdownComponent', () => {
     expect(component.totalSuggestions).toBe(4)
     expect(fixture.nativeElement.textContent).toContain('Arbitration')
     expect(fixture.nativeElement.textContent).toContain(
-      '2 suggestions available below'
+      '2 existing values suggested below'
     )
   })
 
@@ -125,46 +124,10 @@ describe('SuggestionsDropdownComponent', () => {
     })
 
     expect(component.novelSuggestions).toBe(0)
-    expect(component.totalSuggestions).toBe(6)
+    expect(component.totalSuggestions).toBe(5)
 
     fixture.componentRef.setInput('appliedStoragePath', 7)
-    expect(component.totalSuggestions).toBe(5)
+    expect(component.totalSuggestions).toBe(4)
-  })
-
-  it('should count title and dates as field suggestions without calling them existing values', () => {
-    fixture.componentRef.setInput('aiEnabled', true)
-    fixture.componentRef.setInput('fetchedSources', [SuggestionSource.ML])
-    fixture.componentRef.setInput('suggestions', {
-      title: 'Suggested title',
-      dates: ['2026-01-04', '2026-02-01', '2026-03-01'],
-      correspondents: [1, 2, 3, 4],
-      document_types: [1, 2, 3, 4],
-      tags: [1, 2, 3, 4, 5, 6, 7, 8],
-    })
-    fixture.detectChanges()
-    component.clickSuggest()
-    fixture.detectChanges()
-
-    expect(component.reusableSuggestions).toBe(16)
-    expect(component.fieldSuggestions).toBe(20)
-    expect(component.totalSuggestions).toBe(20)
-    expect(fixture.nativeElement.textContent).toContain(
-      '20 suggestions available below'
-    )
-    expect(fixture.nativeElement.textContent).not.toContain('existing value')
-  })
-
-  it('should not count title or date suggestions matching the current values', () => {
-    fixture.componentRef.setInput('suggestions', {
-      title: 'Current title',
-      dates: ['2026-01-04', '2026-02-01'],
-    })
-    expect(component.fieldSuggestions).toBe(3)
-
-    fixture.componentRef.setInput('appliedTitle', 'Current title')
-    fixture.componentRef.setInput('appliedCreated', '2026-01-04')
-    expect(component.fieldSuggestions).toBe(1)
-    expect(component.totalSuggestions).toBe(1)
   })
 
   it('should show when a completed request returned no suggestions', () => {
@@ -181,28 +144,6 @@ describe('SuggestionsDropdownComponent', () => {
     expect(fixture.nativeElement.textContent).toContain('No suggestions')
   })
 
-  it('should wait for all pending responses before showing the empty state', () => {
-    fixture.componentRef.setInput('aiEnabled', true)
-    fixture.componentRef.setInput('source', SuggestionSource.Both)
-    fixture.componentRef.setInput('fetchedSources', [SuggestionSource.ML])
-    fixture.componentRef.setInput('suggestions', { tags: [] })
-    fixture.componentRef.setInput('loading', true)
-    fixture.detectChanges()
-
-    expect(component.noSuggestions).toBeFalsy()
-    expect(fixture.nativeElement.textContent).not.toContain('No suggestions')
-    expect(
-      fixture.nativeElement.querySelector('[role="status"]')
-    ).not.toBeNull()
-
-    fixture.componentRef.setInput('loading', false)
-    fixture.detectChanges()
-
-    expect(component.noSuggestions).toBeTruthy()
-    expect(fixture.nativeElement.textContent).toContain('No suggestions')
-    expect(fixture.nativeElement.querySelector('[role="status"]')).toBeNull()
-  })
-
   it('should not show the empty state before a request or with suggestions', () => {
     expect(component.noSuggestions).toBeFalsy()
 
@@ -238,71 +179,14 @@ describe('SuggestionsDropdownComponent', () => {
 
   it('should toggle dropdown when clickSuggest is called and suggestions are not null', () => {
     fixture.componentRef.setInput('aiEnabled', true)
-    fixture.componentRef.setInput('fetchedSources', [SuggestionSource.ML])
     fixture.detectChanges()
     fixture.componentRef.setInput('suggestions', {
       suggested_correspondents: [],
       suggested_tags: [],
       suggested_document_types: [],
     })
-    fixture.detectChanges()
     component.clickSuggest()
-    expect(component.dropdown.isOpen()).toBeTruthy()
+    expect(component.dropdown.open).toBeTruthy()
     expect(fixture.nativeElement.textContent).toContain('No novel suggestions')
   })
-
-  it('should fetch unfetched sources and show existing suggestions', () => {
-    jest.spyOn(component.getSuggestions, 'emit')
-    fixture.componentRef.setInput('aiEnabled', true)
-    fixture.componentRef.setInput('source', SuggestionSource.Both)
-    fixture.componentRef.setInput('fetchedSources', [SuggestionSource.ML])
-    fixture.componentRef.setInput('suggestions', { tags: [1] })
-    fixture.detectChanges()
-    component.clickSuggest()
-    expect(component.getSuggestions.emit).toHaveBeenCalledWith(
-      SuggestionSource.Both
-    )
-    expect(component.dropdown.isOpen()).toBeTruthy()
-  })
-
-  it('should only show source options when AI is enabled', () => {
-    expect(
-      fixture.nativeElement.querySelector('#suggestionSourceML')
-    ).toBeNull()
-    fixture.componentRef.setInput('aiEnabled', true)
-    fixture.detectChanges()
-    fixture.nativeElement
-      .querySelector('button[title="Suggestion options"]')
-      .click()
-    fixture.detectChanges()
-    expect(
-      fixture.nativeElement.querySelector('#suggestionSourceML')
-    ).not.toBeNull()
-  })
-
-  it('should emit source changes and never allow no source', () => {
-    const emitSpy = jest.spyOn(component.sourceChange, 'emit')
-    component.setSources(true, true)
-    expect(emitSpy).toHaveBeenCalledWith(SuggestionSource.Both)
-    component.setSources(true, false)
-    expect(emitSpy).toHaveBeenCalledWith(SuggestionSource.ML)
-    component.setSources(false, true)
-    expect(emitSpy).toHaveBeenCalledWith(SuggestionSource.AI)
-
-    emitSpy.mockClear()
-    component.setSources(false, false)
-    expect(emitSpy).not.toHaveBeenCalled()
-  })
-
-  it('should indicate a non-default source', () => {
-    fixture.componentRef.setInput('aiEnabled', true)
-    fixture.componentRef.setInput('source', SuggestionSource.AI)
-    fixture.componentRef.setInput('defaultSource', SuggestionSource.AI)
-    fixture.detectChanges()
-    expect(fixture.nativeElement.textContent).not.toContain('Not using default')
-
-    fixture.componentRef.setInput('source', SuggestionSource.Both)
-    fixture.detectChanges()
-    expect(fixture.nativeElement.textContent).toContain('Not using default')
-  })
 })

src-ui/src/app/components/common/suggestions-dropdown/suggestions-dropdown.component.ts

@@ -8,7 +8,6 @@ import {
 import { NgbDropdown, NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { DocumentSuggestions } from 'src/app/data/document-suggestions'
-import { SuggestionSource } from 'src/app/data/ui-settings'
 import { pngxPopperOptions } from 'src/app/utils/popper-options'
 
 @Component({
@@ -19,29 +18,21 @@ import { pngxPopperOptions } from 'src/app/utils/popper-options'
 })
 export class SuggestionsDropdownComponent {
   public popperOptions = pngxPopperOptions
-  public readonly SuggestionSource = SuggestionSource
 
   @ViewChild('dropdown') dropdown: NgbDropdown
   readonly suggestions = input<DocumentSuggestions>(null)
   readonly aiEnabled = input(false)
   readonly loading = input(false)
   readonly disabled = input(false)
-  readonly source = input<SuggestionSource>(SuggestionSource.ML)
-  readonly defaultSource = input<SuggestionSource>(SuggestionSource.ML)
-  readonly fetchedSources = input<SuggestionSource[]>([])
 
   readonly appliedTags = input<number[]>([])
   readonly appliedCorrespondent = input<number>(null)
   readonly appliedDocumentType = input<number>(null)
   readonly appliedStoragePath = input<number>(null)
-  readonly appliedTitle = input<string>(null)
-  readonly appliedCreated = input<string>(null)
 
   @Output()
-  getSuggestions: EventEmitter<SuggestionSource> = new EventEmitter()
+  getSuggestions: EventEmitter<SuggestionsDropdownComponent> =
-
+    new EventEmitter()
-  @Output()
-  sourceChange: EventEmitter<SuggestionSource> = new EventEmitter()
 
   @Output()
   addTag: EventEmitter<string> = new EventEmitter()
@@ -62,42 +53,12 @@ export class SuggestionsDropdownComponent {
     }
 
     if (!this.suggestions()) {
-      this.getSuggestions.emit(this.source())
+      this.getSuggestions.emit(this)
-    } else if (this.hasUnfetchedSources) {
-      // sources changed, fetch the rest and show what we have meanwhile
-      this.getSuggestions.emit(this.source())
-      this.dropdown?.open()
     } else {
       this.dropdown?.toggle()
     }
   }
 
-  get useML(): boolean {
-    return this.source() !== SuggestionSource.AI
-  }
-
-  get useAI(): boolean {
-    return this.source() !== SuggestionSource.ML
-  }
-
-  get hasUnfetchedSources(): boolean {
-    const fetched = this.fetchedSources()
-    return (
-      (this.useML && !fetched.includes(SuggestionSource.ML)) ||
-      (this.useAI && !fetched.includes(SuggestionSource.AI))
-    )
-  }
-
-  public setSources(ml: boolean, ai: boolean) {
-    if (ml && ai) {
-      this.sourceChange.emit(SuggestionSource.Both)
-    } else if (ml) {
-      this.sourceChange.emit(SuggestionSource.ML)
-    } else if (ai) {
-      this.sourceChange.emit(SuggestionSource.AI)
-    }
-  }
-
   get novelSuggestions(): number {
     return (
       (this.suggestions()?.suggested_correspondents?.length ?? 0) +
@@ -130,28 +91,7 @@ export class SuggestionsDropdownComponent {
   }
 
   get totalSuggestions(): number {
-    return this.novelSuggestions + this.fieldSuggestions
+    return this.novelSuggestions + this.reusableSuggestions
-  }
-
-  get fieldSuggestions(): number {
-    return (
-      this.reusableSuggestions +
-      this.unappliedTitleSuggestions +
-      this.unappliedDateSuggestions
-    )
-  }
-
-  // hide a title or date suggestion equal to the current value
-  private get unappliedTitleSuggestions(): number {
-    const title = this.suggestions()?.title
-    return title && title !== this.appliedTitle() ? 1 : 0
-  }
-
-  private get unappliedDateSuggestions(): number {
-    const created = this.appliedCreated()
-    return (this.suggestions()?.dates ?? []).filter(
-      (date) => !created || date !== created
-    ).length
   }
 
   private countUnapplied(suggested: number[], applied: number[]): number {
@@ -162,7 +102,6 @@ export class SuggestionsDropdownComponent {
   get noSuggestions(): boolean {
     const suggestions = this.suggestions()
     return (
-      !this.loading() &&
       suggestions != null &&
       !suggestions.title &&
       !suggestions.tags?.length &&

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

@@ -1,46 +0,0 @@
-<table class="table table-borderless align-baseline">
-  <thead>
-    <tr>
-      <th i18n>Page</th>
-      <th i18n>Type</th>
-      <th i18n>Content</th>
-      <th></th>
-    </tr>
-  </thead>
-  <tbody>
-    @for (barcode of barcodes(); track $index) {
-      <tr>
-        <td>{{ barcode.page }}</td>
-        <td class="text-nowrap">{{ barcode.format }}</td>
-        <td class="text-break">
-          @if (isLink(barcode.value)) {
-            <a
-              [href]="barcode.value"
-              target="_blank"
-              rel="noopener noreferrer nofollow"
-              >{{ barcode.value }}</a
-            >
-          } @else {
-            {{ barcode.value }}
-          }
-        </td>
-        <td class="text-end">
-          <button
-            type="button"
-            class="btn btn-sm btn-outline-primary"
-            (click)="copy($index)"
-            title="Copy content"
-            i18n-title
-          >
-            @if (copiedIndex() === $index) {
-              <i-bs name="clipboard-check"></i-bs>
-            } @else {
-              <i-bs name="clipboard"></i-bs>
-            }
-            <span class="visually-hidden" i18n>Copy content</span>
-          </button>
-        </td>
-      </tr>
-    }
-  </tbody>
-</table>

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

@@ -1,73 +0,0 @@
-import { Clipboard } from '@angular/cdk/clipboard'
-import { ComponentFixture, TestBed } from '@angular/core/testing'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
-import { DocumentBarcodesComponent } from './document-barcodes.component'
-
-const barcodes = [
-  { page: 1, value: 'ASN00123', format: 'Code128' },
-  { page: 2, value: 'https://example.com/invoice/4711', format: 'QRCode' },
-  { page: 2, value: 'javascript:alert(1)', format: 'QRCode' },
-]
-
-describe('DocumentBarcodesComponent', () => {
-  let component: DocumentBarcodesComponent
-  let fixture: ComponentFixture<DocumentBarcodesComponent>
-  let clipboard: Clipboard
-
-  beforeEach(async () => {
-    TestBed.configureTestingModule({
-      imports: [
-        DocumentBarcodesComponent,
-        NgxBootstrapIconsModule.pick(allIcons),
-      ],
-    }).compileComponents()
-
-    fixture = TestBed.createComponent(DocumentBarcodesComponent)
-    component = fixture.componentInstance
-    clipboard = TestBed.inject(Clipboard)
-    fixture.componentRef.setInput('barcodes', barcodes)
-    fixture.detectChanges()
-  })
-
-  it('should display all barcodes', () => {
-    const rows = fixture.nativeElement.querySelectorAll('tbody tr')
-    expect(rows).toHaveLength(3)
-    expect(rows[0].textContent).toContain('ASN00123')
-    expect(rows[0].textContent).toContain('Code128')
-  })
-
-  it('should only link http(s) values', () => {
-    const links = fixture.nativeElement.querySelectorAll('tbody a')
-    expect(links).toHaveLength(1)
-    expect(links[0].getAttribute('href')).toEqual(
-      'https://example.com/invoice/4711'
-    )
-    expect(links[0].getAttribute('target')).toEqual('_blank')
-  })
-
-  it('should copy a value and show feedback', () => {
-    jest.useFakeTimers()
-    const copySpy = jest.spyOn(clipboard, 'copy').mockReturnValue(true)
-    const buttons = fixture.nativeElement.querySelectorAll('tbody button')
-    buttons[0].click()
-    fixture.detectChanges()
-    expect(copySpy).toHaveBeenCalledWith('ASN00123')
-    expect(component.copiedIndex()).toEqual(0)
-    expect(buttons[0].querySelector('i-bs').getAttribute('name')).toEqual(
-      'clipboard-check'
-    )
-    jest.advanceTimersByTime(3000)
-    fixture.detectChanges()
-    expect(component.copiedIndex()).toBeNull()
-    expect(buttons[0].querySelector('i-bs').getAttribute('name')).toEqual(
-      'clipboard'
-    )
-    jest.useRealTimers()
-  })
-
-  it('should not show feedback if copying failed', () => {
-    jest.spyOn(clipboard, 'copy').mockReturnValue(false)
-    component.copy(1)
-    expect(component.copiedIndex()).toBeNull()
-  })
-})

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

@@ -1,38 +0,0 @@
-import { Clipboard } from '@angular/cdk/clipboard'
-import { Component, inject, input, OnDestroy, signal } from '@angular/core'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { DocumentBarcode } from 'src/app/data/document-barcode'
-
-@Component({
-  selector: 'pngx-document-barcodes',
-  templateUrl: './document-barcodes.component.html',
-  imports: [NgxBootstrapIconsModule],
-})
-export class DocumentBarcodesComponent implements OnDestroy {
-  private readonly clipboard = inject(Clipboard)
-
-  readonly barcodes = input<DocumentBarcode[]>([])
-
-  readonly copiedIndex = signal<number>(null)
-  private copyTimeout: ReturnType<typeof setTimeout>
-
-  public isLink(value: string): boolean {
-    try {
-      const url = new URL(value.trim())
-      return ['http:', 'https:'].includes(url.protocol) && !!url.host
-    } catch {
-      return false
-    }
-  }
-
-  public copy(index: number) {
-    if (!this.clipboard.copy(this.barcodes()[index].value)) return
-    this.copiedIndex.set(index)
-    clearTimeout(this.copyTimeout)
-    this.copyTimeout = setTimeout(() => this.copiedIndex.set(null), 3000)
-  }
-
-  ngOnDestroy(): void {
-    clearTimeout(this.copyTimeout)
-  }
-}

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

@@ -134,17 +134,11 @@
                 [loading]="suggestionsLoading()"
                 [suggestions]="suggestions()"
                 [aiEnabled]="aiEnabled"
-                [source]="suggestionSource"
-                [defaultSource]="defaultSuggestionSource"
-                [fetchedSources]="fetchedSuggestionSources()"
                 [appliedTags]="documentForm.value.tags"
                 [appliedCorrespondent]="documentForm.value.correspondent"
                 [appliedDocumentType]="documentForm.value.document_type"
                 [appliedStoragePath]="documentForm.value.storage_path"
-                [appliedTitle]="documentForm.value.title"
+                (getSuggestions)="getSuggestions()"
-                [appliedCreated]="documentForm.value.created"
-                (getSuggestions)="getSuggestions($event)"
-                (sourceChange)="suggestionSourceOverride.set($event)"
                 (addTag)="createTag($event)"
                 (addDocumentType)="createDocumentType($event)"
                 (addCorrespondent)="createCorrespondent($event)">
@@ -356,10 +350,6 @@
               </table>
             }
 
-            @if (metadata()?.barcodes?.length > 0) {
-              <h6 i18n>Barcodes</h6>
-              <pngx-document-barcodes [barcodes]="metadata().barcodes"></pngx-document-barcodes>
-            }
             @if (metadata()?.original_metadata?.length > 0) {
               <pngx-metadata-collapse i18n-title title="Original document metadata" [metadata]="metadata()?.original_metadata"></pngx-metadata-collapse>
             }

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

@@ -43,7 +43,7 @@ import {
 } from 'src/app/data/filter-rule-type'
 import { StoragePath } from 'src/app/data/storage-path'
 import { Tag } from 'src/app/data/tag'
-import { SETTINGS_KEYS, SuggestionSource } from 'src/app/data/ui-settings'
+import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
 import { PermissionsGuard } from 'src/app/guards/permissions.guard'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
 import { DocumentTitlePipe } from 'src/app/pipes/document-title.pipe'
@@ -662,45 +662,6 @@ describe('DocumentDetailComponent', () => {
     )
   })
 
-  it.each([
-    ['tag', 'createTag', 'tags', 'suggested_tags'],
-    [
-      'document type',
-      'createDocumentType',
-      'document_type',
-      'suggested_document_types',
-    ],
-    [
-      'correspondent',
-      'createCorrespondent',
-      'correspondent',
-      'suggested_correspondents',
-    ],
-  ])(
-    'should create a %s after ML-only suggestions',
-    (_, method, field, suggestedField) => {
-      initNormally()
-      component.suggestions.set({ tags: [1] })
-      let openModal: NgbModalRef
-      modalService.activeInstances.subscribe((modal) => (openModal = modal[0]))
-      component[method]('New value')
-      openModal.componentInstance.succeeded.next({
-        id: 12,
-        name: 'New value',
-        is_inbox_tag: false,
-        color: '#ff0000',
-        text_color: '#000000',
-      })
-
-      if (field === 'tags') {
-        expect(component.tagsInput.value).toContain(12)
-      } else {
-        expect(component.documentForm.get(field).value).toBe(12)
-      }
-      expect(component.suggestions()[suggestedField]).toEqual([])
-    }
-  )
-
   it('should support creating storage path', () => {
     initNormally()
     let openModal: NgbModalRef
@@ -1567,113 +1528,6 @@ describe('DocumentDetailComponent', () => {
     expect(component.suggestionsLoading()).toBeFalsy()
   })
 
-  it('should get and merge ML and AI suggestions when source is both', () => {
-    settingsService.set(
-      SETTINGS_KEYS.DOCUMENT_EDITING_SUGGESTION_SOURCE,
-      SuggestionSource.Both
-    )
-    const getSetting = settingsService.get.bind(settingsService)
-    jest
-      .spyOn(settingsService, 'get')
-      .mockImplementation((key) =>
-        key === SETTINGS_KEYS.AI_ENABLED ? true : getSetting(key)
-      )
-    const suggestionsSpy = jest
-      .spyOn(documentService, 'getSuggestions')
-      .mockReturnValue(of({ tags: [42], dates: ['2024-01-01'] }))
-    const aiSuggestionsSpy = jest
-      .spyOn(documentService, 'getAiSuggestions')
-      .mockReturnValue(
-        of({ title: 'AI title', tags: [42, 43], suggested_tags: ['New'] })
-      )
-    initNormally()
-    expect(suggestionsSpy).toHaveBeenCalled()
-    expect(aiSuggestionsSpy).toHaveBeenCalled()
-    expect(component.suggestions().title).toEqual('AI title')
-    expect(component.suggestions().tags).toEqual([42, 43])
-    expect(component.suggestions().suggested_tags).toEqual(['New'])
-    expect(component.suggestions().dates).toEqual(['2024-01-01'])
-  })
-
-  it('should only fetch sources not yet fetched for the document', () => {
-    settingsService.set(SETTINGS_KEYS.DOCUMENT_EDITING_AUTO_SUGGEST, false)
-    settingsService.set(
-      SETTINGS_KEYS.DOCUMENT_EDITING_SUGGESTION_SOURCE,
-      SuggestionSource.ML
-    )
-    const getSetting = settingsService.get.bind(settingsService)
-    jest
-      .spyOn(settingsService, 'get')
-      .mockImplementation((key) =>
-        key === SETTINGS_KEYS.AI_ENABLED ? true : getSetting(key)
-      )
-    const suggestionsSpy = jest
-      .spyOn(documentService, 'getSuggestions')
-      .mockReturnValue(of({ tags: [42] }))
-    const aiSuggestionsSpy = jest
-      .spyOn(documentService, 'getAiSuggestions')
-      .mockReturnValue(of({ tags: [43] }))
-    initNormally()
-
-    component.getSuggestions()
-    expect(suggestionsSpy).toHaveBeenCalledTimes(1)
-    expect(aiSuggestionsSpy).not.toHaveBeenCalled()
-
-    component.getSuggestions(SuggestionSource.Both)
-    expect(suggestionsSpy).toHaveBeenCalledTimes(1)
-    expect(aiSuggestionsSpy).toHaveBeenCalledTimes(1)
-    expect(component.suggestions().tags).toEqual([42, 43])
-
-    component.getSuggestions(SuggestionSource.Both)
-    expect(suggestionsSpy).toHaveBeenCalledTimes(1)
-    expect(aiSuggestionsSpy).toHaveBeenCalledTimes(1)
-  })
-
-  it('should use the per-document source override and reset it on document change', () => {
-    settingsService.set(SETTINGS_KEYS.DOCUMENT_EDITING_AUTO_SUGGEST, false)
-    const getSetting = settingsService.get.bind(settingsService)
-    jest
-      .spyOn(settingsService, 'get')
-      .mockImplementation((key) =>
-        key === SETTINGS_KEYS.AI_ENABLED ? true : getSetting(key)
-      )
-    initNormally()
-    expect(component.suggestionSource).toEqual(SuggestionSource.AI)
-    component.suggestionSourceOverride.set(SuggestionSource.ML)
-    expect(component.suggestionSource).toEqual(SuggestionSource.ML)
-
-    jest
-      .spyOn(documentService, 'get')
-      .mockReturnValueOnce(of(Object.assign({}, doc)))
-    ;(component as any).loadDocument(doc.id, true)
-    expect(component.suggestionSourceOverride()).toBeNull()
-    expect(component.fetchedSuggestionSources()).toEqual([])
-  })
-
-  it('should keep suggestions from one source if the other fails', () => {
-    settingsService.set(
-      SETTINGS_KEYS.DOCUMENT_EDITING_SUGGESTION_SOURCE,
-      SuggestionSource.Both
-    )
-    const getSetting = settingsService.get.bind(settingsService)
-    jest
-      .spyOn(settingsService, 'get')
-      .mockImplementation((key) =>
-        key === SETTINGS_KEYS.AI_ENABLED ? true : getSetting(key)
-      )
-    const errorSpy = jest.spyOn(toastService, 'showError')
-    jest
-      .spyOn(documentService, 'getSuggestions')
-      .mockReturnValue(of({ tags: [42] }))
-    jest
-      .spyOn(documentService, 'getAiSuggestions')
-      .mockReturnValue(throwError(() => new Error('failed')))
-    initNormally()
-    expect(errorSpy).toHaveBeenCalled()
-    expect(component.suggestions().tags).toEqual([42])
-    expect(component.fetchedSuggestionSources()).toEqual([SuggestionSource.ML])
-  })
-
   it('should show error if needed for get suggestions', () => {
     const suggestionsSpy = jest.spyOn(documentService, 'getSuggestions')
     const errorSpy = jest.spyOn(toastService, 'showError')

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

@@ -28,7 +28,7 @@ import {
 import { dirtyCheck, DirtyComponent } from '@ngneat/dirty-check-forms'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { DeviceDetectorService } from 'ngx-device-detector'
-import { BehaviorSubject, merge, Observable, of, Subject, timer } from 'rxjs'
+import { BehaviorSubject, Observable, of, Subject, timer } from 'rxjs'
 import {
   catchError,
   debounceTime,
@@ -48,10 +48,7 @@ import { DataType } from 'src/app/data/datatype'
 import { Document, DocumentVersionInfo } from 'src/app/data/document'
 import { DocumentMetadata } from 'src/app/data/document-metadata'
 import { DocumentNote } from 'src/app/data/document-note'
-import {
+import { DocumentSuggestions } from 'src/app/data/document-suggestions'
-  DocumentSuggestions,
-  mergeSuggestions,
-} from 'src/app/data/document-suggestions'
 import { DocumentType } from 'src/app/data/document-type'
 import { FilterRule } from 'src/app/data/filter-rule'
 import {
@@ -66,7 +63,7 @@ import {
 import { ObjectWithId } from 'src/app/data/object-with-id'
 import { StoragePath } from 'src/app/data/storage-path'
 import { Tag } from 'src/app/data/tag'
-import { SETTINGS_KEYS, SuggestionSource } from 'src/app/data/ui-settings'
+import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
 import { User } from 'src/app/data/user'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
@@ -135,7 +132,6 @@ import { ShareLinksDialogComponent } from '../common/share-links-dialog/share-li
 import { SuggestionsDropdownComponent } from '../common/suggestions-dropdown/suggestions-dropdown.component'
 import { DocumentNotesComponent } from '../document-notes/document-notes.component'
 import { ComponentWithPermissions } from '../with-permissions/with-permissions.component'
-import { DocumentBarcodesComponent } from './document-barcodes/document-barcodes.component'
 import { DocumentHistoryComponent } from './document-history/document-history.component'
 import { DocumentVersionDropdownComponent } from './document-version-dropdown/document-version-dropdown.component'
 import { MetadataCollapseComponent } from './metadata-collapse/metadata-collapse.component'
@@ -178,7 +174,6 @@ interface IncomingDocumentUpdate {
     DateComponent,
     DocumentLinkComponent,
     MetadataCollapseComponent,
-    DocumentBarcodesComponent,
     PermissionsFormComponent,
     SelectComponent,
     TagsComponent,
@@ -245,10 +240,6 @@ export class DocumentDetailComponent
   private readonly autoSuggestSetting = this.settings.getSignal<boolean>(
     SETTINGS_KEYS.DOCUMENT_EDITING_AUTO_SUGGEST
   )
-  private readonly suggestionSourceSetting =
-    this.settings.getSignal<SuggestionSource>(
-      SETTINGS_KEYS.DOCUMENT_EDITING_SUGGESTION_SOURCE
-    )
   private readonly hiddenFieldsSetting = this.settings.getSignal<
     DocumentDetailFieldID[]
   >(SETTINGS_KEYS.DOCUMENT_DETAILS_HIDDEN_FIELDS)
@@ -270,9 +261,6 @@ export class DocumentDetailComponent
   readonly metadata = signal<DocumentMetadata>(undefined)
   readonly suggestions = signal<DocumentSuggestions>(undefined)
   readonly suggestionsLoading = signal(false)
-  // per-document, resets on navigation
-  readonly suggestionSourceOverride = signal<SuggestionSource>(null)
-  readonly fetchedSuggestionSources = signal<SuggestionSource[]>([])
   readonly users = signal<User[]>(undefined)
 
   readonly title = signal<string>(undefined)
@@ -377,15 +365,6 @@ export class DocumentDetailComponent
     return this.autoSuggestSetting()
   }
 
-  get defaultSuggestionSource(): SuggestionSource {
-    return this.aiEnabled ? this.suggestionSourceSetting() : SuggestionSource.ML
-  }
-
-  get suggestionSource(): SuggestionSource {
-    if (!this.aiEnabled) return SuggestionSource.ML
-    return this.suggestionSourceOverride() ?? this.defaultSuggestionSource
-  }
-
   get archiveContentRenderType(): ContentRenderType {
     const hasArchiveVersion =
       this.metadata()?.has_archive_version ??
@@ -611,8 +590,6 @@ export class DocumentDetailComponent
           }
           this.documentId.set(doc.id)
           this.suggestions.set(null)
-          this.suggestionSourceOverride.set(null)
-          this.fetchedSuggestionSources.set([])
           const openDocument = this.openDocumentService.getOpenDocument(
             this.documentId()
           )
@@ -1100,44 +1077,29 @@ export class DocumentDetailComponent
     return this.documentForm.get('custom_fields') as FormArray
   }
 
-  getSuggestions(source: SuggestionSource = this.suggestionSource) {
+  getSuggestions() {
-    const sources = (
-      source === SuggestionSource.Both
-        ? [SuggestionSource.ML, SuggestionSource.AI]
-        : [source]
-    ).filter((s) => !this.fetchedSuggestionSources().includes(s))
-    if (!sources.length) return
-
     this.suggestionsLoading.set(true)
-    merge(
+    const suggestionsObservable = this.aiEnabled
-      ...sources.map((s) =>
+      ? this.documentsService.getAiSuggestions(this.documentId())
-        (s === SuggestionSource.AI
+      : this.documentsService.getSuggestions(this.documentId())
-          ? this.documentsService.getAiSuggestions(this.documentId())
+    suggestionsObservable
-          : this.documentsService.getSuggestions(this.documentId())
-        ).pipe(
-          first(),
-          map((result) => ({ source: s, result })),
-          catchError((error) => {
-            this.toastService.showError(
-              $localize`Error retrieving suggestions.`,
-              error
-            )
-            return of(null)
-          })
-        )
-      )
-    )
       .pipe(
+        first(),
         takeUntil(this.unsubscribeNotifier),
         takeUntil(this.docChangeNotifier),
         finalize(() => this.suggestionsLoading.set(false))
       )
-      .subscribe((response) => {
+      .subscribe({
-        if (!response) return
+        next: (result) => {
-        this.fetchedSuggestionSources.update((f) => [...f, response.source])
+          this.suggestions.set(result)
-        this.suggestions.set(
+        },
-          mergeSuggestions(this.suggestions(), response.result)
+        error: (error) => {
-        )
+          this.suggestions.set(null)
+          this.toastService.showError(
+            $localize`Error retrieving suggestions.`,
+            error
+          )
+        },
       })
   }
 
@@ -1154,7 +1116,7 @@ export class DocumentDetailComponent
           if (this.suggestions()) {
             this.suggestions.set({
               ...this.suggestions(),
-              suggested_tags: (this.suggestions().suggested_tags ?? []).filter(
+              suggested_tags: this.suggestions().suggested_tags.filter(
                 (tag) => tag !== newTag.name
               ),
             })
@@ -1193,12 +1155,10 @@ export class DocumentDetailComponent
         this.documentForm.get('document_type').setValue(newDocumentType.id)
         this.documentForm.get('document_type').markAsDirty()
         if (this.suggestions()) {
-          this.suggestions.set({
+          this.suggestions().suggested_document_types =
-            ...this.suggestions(),
+            this.suggestions().suggested_document_types.filter(
-            suggested_document_types: (
+              (dt) => dt !== newName
-              this.suggestions().suggested_document_types ?? []
+            )
-            ).filter((dt) => dt !== newName),
-          })
         }
       })
   }
@@ -1225,12 +1185,10 @@ export class DocumentDetailComponent
         this.documentForm.get('correspondent').setValue(newCorrespondent.id)
         this.documentForm.get('correspondent').markAsDirty()
         if (this.suggestions()) {
-          this.suggestions.set({
+          this.suggestions().suggested_correspondents =
-            ...this.suggestions(),
+            this.suggestions().suggested_correspondents.filter(
-            suggested_correspondents: (
+              (c) => c !== newName
-              this.suggestions().suggested_correspondents ?? []
+            )
-            ).filter((c) => c !== newName),
-          })
         }
       })
   }

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

@@ -1,7 +0,0 @@
-export interface DocumentBarcode {
-  page: number
-
-  value: string
-
-  format: string
-}

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

@@ -1,5 +1,3 @@
-import { DocumentBarcode } from './document-barcode'
-
 export interface DocumentMetadata {
   original_checksum?: string
 
@@ -14,6 +12,4 @@ export interface DocumentMetadata {
   has_archive_version?: boolean
 
   lang?: string
-
-  barcodes?: DocumentBarcode[]
 }

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

@@ -15,33 +15,3 @@ export interface DocumentSuggestions {
 
   dates?: string[] // ISO-formatted date string e.g. 2022-11-03
 }
-
-const union = <T>(a: T[] = [], b: T[] = []): T[] => [...new Set([...a, ...b])]
-
-export function mergeSuggestions(
-  a: DocumentSuggestions,
-  b: DocumentSuggestions
-): DocumentSuggestions {
-  if (!a) return b
-  return {
-    title: a.title || b.title,
-    tags: union(a.tags, b.tags),
-    suggested_tags: union(a.suggested_tags, b.suggested_tags),
-    correspondents: union(a.correspondents, b.correspondents),
-    suggested_correspondents: union(
-      a.suggested_correspondents,
-      b.suggested_correspondents
-    ),
-    document_types: union(a.document_types, b.document_types),
-    suggested_document_types: union(
-      a.suggested_document_types,
-      b.suggested_document_types
-    ),
-    storage_paths: union(a.storage_paths, b.storage_paths),
-    suggested_storage_paths: union(
-      a.suggested_storage_paths,
-      b.suggested_storage_paths
-    ),
-    dates: union(a.dates, b.dates),
-  }
-}

src-ui/src/app/data/paperless-config.ts

@@ -330,13 +330,6 @@ export const PaperlessConfigOptions: ConfigOption[] = [
     config_key: 'PAPERLESS_CONSUMER_TAG_BARCODE_SPLIT',
     category: ConfigCategory.Barcode,
   },
-  {
-    key: 'barcode_store_values',
-    title: $localize`Store Barcode Contents`,
-    type: ConfigOptionType.Boolean,
-    config_key: 'PAPERLESS_CONSUMER_STORE_BARCODE_VALUES',
-    category: ConfigCategory.Barcode,
-  },
   {
     key: 'ai_enabled',
     title: $localize`AI Enabled`,
@@ -465,7 +458,6 @@ export interface PaperlessConfig extends ObjectWithId {
   barcode_enable_tag: boolean
   barcode_tag_mapping: object
   barcode_tag_split: boolean
-  barcode_store_values: boolean
   remote_ocr_engine: string
   remote_ocr_api_key: string
   remote_ocr_endpoint: string

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

@@ -20,12 +20,6 @@ export enum GlobalSearchType {
   TITLE_CONTENT = 'title-content',
 }
 
-export enum SuggestionSource {
-  ML = 'ml',
-  AI = 'ai',
-  Both = 'both',
-}
-
 export enum CollapsibleSection {
   ATTRIBUTES = 'attributes',
 }
@@ -104,8 +98,6 @@ export const SETTINGS_KEYS = {
     'general-settings:document-editing:overlay-thumbnail',
   DOCUMENT_EDITING_AUTO_SUGGEST:
     'general-settings:document-editing:auto-suggest',
-  DOCUMENT_EDITING_SUGGESTION_SOURCE:
-    'general-settings:document-editing:suggestion-source',
   DOCUMENT_DETAILS_HIDDEN_FIELDS:
     'general-settings:document-details:hidden-fields',
   SEARCH_DB_ONLY: 'general-settings:search:db-only',
@@ -334,11 +326,6 @@ export const SETTINGS: UiSetting[] = [
     type: 'boolean',
     default: true,
   },
-  {
-    key: SETTINGS_KEYS.DOCUMENT_EDITING_SUGGESTION_SOURCE,
-    type: 'string',
-    default: SuggestionSource.AI,
-  },
   {
     key: SETTINGS_KEYS.DOCUMENT_DETAILS_HIDDEN_FIELDS,
     type: 'array',

src-ui/src/environments/environment.prod.ts

@@ -8,7 +8,7 @@ export const environment = {
   apiVersion: '10', // match src/paperless/settings.py
   appTitle: DEFAULT_APP_TITLE,
   tag: 'prod',
-  version: '3.3.1',
+  version: '3.2.1',
   webSocketHost: window.location.host,
   webSocketProtocol: window.location.protocol == 'https:' ? 'wss:' : 'ws:',
   webSocketBaseUrl: base_url.pathname + 'ws/',