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.
2026-10-06 16:20:30 +00:00 · 2026-09-23 14:22:42 -07:00
187 changed files with 51567 additions and 52648 deletions
@@ -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
@@ -59,6 +59,7 @@ updates:
          - "drf-*"
          - "djangorestframework"
          - "whitenoise"
+          - "bleach"
          - "jinja2"
      # Async, Task Queuing & Caching
      async-tasks:
@@ -102,16 +102,17 @@ 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
-        uses: $/.github/actions/apt-install
-        with:
-          packages: unpaper tesseract-ocr imagemagick ghostscript poppler-utils
+        timeout-minutes: 10
+        run: |
+          sudo apt-get update -qq
+          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-6/policy.xml
@@ -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
@@ -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
@@ -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
@@ -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:
@@ -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
@@ -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/
@@ -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
-        uses: $/.github/actions/apt-install
-        with:
-          packages: libmagic1
+        run: |
+          apt-get update
+          apt-get install --yes --quiet --no-install-recommends libmagic1
      - name: Install backend dependencies
        env:
          PYTHON_VERSION: ${{ steps.setup-python.outputs.python-version }}
@@ -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
-        uses: $/.github/actions/apt-install
-        with:
-          packages: gettext liblept5
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -qq --no-install-recommends gettext liblept5
      # ---- Build Documentation ----
      - name: Build documentation
        env:
@@ -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
@@ -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
@@ -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 }}"
@@ -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 }}"
@@ -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
@@ -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
@@ -25,12 +25,11 @@ jobs:
        id: setup-python
        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
      - name: Install system dependencies
-        timeout-minutes: 12
-        uses: $/.github/actions/apt-install
-        with:
-          packages: gettext
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -qq --no-install-recommends 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
@@ -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
@@ -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/* \
-    && echo "Configuring interactive shells to source the s6 container environment" \
-      && echo '. /etc/profile.d/contenv.sh' >> /etc/bash.bashrc
+    && rm --recursive --force --verbose /var/lib/apt/lists/*

 WORKDIR /usr/src/paperless/src/

@@ -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:
@@ -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
@@ -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
-detail page. You can choose which type of suggestions are requested by default under Settings >
-Documents, either ML (classifier-based) suggestions, AI suggestions, or both. When both are requested
-the results are combined.
-
-Suggestions are requested 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 language can be steered with [`PAPERLESS_AI_LLM_OUTPUT_LANGUAGE`](configuration.md#PAPERLESS_AI_LLM_OUTPUT_LANGUAGE)
+storage path and dates by sending the document to the LLM. This is **opt-in per request**
+and surfaces through the "Suggest" control on the document detail page, alongside the
+classic classifier-based suggestions — it does not disable them. Suggestions are requested
+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
+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
@@ -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}
@@ -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
-list by **Duplicates** to find all of them (see
-[Duplicate documents](usage.md#duplicate-documents)). If you prefer the old
+**Duplicates** tab to review documents that share the same content. If you prefer the old
 behavior of rejecting duplicates during consumption, set
 [`PAPERLESS_CONSUMER_DELETE_DUPLICATES`](configuration.md#PAPERLESS_CONSUMER_DELETE_DUPLICATES)
 to `true`.
@@ -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
-still consumed and a warning is logged.
+contents exactly match an existing document (same checksum), the new copy is still
+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
-the other documents you can view that share the same content (including any in the trash).
-To find all documents with duplicates, choose **Duplicates** in the document list's text
-filter dropdown, or use `has_duplicates=true` in the REST API.
+To review duplicates, open a document and switch to the **Duplicates** tab on the
+document detail page. It lists other documents that share the same content, including any
+that are in the trash (shown with a badge), and links to each so you can decide which to
+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
@@ -1,6 +1,6 @@
 [project]
 name = "paperless-ngx"
-version = "3.3.0"
+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-guardian>=3.3.3,<3.6",
+  "django-filter~=25.1",
+  "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'",
@@ -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": [
@@ -1,6 +1,6 @@
 {
  "name": "paperless-ngx-ui",
-  "version": "3.3.0",
+  "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/common": "~22.2.0",
-    "@angular/compiler": "~22.2.0",
-    "@angular/core": "~22.2.0",
-    "@angular/forms": "~22.2.0",
-    "@angular/localize": "~22.2.0",
-    "@angular/platform-browser": "~22.2.0",
-    "@angular/router": "~22.2.0",
+    "@angular/cdk": "^22.1.6",
+    "@angular/common": "~22.1.6",
+    "@angular/compiler": "~22.1.6",
+    "@angular/core": "~22.1.6",
+    "@angular/forms": "~22.1.6",
+    "@angular/localize": "~22.1.6",
+    "@angular/platform-browser": "~22.1.6",
+    "@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/schematics": "^22.2.0",
+    "@angular-devkit/core": "^22.1.8",
+    "@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/cli": "22.2.0",
-    "@angular/compiler-cli": "~22.2.0",
+    "@angular/build": "22.1.8",
+    "@angular/cli": "22.1.8",
+    "@angular/compiler-cli": "~22.1.6",
    "@playwright/test": "^1.62.1",
    "@types/jest": "^30.0.0",
-    "@types/node": "^26.6.2",
-    "@typescript-eslint/eslint-plugin": "^8.70.1",
-    "@typescript-eslint/parser": "^8.70.1",
-    "@typescript-eslint/utils": "^8.70.1",
-    "eslint": "^10.11.0",
-    "jest": "30.5.2",
-    "jest-environment-jsdom": "^30.5.2",
+    "@types/node": "^26.5.0",
+    "@typescript-eslint/eslint-plugin": "^8.70.0",
+    "@typescript-eslint/parser": "^8.70.0",
+    "@typescript-eslint/utils": "^8.70.0",
+    "eslint": "^10.10.0",
+    "jest": "30.5.1",
+    "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"
@@ -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>
@@ -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,
    ])
@@ -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
@@ -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;
-}
@@ -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 {
-  LinkTarget,
-  PDFSinglePageViewer,
-  PDFViewer,
-} from 'pdfjs-dist/web/pdf_viewer.mjs'
+import { 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/'),
    })
  })

@@ -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({
-    eventBus: this.eventBus,
-    externalLinkTarget: LinkTarget.BLANK,
-    externalLinkRel: 'noopener noreferrer nofollow',
-  })
+  private readonly linkService = new PDFLinkService({ eventBus: this.eventBus })
  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 {
@@ -1,84 +1,58 @@
-<div class="d-flex align-items-center">
-  <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>
-      @if (loading()) {
-        <div class="spinner-border spinner-border-sm" role="status"></div>
-      } @else if (noSuggestions) {
-        <i-bs width="1.2em" height="1.2em" name="check-circle"></i-bs>
-      } @else {
-        <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 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>
+    @if (loading()) {
+      <div class="spinner-border spinner-border-sm" role="status"></div>
+    } @else if (noSuggestions) {
+      <i-bs width="1.2em" height="1.2em" name="check-circle"></i-bs>
+    } @else {
+      <i-bs width="1.2em" height="1.2em" name="stars"></i-bs>
    }
-  </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">
-      <button type="button" class="btn btn-sm btn-link position-relative" ngbDropdownToggle [disabled]="disabled() || loading()" i18n-title title="Suggestion options">
-        <i-bs name="three-dots"></i-bs>
-        @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>
-        }
+    <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 class="shadow p-3">
-        <div class="small text-muted mb-2" i18n>Suggest using:</div>
-        <div class="form-check small">
-          <input class="form-check-input" type="checkbox" id="suggestionSourceML" [checked]="useML" [disabled]="useML && !useAI" (change)="setSources($event.target.checked, useAI)">
-          <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>
-        <div class="form-check small">
-          <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>
+
+      <div ngbDropdownMenu aria-labelledby="suggestionsDropdown" class="shadow suggestions-dropdown">
+        <div class="list-group list-group-flush small pb-0">
+          @if (novelSuggestions === 0 && reusableSuggestions === 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 (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>
@@ -1,7 +1,3 @@
 .suggestions-dropdown {
  min-width: 250px;
 }
-
-.btn-link.dropdown-toggle::after {
-  display: none;
-}
@@ -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)
-  })
-
-  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)
+    expect(component.totalSuggestions).toBe(4)
  })

  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')
-  })
 })
@@ -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()
-
-  @Output()
-  sourceChange: EventEmitter<SuggestionSource> = new EventEmitter()
+  getSuggestions: EventEmitter<SuggestionsDropdownComponent> =
+    new EventEmitter()

  @Output()
  addTag: EventEmitter<string> = new EventEmitter()
@@ -62,42 +53,12 @@ export class SuggestionsDropdownComponent {
    }

    if (!this.suggestions()) {
-      this.getSuggestions.emit(this.source())
-    } else if (this.hasUnfetchedSources) {
-      // sources changed, fetch the rest and show what we have meanwhile
-      this.getSuggestions.emit(this.source())
-      this.dropdown?.open()
+      this.getSuggestions.emit(this)
    } 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
-  }
-
-  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
+    return this.novelSuggestions + this.reusableSuggestions
  }

  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 &&
@@ -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>
@@ -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()
-  })
-})
@@ -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)
-  }
-}
@@ -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"
-                [appliedCreated]="documentForm.value.created"
-                (getSuggestions)="getSuggestions($event)"
-                (sourceChange)="suggestionSourceOverride.set($event)"
+                (getSuggestions)="getSuggestions()"
                (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>
            }
@@ -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')
@@ -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 {
-  DocumentSuggestions,
-  mergeSuggestions,
-} from 'src/app/data/document-suggestions'
+import { DocumentSuggestions } 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) {
-    const sources = (
-      source === SuggestionSource.Both
-        ? [SuggestionSource.ML, SuggestionSource.AI]
-        : [source]
-    ).filter((s) => !this.fetchedSuggestionSources().includes(s))
-    if (!sources.length) return
-
+  getSuggestions() {
    this.suggestionsLoading.set(true)
-    merge(
-      ...sources.map((s) =>
-        (s === SuggestionSource.AI
-          ? this.documentsService.getAiSuggestions(this.documentId())
-          : 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)
-          })
-        )
-      )
-    )
+    const suggestionsObservable = this.aiEnabled
+      ? this.documentsService.getAiSuggestions(this.documentId())
+      : this.documentsService.getSuggestions(this.documentId())
+    suggestionsObservable
      .pipe(
+        first(),
        takeUntil(this.unsubscribeNotifier),
        takeUntil(this.docChangeNotifier),
        finalize(() => this.suggestionsLoading.set(false))
      )
-      .subscribe((response) => {
-        if (!response) return
-        this.fetchedSuggestionSources.update((f) => [...f, response.source])
-        this.suggestions.set(
-          mergeSuggestions(this.suggestions(), response.result)
-        )
+      .subscribe({
+        next: (result) => {
+          this.suggestions.set(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().suggested_document_types ?? []
-            ).filter((dt) => dt !== newName),
-          })
+          this.suggestions().suggested_document_types =
+            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().suggested_correspondents ?? []
-            ).filter((c) => c !== newName),
-          })
+          this.suggestions().suggested_correspondents =
+            this.suggestions().suggested_correspondents.filter(
+              (c) => c !== newName
+            )
        }
      })
  }
@@ -1,7 +0,0 @@
-export interface DocumentBarcode {
-  page: number
-
-  value: string
-
-  format: string
-}
@@ -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[]
 }
@@ -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),
-  }
-}
@@ -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
@@ -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',
@@ -8,7 +8,7 @@ export const environment = {
  apiVersion: '10', // match src/paperless/settings.py
  appTitle: DEFAULT_APP_TITLE,
  tag: 'prod',
-  version: '3.3.0',
+  version: '3.2.1',
  webSocketHost: window.location.host,
  webSocketProtocol: window.location.protocol == 'https:' ? 'wss:' : 'ws:',
  webSocketBaseUrl: base_url.pathname + 'ws/',
@@ -74,7 +74,6 @@ import {
  clipboardCheckFill,
  clipboardFill,
  clockHistory,
-  cpu,
  creditCard,
  dash,
  dashCircle,
@@ -119,7 +118,6 @@ import {
  infoCircle,
  journalBookmarkFill,
  journals,
-  lightbulb,
  link,
  list,
  listNested,
@@ -324,7 +322,6 @@ const icons = {
  clipboardCheckFill,
  clipboardFill,
  clockHistory,
-  cpu,
  cash,
  creditCard,
  dash,
@@ -370,7 +367,6 @@ const icons = {
  infoCircle,
  journalBookmarkFill,
  journals,
-  lightbulb,
  link,
  list,
  listNested,
@@ -292,7 +292,6 @@ a.btn-link:active,
 a.btn-link:focus-visible,
 .btn-link:hover,
 .btn-link:active,
-.btn-link.show,
 .btn-link:focus-visible {
  color: var(--pngx-primary-lighten-10) !important;
  .primary-light & {
@@ -25,20 +25,10 @@ export class PDFFindController {
  onIsPageVisible?: () => boolean
 }

-export const LinkTarget = {
-  NONE: 0,
-  SELF: 1,
-  BLANK: 2,
-  PARENT: 3,
-  TOP: 4,
-}
-
 export class PDFLinkService {
  private document?: unknown
  private viewer?: unknown

-  constructor(readonly options: Record<string, unknown> = {}) {}
-
  setDocument(document: unknown): void {
    this.document = document
  }
@@ -18,7 +18,6 @@ from documents.converters import convert_from_tiff_to_pdf
 from documents.data_models import ConsumableDocument
 from documents.data_models import DocumentMetadataOverrides
 from documents.data_models import DocumentSource
-from documents.data_models import StoredBarcode
 from documents.models import Document
 from documents.models import PaperlessTask
 from documents.models import Tag
@@ -48,7 +47,6 @@ class Barcode:
    page: int
    value: str
    settings: BarcodeConfig
-    format: str = ""

    @property
    def is_separator(self) -> bool:
@@ -80,12 +78,6 @@ class Barcode:
                return True
        return False

-    def stored(self) -> StoredBarcode:
-        """
-        The barcode as it is stored with a document, page 1-indexed
-        """
-        return {"page": self.page + 1, "value": self.value, "format": self.format}
-

 class BarcodePlugin(ConsumeTaskPlugin):
    NAME: str = "BarcodePlugin"
@@ -97,12 +89,16 @@ class BarcodePlugin(ConsumeTaskPlugin):
          - ASN from barcode detection is enabled or
          - Barcode support is enabled and the mime type is supported
        """
+        if self.settings.barcode_enable_tiff_support:
+            supported_mimes: set[str] = {"application/pdf", "image/tiff"}
+        else:
+            supported_mimes = {"application/pdf"}
+
        return (
            self.settings.barcode_enable_asn
            or self.settings.barcodes_enabled
            or self.settings.barcode_enable_tag
-            or self.settings.barcode_store_values
-        ) and self.input_doc.mime_type in scannable_mime_types(self.settings)
+        ) and self.input_doc.mime_type in supported_mimes

    def get_settings(self) -> BarcodeConfig:
        """
@@ -248,10 +244,6 @@ class BarcodePlugin(ConsumeTaskPlugin):
        if self.settings.barcode_enable_asn and (located_asn := self.asn) is not None:
            self._apply_detected_asn(located_asn)

-        # After splitting too, so each split document keeps its own barcodes
-        if self.settings.barcode_store_values:
-            self.metadata.barcodes = [x.stored() for x in self.barcodes] or None
-
    def cleanup(self) -> None:
        self.temp_dir.cleanup()

@@ -270,6 +262,22 @@ class BarcodePlugin(ConsumeTaskPlugin):
        )
        self._tiff_conversion_done = True

+    @staticmethod
+    def read_barcodes_zxing(image: Image.Image) -> list[str]:
+        barcodes = []
+
+        import zxingcpp
+
+        detected_barcodes = zxingcpp.read_barcodes(image)
+        for barcode in detected_barcodes:
+            if barcode.text:
+                barcodes.append(barcode.text)
+                logger.debug(
+                    f"Barcode of type {barcode.format} found: {barcode.text}",
+                )
+
+        return barcodes
+
    def detect(self) -> None:
        """
        Scan all pages of the PDF as images, updating barcodes and the pages
@@ -283,12 +291,60 @@ class BarcodePlugin(ConsumeTaskPlugin):
        self.convert_from_tiff_to_pdf()

        try:
-            self.barcodes = scan_pdf(
-                self.pdf_file,
-                self.settings,
-                Path(self.temp_dir.name),
+            # Read number of pages from pdf
+            with Pdf.open(self.pdf_file) as pdf:
+                num_of_pages = len(pdf.pages)
+            logger.debug(f"PDF has {num_of_pages} pages")
+
+            # Get limit from configuration
+            barcode_max_pages: int = (
+                num_of_pages
+                if self.settings.barcode_max_pages == 0
+                else self.settings.barcode_max_pages
            )

+            if barcode_max_pages < num_of_pages:  # pragma: no cover
+                logger.debug(
+                    f"Barcodes detection will be limited to the first {barcode_max_pages} pages",
+                )
+
+            # Loop al page
+            for current_page_number in range(min(num_of_pages, barcode_max_pages)):
+                logger.debug(f"Processing page {current_page_number}")
+
+                # Convert page to image
+                page = convert_from_path(
+                    self.pdf_file,
+                    dpi=self.settings.barcode_dpi,
+                    output_folder=self.temp_dir.name,
+                    first_page=current_page_number + 1,
+                    last_page=current_page_number + 1,
+                )[0]
+
+                # Remember filename, since it is lost by upscaling
+                page_filepath = Path(page.filename)
+                logger.debug(f"Image is at {page_filepath}")
+
+                # Upscale image if configured
+                factor = self.settings.barcode_upscale
+                if factor > 1.0:
+                    logger.debug(
+                        f"Upscaling image by {factor} for better barcode detection",
+                    )
+                    x, y = page.size
+                    page = page.resize(
+                        (round(x * factor), (round(y * factor))),
+                    )
+
+                # Detect barcodes
+                for barcode_value in self.read_barcodes_zxing(page):
+                    self.barcodes.append(
+                        Barcode(current_page_number, barcode_value, self.settings),
+                    )
+
+                # Delete temporary image file
+                page_filepath.unlink()
+
        # Password protected files can't be checked
        # This is the exception raised for those
        except PasswordError as e:
@@ -478,111 +534,3 @@ class BarcodePlugin(ConsumeTaskPlugin):
                document_paths.append(savepath)

            return document_paths
-
-
-def scannable_mime_types(settings: BarcodeConfig) -> set[str]:
-    """
-    The file types the barcode scan supports with the current settings
-    """
-    if settings.barcode_enable_tiff_support:
-        return {"application/pdf", "image/tiff"}
-    return {"application/pdf"}
-
-
-def read_barcodes_zxing(image: Image.Image) -> list[tuple[str, str]]:
-    """
-    Returns the text and format (zxing enum name) of each barcode found in
-    the image
-    """
-    barcodes = []
-
-    import zxingcpp
-
-    detected_barcodes = zxingcpp.read_barcodes(image)
-    for barcode in detected_barcodes:
-        if barcode.text:
-            barcodes.append((barcode.text, barcode.format.name))
-            logger.debug(
-                f"Barcode of type {barcode.format} found: {barcode.text}",
-            )
-
-    return barcodes
-
-
-def scan_pdf(pdf_path: Path, settings: BarcodeConfig, work_dir: Path) -> list[Barcode]:
-    """
-    Scans the pages of a PDF as images for barcodes. Errors are not caught,
-    so callers can tell a failed scan from one that found nothing.
-    """
-    barcodes: list[Barcode] = []
-
-    with Pdf.open(pdf_path) as pdf:
-        num_of_pages = len(pdf.pages)
-    logger.debug(f"PDF has {num_of_pages} pages")
-
-    # Get limit from configuration
-    barcode_max_pages: int = (
-        num_of_pages if settings.barcode_max_pages == 0 else settings.barcode_max_pages
-    )
-
-    if barcode_max_pages < num_of_pages:  # pragma: no cover
-        logger.debug(
-            f"Barcodes detection will be limited to the first {barcode_max_pages} pages",
-        )
-
-    for current_page_number in range(min(num_of_pages, barcode_max_pages)):
-        logger.debug(f"Processing page {current_page_number}")
-
-        # Convert page to image
-        page = convert_from_path(
-            pdf_path,
-            dpi=settings.barcode_dpi,
-            output_folder=work_dir,
-            first_page=current_page_number + 1,
-            last_page=current_page_number + 1,
-        )[0]
-
-        # Remember filename, since it is lost by upscaling
-        page_filepath = Path(page.filename)
-        logger.debug(f"Image is at {page_filepath}")
-
-        # Upscale image if configured
-        factor = settings.barcode_upscale
-        if factor > 1.0:
-            logger.debug(
-                f"Upscaling image by {factor} for better barcode detection",
-            )
-            x, y = page.size
-            page = page.resize(
-                (round(x * factor), (round(y * factor))),
-            )
-
-        for barcode_value, barcode_format in read_barcodes_zxing(page):
-            barcodes.append(
-                Barcode(current_page_number, barcode_value, settings, barcode_format),
-            )
-
-        # Delete temporary image file
-        page_filepath.unlink()
-
-    return barcodes
-
-
-def read_barcode_values(
-    path: Path,
-    mime_type: str,
-    settings: BarcodeConfig,
-    work_dir: Path,
-) -> list[StoredBarcode] | None:
-    """
-    Reads the barcodes of a file outside of the consumption plugins: for new
-    versions, which skip the barcode plugin, and when reprocessing.
-
-    Returns None if the file can't be scanned with the current settings.
-    Errors while scanning are raised.
-    """
-    if mime_type not in scannable_mime_types(settings):
-        return None
-    if mime_type == "image/tiff":
-        path = convert_from_tiff_to_pdf(path, work_dir)
-    return [x.stored() for x in scan_pdf(path, settings, work_dir)]
--- a/Show More
+++ b/Show More