Update advanced-search-query.ts

The inverse of the serializer, deliberately narrow: it reads the forms
the serializer writes and nothing else, so a query it cannot show stays
text instead of being converted into something subtly different.

The guarantee is enforced rather than argued: a tree is only returned
when writing it out again reproduces the query character for character.
That turns every near miss into a plain "can't show this one" - a
boost, an implicit AND, a field alias, or AND and OR mixed at one level.
Aliases are refused for the same reason, since reading type: would mean
rewriting the query as it was read.

Per-word field prefixes are put back together into the single condition
they came from, but only when adjacent and on the same field, so the
order of what the user typed is never rearranged.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

.dockerignore

@@ -15,8 +15,6 @@
 # Test related
 **/.pytest_cache
 **/tests
-src/paperless_testing
-src/conftest.py
 **/*.spec.ts
 **/htmlcov
 # Local folders

.github/dependabot.yml

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

.github/workflows/ci-backend.yml

@@ -102,7 +102,7 @@ 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
@@ -139,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
@@ -176,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

@@ -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:

.github/workflows/ci-docs.yml

@@ -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

.github/workflows/ci-frontend.yml

@@ -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

.github/workflows/ci-release.yml

@@ -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
@@ -212,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

@@ -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@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4.38.1
+        uses: github/codeql-action/upload-sarif@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0
         if: always()
         with:
           sarif_file: results.sarif

.github/workflows/cleanup-tags.yml

@@ -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 }}"

.github/workflows/codeql-analysis.yml

@@ -39,7 +39,7 @@ jobs:
           persist-credentials: false
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4.38.1
+        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@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4.38.1
+        uses: github/codeql-action/analyze@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0

.github/workflows/crowdin.yml

@@ -22,7 +22,7 @@ jobs:
           token: ${{ secrets.PNGX_BOT_PAT }}
           persist-credentials: false
       - name: crowdin action
-        uses: crowdin/github-action@df474cdfb9f41d6ae777118749477c2cdf7cacc8 # v3.2.0
+        uses: crowdin/github-action@0d5670f539973aea2f01abce61a8989934df0025 # v3.0.2
         with:
           upload_translations: false
           download_translations: true

.github/workflows/translate-strings.yml

@@ -29,7 +29,7 @@ jobs:
           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

.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.8'
+    rev: 'v3.9.6'
     hooks:
       - id: prettier
         types_or:
@@ -46,16 +46,16 @@ repos:
           - ts
           - markdown
         additional_dependencies:
-          - prettier@3.9.8
+          - 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.8
+    rev: v0.16.5
     hooks:
       - id: ruff-check
       - id: ruff-format
   - repo: https://github.com/tox-dev/pyproject-fmt
-    rev: "v2.29.4"
+    rev: "v2.28.1"
     hooks:
       - id: pyproject-fmt
         additional_dependencies: [tomli]

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.20-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/
 

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

@@ -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/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

docker/rootfs/etc/s6-overlay/s6-rc.d/svc-flower/run

@@ -2,7 +2,6 @@
 # shellcheck shell=bash
 
 declare -r log_prefix="[svc-flower]"
-declare -r flower_config="${PAPERLESS_SRC_DIR}/paperless/flowerconfig.py"
 
 echo "${log_prefix} Checking if we should start flower..."
 
@@ -10,20 +9,12 @@ if [[ -n "${PAPERLESS_ENABLE_FLOWER}" ]]; then
 	# Small delay to allow celery to be up first
 	echo "${log_prefix} Starting flower in 5s"
 	sleep 5
-	cd "${PAPERLESS_SRC_DIR}" || exit 1
+	cd ${PAPERLESS_SRC_DIR}
-
-	# Only pass --conf if the file is actually there. The image does not ship one, and
-	# flower >= 2.1.0 exits with FileNotFoundError when an explicitly given --conf path
-	# does not exist (mher/flower#1391). Earlier versions silently ignored it.
-	declare -a conf_args=()
-	if [[ -f "${flower_config}" ]]; then
-		conf_args=(--conf="${flower_config}")
-	fi
 
 	if [[ -n "${USER_IS_NON_ROOT}" ]]; then
-		exec /usr/local/bin/celery --app paperless flower "${conf_args[@]}"
+		exec /usr/local/bin/celery --app paperless flower --conf=${PAPERLESS_SRC_DIR}/paperless/flowerconfig.py
 	else
-		exec s6-setuidgid paperless /usr/local/bin/celery --app paperless flower "${conf_args[@]}"
+		exec s6-setuidgid paperless /usr/local/bin/celery --app paperless flower --conf=${PAPERLESS_SRC_DIR}/paperless/flowerconfig.py
 	fi
 
 else

docs/advanced_usage.md

@@ -153,11 +153,8 @@ in similar existing documents, and the document chat can retrieve relevant conte
 
 Enable it by setting
 [`PAPERLESS_AI_LLM_EMBEDDING_BACKEND`](configuration.md#PAPERLESS_AI_LLM_EMBEDDING_BACKEND)
-(`huggingface` for fully-local embeddings, or `ollama` / `openai-like`). By default, the main
+(`huggingface` for fully-local embeddings, or `ollama` / `openai-like`). The index is only
-LLM API key and endpoint are used, but an optional embedding-specific[API key](configuration.md#PAPERLESS_AI_LLM_EMBEDDING_API_KEY)
+built when AI is enabled **and** an embedding backend is set.
-and [endpoint](configuration.md#PAPERLESS_AI_LLM_EMBEDDING_ENDPOINT) can be configured.
-
-The index is only built when AI is enabled **and** an embedding backend is set.
 
 The index is updated automatically on a schedule controlled by
 [`PAPERLESS_LLM_INDEX_TASK_CRON`](configuration.md#PAPERLESS_LLM_INDEX_TASK_CRON) (daily by

docs/changelog.md

@@ -1,30 +1,5 @@
 # Changelog
 
-## paperless-ngx 3.2.1
-
-### Bug Fixes
-
-- Fix: only pass --conf to flower when flowerconfig.py exists [@bitfoo1](https://github.com/bitfoo1) ([#14182](https://github.com/paperless-ngx/paperless-ngx/pull/14182))
-- Fix: replace stale mail-fetch overlap check with a self-expiring lock [@stumpylog](https://github.com/stumpylog) ([#14189](https://github.com/paperless-ngx/paperless-ngx/pull/14189))
-- Fix: bump ocrmypdf to 17.12 to pick up the ligature text-layer fix [@stumpylog](https://github.com/stumpylog) ([#14190](https://github.com/paperless-ngx/paperless-ngx/pull/14190))
-- Fix: rebuild the search index automatically when it is missing Tantivy files [@stumpylog](https://github.com/stumpylog) ([#14180](https://github.com/paperless-ngx/paperless-ngx/pull/14180))
-
-### Dependencies
-
-- Chore(deps): Bump anyio from 4.12.1 to 4.14.2 in the uv group across 1 directory @[dependabot[bot]](https://github.com/apps/dependabot) ([#14175](https://github.com/paperless-ngx/paperless-ngx/pull/14175))
-
-### All App Changes
-
-<details>
-<summary>4 changes</summary>
-
-- Chore(deps): Bump anyio from 4.12.1 to 4.14.2 in the uv group across 1 directory @[dependabot[bot]](https://github.com/apps/dependabot) ([#14175](https://github.com/paperless-ngx/paperless-ngx/pull/14175))
-- Fix: replace stale mail-fetch overlap check with a self-expiring lock [@stumpylog](https://github.com/stumpylog) ([#14189](https://github.com/paperless-ngx/paperless-ngx/pull/14189))
-- Fix: bump ocrmypdf to 17.12 to pick up the ligature text-layer fix [@stumpylog](https://github.com/stumpylog) ([#14190](https://github.com/paperless-ngx/paperless-ngx/pull/14190))
-- Fix: rebuild the search index automatically when it is missing Tantivy files [@stumpylog](https://github.com/stumpylog) ([#14180](https://github.com/paperless-ngx/paperless-ngx/pull/14180))
-
-</details>
-
 ## paperless-ngx 3.2.0
 
 ### Features / Enhancements

docs/configuration.md

@@ -2133,13 +2133,6 @@ for language and resource considerations.
 
     Defaults to None.
 
-#### [`PAPERLESS_AI_LLM_EMBEDDING_API_KEY=<str>`](#PAPERLESS_AI_LLM_EMBEDDING_API_KEY) {#PAPERLESS_AI_LLM_EMBEDDING_API_KEY}
-
-: The API key to use for the embedding backend. If not supplied, embeddings use
-`PAPERLESS_AI_LLM_API_KEY`.
-
-    Defaults to None.
-
 #### [`PAPERLESS_AI_LLM_EMBEDDING_ENDPOINT=<str>`](#PAPERLESS_AI_LLM_EMBEDDING_ENDPOINT) {#PAPERLESS_AI_LLM_EMBEDDING_ENDPOINT}
 
 : The endpoint / url to use for the embedding backend. If not supplied, embeddings use
@@ -2224,19 +2217,6 @@ used with the OpenAI-compatible backend to target a custom provider or local gat
 
     Defaults to true, which allows internal endpoints.
 
-#### [`PAPERLESS_AI_LLM_EXTRA_PARAMS=<json>`](#PAPERLESS_AI_LLM_EXTRA_PARAMS) {#PAPERLESS_AI_LLM_EXTRA_PARAMS}
-
-: A JSON object of extra parameters sent with every LLM request, for providers that require a parameter Paperless does not
-set itself. Values here override Paperless' own, and no validation is performed. Whatever you put here is passed to the
-backend as-is, so an invalid parameter will simply be rejected by your provider. For example, current OpenAI reasoning
-models refuse tool calls on the chat completions API unless reasoning is off:
-
-    ```
-    PAPERLESS_AI_LLM_EXTRA_PARAMS={"reasoning_effort": "none"}
-    ```
-
-    Defaults to empty, which adds nothing to requests.
-
 #### [`PAPERLESS_LLM_INDEX_TASK_CRON=<cron expression>`](#PAPERLESS_LLM_INDEX_TASK_CRON) {#PAPERLESS_LLM_INDEX_TASK_CRON}
 
 : Configures the schedule to update the AI embeddings of text content and metadata for all documents. Only performed if

docs/development.md

@@ -150,7 +150,6 @@ pnpm ng build --configuration production
   is loaded as well. However, the tests rely on the default
   configuration. This is not ideal. But for now, make sure no settings
   except for DEBUG are overridden when testing.
-- Tests run in a random order each session, so that one test cannot quietly depend on another having run first. The seed is printed at the top of the run; pass `--randomly-seed=<seed>` to replay that exact order, or `--randomly-seed=last` to repeat the previous run.
 
 !!! note
 

pyproject.toml

@@ -1,9 +1,7 @@
 [project]
 name = "paperless-ngx"
-version = "3.2.1"
+version = "3.2.0"
-description = """\
+description = "A community-supported supercharged document management system: scan, index and archive all your physical documents"
-  A community-supported supercharged document management system: scan, index and archive all your physical documents\
-  """
 readme = "README.md"
 requires-python = ">=3.11"
 classifiers = [
@@ -12,13 +10,13 @@ classifiers = [
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
   "Programming Language :: Python :: 3.14",
-  "Programming Language :: Python :: 3.15",
 ]
 # TODO: Move certain things to groups and then utilize that further
 # This will allow testing to not install a webserver, mysql, etc
 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",
@@ -34,7 +32,7 @@ dependencies = [
   "django-cors-headers~=4.9.0",
   "django-extensions~=4.1",
   "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 +42,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 +74,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 +81,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.2",
+  "psycopg-pool==3.3.1",
 ]
 webserver = [
   "granian[uvloop]>=2.7,<2.9",
@@ -112,7 +109,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",
@@ -120,7 +117,7 @@ testing = [
   "pytest-env~=1.7.0",
   "pytest-httpx",
   "pytest-mock~=3.15.1",
-  "pytest-randomly~=5.0.0",
+  # "pytest-randomly~=4.0.1",
   "pytest-rerunfailures~=16.4",
   "pytest-sugar",
   "pytest-xdist~=3.8.0",
@@ -136,6 +133,7 @@ typing = [
   "mypy",
   "mypy-baseline",
   "pyrefly",
+  "types-bleach",
   "types-channels",
   "types-colorama",
   "types-dateparser",
@@ -150,7 +148,6 @@ typing = [
 
 [tool.uv]
 required-version = ">=0.9.0"
-prerelease = "disallow"
 environments = [
   "sys_platform == 'darwin'",
   "sys_platform == 'linux'",
@@ -247,10 +244,6 @@ per-file-ignores."docker/wait-for-redis.py" = [
 per-file-ignores."src/documents/models.py" = [
   "SIM115",
 ]
-per-file-ignores."src/documents/tests/*.py" = [
-  "TID251",
-]
-flake8-tidy-imports.banned-api."documents.tests".msg = "Shared test infrastructure lives in src/paperless_testing/."
 isort.force-single-line = true
 
 [tool.codespell]
@@ -278,9 +271,9 @@ plugins = [
 ]
 
 [tool.pyrefly]
+baseline = ".pyrefly-baseline.json"
 python-platform = "linux"
 search-path = [ "src" ]
-baseline = ".pyrefly-baseline.json"
 
 [tool.django-stubs]
 django_settings_module = "paperless.settings"
@@ -333,8 +326,6 @@ PAPERLESS_CACHE_BACKEND = "django.core.cache.backends.locmem.LocMemCache"
 PAPERLESS_CHANNELS_BACKEND = "channels.layers.InMemoryChannelLayer"
 # I don't think anything hits this, but just in case, basically infinite
 PAPERLESS_TOKEN_THROTTLE_RATE = "1000/min"
-# The 0.1s production default trips on a stalled CI runner, the date parsing tests then find no dates
-PAPERLESS_MATCH_REGEX_TIMEOUT_SECONDS = "5"
 
 [tool.coverage.run]
 source = [
@@ -343,15 +334,13 @@ source = [
 omit = [
   "*/tests/*",
   "manage.py",
-  "paperless/auth.py",
   "paperless/wsgi.py",
-  "src/conftest.py",
+  "paperless/auth.py",
-  "src/paperless_testing/*",
 ]
 [tool.coverage.report]
 exclude_also = [
-  "if AUDIT_LOG_ENABLED:",
   "if settings.AUDIT_LOG_ENABLED:",
+  "if AUDIT_LOG_ENABLED:",
   "if TYPE_CHECKING:",
 ]
 

src-ui/messages.xlf

@@ -5,14 +5,14 @@
       <trans-unit id="ngb.alert.close" datatype="html">
         <source>Close</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/alert/alert.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/alert/alert.ts</context>
           <context context-type="linenumber">39</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.carousel.slide-number" datatype="html">
         <source> Slide <x id="INTERPOLATION"/> of <x id="INTERPOLATION_1"/> </source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/carousel/carousel.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/carousel/carousel.ts</context>
           <context context-type="linenumber">129</context>
         </context-group>
         <note priority="1" from="description">Currently selected slide number read by screen reader</note>
@@ -20,219 +20,219 @@
       <trans-unit id="ngb.carousel.previous" datatype="html">
         <source>Previous</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/carousel/carousel.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/carousel/carousel.ts</context>
           <context context-type="linenumber">147,148</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.carousel.next" datatype="html">
         <source>Next</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/carousel/carousel.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/carousel/carousel.ts</context>
           <context context-type="linenumber">187</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.datepicker.select-month" datatype="html">
         <source>Select month</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/datepicker/datepicker-navigation-select.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/datepicker/datepicker-navigation-select.ts</context>
           <context context-type="linenumber">89</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/datepicker/datepicker-navigation-select.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/datepicker/datepicker-navigation-select.ts</context>
           <context context-type="linenumber">89</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.datepicker.select-year" datatype="html">
         <source>Select year</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/datepicker/datepicker-navigation-select.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/datepicker/datepicker-navigation-select.ts</context>
           <context context-type="linenumber">89</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/datepicker/datepicker-navigation-select.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/datepicker/datepicker-navigation-select.ts</context>
           <context context-type="linenumber">89</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.datepicker.previous-month" datatype="html">
         <source>Previous month</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/datepicker/datepicker-navigation.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/datepicker/datepicker-navigation.ts</context>
           <context context-type="linenumber">74,76</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/datepicker/datepicker-navigation.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/datepicker/datepicker-navigation.ts</context>
           <context context-type="linenumber">103</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.datepicker.next-month" datatype="html">
         <source>Next month</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/datepicker/datepicker-navigation.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/datepicker/datepicker-navigation.ts</context>
           <context context-type="linenumber">103</context>
         </context-group>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/datepicker/datepicker-navigation.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/datepicker/datepicker-navigation.ts</context>
           <context context-type="linenumber">103</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.pagination.first" datatype="html">
         <source>««</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/pagination/pagination.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/pagination/pagination.ts</context>
           <context context-type="linenumber">297</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.pagination.previous" datatype="html">
         <source>«</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/pagination/pagination.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/pagination/pagination.ts</context>
           <context context-type="linenumber">322</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.pagination.next" datatype="html">
         <source>»</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/pagination/pagination.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/pagination/pagination.ts</context>
           <context context-type="linenumber">358</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.pagination.last" datatype="html">
         <source>»»</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/pagination/pagination.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/pagination/pagination.ts</context>
           <context context-type="linenumber">396</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.pagination.first-aria" datatype="html">
         <source>First</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/pagination/pagination.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/pagination/pagination.ts</context>
           <context context-type="linenumber">414,415</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.pagination.previous-aria" datatype="html">
         <source>Previous</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/pagination/pagination.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/pagination/pagination.ts</context>
           <context context-type="linenumber">444,445</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.pagination.next-aria" datatype="html">
         <source>Next</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/pagination/pagination.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/pagination/pagination.ts</context>
           <context context-type="linenumber">479,480</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.pagination.last-aria" datatype="html">
         <source>Last</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/pagination/pagination.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/pagination/pagination.ts</context>
           <context context-type="linenumber">506</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.progressbar.value" datatype="html">
         <source><x id="INTERPOLATION"/></source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/progressbar/progressbar.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/progressbar/progressbar.ts</context>
           <context context-type="linenumber">40</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.timepicker.HH" datatype="html">
         <source>HH</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/timepicker/timepicker.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts</context>
           <context context-type="linenumber">256,259</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.timepicker.hours" datatype="html">
         <source>Hours</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/timepicker/timepicker.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts</context>
           <context context-type="linenumber">293,295</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.timepicker.MM" datatype="html">
         <source>MM</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/timepicker/timepicker.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts</context>
           <context context-type="linenumber">322</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.timepicker.minutes" datatype="html">
         <source>Minutes</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/timepicker/timepicker.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts</context>
           <context context-type="linenumber">360</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.timepicker.increment-hours" datatype="html">
         <source>Increment hours</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/timepicker/timepicker.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts</context>
           <context context-type="linenumber">397,399</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.timepicker.decrement-hours" datatype="html">
         <source>Decrement hours</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/timepicker/timepicker.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts</context>
           <context context-type="linenumber">435,438</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.timepicker.increment-minutes" datatype="html">
         <source>Increment minutes</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/timepicker/timepicker.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts</context>
           <context context-type="linenumber">442</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.timepicker.decrement-minutes" datatype="html">
         <source>Decrement minutes</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/timepicker/timepicker.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts</context>
           <context context-type="linenumber">442</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.timepicker.SS" datatype="html">
         <source>SS</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/timepicker/timepicker.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts</context>
           <context context-type="linenumber">442</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.timepicker.seconds" datatype="html">
         <source>Seconds</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/timepicker/timepicker.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts</context>
           <context context-type="linenumber">442</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.timepicker.increment-seconds" datatype="html">
         <source>Increment seconds</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/timepicker/timepicker.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts</context>
           <context context-type="linenumber">442</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.timepicker.decrement-seconds" datatype="html">
         <source>Decrement seconds</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/timepicker/timepicker.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts</context>
           <context context-type="linenumber">442</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.timepicker.PM" datatype="html">
         <source><x id="INTERPOLATION"/></source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/timepicker/timepicker.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/timepicker/timepicker.ts</context>
           <context context-type="linenumber">442</context>
         </context-group>
       </trans-unit>
       <trans-unit id="ngb.toast.close-aria" datatype="html">
         <source>Close</source>
         <context-group purpose="location">
-          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.7_@angular+core@22.1.7_@angular+_bdd9adf606c7b6a0170d9f35c5973e0f/node_modules/src/toast/toast.ts</context>
+          <context context-type="sourcefile">node_modules/.pnpm/@ng-bootstrap+ng-bootstrap@21.0.0_@angular+common@22.1.6_@angular+core@22.1.6_@angular+_0f0da7e9cfc35b268da39b83c54e3258/node_modules/src/toast/toast.ts</context>
           <context context-type="linenumber">110,112</context>
         </context-group>
       </trans-unit>
@@ -9745,7 +9745,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">351</context>
+          <context context-type="linenumber">348</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/document-attributes/document-attributes.component.html</context>
@@ -9760,7 +9760,7 @@
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">344</context>
+          <context context-type="linenumber">341</context>
         </context-group>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/manage/document-attributes/document-attributes.component.html</context>
@@ -10016,56 +10016,56 @@
         <source>Reset filters / selection</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">332</context>
+          <context context-type="linenumber">329</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4135055128446167640" datatype="html">
         <source>Open first [selected] document</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">360</context>
+          <context context-type="linenumber">357</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3629960544875360046" datatype="html">
         <source>Previous page</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">376</context>
+          <context context-type="linenumber">373</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3337301694210287595" datatype="html">
         <source>Next page</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">388</context>
+          <context context-type="linenumber">385</context>
         </context-group>
       </trans-unit>
       <trans-unit id="2155249406916744630" datatype="html">
         <source>View &quot;<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>&quot; saved successfully.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">422</context>
+          <context context-type="linenumber">419</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4646273665293421938" datatype="html">
         <source>Failed to save view &quot;<x id="PH" equiv-text="this.list.activeSavedViewTitle"/>&quot;.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">428</context>
+          <context context-type="linenumber">425</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6837554170707123455" datatype="html">
         <source>View &quot;<x id="PH" equiv-text="savedView.name"/>&quot; created successfully.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">497</context>
+          <context context-type="linenumber">494</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6028096992841030074" datatype="html">
         <source>View &quot;<x id="PH" equiv-text="savedView.name"/>&quot; created successfully, but could not update visibility settings.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/components/document-list/document-list.component.ts</context>
-          <context context-type="linenumber">503</context>
+          <context context-type="linenumber">500</context>
         </context-group>
       </trans-unit>
       <trans-unit id="739880801667335279" datatype="html">
@@ -12018,95 +12018,81 @@
           <context context-type="linenumber">351</context>
         </context-group>
       </trans-unit>
-      <trans-unit id="861068592166833023" datatype="html">
-        <source>LLM Embedding API Key</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/paperless-config.ts</context>
-          <context context-type="linenumber">358</context>
-        </context-group>
-      </trans-unit>
-      <trans-unit id="2929108042259892948" datatype="html">
-        <source>Used for embeddings when set, otherwise LLM API key is used.</source>
-        <context-group purpose="location">
-          <context context-type="sourcefile">src/app/data/paperless-config.ts</context>
-          <context context-type="linenumber">360</context>
-        </context-group>
-      </trans-unit>
       <trans-unit id="3554114880473286122" datatype="html">
         <source>LLM Embedding Endpoint</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/paperless-config.ts</context>
-          <context context-type="linenumber">366</context>
+          <context context-type="linenumber">358</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1044242175651289991" datatype="html">
         <source>LLM Embedding Chunk Size</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/paperless-config.ts</context>
-          <context context-type="linenumber">373</context>
+          <context context-type="linenumber">365</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7218245223139363113" datatype="html">
         <source>LLM Context Size</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/paperless-config.ts</context>
-          <context context-type="linenumber">380</context>
+          <context context-type="linenumber">372</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4234495692726214397" datatype="html">
         <source>LLM Backend</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/paperless-config.ts</context>
-          <context context-type="linenumber">387</context>
+          <context context-type="linenumber">379</context>
         </context-group>
       </trans-unit>
       <trans-unit id="7935234833834000002" datatype="html">
         <source>LLM Model</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/paperless-config.ts</context>
-          <context context-type="linenumber">395</context>
+          <context context-type="linenumber">387</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1980550530387803165" datatype="html">
         <source>LLM API Key</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/paperless-config.ts</context>
-          <context context-type="linenumber">402</context>
+          <context context-type="linenumber">394</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6126617860376156501" datatype="html">
         <source>LLM Endpoint</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/paperless-config.ts</context>
-          <context context-type="linenumber">409</context>
+          <context context-type="linenumber">401</context>
         </context-group>
       </trans-unit>
       <trans-unit id="6572826277249350975" datatype="html">
         <source>LLM Output Language</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/paperless-config.ts</context>
-          <context context-type="linenumber">416</context>
+          <context context-type="linenumber">408</context>
         </context-group>
       </trans-unit>
       <trans-unit id="3284403507172415792" datatype="html">
         <source>Language to use for generated AI suggestions. When unset, AI suggestions use the user&apos;s display language if explicitly set.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/paperless-config.ts</context>
-          <context context-type="linenumber">420</context>
+          <context context-type="linenumber">412</context>
         </context-group>
       </trans-unit>
       <trans-unit id="4493921125434706859" datatype="html">
         <source>LLM Request Timeout</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/paperless-config.ts</context>
-          <context context-type="linenumber">424</context>
+          <context context-type="linenumber">416</context>
         </context-group>
       </trans-unit>
       <trans-unit id="483994032066441287" datatype="html">
         <source>Timeout in seconds for LLM requests.</source>
         <context-group purpose="location">
           <context context-type="sourcefile">src/app/data/paperless-config.ts</context>
-          <context context-type="linenumber">428</context>
+          <context context-type="linenumber">420</context>
         </context-group>
       </trans-unit>
       <trans-unit id="1055686627716339120" datatype="html">

src-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paperless-ngx-ui",
-  "version": "3.2.1",
+  "version": "3.2.0",
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "ng": "ng",
@@ -15,16 +15,16 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/cdk": "^22.1.7",
+    "@angular/cdk": "^22.1.6",
-    "@angular/common": "~22.1.7",
+    "@angular/common": "~22.1.6",
-    "@angular/compiler": "~22.1.7",
+    "@angular/compiler": "~22.1.6",
-    "@angular/core": "~22.1.7",
+    "@angular/core": "~22.1.6",
-    "@angular/forms": "~22.1.7",
+    "@angular/forms": "~22.1.6",
-    "@angular/localize": "~22.1.7",
+    "@angular/localize": "~22.1.6",
-    "@angular/platform-browser": "~22.1.7",
+    "@angular/platform-browser": "~22.1.6",
-    "@angular/router": "~22.1.7",
+    "@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",
@@ -54,20 +54,20 @@
     "@angular-eslint/template-parser": "22.5.0",
     "@angular/build": "22.1.8",
     "@angular/cli": "22.1.8",
-    "@angular/compiler-cli": "~22.1.7",
+    "@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.0",
     "@typescript-eslint/parser": "^8.70.0",
     "@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.8",
+    "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/common/advanced-search-dialog/advanced-search-dialog.component.html

@@ -0,0 +1,347 @@
+<div class="modal-header">
+  <h4 class="modal-title" id="advanced-search-dialog-title" i18n>
+    Advanced search
+  </h4>
+  <button
+    type="button"
+    class="btn-close"
+    aria-label="Close"
+    i18n-aria-label
+    (click)="cancel()"
+  ></button>
+</div>
+<div class="modal-body">
+  @if (unreadable) {
+    <div class="alert alert-warning d-flex flex-wrap gap-2 align-items-center">
+      <div class="flex-grow-1">
+        <span i18n
+          >The current query uses syntax this editor can't show. It still works
+          as typed.</span
+        >
+      </div>
+      <button
+        type="button"
+        class="btn btn-sm btn-outline-secondary"
+        (click)="startOver()"
+        i18n
+      >
+        Start a new query
+      </button>
+    </div>
+  }
+
+  <ng-container
+    *ngTemplateOutlet="
+      groupTemplate;
+      context: { group: root, parent: null, depth: 0 }
+    "
+  ></ng-container>
+
+  <div class="mt-4">
+    <label
+      class="form-label small text-muted"
+      for="advanced-search-preview"
+      i18n
+      >Query</label
+    >
+    <pre
+      id="advanced-search-preview"
+      class="query-preview mb-0 p-2 rounded border"
+    >@if (generatedQuery) {{{ generatedQuery }}} @else {<span class="text-muted fst-italic" i18n>Nothing to search for yet</span>}</pre>
+  </div>
+</div>
+<div class="modal-footer">
+  <button
+    type="button"
+    class="btn btn-outline-secondary"
+    (click)="cancel()"
+    i18n
+  >
+    Cancel
+  </button>
+  <button
+    type="button"
+    class="btn btn-primary"
+    (click)="apply()"
+    [disabled]="!generatedQuery"
+    i18n
+  >
+    Apply
+  </button>
+</div>
+
+<ng-template
+  #groupTemplate
+  let-group="group"
+  let-parent="parent"
+  let-depth="depth"
+>
+  <div class="d-flex w-100 gap-2">
+    <div class="d-flex flex-grow-1 flex-column">
+      <div class="d-flex align-items-center flex-wrap">
+        <div
+          class="btn-group btn-group-xs"
+          role="group"
+          aria-label="Match"
+          i18n-aria-label
+        >
+          <input
+            type="radio"
+            class="btn-check"
+            [(ngModel)]="group.operator"
+            [ngModelOptions]="{ standalone: true }"
+            [value]="LogicalOperator.Or"
+            id="advancedSearchAny_{{ idFor(group) }}"
+            name="advancedSearchAny_{{ idFor(group) }}"
+          />
+          <label
+            class="btn btn-outline-primary"
+            for="advancedSearchAny_{{ idFor(group) }}"
+            i18n
+            >Any</label
+          >
+          <input
+            type="radio"
+            class="btn-check"
+            [(ngModel)]="group.operator"
+            [ngModelOptions]="{ standalone: true }"
+            [value]="LogicalOperator.And"
+            id="advancedSearchAll_{{ idFor(group) }}"
+            name="advancedSearchAll_{{ idFor(group) }}"
+          />
+          <label
+            class="btn btn-outline-primary"
+            for="advancedSearchAll_{{ idFor(group) }}"
+            i18n
+            >All</label
+          >
+          <input
+            type="radio"
+            class="btn-check"
+            [(ngModel)]="group.operator"
+            [ngModelOptions]="{ standalone: true }"
+            [value]="LogicalOperator.Not"
+            id="advancedSearchNot_{{ idFor(group) }}"
+            name="advancedSearchNot_{{ idFor(group) }}"
+          />
+          <label
+            class="btn btn-outline-secondary"
+            for="advancedSearchNot_{{ idFor(group) }}"
+            i18n
+            >Not</label
+          >
+        </div>
+        <span class="small text-muted ms-2">
+          @switch (group.operator) {
+            @case (LogicalOperator.And) {
+              <ng-container i18n>match all of these</ng-container>
+            }
+            @case (LogicalOperator.Or) {
+              <ng-container i18n>match any of these</ng-container>
+            }
+            @case (LogicalOperator.Not) {
+              <ng-container i18n>match none of these</ng-container>
+            }
+          }
+        </span>
+      </div>
+      <div class="list-group list-group-flush">
+        @for (element of group.children; track element) {
+          <div class="list-group-item px-0 d-flex flex-nowrap">
+            @if (element.type === ElementType.Group) {
+              <ng-container
+                *ngTemplateOutlet="
+                  groupTemplate;
+                  context: { group: element, parent: group, depth: depth + 1 }
+                "
+              ></ng-container>
+            } @else {
+              <ng-container
+                *ngTemplateOutlet="
+                  atomTemplate;
+                  context: { atom: element, parent: group }
+                "
+              ></ng-container>
+            }
+          </div>
+        }
+      </div>
+    </div>
+    <div
+      class="btn-group-vertical align-self-start ms-2 ps-2 border-start"
+      role="group"
+      aria-label="Group actions"
+      i18n-aria-label
+    >
+      <button
+        type="button"
+        class="btn btn-sm btn-outline-secondary text-primary"
+        title="Add condition"
+        i18n-title
+        (click)="addAtom(group)"
+        [disabled]="group.children.length >= maxAtoms"
+      >
+        <i-bs name="node-plus"></i-bs>
+      </button>
+      <button
+        type="button"
+        class="btn btn-sm btn-outline-secondary text-primary"
+        title="Add group"
+        i18n-title
+        (click)="addGroup(group)"
+        [disabled]="depth >= maxDepth"
+      >
+        <i-bs name="braces"></i-bs>
+      </button>
+      @if (parent) {
+        <button
+          type="button"
+          class="btn btn-sm btn-outline-secondary text-danger"
+          aria-label="Remove group"
+          i18n-aria-label
+          (click)="remove(parent, group)"
+        >
+          <i-bs name="x-circle"></i-bs>
+        </button>
+      }
+    </div>
+  </div>
+</ng-template>
+
+<ng-template #atomTemplate let-atom="atom" let-parent="parent">
+  <div class="d-flex align-items-center gap-1 w-100">
+    <div class="input-group input-group-sm flex-wrap">
+      <select
+        class="form-select flex-grow-0 w-auto"
+        [(ngModel)]="atom.field"
+        [ngModelOptions]="{ standalone: true }"
+        (ngModelChange)="onFieldChange(atom)"
+        aria-label="Field"
+        i18n-aria-label
+      >
+        @for (fieldGroup of fieldGroups; track fieldGroup.label) {
+          <optgroup [label]="fieldGroup.label">
+            @for (field of fieldGroup.fields; track field) {
+              <option [ngValue]="field">{{ fieldLabels[field] }}</option>
+            }
+          </optgroup>
+        }
+      </select>
+      <select
+        class="form-select flex-grow-0 w-auto"
+        [(ngModel)]="atom.operator"
+        [ngModelOptions]="{ standalone: true }"
+        (ngModelChange)="onOperatorChange(atom)"
+        aria-label="Condition"
+        i18n-aria-label
+      >
+        @for (operator of operatorsFor(atom); track operator) {
+          <option [ngValue]="operator">
+            {{ operatorLabel(atom, operator) }}
+          </option>
+        }
+      </select>
+
+      @switch (atom.operator) {
+        @case (Operator.DateKeyword) {
+          <select
+            class="form-select"
+            [(ngModel)]="atom.value"
+            [ngModelOptions]="{ standalone: true }"
+            aria-label="Period"
+            i18n-aria-label
+          >
+            <option [ngValue]="''" disabled i18n>Choose a period</option>
+            @for (keyword of dateKeywords; track keyword) {
+              <option [ngValue]="keyword">
+                {{ dateKeywordLabels[keyword] }}
+              </option>
+            }
+          </select>
+        }
+        @case (Operator.WithinLast) {
+          <input
+            class="form-control amount"
+            type="number"
+            min="1"
+            [(ngModel)]="atom.value"
+            [ngModelOptions]="{ standalone: true }"
+            aria-label="Amount"
+            i18n-aria-label
+          />
+          <select
+            class="form-select"
+            [(ngModel)]="atom.unit"
+            [ngModelOptions]="{ standalone: true }"
+            aria-label="Unit"
+            i18n-aria-label
+          >
+            @for (unit of dateUnits; track unit) {
+              <option [ngValue]="unit">{{ dateUnitLabels[unit] }}</option>
+            }
+          </select>
+        }
+        @case (Operator.Between) {
+          <input
+            class="form-control"
+            [type]="kindOf(atom) === FieldKind.Date ? 'date' : 'number'"
+            [(ngModel)]="atom.value"
+            [ngModelOptions]="{ standalone: true }"
+            aria-label="From"
+            i18n-aria-label
+          />
+          <span class="input-group-text" i18n>and</span>
+          <input
+            class="form-control"
+            [type]="kindOf(atom) === FieldKind.Date ? 'date' : 'number'"
+            [(ngModel)]="atom.valueTo"
+            [ngModelOptions]="{ standalone: true }"
+            aria-label="To"
+            i18n-aria-label
+          />
+        }
+        @default {
+          @if (kindOf(atom) === FieldKind.Date) {
+            <input
+              class="form-control"
+              type="date"
+              [(ngModel)]="atom.value"
+              [ngModelOptions]="{ standalone: true }"
+              aria-label="Date"
+              i18n-aria-label
+            />
+          } @else if (kindOf(atom) === FieldKind.Number) {
+            <input
+              class="form-control"
+              type="number"
+              min="0"
+              [(ngModel)]="atom.value"
+              [ngModelOptions]="{ standalone: true }"
+              aria-label="Number"
+              i18n-aria-label
+            />
+          } @else {
+            <input
+              class="form-control"
+              type="text"
+              [(ngModel)]="atom.value"
+              [ngModelOptions]="{ standalone: true }"
+              [placeholder]="placeholderFor(atom)"
+              aria-label="Value"
+              i18n-aria-label
+            />
+          }
+        }
+      }
+    </div>
+    <button
+      class="btn btn-link btn-sm text-danger px-1"
+      type="button"
+      (click)="remove(parent, atom)"
+      aria-label="Remove condition"
+      i18n-aria-label
+    >
+      <i-bs name="x-circle"></i-bs>
+    </button>
+  </div>
+</ng-template>

src-ui/src/app/components/common/advanced-search-dialog/advanced-search-dialog.component.scss

@@ -0,0 +1,11 @@
+.query-preview {
+  font-size: 0.8125rem;
+  white-space: pre-wrap;
+  word-break: break-word;
+  background-color: var(--pngx-bg-darker);
+  border-color: var(--bs-border-color) !important;
+}
+
+.input-group .amount {
+  flex: 0 1 5rem;
+}

src-ui/src/app/components/common/advanced-search-dialog/advanced-search-dialog.component.spec.ts

@@ -0,0 +1,186 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing'
+
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
+import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import {
+  AdvancedSearchDateUnit,
+  AdvancedSearchField,
+  AdvancedSearchLogicalOperator,
+  AdvancedSearchOperator,
+  AdvancedSearchQueryAtom,
+  AdvancedSearchQueryElementType,
+  AdvancedSearchQueryGroup,
+} from 'src/app/data/advanced-search-query'
+import { AdvancedSearchDialogComponent } from './advanced-search-dialog.component'
+
+describe('AdvancedSearchDialogComponent', () => {
+  let component: AdvancedSearchDialogComponent
+  let fixture: ComponentFixture<AdvancedSearchDialogComponent>
+  let activeModal: NgbActiveModal
+
+  const firstAtom = (): AdvancedSearchQueryAtom =>
+    component.root.children[0] as AdvancedSearchQueryAtom
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [
+        AdvancedSearchDialogComponent,
+        NgxBootstrapIconsModule.pick(allIcons),
+      ],
+      providers: [NgbActiveModal],
+    }).compileComponents()
+
+    fixture = TestBed.createComponent(AdvancedSearchDialogComponent)
+    activeModal = TestBed.inject(NgbActiveModal)
+    component = fixture.componentInstance
+    fixture.detectChanges()
+  })
+
+  it('should start with one empty condition and nothing to search for', () => {
+    expect(component.root.children).toHaveLength(1)
+    expect(component.generatedQuery).toBe('')
+    expect(component.unreadable).toBeFalsy()
+  })
+
+  it('should show an existing query as conditions', () => {
+    component.query = 'title:invoice AND NOT tag:paid'
+    expect(component.unreadable).toBeFalsy()
+    expect(component.root.children).toHaveLength(2)
+    expect(component.generatedQuery).toBe('title:invoice AND NOT tag:paid')
+  })
+
+  it('should flag a query it cannot show and start empty', () => {
+    component.query = 'title:invoice^2'
+    expect(component.unreadable).toBeTruthy()
+    expect(component.generatedQuery).toBe('')
+  })
+
+  it('should clear the warning when starting a new query', () => {
+    component.query = 'title:invoice^2'
+    component.startOver()
+    expect(component.unreadable).toBeFalsy()
+    expect(component.root.children).toHaveLength(1)
+  })
+
+  it('should treat an empty query as a fresh start', () => {
+    component.query = '   '
+    expect(component.unreadable).toBeFalsy()
+    expect(component.root.children).toHaveLength(1)
+  })
+
+  it('should write the query as conditions are filled in', () => {
+    const atom = firstAtom()
+    atom.field = AdvancedSearchField.Title
+    atom.value = 'unpaid invoice'
+    expect(component.generatedQuery).toBe('title:unpaid AND title:invoice')
+  })
+
+  it('should offer the conditions of the chosen field', () => {
+    const atom = firstAtom()
+    atom.field = AdvancedSearchField.Added
+    component.onFieldChange(atom)
+    expect(component.operatorsFor(atom)).toContain(
+      AdvancedSearchOperator.WithinLast
+    )
+    expect(component.operatorsFor(atom)).not.toContain(
+      AdvancedSearchOperator.Phrase
+    )
+  })
+
+  it('should keep a condition the new field still offers', () => {
+    const atom = firstAtom()
+    atom.operator = AdvancedSearchOperator.Phrase
+    atom.field = AdvancedSearchField.Correspondent
+    component.onFieldChange(atom)
+    expect(atom.operator).toBe(AdvancedSearchOperator.Phrase)
+  })
+
+  it('should replace a condition the new field does not offer, and clear the value', () => {
+    const atom = firstAtom()
+    atom.operator = AdvancedSearchOperator.Phrase
+    atom.value = 'invoice'
+    atom.field = AdvancedSearchField.ASN
+    component.onFieldChange(atom)
+    expect(atom.operator).toBe(AdvancedSearchOperator.Equals)
+    expect(atom.value).toBe('')
+  })
+
+  it('should give a within-the-last condition a unit to start from', () => {
+    const atom = firstAtom()
+    atom.field = AdvancedSearchField.Added
+    atom.operator = AdvancedSearchOperator.WithinLast
+    component.onOperatorChange(atom)
+    expect(atom.unit).toBe(AdvancedSearchDateUnit.Day)
+    atom.value = '3'
+    expect(component.generatedQuery).toBe('added:[-3 days to now]')
+  })
+
+  it('should label date comparisons as dates', () => {
+    const atom = firstAtom()
+    atom.field = AdvancedSearchField.Created
+    expect(
+      component.operatorLabel(atom, AdvancedSearchOperator.AtLeast)
+    ).toEqual('is on or after')
+    atom.field = AdvancedSearchField.ASN
+    expect(
+      component.operatorLabel(atom, AdvancedSearchOperator.AtLeast)
+    ).toEqual('is at least')
+  })
+
+  it('should add and remove conditions', () => {
+    component.addAtom(component.root)
+    expect(component.root.children).toHaveLength(2)
+    component.remove(component.root, component.root.children[1])
+    expect(component.root.children).toHaveLength(1)
+  })
+
+  it('should add a group, which starts as Any', () => {
+    component.addGroup(component.root)
+    const group = component.root.children[1] as AdvancedSearchQueryGroup
+    expect(group.type).toBe(AdvancedSearchQueryElementType.Group)
+    expect(group.operator).toBe(AdvancedSearchLogicalOperator.Or)
+    expect(group.children).toHaveLength(1)
+  })
+
+  it('should give every group its own id, once', () => {
+    component.addGroup(component.root)
+    const group = component.root.children[1] as AdvancedSearchQueryGroup
+    expect(component.idFor(component.root)).not.toEqual(component.idFor(group))
+    expect(component.idFor(group)).toEqual(component.idFor(group))
+  })
+
+  it('should apply the query and close', () => {
+    const emitSpy = jest.spyOn(component.queryApplied, 'emit')
+    const closeSpy = jest.spyOn(activeModal, 'close')
+    const atom = firstAtom()
+    atom.value = 'invoice'
+    component.apply()
+    expect(emitSpy).toHaveBeenCalledWith('content:invoice')
+    expect(closeSpy).toHaveBeenCalled()
+  })
+
+  it('should close without applying on cancel', () => {
+    const emitSpy = jest.spyOn(component.queryApplied, 'emit')
+    const closeSpy = jest.spyOn(activeModal, 'close')
+    component.cancel()
+    expect(emitSpy).not.toHaveBeenCalled()
+    expect(closeSpy).toHaveBeenCalled()
+  })
+
+  it('should show the query it will apply', () => {
+    component.query = 'content:invoice OR content:receipt'
+    fixture.detectChanges()
+    const preview = fixture.nativeElement.querySelector(
+      '#advanced-search-preview'
+    )
+    expect(preview.textContent).toContain('content:invoice OR content:receipt')
+  })
+
+  it('should not offer to apply an empty query', () => {
+    fixture.detectChanges()
+    const apply = Array.from(
+      fixture.nativeElement.querySelectorAll('.modal-footer button')
+    ).pop() as HTMLButtonElement
+    expect(apply.disabled).toBeTruthy()
+  })
+})

src-ui/src/app/components/common/advanced-search-dialog/advanced-search-dialog.component.ts

@@ -0,0 +1,197 @@
+import { NgTemplateOutlet } from '@angular/common'
+import { Component, EventEmitter, inject, Input, Output } from '@angular/core'
+import { FormsModule } from '@angular/forms'
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
+import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
+import {
+  ADVANCED_SEARCH_DATE_KEYWORD_LABELS,
+  ADVANCED_SEARCH_DATE_KEYWORDS,
+  ADVANCED_SEARCH_DATE_OPERATOR_LABELS,
+  ADVANCED_SEARCH_DATE_UNIT_LABELS,
+  ADVANCED_SEARCH_FIELD_GROUPS,
+  ADVANCED_SEARCH_FIELD_KINDS,
+  ADVANCED_SEARCH_FIELD_LABELS,
+  ADVANCED_SEARCH_MAX_ATOMS,
+  ADVANCED_SEARCH_MAX_DEPTH,
+  ADVANCED_SEARCH_OPERATOR_LABELS,
+  ADVANCED_SEARCH_OPERATORS_BY_KIND,
+  AdvancedSearchDateUnit,
+  AdvancedSearchField,
+  AdvancedSearchFieldKind,
+  AdvancedSearchLogicalOperator,
+  AdvancedSearchOperator,
+  AdvancedSearchQueryAtom,
+  AdvancedSearchQueryElement,
+  AdvancedSearchQueryElementType,
+  AdvancedSearchQueryGroup,
+} from 'src/app/data/advanced-search-query'
+import {
+  parseAdvancedSearchQuery,
+  serializeAdvancedSearchQuery,
+} from 'src/app/utils/advanced-search-query'
+import { LoadingComponentWithPermissions } from '../../loading-component/loading.component'
+
+@Component({
+  selector: 'pngx-advanced-search-dialog',
+  templateUrl: './advanced-search-dialog.component.html',
+  styleUrl: './advanced-search-dialog.component.scss',
+  imports: [FormsModule, NgTemplateOutlet, NgxBootstrapIconsModule],
+})
+export class AdvancedSearchDialogComponent extends LoadingComponentWithPermissions {
+  private activeModal = inject(NgbActiveModal)
+
+  public readonly ElementType = AdvancedSearchQueryElementType
+  public readonly LogicalOperator = AdvancedSearchLogicalOperator
+  public readonly Operator = AdvancedSearchOperator
+  public readonly FieldKind = AdvancedSearchFieldKind
+  public readonly fieldGroups = ADVANCED_SEARCH_FIELD_GROUPS
+  public readonly fieldLabels = ADVANCED_SEARCH_FIELD_LABELS
+  public readonly dateKeywords = ADVANCED_SEARCH_DATE_KEYWORDS
+  public readonly dateKeywordLabels = ADVANCED_SEARCH_DATE_KEYWORD_LABELS
+  public readonly dateUnits = Object.values(AdvancedSearchDateUnit)
+  public readonly dateUnitLabels = ADVANCED_SEARCH_DATE_UNIT_LABELS
+  public readonly maxDepth = ADVANCED_SEARCH_MAX_DEPTH
+  public readonly maxAtoms = ADVANCED_SEARCH_MAX_ATOMS
+
+  @Output()
+  public queryApplied = new EventEmitter<string>()
+
+  public root: AdvancedSearchQueryGroup = this.emptyRoot()
+
+  // True when the query in the search box uses syntax the editor cannot show
+  public unreadable: boolean = false
+
+  private _query: string = ''
+
+  @Input()
+  set query(query: string) {
+    this._query = query ?? ''
+    const parsed = parseAdvancedSearchQuery(this._query)
+    this.unreadable = !!this._query.trim() && !parsed
+    this.root = parsed ?? this.emptyRoot()
+  }
+
+  get query(): string {
+    return this._query
+  }
+
+  constructor() {
+    super()
+    this.loading.set(false)
+  }
+
+  // Stable ids for the radio groups, without putting them in the query model
+  private ids = new WeakMap<object, number>()
+  private nextId = 0
+
+  public idFor(element: AdvancedSearchQueryElement): number {
+    if (!this.ids.has(element)) {
+      this.ids.set(element, this.nextId++)
+    }
+    return this.ids.get(element)
+  }
+
+  private emptyRoot(): AdvancedSearchQueryGroup {
+    return {
+      type: AdvancedSearchQueryElementType.Group,
+      operator: AdvancedSearchLogicalOperator.And,
+      children: [this.newAtom()],
+    }
+  }
+
+  private newAtom(): AdvancedSearchQueryAtom {
+    return {
+      type: AdvancedSearchQueryElementType.Atom,
+      field: AdvancedSearchField.Content,
+      operator: AdvancedSearchOperator.AllWords,
+      value: '',
+    }
+  }
+
+  public get generatedQuery(): string {
+    return serializeAdvancedSearchQuery(this.root)
+  }
+
+  public kindOf(atom: AdvancedSearchQueryAtom): AdvancedSearchFieldKind {
+    return ADVANCED_SEARCH_FIELD_KINDS[atom.field]
+  }
+
+  public operatorsFor(atom: AdvancedSearchQueryAtom): AdvancedSearchOperator[] {
+    return ADVANCED_SEARCH_OPERATORS_BY_KIND[this.kindOf(atom)]
+  }
+
+  public operatorLabel(
+    atom: AdvancedSearchQueryAtom,
+    operator: AdvancedSearchOperator
+  ): string {
+    return this.kindOf(atom) === AdvancedSearchFieldKind.Date
+      ? (ADVANCED_SEARCH_DATE_OPERATOR_LABELS[operator] ??
+          ADVANCED_SEARCH_OPERATOR_LABELS[operator])
+      : ADVANCED_SEARCH_OPERATOR_LABELS[operator]
+  }
+
+  public placeholderFor(atom: AdvancedSearchQueryAtom): string {
+    switch (atom.operator) {
+      case AdvancedSearchOperator.Phrase:
+        return $localize`phrase`
+      case AdvancedSearchOperator.StartsWith:
+        return $localize`beginning of a word`
+      default:
+        return $localize`words`
+    }
+  }
+
+  public onFieldChange(atom: AdvancedSearchQueryAtom) {
+    // Keep the condition only if the new field still offers it
+    if (!this.operatorsFor(atom).includes(atom.operator)) {
+      atom.operator = this.operatorsFor(atom)[0]
+    }
+    this.clearValues(atom)
+  }
+
+  public onOperatorChange(atom: AdvancedSearchQueryAtom) {
+    this.clearValues(atom)
+  }
+
+  private clearValues(atom: AdvancedSearchQueryAtom) {
+    atom.value = ''
+    atom.valueTo = undefined
+    atom.unit =
+      atom.operator === AdvancedSearchOperator.WithinLast
+        ? AdvancedSearchDateUnit.Day
+        : undefined
+  }
+
+  public addAtom(group: AdvancedSearchQueryGroup) {
+    group.children.push(this.newAtom())
+  }
+
+  public addGroup(group: AdvancedSearchQueryGroup) {
+    group.children.push({
+      type: AdvancedSearchQueryElementType.Group,
+      operator: AdvancedSearchLogicalOperator.Or,
+      children: [this.newAtom()],
+    })
+  }
+
+  public remove(
+    parent: AdvancedSearchQueryGroup,
+    element: AdvancedSearchQueryElement
+  ) {
+    parent.children = parent.children.filter((child) => child !== element)
+  }
+
+  public startOver() {
+    this.unreadable = false
+    this.root = this.emptyRoot()
+  }
+
+  public apply() {
+    this.queryApplied.emit(this.generatedQuery)
+    this.activeModal.close()
+  }
+
+  public cancel() {
+    this.activeModal.close()
+  }
+}

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')

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,

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

@@ -146,19 +146,6 @@ describe('DocumentListComponent', () => {
     expect(reloadSpy).toHaveBeenCalled()
   })
 
-  it('should stop reloading on document deleted after destroy', () => {
-    const reloadSpy = jest.spyOn(documentListService, 'reload')
-    const documentDeletedSubject = new Subject<boolean>()
-    jest
-      .spyOn(websocketStatusService, 'onDocumentDeleted')
-      .mockReturnValue(documentDeletedSubject)
-    fixture.detectChanges()
-    fixture.destroy()
-    reloadSpy.mockClear()
-    documentDeletedSubject.next(true)
-    expect(reloadSpy).not.toHaveBeenCalled()
-  })
-
   it('should show score sort fields on fulltext queries', () => {
     documentListService.setFilterRules([
       {

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

@@ -270,10 +270,7 @@ export class DocumentListComponent
         this.list.reload()
       })
 
-    this.websocketStatusService
+    this.websocketStatusService.onDocumentDeleted().subscribe(() => {
-      .onDocumentDeleted()
-      .pipe(takeUntil(this.unsubscribeNotifier))
-      .subscribe(() => {
       this.list.reload()
     })
 

src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html

@@ -17,6 +17,12 @@
             }
           </select>
         }
+        @if (advancedSearchEditorAvailable) {
+          <button class="btn btn-sm btn-outline-primary" type="button" (click)="openAdvancedSearchEditor()"
+            title="Edit query" i18n-title [disabled]="disabled">
+            <i-bs name="sliders"></i-bs>
+          </button>
+        }
         @if (_textFilter) {
           <button class="btn btn-link btn-sm px-2 position-absolute top-0 end-0 z-10" (click)="resetTextField()" aria-label="Clear search" i18n-aria-label>
             <i-bs width="1em" height="1em" name="x"></i-bs>

src-ui/src/app/components/document-list/filter-editor/filter-editor.component.spec.ts

@@ -12,6 +12,8 @@ import {
   NgbDatepickerModule,
   NgbDropdownItem,
   NgbDropdownModule,
+  NgbModal,
+  NgbModalRef,
   NgbTypeaheadModule,
 } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectComponent, NgSelectModule } from '@ng-select/ng-select'
@@ -2515,4 +2517,45 @@ describe('FilterEditorComponent', () => {
 
     expect(component.textFilter).toEqual('help ')
   })
+
+  it('should open the advanced search editor with the current query and apply the result', () => {
+    const modalService: NgbModal = TestBed.inject(NgbModal)
+    let modal: NgbModalRef
+    modalService.activeInstances.subscribe(
+      (instances) => (modal = instances[0])
+    )
+    component.textFilterTarget = 'fulltext-query'
+    component.updateTextFilter('title:invoice')
+    fixture.detectChanges()
+
+    const editorButton = fixture.debugElement.query(
+      By.css('button[title="Edit query"]')
+    )
+    expect(editorButton).not.toBeNull()
+    editorButton.triggerEventHandler('click')
+    fixture.detectChanges()
+
+    expect(modal.componentInstance.query).toEqual('title:invoice')
+
+    const rulesSpy = jest.spyOn(component.filterRulesChange, 'next')
+    modal.componentInstance.queryApplied.emit('title:invoice AND NOT tag:paid')
+    expect(component.textFilter).toEqual('title:invoice AND NOT tag:paid')
+    expect(documentService.searchQuery).toEqual(
+      'title:invoice AND NOT tag:paid'
+    )
+    expect(rulesSpy).toHaveBeenCalledWith([
+      {
+        rule_type: FILTER_FULLTEXT_QUERY,
+        value: 'title:invoice AND NOT tag:paid',
+      },
+    ])
+  })
+
+  it('should not offer the advanced search editor for other targets', () => {
+    component.textFilterTarget = 'title-content'
+    fixture.detectChanges()
+    expect(
+      fixture.debugElement.query(By.css('button[title="Edit query"]'))
+    ).toBeNull()
+  })
 })

src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts

@@ -15,12 +15,13 @@ import {
 import { FormsModule, ReactiveFormsModule } from '@angular/forms'
 import {
   NgbDropdownModule,
+  NgbModal,
   NgbTypeahead,
   NgbTypeaheadModule,
 } from '@ng-bootstrap/ng-bootstrap'
 import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
 import { TourNgBootstrap } from 'ngx-ui-tour-ng-bootstrap'
-import { Observable, Subject, from } from 'rxjs'
+import { first, Observable, Subject, from } from 'rxjs'
 import {
   catchError,
   debounceTime,
@@ -121,6 +122,7 @@ import {
   PermissionsFilterDropdownComponent,
   PermissionsSelectionModel,
 } from '../../common/permissions-filter-dropdown/permissions-filter-dropdown.component'
+import { AdvancedSearchDialogComponent } from '../../common/advanced-search-dialog/advanced-search-dialog.component'
 import { LoadingComponentWithPermissions } from '../../loading-component/loading.component'
 
 const TEXT_FILTER_TARGET_TITLE = 'title'
@@ -286,6 +288,7 @@ export class FilterEditorComponent
   permissionsService = inject(PermissionsService)
   private customFieldService = inject(CustomFieldsService)
   private searchService = inject(SearchService)
+  private modalService = inject(NgbModal)
 
   generateFilterName() {
     if (this.filterRules.length == 1) {
@@ -1372,6 +1375,23 @@ export class FilterEditorComponent
     }
   }
 
+  get advancedSearchEditorAvailable(): boolean {
+    return this.textFilterTarget === TEXT_FILTER_TARGET_FULLTEXT_QUERY
+  }
+
+  openAdvancedSearchEditor() {
+    const modal = this.modalService.open(AdvancedSearchDialogComponent, {
+      backdrop: 'static',
+      size: 'lg',
+    })
+    modal.componentInstance.query = this._textFilter ?? ''
+    modal.componentInstance.queryApplied
+      .pipe(first())
+      .subscribe((query: string) => {
+        this.updateTextFilter(query)
+      })
+  }
+
   textFilterKeydown(event: KeyboardEvent) {
     if (event.key == 'Enter') {
       if (event.defaultPrevented) {

src-ui/src/app/data/advanced-search-query.ts

@@ -0,0 +1,262 @@
+// Fields and forms documented in docs/usage.md > "Document searches"
+
+export enum AdvancedSearchField {
+  Any = '',
+  Title = 'title',
+  Content = 'content',
+  OriginalFilename = 'original_filename',
+  NoteText = 'notes.note',
+  NoteAuthor = 'notes.user',
+  CustomFieldName = 'custom_fields.name',
+  CustomFieldValue = 'custom_fields.value',
+  Correspondent = 'correspondent',
+  DocumentType = 'document_type',
+  StoragePath = 'storage_path',
+  Tag = 'tag',
+  ASN = 'asn',
+  PageCount = 'page_count',
+  NumNotes = 'num_notes',
+  Created = 'created',
+  Added = 'added',
+  Modified = 'modified',
+  Checksum = 'checksum',
+}
+
+export enum AdvancedSearchFieldKind {
+  Text = 'text',
+  Number = 'number',
+  Date = 'date',
+  Checksum = 'checksum',
+}
+
+export const ADVANCED_SEARCH_FIELD_KINDS: Record<
+  AdvancedSearchField,
+  AdvancedSearchFieldKind
+> = {
+  [AdvancedSearchField.Any]: AdvancedSearchFieldKind.Text,
+  [AdvancedSearchField.Title]: AdvancedSearchFieldKind.Text,
+  [AdvancedSearchField.Content]: AdvancedSearchFieldKind.Text,
+  [AdvancedSearchField.OriginalFilename]: AdvancedSearchFieldKind.Text,
+  [AdvancedSearchField.NoteText]: AdvancedSearchFieldKind.Text,
+  [AdvancedSearchField.NoteAuthor]: AdvancedSearchFieldKind.Text,
+  [AdvancedSearchField.CustomFieldName]: AdvancedSearchFieldKind.Text,
+  [AdvancedSearchField.CustomFieldValue]: AdvancedSearchFieldKind.Text,
+  [AdvancedSearchField.Correspondent]: AdvancedSearchFieldKind.Text,
+  [AdvancedSearchField.DocumentType]: AdvancedSearchFieldKind.Text,
+  [AdvancedSearchField.StoragePath]: AdvancedSearchFieldKind.Text,
+  [AdvancedSearchField.Tag]: AdvancedSearchFieldKind.Text,
+  [AdvancedSearchField.ASN]: AdvancedSearchFieldKind.Number,
+  [AdvancedSearchField.PageCount]: AdvancedSearchFieldKind.Number,
+  [AdvancedSearchField.NumNotes]: AdvancedSearchFieldKind.Number,
+  [AdvancedSearchField.Created]: AdvancedSearchFieldKind.Date,
+  [AdvancedSearchField.Added]: AdvancedSearchFieldKind.Date,
+  [AdvancedSearchField.Modified]: AdvancedSearchFieldKind.Date,
+  [AdvancedSearchField.Checksum]: AdvancedSearchFieldKind.Checksum,
+}
+
+export enum AdvancedSearchOperator {
+  AllWords = 'all',
+  AnyWord = 'any',
+  Phrase = 'phrase',
+  StartsWith = 'prefix',
+  Equals = 'eq',
+  AtLeast = 'gte',
+  AtMost = 'lte',
+  Between = 'between',
+  DateKeyword = 'keyword',
+  WithinLast = 'within',
+}
+
+export const ADVANCED_SEARCH_OPERATORS_BY_KIND: Record<
+  AdvancedSearchFieldKind,
+  AdvancedSearchOperator[]
+> = {
+  [AdvancedSearchFieldKind.Text]: [
+    AdvancedSearchOperator.AllWords,
+    AdvancedSearchOperator.AnyWord,
+    AdvancedSearchOperator.Phrase,
+    AdvancedSearchOperator.StartsWith,
+  ],
+  [AdvancedSearchFieldKind.Number]: [
+    AdvancedSearchOperator.Equals,
+    AdvancedSearchOperator.AtLeast,
+    AdvancedSearchOperator.AtMost,
+    AdvancedSearchOperator.Between,
+  ],
+  [AdvancedSearchFieldKind.Date]: [
+    AdvancedSearchOperator.DateKeyword,
+    AdvancedSearchOperator.WithinLast,
+    AdvancedSearchOperator.AtLeast,
+    AdvancedSearchOperator.AtMost,
+    AdvancedSearchOperator.Between,
+  ],
+  [AdvancedSearchFieldKind.Checksum]: [AdvancedSearchOperator.StartsWith],
+}
+
+export const ADVANCED_SEARCH_DATE_KEYWORDS = [
+  'today',
+  'yesterday',
+  'tomorrow',
+  'previous week',
+  'this month',
+  'previous month',
+  'previous quarter',
+  'this year',
+  'previous year',
+] as const
+
+export type AdvancedSearchDateKeyword =
+  (typeof ADVANCED_SEARCH_DATE_KEYWORDS)[number]
+
+export enum AdvancedSearchDateUnit {
+  Day = 'day',
+  Week = 'week',
+  Month = 'month',
+  Year = 'year',
+}
+
+export enum AdvancedSearchLogicalOperator {
+  And = 'AND',
+  Or = 'OR',
+  Not = 'NOT',
+}
+
+export enum AdvancedSearchQueryElementType {
+  Atom = 'atom',
+  Group = 'group',
+}
+
+export interface AdvancedSearchQueryAtom {
+  type: AdvancedSearchQueryElementType.Atom
+  field: AdvancedSearchField
+  operator: AdvancedSearchOperator
+  value?: string
+  valueTo?: string
+  unit?: AdvancedSearchDateUnit // for WithinLast
+}
+
+export interface AdvancedSearchQueryGroup {
+  type: AdvancedSearchQueryElementType.Group
+  operator: AdvancedSearchLogicalOperator
+  children: AdvancedSearchQueryElement[]
+}
+
+export type AdvancedSearchQueryElement =
+  AdvancedSearchQueryAtom | AdvancedSearchQueryGroup
+
+export const ADVANCED_SEARCH_MAX_DEPTH = 2
+export const ADVANCED_SEARCH_MAX_ATOMS = 10
+
+export const ADVANCED_SEARCH_FIELD_LABELS: Record<AdvancedSearchField, string> =
+  {
+    [AdvancedSearchField.Any]: $localize`Any field`,
+    [AdvancedSearchField.Title]: $localize`Title`,
+    [AdvancedSearchField.Content]: $localize`Content`,
+    [AdvancedSearchField.OriginalFilename]: $localize`File name`,
+    [AdvancedSearchField.NoteText]: $localize`Note text`,
+    [AdvancedSearchField.NoteAuthor]: $localize`Note author`,
+    [AdvancedSearchField.CustomFieldName]: $localize`Custom field name`,
+    [AdvancedSearchField.CustomFieldValue]: $localize`Custom field value`,
+    [AdvancedSearchField.Correspondent]: $localize`Correspondent name`,
+    [AdvancedSearchField.DocumentType]: $localize`Document type name`,
+    [AdvancedSearchField.StoragePath]: $localize`Storage path name`,
+    [AdvancedSearchField.Tag]: $localize`Tag name`,
+    [AdvancedSearchField.ASN]: $localize`ASN`,
+    [AdvancedSearchField.PageCount]: $localize`Pages`,
+    [AdvancedSearchField.NumNotes]: $localize`Number of notes`,
+    [AdvancedSearchField.Created]: $localize`Created`,
+    [AdvancedSearchField.Added]: $localize`Added`,
+    [AdvancedSearchField.Modified]: $localize`Modified`,
+    [AdvancedSearchField.Checksum]: $localize`Checksum`,
+  }
+
+export const ADVANCED_SEARCH_FIELD_GROUPS: {
+  label: string
+  fields: AdvancedSearchField[]
+}[] = [
+  {
+    label: $localize`Text`,
+    fields: [
+      AdvancedSearchField.Any,
+      AdvancedSearchField.Title,
+      AdvancedSearchField.Content,
+      AdvancedSearchField.OriginalFilename,
+      AdvancedSearchField.NoteText,
+      AdvancedSearchField.NoteAuthor,
+      AdvancedSearchField.CustomFieldName,
+      AdvancedSearchField.CustomFieldValue,
+    ],
+  },
+  {
+    label: $localize`Names`,
+    fields: [
+      AdvancedSearchField.Correspondent,
+      AdvancedSearchField.DocumentType,
+      AdvancedSearchField.StoragePath,
+      AdvancedSearchField.Tag,
+    ],
+  },
+  {
+    label: $localize`Numbers`,
+    fields: [
+      AdvancedSearchField.ASN,
+      AdvancedSearchField.PageCount,
+      AdvancedSearchField.NumNotes,
+    ],
+  },
+  {
+    label: $localize`Dates`,
+    fields: [
+      AdvancedSearchField.Created,
+      AdvancedSearchField.Added,
+      AdvancedSearchField.Modified,
+    ],
+  },
+  { label: $localize`Other`, fields: [AdvancedSearchField.Checksum] },
+]
+
+export const ADVANCED_SEARCH_OPERATOR_LABELS: Record<
+  AdvancedSearchOperator,
+  string
+> = {
+  [AdvancedSearchOperator.AllWords]: $localize`contains all words`,
+  [AdvancedSearchOperator.AnyWord]: $localize`contains any word`,
+  [AdvancedSearchOperator.Phrase]: $localize`contains the phrase`,
+  [AdvancedSearchOperator.StartsWith]: $localize`starts with`,
+  [AdvancedSearchOperator.Equals]: $localize`is`,
+  [AdvancedSearchOperator.AtLeast]: $localize`is at least`,
+  [AdvancedSearchOperator.AtMost]: $localize`is at most`,
+  [AdvancedSearchOperator.Between]: $localize`is between`,
+  [AdvancedSearchOperator.DateKeyword]: $localize`is`,
+  [AdvancedSearchOperator.WithinLast]: $localize`is within the last`,
+}
+
+// Comparing dates reads differently than comparing counts
+export const ADVANCED_SEARCH_DATE_OPERATOR_LABELS: Partial<
+  Record<AdvancedSearchOperator, string>
+> = {
+  [AdvancedSearchOperator.AtLeast]: $localize`is on or after`,
+  [AdvancedSearchOperator.AtMost]: $localize`is on or before`,
+}
+
+export const ADVANCED_SEARCH_DATE_KEYWORD_LABELS: Record<string, string> = {
+  today: $localize`today`,
+  yesterday: $localize`yesterday`,
+  tomorrow: $localize`tomorrow`,
+  'previous week': $localize`previous week`,
+  'this month': $localize`this month`,
+  'previous month': $localize`previous month`,
+  'previous quarter': $localize`previous quarter`,
+  'this year': $localize`this year`,
+  'previous year': $localize`previous year`,
+}
+
+export const ADVANCED_SEARCH_DATE_UNIT_LABELS: Record<
+  AdvancedSearchDateUnit,
+  string
+> = {
+  [AdvancedSearchDateUnit.Day]: $localize`days`,
+  [AdvancedSearchDateUnit.Week]: $localize`weeks`,
+  [AdvancedSearchDateUnit.Month]: $localize`months`,
+  [AdvancedSearchDateUnit.Year]: $localize`years`,
+}

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

@@ -353,14 +353,6 @@ export const PaperlessConfigOptions: ConfigOption[] = [
     config_key: 'PAPERLESS_AI_LLM_EMBEDDING_MODEL',
     category: ConfigCategory.AI,
   },
-  {
-    key: 'llm_embedding_api_key',
-    title: $localize`LLM Embedding API Key`,
-    type: ConfigOptionType.Password,
-    note: $localize`Used for embeddings when set, otherwise LLM API key is used.`,
-    config_key: 'PAPERLESS_AI_LLM_EMBEDDING_API_KEY',
-    category: ConfigCategory.AI,
-  },
   {
     key: 'llm_embedding_endpoint',
     title: $localize`LLM Embedding Endpoint`,
@@ -465,7 +457,6 @@ export interface PaperlessConfig extends ObjectWithId {
   ai_enabled: boolean
   llm_embedding_backend: string
   llm_embedding_model: string
-  llm_embedding_api_key: string
   llm_embedding_endpoint: string
   llm_embedding_chunk_size: number
   llm_context_size: number

src-ui/src/app/utils/advanced-search-query.spec.ts

@@ -0,0 +1,515 @@
+import {
+  AdvancedSearchDateUnit,
+  AdvancedSearchField,
+  AdvancedSearchLogicalOperator,
+  AdvancedSearchOperator,
+  AdvancedSearchQueryAtom,
+  AdvancedSearchQueryElement,
+  AdvancedSearchQueryElementType,
+  AdvancedSearchQueryGroup,
+} from '../data/advanced-search-query'
+import {
+  parseAdvancedSearchQuery,
+  serializeAdvancedSearchQuery,
+} from './advanced-search-query'
+
+const atom = (
+  field: AdvancedSearchField,
+  operator: AdvancedSearchOperator,
+  value?: string,
+  extra: Partial<AdvancedSearchQueryAtom> = {}
+): AdvancedSearchQueryAtom => ({
+  type: AdvancedSearchQueryElementType.Atom,
+  field,
+  operator,
+  value,
+  ...extra,
+})
+
+const group = (
+  operator: AdvancedSearchLogicalOperator,
+  ...children: AdvancedSearchQueryElement[]
+): AdvancedSearchQueryGroup => ({
+  type: AdvancedSearchQueryElementType.Group,
+  operator,
+  children,
+})
+
+const { And, Or, Not } = AdvancedSearchLogicalOperator
+
+describe('serializeAdvancedSearchQuery', () => {
+  describe('text fields', () => {
+    it.each([
+      [AdvancedSearchOperator.AllWords, 'invoice', 'title:invoice'],
+      [
+        AdvancedSearchOperator.AllWords,
+        '  invoice   unpaid ',
+        'title:invoice AND title:unpaid',
+      ],
+      [
+        AdvancedSearchOperator.AnyWord,
+        'invoice unpaid',
+        'title:invoice OR title:unpaid',
+      ],
+      [
+        AdvancedSearchOperator.Phrase,
+        'quick brown fox',
+        'title:"quick brown fox"',
+      ],
+      [AdvancedSearchOperator.Phrase, 'say "hi"', 'title:"say hi"'],
+      [AdvancedSearchOperator.StartsWith, 'invoi', 'title:invoi*'],
+      [AdvancedSearchOperator.StartsWith, 'in*v?oi', 'title:invoi*'],
+    ])('%s %j writes %s', (operator, value, expected) => {
+      expect(
+        serializeAdvancedSearchQuery(
+          atom(AdvancedSearchField.Title, operator, value)
+        )
+      ).toBe(expected)
+    })
+
+    it('writes bare words for the Any field', () => {
+      expect(
+        serializeAdvancedSearchQuery(
+          atom(AdvancedSearchField.Any, AdvancedSearchOperator.AllWords, 'a b')
+        )
+      ).toBe('a AND b')
+    })
+
+    it.each([
+      ['A-1312/99', 'custom_fields.value:A-1312/99'],
+      ["O'Brien", "custom_fields.value:O'Brien"],
+      ["'quoted'", `custom_fields.value:"'quoted'"`],
+      ['foo:bar', 'custom_fields.value:"foo:bar"'],
+      ['(x)', 'custom_fields.value:"(x)"'],
+      ['2024*', 'custom_fields.value:"2024*"'],
+      ['a,b', 'custom_fields.value:"a,b"'],
+      ['OR', 'custom_fields.value:"OR"'],
+      ['or', 'custom_fields.value:or'],
+    ])(
+      'quotes %j only when the grammar would read it as syntax',
+      (value, expected) => {
+        expect(
+          serializeAdvancedSearchQuery(
+            atom(
+              AdvancedSearchField.CustomFieldValue,
+              AdvancedSearchOperator.AllWords,
+              value
+            )
+          )
+        ).toBe(expected)
+      }
+    )
+
+    it('uses the dotted names for custom fields', () => {
+      expect(
+        serializeAdvancedSearchQuery(
+          group(
+            And,
+            atom(
+              AdvancedSearchField.CustomFieldName,
+              AdvancedSearchOperator.Phrase,
+              'status'
+            ),
+            atom(
+              AdvancedSearchField.CustomFieldValue,
+              AdvancedSearchOperator.AllWords,
+              'paid'
+            )
+          )
+        )
+      ).toBe('custom_fields.name:"status" AND custom_fields.value:paid')
+    })
+
+    it('uses the dotted names for notes', () => {
+      expect(
+        serializeAdvancedSearchQuery(
+          group(
+            And,
+            atom(
+              AdvancedSearchField.NoteText,
+              AdvancedSearchOperator.AllWords,
+              'call'
+            ),
+            atom(
+              AdvancedSearchField.NoteAuthor,
+              AdvancedSearchOperator.AllWords,
+              'alice'
+            )
+          )
+        )
+      ).toBe('notes.note:call AND notes.user:alice')
+    })
+
+    it.each([
+      [AdvancedSearchOperator.AllWords, ''],
+      [AdvancedSearchOperator.AllWords, '  '],
+      [AdvancedSearchOperator.AllWords, '!! --'],
+      [AdvancedSearchOperator.Phrase, '""'],
+      [AdvancedSearchOperator.StartsWith, 'two words'],
+      [AdvancedSearchOperator.StartsWith, '***'],
+      [AdvancedSearchOperator.StartsWith, undefined],
+    ])('leaves out %s %j', (operator, value) => {
+      expect(
+        serializeAdvancedSearchQuery(
+          atom(AdvancedSearchField.Title, operator, value)
+        )
+      ).toBe('')
+    })
+  })
+
+  describe('checksum', () => {
+    it('lowercases the prefix', () => {
+      expect(
+        serializeAdvancedSearchQuery(
+          atom(
+            AdvancedSearchField.Checksum,
+            AdvancedSearchOperator.StartsWith,
+            '9F86D081'
+          )
+        )
+      ).toBe('checksum:9f86d081*')
+    })
+  })
+
+  describe('number fields', () => {
+    it.each([
+      [AdvancedSearchOperator.Equals, '42', undefined, 'asn:42'],
+      [AdvancedSearchOperator.AtLeast, '50', undefined, 'asn:[50 to]'],
+      [AdvancedSearchOperator.AtMost, '50', undefined, 'asn:[to 50]'],
+      [AdvancedSearchOperator.Between, '50', '150', 'asn:[50 to 150]'],
+      [AdvancedSearchOperator.Equals, '4.2', undefined, ''],
+      [AdvancedSearchOperator.Equals, '-1', undefined, ''],
+      [AdvancedSearchOperator.Equals, '2024-01-01', undefined, ''],
+      [AdvancedSearchOperator.Between, '50', '', ''],
+    ])('%s %j %j writes %j', (operator, value, valueTo, expected) => {
+      expect(
+        serializeAdvancedSearchQuery(
+          atom(AdvancedSearchField.ASN, operator, value, { valueTo })
+        )
+      ).toBe(expected)
+    })
+  })
+
+  describe('date fields', () => {
+    it.each([
+      ['today', 'added:today'],
+      ['previous month', 'added:"previous month"'],
+      ['last tuesday', ''],
+      ['', ''],
+    ])('keyword %j writes %j', (value, expected) => {
+      expect(
+        serializeAdvancedSearchQuery(
+          atom(
+            AdvancedSearchField.Added,
+            AdvancedSearchOperator.DateKeyword,
+            value
+          )
+        )
+      ).toBe(expected)
+    })
+
+    it.each([
+      ['1', AdvancedSearchDateUnit.Day, 'added:[-1 day to now]'],
+      ['3', AdvancedSearchDateUnit.Month, 'added:[-3 months to now]'],
+      ['2', AdvancedSearchDateUnit.Week, 'added:[-2 weeks to now]'],
+      ['0', AdvancedSearchDateUnit.Year, ''],
+      ['1.5', AdvancedSearchDateUnit.Year, ''],
+      ['3', undefined, ''],
+      ['3', 'fortnight' as AdvancedSearchDateUnit, ''],
+    ])('within the last %j %j writes %j', (value, unit, expected) => {
+      expect(
+        serializeAdvancedSearchQuery(
+          atom(
+            AdvancedSearchField.Added,
+            AdvancedSearchOperator.WithinLast,
+            value,
+            {
+              unit,
+            }
+          )
+        )
+      ).toBe(expected)
+    })
+
+    it.each([
+      [
+        AdvancedSearchOperator.AtLeast,
+        '2024-01-01',
+        undefined,
+        'created:[2024-01-01 to]',
+      ],
+      [
+        AdvancedSearchOperator.AtMost,
+        '2024-01-01',
+        undefined,
+        'created:[to 2024-01-01]',
+      ],
+      [
+        AdvancedSearchOperator.Between,
+        '2024-01-01',
+        '2024-03-31',
+        'created:[2024-01-01 to 2024-03-31]',
+      ],
+      [AdvancedSearchOperator.AtLeast, '2024', undefined, ''],
+      [AdvancedSearchOperator.Between, '2024-01-01', 'now', ''],
+    ])('%s %j %j writes %j', (operator, value, valueTo, expected) => {
+      expect(
+        serializeAdvancedSearchQuery(
+          atom(AdvancedSearchField.Created, operator, value, { valueTo })
+        )
+      ).toBe(expected)
+    })
+  })
+
+  describe('groups', () => {
+    const invoice = atom(
+      AdvancedSearchField.Content,
+      AdvancedSearchOperator.AllWords,
+      'invoice'
+    )
+    const letter = atom(
+      AdvancedSearchField.Title,
+      AdvancedSearchOperator.AllWords,
+      'letter'
+    )
+    const paid = atom(
+      AdvancedSearchField.Tag,
+      AdvancedSearchOperator.AllWords,
+      'paid'
+    )
+    const twoWords = atom(
+      AdvancedSearchField.Title,
+      AdvancedSearchOperator.AllWords,
+      'a b'
+    )
+    const anyWords = atom(
+      AdvancedSearchField.Title,
+      AdvancedSearchOperator.AnyWord,
+      'a b'
+    )
+    const empty = atom(
+      AdvancedSearchField.Title,
+      AdvancedSearchOperator.AllWords,
+      ''
+    )
+
+    it.each([
+      ['an empty group', group(And), ''],
+      ['a group of empty atoms', group(Or, empty, group(And, empty)), ''],
+      [
+        'a single child without parentheses',
+        group(Or, invoice),
+        'content:invoice',
+      ],
+      ['All', group(And, invoice, letter), 'content:invoice AND title:letter'],
+      ['Any', group(Or, invoice, letter), 'content:invoice OR title:letter'],
+      [
+        'skipped empty atoms',
+        group(And, empty, invoice, empty),
+        'content:invoice',
+      ],
+      ['Not with one child', group(Not, paid), 'NOT tag:paid'],
+      [
+        'Not as none of',
+        group(Not, paid, letter),
+        'NOT (tag:paid OR title:letter)',
+      ],
+      [
+        'Not with a compound child',
+        group(Not, twoWords),
+        'NOT (title:a AND title:b)',
+      ],
+      [
+        'Not inside All',
+        group(And, invoice, group(Not, paid)),
+        'content:invoice AND NOT tag:paid',
+      ],
+      [
+        'Not inside Any',
+        group(Or, invoice, group(Not, paid)),
+        'content:invoice OR NOT tag:paid',
+      ],
+      [
+        'Any inside All',
+        group(And, invoice, group(Or, letter, paid)),
+        'content:invoice AND (title:letter OR tag:paid)',
+      ],
+      [
+        'All inside Any',
+        group(Or, invoice, group(And, letter, paid)),
+        'content:invoice OR (title:letter AND tag:paid)',
+      ],
+      [
+        'All inside All flattened',
+        group(And, invoice, group(And, letter, paid)),
+        'content:invoice AND title:letter AND tag:paid',
+      ],
+      [
+        'an all-words atom inside Any',
+        group(Or, invoice, twoWords),
+        'content:invoice OR (title:a AND title:b)',
+      ],
+      [
+        'an any-word atom inside All',
+        group(And, invoice, anyWords),
+        'content:invoice AND (title:a OR title:b)',
+      ],
+      [
+        'an all-words atom inside Not with siblings',
+        group(Not, paid, twoWords),
+        'NOT (tag:paid OR (title:a AND title:b))',
+      ],
+    ])('writes %s', (_, tree, expected) => {
+      expect(serializeAdvancedSearchQuery(tree)).toBe(expected)
+    })
+
+    it('writes the mockup example', () => {
+      expect(
+        serializeAdvancedSearchQuery(
+          group(
+            And,
+            invoice,
+            group(
+              Or,
+              atom(
+                AdvancedSearchField.Correspondent,
+                AdvancedSearchOperator.Phrase,
+                'acme corp'
+              ),
+              atom(
+                AdvancedSearchField.Content,
+                AdvancedSearchOperator.Phrase,
+                'acme corporation'
+              )
+            ),
+            atom(
+              AdvancedSearchField.Added,
+              AdvancedSearchOperator.WithinLast,
+              '3',
+              {
+                unit: AdvancedSearchDateUnit.Month,
+              }
+            ),
+            group(Not, paid)
+          )
+        )
+      ).toBe(
+        'content:invoice AND (correspondent:"acme corp" OR content:"acme corporation") AND added:[-3 months to now] AND NOT tag:paid'
+      )
+    })
+  })
+})
+
+describe('parseAdvancedSearchQuery', () => {
+  const canonical = [
+    'title:invoice',
+    'title:invoice AND title:unpaid',
+    'content:invoice OR content:receipt',
+    'a AND b',
+    'title:"quick brown fox"',
+    'title:invoi*',
+    "custom_fields.value:O'Brien",
+    'custom_fields.value:"foo:bar"',
+    'custom_fields.name:"status" AND custom_fields.value:paid',
+    'notes.note:call AND notes.user:alice',
+    'checksum:9f86d081*',
+    'asn:42',
+    'asn:[50 to 150]',
+    'asn:[50 to]',
+    'asn:[to 50]',
+    'page_count:[10 to]',
+    'added:today',
+    'added:"previous month"',
+    'added:[-1 day to now]',
+    'added:[-3 months to now]',
+    'created:[2024-01-01 to 2024-03-31]',
+    'created:[2024-01-01 to]',
+    'created:[to 2024-01-01]',
+    'NOT tag:paid',
+    'NOT (tag:paid OR title:letter)',
+    'NOT (title:a AND title:b)',
+    'content:invoice OR NOT tag:paid',
+    'content:invoice AND (title:letter OR tag:paid)',
+    'content:invoice OR (title:letter AND tag:paid)',
+    'content:invoice AND (correspondent:"acme corp" OR content:"acme corporation") AND added:[-3 months to now] AND NOT tag:paid',
+  ]
+
+  it.each(canonical)('reads back %s unchanged', (query) => {
+    const tree = parseAdvancedSearchQuery(query)
+    expect(tree).not.toBeNull()
+    expect(serializeAdvancedSearchQuery(tree)).toBe(query)
+  })
+
+  it('reads surrounding whitespace', () => {
+    expect(
+      serializeAdvancedSearchQuery(
+        parseAdvancedSearchQuery('  title:invoice  ')
+      )
+    ).toBe('title:invoice')
+  })
+
+  it('puts the words of one condition back together', () => {
+    expect(parseAdvancedSearchQuery('title:invoice AND title:unpaid')).toEqual(
+      group(
+        And,
+        atom(
+          AdvancedSearchField.Title,
+          AdvancedSearchOperator.AllWords,
+          'invoice unpaid'
+        )
+      )
+    )
+  })
+
+  it('keeps words of different fields apart', () => {
+    expect(parseAdvancedSearchQuery('title:a OR content:b')).toEqual(
+      group(
+        Or,
+        atom(AdvancedSearchField.Title, AdvancedSearchOperator.AllWords, 'a'),
+        atom(AdvancedSearchField.Content, AdvancedSearchOperator.AllWords, 'b')
+      )
+    )
+  })
+
+  it('reads a range as its condition', () => {
+    expect(parseAdvancedSearchQuery('added:[-3 months to now]')).toEqual(
+      group(
+        And,
+        atom(
+          AdvancedSearchField.Added,
+          AdvancedSearchOperator.WithinLast,
+          '3',
+          {
+            unit: AdvancedSearchDateUnit.Month,
+          }
+        )
+      )
+    )
+  })
+
+  it.each([
+    ['', 'nothing'],
+    ['   ', 'whitespace'],
+    ['type:invoice', 'a field alias'],
+    ['notes:call', 'a bare notes prefix'],
+    ['unknown:x', 'an unknown field'],
+    ['title:a AND content:b OR title:c', 'AND and OR mixed at one level'],
+    ['title:a b', 'an implicit AND'],
+    ['title:"unterminated', 'an unterminated phrase'],
+    ['asn:[50 to', 'an unterminated range'],
+    ['title:a*b', 'a wildcard in the middle'],
+    ['title:invoice^2', 'a boost'],
+    ['asn:[50 to abc]', 'a non-numeric bound'],
+    ['asn:invoice', 'a word on a number field'],
+    ['created:[2024 to 2025]', 'a year-only date range'],
+    ['added:"last tuesday"', 'a date keyword paperless does not have'],
+    ['title:[a to b]', 'a range on a text field'],
+    ['checksum:9f86d081', 'a checksum without a wildcard'],
+    ['(title:invoice)', 'parentheses the editor would not write'],
+    ['title:invoice AND', 'a trailing operator'],
+    ['title:"a"b', 'a value running into the next'],
+    ['ADDED:today', 'an uppercase field name'],
+  ])('leaves %s alone, having %s', (query) => {
+    expect(parseAdvancedSearchQuery(query)).toBeNull()
+  })
+})

src-ui/src/app/utils/advanced-search-query.ts

@@ -0,0 +1,500 @@
+import {
+  ADVANCED_SEARCH_DATE_KEYWORDS,
+  ADVANCED_SEARCH_FIELD_KINDS,
+  AdvancedSearchDateUnit,
+  AdvancedSearchField,
+  AdvancedSearchFieldKind,
+  AdvancedSearchLogicalOperator,
+  AdvancedSearchOperator,
+  AdvancedSearchQueryAtom,
+  AdvancedSearchQueryElement,
+  AdvancedSearchQueryElementType,
+  AdvancedSearchQueryGroup,
+} from '../data/advanced-search-query'
+
+// Anything the query grammar would read as syntax rather than as a word
+const SYNTAX_CHARS = /[\s():"[\]*?,{}^~\\]/
+const SYNTAX_CHARS_GLOBAL = new RegExp(SYNTAX_CHARS, 'g')
+// A word wrapped in single quotes is also syntax, an apostrophe inside one is not
+const EDGE_SINGLE_QUOTE = /^'|'$/
+const RESERVED_WORDS = /^(AND|OR|NOT|TO)$/
+const HAS_WORD_CHAR = /[\p{L}\p{N}]/u
+const WHOLE_NUMBER = /^\d+$/
+const ISO_DATE = /^\d{4}-\d{2}-\d{2}$/
+
+interface Serialized {
+  text: string
+  // The operator joining the top level of `text`, null when it is self-delimiting
+  join:
+    AdvancedSearchLogicalOperator.And | AdvancedSearchLogicalOperator.Or | null
+}
+
+const prefix = (field: AdvancedSearchField) => (field ? `${field}:` : '')
+
+const quote = (text: string) => `"${text.replace(/"/g, '')}"`
+
+const words = (value: string) =>
+  value
+    .trim()
+    .split(/\s+/)
+    .filter((word) => HAS_WORD_CHAR.test(word))
+
+const word = (w: string) =>
+  SYNTAX_CHARS.test(w) || EDGE_SINGLE_QUOTE.test(w) || RESERVED_WORDS.test(w)
+    ? quote(w)
+    : w
+
+const atomic = (text: string): Serialized => ({ text, join: null })
+
+function serializeWords(
+  atom: AdvancedSearchQueryAtom,
+  join: AdvancedSearchLogicalOperator.And | AdvancedSearchLogicalOperator.Or
+): Serialized {
+  // A field applies only to the word right after it, so repeat it per word
+  const terms = words(atom.value ?? '').map(
+    (w) => `${prefix(atom.field)}${word(w)}`
+  )
+  if (terms.length === 0) return null
+  if (terms.length === 1) return atomic(terms[0])
+  return { text: terms.join(` ${join} `), join }
+}
+
+function serializeRange(
+  atom: AdvancedSearchQueryAtom,
+  isValid: (v: string) => boolean
+): Serialized {
+  const lo = atom.value?.trim() ?? ''
+  const hi = atom.valueTo?.trim() ?? ''
+  const field = prefix(atom.field)
+  switch (atom.operator) {
+    case AdvancedSearchOperator.Equals:
+      return isValid(lo) ? atomic(`${field}${lo}`) : null
+    case AdvancedSearchOperator.AtLeast:
+      return isValid(lo) ? atomic(`${field}[${lo} to]`) : null
+    case AdvancedSearchOperator.AtMost:
+      return isValid(lo) ? atomic(`${field}[to ${lo}]`) : null
+    case AdvancedSearchOperator.Between:
+      return isValid(lo) && isValid(hi)
+        ? atomic(`${field}[${lo} to ${hi}]`)
+        : null
+  }
+  return null
+}
+
+function serializeAtom(atom: AdvancedSearchQueryAtom): Serialized {
+  const field = prefix(atom.field)
+  const value = atom.value?.trim() ?? ''
+
+  switch (atom.operator) {
+    case AdvancedSearchOperator.AllWords:
+      return serializeWords(atom, AdvancedSearchLogicalOperator.And)
+    case AdvancedSearchOperator.AnyWord:
+      return serializeWords(atom, AdvancedSearchLogicalOperator.Or)
+    case AdvancedSearchOperator.Phrase:
+      return HAS_WORD_CHAR.test(value)
+        ? atomic(`${field}${quote(value)}`)
+        : null
+    case AdvancedSearchOperator.StartsWith: {
+      if (/\s/.test(value)) return null
+      let stem = value.replace(SYNTAX_CHARS_GLOBAL, '')
+      if (!HAS_WORD_CHAR.test(stem)) return null
+      // checksum is indexed as-is, in lowercase
+      if (atom.field === AdvancedSearchField.Checksum) {
+        stem = stem.toLowerCase()
+      }
+      return atomic(`${field}${stem}*`)
+    }
+    case AdvancedSearchOperator.DateKeyword:
+      return (ADVANCED_SEARCH_DATE_KEYWORDS as readonly string[]).includes(
+        value
+      )
+        ? atomic(`${field}${word(value)}`)
+        : null
+    case AdvancedSearchOperator.WithinLast: {
+      const amount = parseInt(value, 10)
+      const units = Object.values(AdvancedSearchDateUnit) as string[]
+      if (!WHOLE_NUMBER.test(value) || amount < 1) return null
+      if (!units.includes(atom.unit)) return null
+      const unit = amount === 1 ? atom.unit : `${atom.unit}s`
+      return atomic(`${field}[-${amount} ${unit} to now]`)
+    }
+    case AdvancedSearchOperator.Equals:
+    case AdvancedSearchOperator.AtLeast:
+    case AdvancedSearchOperator.AtMost:
+    case AdvancedSearchOperator.Between:
+      return serializeRange(
+        atom,
+        ADVANCED_SEARCH_FIELD_KINDS[atom.field] === AdvancedSearchFieldKind.Date
+          ? (v) => ISO_DATE.test(v)
+          : (v) => WHOLE_NUMBER.test(v)
+      )
+  }
+  return null
+}
+
+function wrap(
+  child: Serialized,
+  parentJoin: AdvancedSearchLogicalOperator
+): string {
+  return child.join === null || child.join === parentJoin
+    ? child.text
+    : `(${child.text})`
+}
+
+function serializeGroup(group: AdvancedSearchQueryGroup): Serialized {
+  const children = group.children.map(serializeElement).filter(Boolean)
+  if (children.length === 0) return null
+
+  if (group.operator === AdvancedSearchLogicalOperator.Not) {
+    // A Not group matches documents matching none of its children
+    if (children.length === 1 && children[0].join === null) {
+      return atomic(`NOT ${children[0].text}`)
+    }
+    const inner =
+      children.length === 1
+        ? children[0].text
+        : children
+            .map((c) => wrap(c, AdvancedSearchLogicalOperator.Or))
+            .join(' OR ')
+    return atomic(`NOT (${inner})`)
+  }
+
+  if (children.length === 1) return children[0]
+  return {
+    text: children
+      .map((c) => wrap(c, group.operator))
+      .join(` ${group.operator} `),
+    join: group.operator,
+  }
+}
+
+function serializeElement(element: AdvancedSearchQueryElement): Serialized {
+  return element.type === AdvancedSearchQueryElementType.Group
+    ? serializeGroup(element)
+    : serializeAtom(element)
+}
+
+/**
+ * Writes an editor tree as a full-text query. Atoms that are not filled in
+ * (or not valid) are left out, and empty groups with them.
+ */
+export function serializeAdvancedSearchQuery(
+  element: AdvancedSearchQueryElement
+): string {
+  return serializeElement(element)?.text ?? ''
+}
+
+// --- Reading a query back into the editor --------------------------------
+//
+// Deliberately narrow: this reads the forms serializeAdvancedSearchQuery
+// writes, and nothing else. A query it cannot read is not a failure, it just
+// stays text, so there is never a lossy or surprising conversion. The final
+// round-trip check below is what holds that promise: a tree is only returned
+// when writing it out again reproduces the query exactly.
+
+const RELATIVE_BOUND = /^-(\d+) (day|week|month|year)s?$/
+const FIELD_PREFIX = /^([a-z_]+(?:\.[a-z_]+)?):/
+const KEYWORD_TOKEN = /^(AND|OR|NOT)(?=[\s(]|$)/
+// Either bound may be missing: [50 to 150], [50 to], [to 50]
+const RANGE_BOUNDS = /^(?:(.+?) )?to(?: (.+))?$/
+const TRAILING_WILDCARD = /^([^*?]+)\*$/
+
+class UnreadableQuery extends Error {}
+
+interface Token {
+  type: 'term' | 'AND' | 'OR' | 'NOT' | '(' | ')'
+  field?: string
+  value?: string
+  quoted?: boolean
+  range?: boolean
+}
+
+// A parsed element, plus what it takes to merge the per-word terms the
+// serializer writes for "contains all words" back into a single condition
+interface Parsed {
+  element: AdvancedSearchQueryElement
+  word?: { field: AdvancedSearchField; text: string }
+}
+
+function tokenize(query: string): Token[] {
+  const tokens: Token[] = []
+  let i = 0
+  while (i < query.length) {
+    const rest = query.slice(i)
+    if (/^\s/.test(rest)) {
+      i++
+      continue
+    }
+    if (rest[0] === '(' || rest[0] === ')') {
+      tokens.push({ type: rest[0] as '(' | ')' })
+      i++
+      continue
+    }
+    const keyword = KEYWORD_TOKEN.exec(rest)
+    if (keyword) {
+      tokens.push({ type: keyword[1] as 'AND' | 'OR' | 'NOT' })
+      i += keyword[1].length
+      continue
+    }
+    const fieldMatch = FIELD_PREFIX.exec(rest)
+    const field = fieldMatch ? fieldMatch[1] : ''
+    i += fieldMatch ? fieldMatch[0].length : 0
+
+    const value = query.slice(i)
+    if (value.startsWith('"')) {
+      const end = query.indexOf('"', i + 1)
+      if (end < 0) throw new UnreadableQuery()
+      tokens.push({
+        type: 'term',
+        field,
+        value: query.slice(i + 1, end),
+        quoted: true,
+      })
+      i = end + 1
+    } else if (value.startsWith('[')) {
+      const end = query.indexOf(']', i + 1)
+      if (end < 0) throw new UnreadableQuery()
+      tokens.push({
+        type: 'term',
+        field,
+        value: query.slice(i + 1, end),
+        range: true,
+      })
+      i = end + 1
+    } else {
+      const bare = /^[^\s()]+/.exec(value)
+      if (!bare) throw new UnreadableQuery()
+      tokens.push({ type: 'term', field, value: bare[0] })
+      i += bare[0].length
+    }
+    // Nothing may run on directly after a value, e.g. title:"a"b
+    if (i < query.length && !/[\s)]/.test(query[i])) throw new UnreadableQuery()
+  }
+  return tokens
+}
+
+function resolveField(name: string): AdvancedSearchField {
+  const fields = Object.values(AdvancedSearchField) as string[]
+  // Aliases (type:, path:, notes:) are left to the text box on purpose:
+  // reading one would mean rewriting the user's query as it was read
+  if (!fields.includes(name)) throw new UnreadableQuery()
+  return name as AdvancedSearchField
+}
+
+function atomFrom(
+  field: AdvancedSearchField,
+  operator: AdvancedSearchOperator,
+  value: string,
+  extra: Partial<AdvancedSearchQueryAtom> = {}
+): AdvancedSearchQueryAtom {
+  return {
+    type: AdvancedSearchQueryElementType.Atom,
+    field,
+    operator,
+    value,
+    ...extra,
+  }
+}
+
+function parseRange(
+  field: AdvancedSearchField,
+  kind: AdvancedSearchFieldKind,
+  body: string
+): AdvancedSearchQueryAtom {
+  const bounds = RANGE_BOUNDS.exec(body)
+  if (!bounds) throw new UnreadableQuery()
+  const lo = bounds[1] ?? ''
+  const hi = bounds[2] ?? ''
+
+  if (kind === AdvancedSearchFieldKind.Date) {
+    const relative = RELATIVE_BOUND.exec(lo)
+    if (relative && hi === 'now') {
+      return atomFrom(field, AdvancedSearchOperator.WithinLast, relative[1], {
+        unit: relative[2] as AdvancedSearchDateUnit,
+      })
+    }
+  } else if (kind !== AdvancedSearchFieldKind.Number) {
+    throw new UnreadableQuery()
+  }
+
+  const isValid =
+    kind === AdvancedSearchFieldKind.Date
+      ? (v: string) => ISO_DATE.test(v)
+      : (v: string) => WHOLE_NUMBER.test(v)
+
+  if (lo && hi) {
+    if (!isValid(lo) || !isValid(hi)) throw new UnreadableQuery()
+    return atomFrom(field, AdvancedSearchOperator.Between, lo, { valueTo: hi })
+  }
+  if (lo && isValid(lo))
+    return atomFrom(field, AdvancedSearchOperator.AtLeast, lo)
+  if (hi && isValid(hi))
+    return atomFrom(field, AdvancedSearchOperator.AtMost, hi)
+  throw new UnreadableQuery()
+}
+
+function parseTerm(token: Token): Parsed {
+  const field = resolveField(token.field)
+  const kind = ADVANCED_SEARCH_FIELD_KINDS[field]
+  const value = token.value
+  const isKeyword = (
+    ADVANCED_SEARCH_DATE_KEYWORDS as readonly string[]
+  ).includes(value)
+
+  if (token.range) {
+    return { element: parseRange(field, kind, value) }
+  }
+
+  if (kind === AdvancedSearchFieldKind.Date) {
+    if (!isKeyword) throw new UnreadableQuery()
+    return {
+      element: atomFrom(field, AdvancedSearchOperator.DateKeyword, value),
+    }
+  }
+
+  if (token.quoted) {
+    if (kind !== AdvancedSearchFieldKind.Text) throw new UnreadableQuery()
+    return { element: atomFrom(field, AdvancedSearchOperator.Phrase, value) }
+  }
+
+  const wildcard = TRAILING_WILDCARD.exec(value)
+  if (wildcard) {
+    if (kind === AdvancedSearchFieldKind.Number) throw new UnreadableQuery()
+    return {
+      element: atomFrom(field, AdvancedSearchOperator.StartsWith, wildcard[1]),
+    }
+  }
+
+  if (kind === AdvancedSearchFieldKind.Number) {
+    if (!WHOLE_NUMBER.test(value)) throw new UnreadableQuery()
+    return { element: atomFrom(field, AdvancedSearchOperator.Equals, value) }
+  }
+  // A checksum is only ever searched by its first characters
+  if (kind === AdvancedSearchFieldKind.Checksum) throw new UnreadableQuery()
+
+  return {
+    element: atomFrom(field, AdvancedSearchOperator.AllWords, value),
+    word: { field, text: value },
+  }
+}
+
+// The serializer repeats the field for every word, because a field applies
+// only to the word after it. Put those back together into one condition.
+function mergeWords(
+  parts: Parsed[],
+  operator: AdvancedSearchLogicalOperator.And | AdvancedSearchLogicalOperator.Or
+): AdvancedSearchQueryElement[] {
+  const merged: AdvancedSearchQueryElement[] = []
+  for (let i = 0; i < parts.length; i++) {
+    const run = [parts[i]]
+    while (
+      parts[i].word &&
+      parts[i + 1]?.word &&
+      parts[i + 1].word.field === parts[i].word.field
+    ) {
+      run.push(parts[++i])
+    }
+    if (run.length === 1) {
+      merged.push(run[0].element)
+      continue
+    }
+    merged.push(
+      atomFrom(
+        run[0].word.field,
+        operator === AdvancedSearchLogicalOperator.And
+          ? AdvancedSearchOperator.AllWords
+          : AdvancedSearchOperator.AnyWord,
+        run.map((part) => part.word.text).join(' ')
+      )
+    )
+  }
+  return merged
+}
+
+interface Cursor {
+  tokens: Token[]
+  at: number
+}
+
+function parseExpression(cursor: Cursor): Parsed {
+  const parts: Parsed[] = [parseOperand(cursor)]
+  let operator:
+    AdvancedSearchLogicalOperator.And | AdvancedSearchLogicalOperator.Or
+  while (
+    cursor.tokens[cursor.at]?.type === 'AND' ||
+    cursor.tokens[cursor.at]?.type === 'OR'
+  ) {
+    const next = cursor.tokens[cursor.at++].type as
+      AdvancedSearchLogicalOperator.And | AdvancedSearchLogicalOperator.Or
+    // One level mixing AND and OR is never something the editor wrote
+    if (operator && next !== operator) throw new UnreadableQuery()
+    operator = next
+    parts.push(parseOperand(cursor))
+  }
+  if (parts.length === 1) return parts[0]
+
+  const children = mergeWords(parts, operator)
+  if (children.length === 1) return { element: children[0] }
+  return {
+    element: {
+      type: AdvancedSearchQueryElementType.Group,
+      operator,
+      children,
+    },
+  }
+}
+
+function parseOperand(cursor: Cursor): Parsed {
+  const token = cursor.tokens[cursor.at++]
+  if (!token) throw new UnreadableQuery()
+
+  if (token.type === 'NOT') {
+    const child = parseOperand(cursor)
+    return {
+      element: {
+        type: AdvancedSearchQueryElementType.Group,
+        operator: AdvancedSearchLogicalOperator.Not,
+        children: [child.element],
+      },
+    }
+  }
+  if (token.type === '(') {
+    const inner = parseExpression(cursor)
+    if (cursor.tokens[cursor.at++]?.type !== ')') throw new UnreadableQuery()
+    return { element: inner.element }
+  }
+  if (token.type !== 'term') throw new UnreadableQuery()
+  return parseTerm(token)
+}
+
+/**
+ * Reads a query the editor could have written back into an editor tree, or
+ * returns null when the editor cannot show it, in which case the query stays
+ * text. Never returns a tree that would be written back differently.
+ */
+export function parseAdvancedSearchQuery(
+  query: string
+): AdvancedSearchQueryGroup | null {
+  const trimmed = query?.trim() ?? ''
+  if (!trimmed) return null
+
+  let parsed: Parsed
+  try {
+    const cursor: Cursor = { tokens: tokenize(trimmed), at: 0 }
+    parsed = parseExpression(cursor)
+    if (cursor.at !== cursor.tokens.length) throw new UnreadableQuery()
+  } catch {
+    return null
+  }
+
+  const root =
+    parsed.element.type === AdvancedSearchQueryElementType.Group
+      ? parsed.element
+      : {
+          type: AdvancedSearchQueryElementType.Group as const,
+          operator: AdvancedSearchLogicalOperator.And,
+          children: [parsed.element],
+        }
+
+  return serializeAdvancedSearchQuery(root) === trimmed ? root : null
+}

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.2.1',
+  version: '3.2.0',
   webSocketHost: window.location.host,
   webSocketProtocol: window.location.protocol == 'https:' ? 'wss:' : 'ws:',
   webSocketBaseUrl: base_url.pathname + 'ws/',

src-ui/src/locale/messages.de_DE.xlf

@@ -2855,7 +2855,7 @@
           <context context-type="sourcefile">src/app/components/admin/tasks/tasks.component.ts</context>
           <context context-type="linenumber">104</context>
         </context-group>
-        <target state="translated">KI-Vorschläge anwenden</target>
+        <target state="needs-translation">Apply AI Suggestions</target>
       </trans-unit>
       <trans-unit id="9172233176401579786" datatype="html" approved="yes">
         <source>Scheduled</source>
@@ -3907,7 +3907,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-links.component.html</context>
           <context context-type="linenumber">2,3</context>
         </context-group>
-        <target state="translated">Share Links</target>
+        <target state="needs-translation">Share links</target>
       </trans-unit>
       <trans-unit id="7844706011418789951" datatype="html" approved="yes">
         <source>Administration</source>
@@ -5835,7 +5835,7 @@
           <context context-type="sourcefile">src/app/components/common/edit-dialog/mail-rule-edit-dialog/mail-rule-edit-dialog.component.ts</context>
           <context context-type="linenumber">182</context>
         </context-group>
-        <target state="translated">Fehler beim Abrufen der Korrespondenten</target>
+        <target state="needs-translation">Error retrieving correspondents</target>
       </trans-unit>
       <trans-unit id="3407606224361082860" datatype="html">
         <source>Error retrieving document types</source>
@@ -9623,7 +9623,7 @@
           <context context-type="sourcefile">src/app/components/document-detail/document-detail.component.ts</context>
           <context context-type="linenumber">1051</context>
         </context-group>
-        <target state="translated">Sie haben ungespeicherte Änderungen am Inhalt dieser Version.</target>
+        <target state="needs-translation">You have unsaved changes to the content of this version.</target>
       </trans-unit>
       <trans-unit id="85184271222513014" datatype="html">
         <source>Switching versions will discard them.</source>
@@ -12574,7 +12574,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-links.component.html</context>
           <context context-type="linenumber">4,5</context>
         </context-group>
-        <target state="translated">Verwalten Sie öffentliche Links zu einzelnen Dokumenten und Dokumentenbündeln.</target>
+        <target state="needs-translation">Manage public links to individual documents and document bundles.</target>
       </trans-unit>
       <trans-unit id="3740311348735113099" datatype="html">
         <source>Document links</source>

src-ui/src/locale/messages.it_IT.xlf

@@ -3907,7 +3907,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-links.component.html</context>
           <context context-type="linenumber">2,3</context>
         </context-group>
-        <target state="translated">Condividi link</target>
+        <target state="needs-translation">Share links</target>
       </trans-unit>
       <trans-unit id="7844706011418789951" datatype="html">
         <source>Administration</source>
@@ -12411,7 +12411,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.html</context>
           <context context-type="linenumber">40,41</context>
         </context-group>
-        <target state="translated">Scaduto</target>
+        <target state="needs-translation">Expired</target>
       </trans-unit>
       <trans-unit id="2057574872309338088" datatype="html">
         <source>Copy share link</source>
@@ -12455,7 +12455,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html</context>
           <context context-type="linenumber">164,165</context>
         </context-group>
-        <target state="translated">Paginazione dei pacchetti di link di condivisione</target>
+        <target state="needs-translation">Share link bundles pagination</target>
       </trans-unit>
       <trans-unit id="1541995860059283227" datatype="html">
         <source>Failed to load share link bundles.</source>
@@ -12511,7 +12511,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.html</context>
           <context context-type="linenumber">7,8</context>
         </context-group>
-        <target state="translated"> Attualmente non sono presenti link per la condivisione dei documenti. </target>
+        <target state="needs-translation"> No document share links currently exist. </target>
       </trans-unit>
       <trans-unit id="894965666917873756" datatype="html">
         <source>Document</source>
@@ -12519,7 +12519,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.html</context>
           <context context-type="linenumber">15,16</context>
         </context-group>
-        <target state="translated">Documento</target>
+        <target state="needs-translation">Document</target>
       </trans-unit>
       <trans-unit id="7420713064779772535" datatype="html">
         <source>Delete share link</source>
@@ -12527,7 +12527,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.html</context>
           <context context-type="linenumber">75,76</context>
         </context-group>
-        <target state="translated">Elimina link di condivisione</target>
+        <target state="needs-translation">Delete share link</target>
       </trans-unit>
       <trans-unit id="5198271726831144068" datatype="html">
         <source>Share links pagination</source>
@@ -12535,7 +12535,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.html</context>
           <context context-type="linenumber">104,105</context>
         </context-group>
-        <target state="translated">Paginazione link condivisi</target>
+        <target state="needs-translation">Share links pagination</target>
       </trans-unit>
       <trans-unit id="2976350639944567244" datatype="html">
         <source>Failed to load share links.</source>
@@ -12543,7 +12543,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.ts</context>
           <context context-type="linenumber">105</context>
         </context-group>
-        <target state="translated">Impossibile caricare i link di condivisione.</target>
+        <target state="needs-translation">Failed to load share links.</target>
       </trans-unit>
       <trans-unit id="4100863040928608880" datatype="html">
         <source>Error retrieving share links.</source>
@@ -12551,7 +12551,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.ts</context>
           <context context-type="linenumber">107</context>
         </context-group>
-        <target state="translated">Errore nel recuperare i link di condivisione.</target>
+        <target state="needs-translation">Error retrieving share links.</target>
       </trans-unit>
       <trans-unit id="326120283142363299" datatype="html">
         <source>Share link deleted.</source>
@@ -12559,7 +12559,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.ts</context>
           <context context-type="linenumber">154</context>
         </context-group>
-        <target state="translated">Link di condivisione eliminato.</target>
+        <target state="needs-translation">Share link deleted.</target>
       </trans-unit>
       <trans-unit id="4964931417181298145" datatype="html">
         <source>Error deleting share link.</source>
@@ -12567,7 +12567,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.ts</context>
           <context context-type="linenumber">159</context>
         </context-group>
-        <target state="translated">Errore nell'eliminare il link condivisione.</target>
+        <target state="needs-translation">Error deleting share link.</target>
       </trans-unit>
       <trans-unit id="3439104787814858626" datatype="html">
         <source>Manage public links to individual documents and document bundles.</source>
@@ -12575,7 +12575,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-links.component.html</context>
           <context context-type="linenumber">4,5</context>
         </context-group>
-        <target state="translated">Gestisci i link pubblici ai singoli documenti e pacchetti di documenti.</target>
+        <target state="needs-translation">Manage public links to individual documents and document bundles.</target>
       </trans-unit>
       <trans-unit id="3740311348735113099" datatype="html">
         <source>Document links</source>
@@ -12583,7 +12583,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-links.component.html</context>
           <context context-type="linenumber">18,19</context>
         </context-group>
-        <target state="translated">Link al documento</target>
+        <target state="needs-translation">Document links</target>
       </trans-unit>
       <trans-unit id="8216780576869093031" datatype="html">
         <source>Bundles</source>
@@ -12591,7 +12591,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-links.component.html</context>
           <context context-type="linenumber">26,27</context>
         </context-group>
-        <target state="translated">Pacchetti</target>
+        <target state="needs-translation">Bundles</target>
       </trans-unit>
       <trans-unit id="1229748338333965418" datatype="html">
         <source>Use workflows to customize the behavior of Paperless-ngx when events &apos;trigger&apos; a workflow.</source>

src-ui/src/locale/messages.ru_RU.xlf

@@ -3907,7 +3907,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-links.component.html</context>
           <context context-type="linenumber">2,3</context>
         </context-group>
-        <target state="translated">Ссылки для обмена</target>
+        <target state="needs-translation">Share links</target>
       </trans-unit>
       <trans-unit id="7844706011418789951" datatype="html">
         <source>Administration</source>
@@ -12410,7 +12410,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.html</context>
           <context context-type="linenumber">40,41</context>
         </context-group>
-        <target state="translated">Истёкшие</target>
+        <target state="needs-translation">Expired</target>
       </trans-unit>
       <trans-unit id="2057574872309338088" datatype="html">
         <source>Copy share link</source>
@@ -12454,7 +12454,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html</context>
           <context context-type="linenumber">164,165</context>
         </context-group>
-        <target state="translated">Пагинация ссылок</target>
+        <target state="needs-translation">Share link bundles pagination</target>
       </trans-unit>
       <trans-unit id="1541995860059283227" datatype="html">
         <source>Failed to load share link bundles.</source>
@@ -12510,7 +12510,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.html</context>
           <context context-type="linenumber">7,8</context>
         </context-group>
-        <target state="translated"> В настоящее время нет общих ссылок. </target>
+        <target state="needs-translation"> No document share links currently exist. </target>
       </trans-unit>
       <trans-unit id="894965666917873756" datatype="html">
         <source>Document</source>
@@ -12518,7 +12518,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.html</context>
           <context context-type="linenumber">15,16</context>
         </context-group>
-        <target state="translated">Документ</target>
+        <target state="needs-translation">Document</target>
       </trans-unit>
       <trans-unit id="7420713064779772535" datatype="html">
         <source>Delete share link</source>
@@ -12526,7 +12526,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.html</context>
           <context context-type="linenumber">75,76</context>
         </context-group>
-        <target state="translated">Удалить ссылку для обмена</target>
+        <target state="needs-translation">Delete share link</target>
       </trans-unit>
       <trans-unit id="5198271726831144068" datatype="html">
         <source>Share links pagination</source>
@@ -12534,7 +12534,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.html</context>
           <context context-type="linenumber">104,105</context>
         </context-group>
-        <target state="translated">Пагинация ссылок</target>
+        <target state="needs-translation">Share links pagination</target>
       </trans-unit>
       <trans-unit id="2976350639944567244" datatype="html">
         <source>Failed to load share links.</source>
@@ -12542,7 +12542,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.ts</context>
           <context context-type="linenumber">105</context>
         </context-group>
-        <target state="translated">Не удалось загрузить ссылки.</target>
+        <target state="needs-translation">Failed to load share links.</target>
       </trans-unit>
       <trans-unit id="4100863040928608880" datatype="html">
         <source>Error retrieving share links.</source>
@@ -12550,7 +12550,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.ts</context>
           <context context-type="linenumber">107</context>
         </context-group>
-        <target state="translated">Ошибка при получении ссылок.</target>
+        <target state="needs-translation">Error retrieving share links.</target>
       </trans-unit>
       <trans-unit id="326120283142363299" datatype="html">
         <source>Share link deleted.</source>
@@ -12558,7 +12558,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.ts</context>
           <context context-type="linenumber">154</context>
         </context-group>
-        <target state="translated">Ссылка для обмена удалена.</target>
+        <target state="needs-translation">Share link deleted.</target>
       </trans-unit>
       <trans-unit id="4964931417181298145" datatype="html">
         <source>Error deleting share link.</source>
@@ -12566,7 +12566,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.ts</context>
           <context context-type="linenumber">159</context>
         </context-group>
-        <target state="translated">Ошибка при удалении ссылки.</target>
+        <target state="needs-translation">Error deleting share link.</target>
       </trans-unit>
       <trans-unit id="3439104787814858626" datatype="html">
         <source>Manage public links to individual documents and document bundles.</source>
@@ -12574,7 +12574,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-links.component.html</context>
           <context context-type="linenumber">4,5</context>
         </context-group>
-        <target state="translated">Управление публичными ссылками на отдельные документы и комплекты документов.</target>
+        <target state="needs-translation">Manage public links to individual documents and document bundles.</target>
       </trans-unit>
       <trans-unit id="3740311348735113099" datatype="html">
         <source>Document links</source>
@@ -12582,7 +12582,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-links.component.html</context>
           <context context-type="linenumber">18,19</context>
         </context-group>
-        <target state="translated">Ссылки на документы</target>
+        <target state="needs-translation">Document links</target>
       </trans-unit>
       <trans-unit id="8216780576869093031" datatype="html">
         <source>Bundles</source>
@@ -12590,7 +12590,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-links.component.html</context>
           <context context-type="linenumber">26,27</context>
         </context-group>
-        <target state="translated">Комплекты</target>
+        <target state="needs-translation">Bundles</target>
       </trans-unit>
       <trans-unit id="1229748338333965418" datatype="html">
         <source>Use workflows to customize the behavior of Paperless-ngx when events &apos;trigger&apos; a workflow.</source>

src-ui/src/locale/messages.sl_SI.xlf

@@ -2855,7 +2855,7 @@
           <context context-type="sourcefile">src/app/components/admin/tasks/tasks.component.ts</context>
           <context context-type="linenumber">104</context>
         </context-group>
-        <target state="translated">Uporabi predloge umetne inteligence</target>
+        <target state="needs-translation">Apply AI Suggestions</target>
       </trans-unit>
       <trans-unit id="9172233176401579786" datatype="html">
         <source>Scheduled</source>
@@ -3907,7 +3907,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-links.component.html</context>
           <context context-type="linenumber">2,3</context>
         </context-group>
-        <target state="translated">Delite povezave</target>
+        <target state="needs-translation">Share links</target>
       </trans-unit>
       <trans-unit id="7844706011418789951" datatype="html">
         <source>Administration</source>
@@ -12411,7 +12411,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.html</context>
           <context context-type="linenumber">40,41</context>
         </context-group>
-        <target state="translated">Poteklo</target>
+        <target state="needs-translation">Expired</target>
       </trans-unit>
       <trans-unit id="2057574872309338088" datatype="html">
         <source>Copy share link</source>
@@ -12455,7 +12455,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-bundle-list/share-link-bundle-list.component.html</context>
           <context context-type="linenumber">164,165</context>
         </context-group>
-        <target state="translated">Deljenje povezav – strani v sklopih</target>
+        <target state="needs-translation">Share link bundles pagination</target>
       </trans-unit>
       <trans-unit id="1541995860059283227" datatype="html">
         <source>Failed to load share link bundles.</source>
@@ -12511,7 +12511,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.html</context>
           <context context-type="linenumber">7,8</context>
         </context-group>
-        <target state="translated"> Trenutno ni povezav za skupno rabo dokumentov. </target>
+        <target state="needs-translation"> No document share links currently exist. </target>
       </trans-unit>
       <trans-unit id="894965666917873756" datatype="html">
         <source>Document</source>
@@ -12519,7 +12519,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.html</context>
           <context context-type="linenumber">15,16</context>
         </context-group>
-        <target state="translated">Dokument</target>
+        <target state="needs-translation">Document</target>
       </trans-unit>
       <trans-unit id="7420713064779772535" datatype="html">
         <source>Delete share link</source>
@@ -12527,7 +12527,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.html</context>
           <context context-type="linenumber">75,76</context>
         </context-group>
-        <target state="translated">Izbriši povezavo za deljenje</target>
+        <target state="needs-translation">Delete share link</target>
       </trans-unit>
       <trans-unit id="5198271726831144068" datatype="html">
         <source>Share links pagination</source>
@@ -12535,7 +12535,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.html</context>
           <context context-type="linenumber">104,105</context>
         </context-group>
-        <target state="translated">Deljenje povezav – strani v sklopih</target>
+        <target state="needs-translation">Share links pagination</target>
       </trans-unit>
       <trans-unit id="2976350639944567244" datatype="html">
         <source>Failed to load share links.</source>
@@ -12543,7 +12543,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.ts</context>
           <context context-type="linenumber">105</context>
         </context-group>
-        <target state="translated">Povezav za deljenje ni bilo mogoče naložiti.</target>
+        <target state="needs-translation">Failed to load share links.</target>
       </trans-unit>
       <trans-unit id="4100863040928608880" datatype="html">
         <source>Error retrieving share links.</source>
@@ -12551,7 +12551,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.ts</context>
           <context context-type="linenumber">107</context>
         </context-group>
-        <target state="translated">Napaka pri pridobivanju povezav za deljenje.</target>
+        <target state="needs-translation">Error retrieving share links.</target>
       </trans-unit>
       <trans-unit id="326120283142363299" datatype="html">
         <source>Share link deleted.</source>
@@ -12559,7 +12559,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.ts</context>
           <context context-type="linenumber">154</context>
         </context-group>
-        <target state="translated">Povezava za deljenje je bila izbrisana.</target>
+        <target state="needs-translation">Share link deleted.</target>
       </trans-unit>
       <trans-unit id="4964931417181298145" datatype="html">
         <source>Error deleting share link.</source>
@@ -12567,7 +12567,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-link-list/share-link-list.component.ts</context>
           <context context-type="linenumber">159</context>
         </context-group>
-        <target state="translated">Napaka pri brisanju povezave za deljenje.</target>
+        <target state="needs-translation">Error deleting share link.</target>
       </trans-unit>
       <trans-unit id="3439104787814858626" datatype="html">
         <source>Manage public links to individual documents and document bundles.</source>
@@ -12575,7 +12575,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-links.component.html</context>
           <context context-type="linenumber">4,5</context>
         </context-group>
-        <target state="translated">Upravljajte javne povezave do posameznih dokumentov in paketov dokumentov.</target>
+        <target state="needs-translation">Manage public links to individual documents and document bundles.</target>
       </trans-unit>
       <trans-unit id="3740311348735113099" datatype="html">
         <source>Document links</source>
@@ -12583,7 +12583,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-links.component.html</context>
           <context context-type="linenumber">18,19</context>
         </context-group>
-        <target state="translated">Povezave do dokumentov</target>
+        <target state="needs-translation">Document links</target>
       </trans-unit>
       <trans-unit id="8216780576869093031" datatype="html">
         <source>Bundles</source>
@@ -12591,7 +12591,7 @@
           <context context-type="sourcefile">src/app/components/manage/share-links/share-links.component.html</context>
           <context context-type="linenumber">26,27</context>
         </context-group>
-        <target state="translated">Paketi</target>
+        <target state="needs-translation">Bundles</target>
       </trans-unit>
       <trans-unit id="1229748338333965418" datatype="html">
         <source>Use workflows to customize the behavior of Paperless-ngx when events &apos;trigger&apos; a workflow.</source>

src-ui/src/locale/messages.sv_SE.xlf

@@ -11518,7 +11518,7 @@
           <context context-type="sourcefile">src/app/components/manage/document-attributes/custom-fields/custom-fields.component.html</context>
           <context context-type="linenumber">70,72</context>
         </context-group>
-        <target state="translated">Inga fält har definierats.</target>
+        <target state="translated"/>
       </trans-unit>
       <trans-unit id="3032792139967609806" datatype="html">
         <source>Confirm delete field</source>

src-ui/src/main.ts

@@ -148,6 +148,7 @@ import {
   send,
   shop,
   slashCircle,
+  sliders,
   sliders2Vertical,
   sortAlphaDown,
   sortAlphaUpAlt,
@@ -397,6 +398,7 @@ const icons = {
   send,
   slashCircle,
   shop,
+  sliders,
   sliders2Vertical,
   sortAlphaDown,
   sortAlphaUpAlt,

src-ui/src/test/mocks/pdfjs-web-pdf_viewer.ts

@@ -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
   }

src/conftest.py

@@ -1,151 +0,0 @@
-"""Fixtures available to every Paperless-ngx app.
-
-Loaded automatically for every test path. Keep module-scope imports minimal:
-this file is imported for every session,  so anything heavy belongs inside
-the fixture body that needs it.
-"""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import pytest
-
-if TYPE_CHECKING:
-    from collections.abc import Generator
-    from pathlib import Path
-
-    from django.contrib.auth.models import User
-    from pytest_django.fixtures import Settings
-    from rest_framework.test import APIClient
-
-    from paperless_testing.dirs import PaperlessDirs
-    from paperless_testing.fakes.progress import FakeProgressManager
-
-
-@pytest.fixture(scope="session", autouse=True)
-def faker_session_locale() -> str:
-    """Pin Faker's locale so generated data does not follow the host locale.
-
-    The seed itself is left to pytest-randomly, which derives one per run.
-    """
-    return "en_US"
-
-
-@pytest.fixture(autouse=True)
-def _fast_password_hasher(settings: Settings) -> None:
-    """Hash test passwords with MD5 instead of Django's default PBKDF2.
-
-    PBKDF2 is deliberately slow, and every ``admin_user`` or
-    ``create_superuser`` call pays for it: about 600 ms each. No test depends
-    on the hash format, only on ``check_password`` and on the stored value
-    changing when the password does.
-    """
-    settings.PASSWORD_HASHERS = ["django.contrib.auth.hashers.MD5PasswordHasher"]
-
-
-@pytest.fixture(autouse=True)
-def _clear_content_type_caches() -> None:
-    """Clear Django's ContentType cache and guardian's lru_cache before each test.
-
-    Tests that delete and reinsert ContentType/Permission rows (e.g. the
-    importer) corrupt both caches. Without this fixture a subsequent test on
-    the same xdist worker sees stale ContentType objects and guardian raises
-    MixedContentTypeError.
-    """
-    from django.contrib.contenttypes.models import ContentType
-    from guardian.shortcuts import clear_ct_cache
-
-    ContentType.objects.clear_cache()
-    clear_ct_cache()
-
-
-@pytest.fixture(autouse=True)
-def _clear_django_caches() -> None:
-    """Clear every configured cache before each test.
-
-    Cached values outlive the test that wrote them: the classifier keys its
-    vectorized content on a hash of the content itself, so a second test
-    generating the same fixture data takes the cache-hit path and never calls
-    the code it is asserting against.
-    """
-    from django.core.cache import caches
-
-    for cache in caches.all(initialized_only=False):
-        cache.clear()
-
-
-@pytest.fixture
-def paperless_dirs(
-    tmp_path: Path,
-    settings: Settings,
-) -> Generator[PaperlessDirs, None, None]:
-    """The standard temp directory layout, applied to Django settings."""
-    from documents.search import reset_backend
-    from paperless_testing.dirs import build_paperless_dirs
-    from paperless_testing.dirs import dirs_settings
-
-    dirs = build_paperless_dirs(tmp_path)
-    for name, value in dirs_settings(dirs).items():
-        setattr(settings, name, value)
-
-    # Not directory settings, but they are needed alongside the layout by the
-    # sanity checker tests.
-    settings.IGNORABLE_FILES = {".DS_Store", "Thumbs.db", "desktop.ini"}
-    settings.APP_LOGO = ""
-
-    reset_backend()
-    yield dirs
-    reset_backend()
-
-
-@pytest.fixture
-def rest_api_client() -> APIClient:
-    """The basic DRF APIClient, unauthenticated."""
-    from rest_framework.test import APIClient
-
-    return APIClient()
-
-
-@pytest.fixture
-def regular_user(db: None) -> User:
-    """Unprivileged user for permission boundary tests."""
-    from paperless_testing.factories import UserFactory
-
-    return UserFactory(username="regular")
-
-
-@pytest.fixture
-def admin_client(rest_api_client: APIClient, admin_user: User) -> APIClient:
-    """Admin client pre-authenticated and sending the v10 Accept header."""
-    rest_api_client.force_authenticate(user=admin_user)
-    rest_api_client.credentials(HTTP_ACCEPT="application/json; version=10")
-    return rest_api_client
-
-
-@pytest.fixture
-def v9_client(rest_api_client: APIClient, admin_user: User) -> APIClient:
-    """Admin client pre-authenticated and sending the v9 Accept header."""
-    rest_api_client.force_authenticate(user=admin_user)
-    rest_api_client.credentials(HTTP_ACCEPT="application/json; version=9")
-    return rest_api_client
-
-
-@pytest.fixture
-def user_client(rest_api_client: APIClient, regular_user: User) -> APIClient:
-    """Regular-user client pre-authenticated and sending the v10 Accept header."""
-    rest_api_client.force_authenticate(user=regular_user)
-    rest_api_client.credentials(HTTP_ACCEPT="application/json; version=10")
-    return rest_api_client
-
-
-@pytest.fixture
-def fake_progress_manager(
-    monkeypatch: pytest.MonkeyPatch,
-) -> type[FakeProgressManager]:
-    """Replace documents.tasks.ProgressManager with the fake, so consuming a file
-    in a test never tries to reach a broker."""
-    from paperless_testing.fakes.progress import FakeProgressManager
-
-    monkeypatch.setattr("documents.tasks.ProgressManager", FakeProgressManager)
-    return FakeProgressManager

src/documents/apps.py

@@ -26,6 +26,7 @@ class DocumentsConfig(AppConfig):
         document_consumption_finished.connect(set_document_type)
         document_consumption_finished.connect(set_tags)
         document_consumption_finished.connect(set_storage_path)
+        document_consumption_finished.connect(add_to_index)
         document_consumption_finished.connect(run_workflows_added)
         document_consumption_finished.connect(add_to_index)
         document_consumption_finished.connect(add_or_update_document_in_llm_index)

src/documents/consumer.py

@@ -857,9 +857,8 @@ class ConsumerPlugin(
             self.log.debug(f"Creation date from parse_date: {create_date}")
         else:
             stats = Path(self.input_doc.original_file).stat()
-            create_date = datetime.datetime.fromtimestamp(
+            create_date = timezone.make_aware(
-                stats.st_mtime,
+                datetime.datetime.fromtimestamp(stats.st_mtime),
-                tz=timezone.get_current_timezone(),
             )
             self.log.debug(f"Creation date from st_mtime: {create_date}")
 

src/documents/search/_backend.py

@@ -196,6 +196,7 @@ class WriteBatch:
         return self._raw_writer
 
     def __enter__(self) -> Self:
+        if self._backend._path is not None:
             lock_path = self._backend._path / ".tantivy.lock"
             self._lock = filelock.FileLock(str(lock_path))
             for attempt in range(_LOCK_RETRY_ATTEMPTS):
@@ -239,6 +240,8 @@ class WriteBatch:
             )
             register_tokenizers(write_index, settings.SEARCH_LANGUAGE)
             self._raw_writer = write_index.writer()
+        else:
+            self._raw_writer = self._backend._index.writer()
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
@@ -369,8 +372,9 @@ class TantivyBackend:
     Tantivy search backend with explicit lifecycle management.
 
     Provides full-text search capabilities using the Tantivy search engine.
-    Keeps a persistent on-disk index. Handles document indexing, search queries,
+    Supports in-memory indexes (for testing) and persistent on-disk indexes
-    autocompletion, and "more like this" functionality.
+    (for production use). Handles document indexing, search queries, autocompletion,
+    and "more like this" functionality.
 
     The backend manages its own connection lifecycle and can be reset when
     the underlying index directory changes (e.g., during test isolation).
@@ -404,7 +408,9 @@ class TantivyBackend:
         },
     )
 
-    def __init__(self, path: Path):
+    def __init__(self, path: Path | None = None):
+        # path=None → in-memory index (for tests)
+        # path=some_dir → on-disk index (for production)
         self._path = path
         self._raw_index: tantivy.Index | None = None
         self._raw_schema: tantivy.Schema | None = None
@@ -423,13 +429,16 @@ class TantivyBackend:
         """
         Open or rebuild the index as needed.
 
-        Checks if rebuilding is needed due to schema version or language
+        For disk-based indexes, checks if rebuilding is needed due to schema
-        changes. Registers custom tokenizers after opening.
+        version or language changes. Registers custom tokenizers after opening.
         Safe to call multiple times - subsequent calls are no-ops.
         """
         if self._raw_index is not None:
             return  # pragma: no cover
+        if self._path is not None:
             self._raw_index = open_or_rebuild_index(self._path)
+        else:
+            self._raw_index = tantivy.Index(build_schema())
         register_tokenizers(self._raw_index, settings.SEARCH_LANGUAGE)
         self._raw_schema = self._raw_index.schema
 
@@ -1093,9 +1102,13 @@ class TantivyBackend:
                 writer's threads). Larger values buffer more docs in RAM before
                 flushing a segment, deferring merge work; they do not avoid it.
         """
+        # Create new index (on-disk or in-memory)
+        if self._path is not None:
             wipe_index(self._path)
             new_index = tantivy.Index(build_schema(), path=str(self._path))
             _write_sentinels(self._path)
+        else:
+            new_index = tantivy.Index(build_schema())
         register_tokenizers(new_index, settings.SEARCH_LANGUAGE)
 
         # Point instance at the new index so _build_tantivy_doc uses it

src/documents/serialisers.py

@@ -1079,16 +1079,6 @@ class DocumentSerializer(
     )
 
     def get_page_count(self, obj) -> int | None:
-        # Like content versions get their own page count from the newest version,
-        # use the prefetched versions cache to avoid an extra query
-        prefetched_cache = getattr(obj, "_prefetched_objects_cache", None)
-        prefetched_versions = (
-            prefetched_cache.get("versions")
-            if isinstance(prefetched_cache, dict)
-            else None
-        )
-        if obj.root_document_id is None and prefetched_versions:
-            return sort_versions_newest_first(prefetched_versions)[0].page_count
         return obj.page_count
 
     @extend_schema_field(DuplicateDocumentSummarySerializer(many=True))
@@ -2108,8 +2098,6 @@ class BulkEditSerializer(
         if not isinstance(parameters["pages"], str):
             raise serializers.ValidationError("invalid pages specified")
         page_count = Document.objects.get(id=document_id).page_count
-        if not page_count:
-            raise serializers.ValidationError("document page count is unknown")
         pages = []
         for group in parameters["pages"].split(","):
             start, is_range, end = group.partition("-")
@@ -2119,7 +2107,7 @@ class BulkEditSerializer(
             except ValueError as e:
                 raise serializers.ValidationError("invalid pages specified") from e
             # Bound the range before building it, a huge one would exhaust memory
-            if not 1 <= first <= last <= page_count:
+            if not 1 <= first <= last or (page_count and last > page_count):
                 raise serializers.ValidationError("invalid pages specified")
             pages.append(list(range(first, last + 1)))
         parameters["pages"] = pages

src/documents/signals/handlers.py

@@ -56,7 +56,6 @@ from documents.permissions import get_objects_for_user_owner_aware
 from documents.plugins.helpers import DocumentsStatusManager
 from documents.templating.utils import convert_format_str_to_template_format
 from documents.utils import compute_checksum
-from documents.utils import copy_file_with_basic_stats
 from documents.workflows.actions import build_workflow_action_context
 from documents.workflows.actions import execute_email_action
 from documents.workflows.actions import execute_move_to_trash_action
@@ -364,11 +363,7 @@ def cleanup_document_deletion(sender, instance, **kwargs) -> None:
 
             logger.debug(f"Moving {instance.source_path} to trash at {new_file_path}")
             try:
-                shutil.move(
+                shutil.move(instance.source_path, new_file_path)
-                    instance.source_path,
-                    new_file_path,
-                    copy_function=copy_file_with_basic_stats,
-                )
             except OSError as e:
                 logger.error(
                     f"Failed to move {instance.source_path} to trash at "

src/documents/templates/index.html

@@ -12,7 +12,7 @@
 	<meta name="robots" content="noindex,nofollow">
 	<meta name="author" content="The Paperless-ngx Team">
 	<link rel="icon" type="image/x-icon" href="favicon.ico">
-	<link rel="manifest" href="{% static webmanifest %}" crossorigin="use-credentials">
+	<link rel="manifest" href="{% static webmanifest %}">
 	<link rel="stylesheet" href="{% static styles_css %}">
 	<link rel="apple-touch-icon" href="{% static apple_touch_icon %}">
 </head>

src/documents/tests/conftest.py

@@ -1,41 +1,88 @@
 import shutil
+import zoneinfo
+from collections.abc import Generator
+from dataclasses import dataclass
 from pathlib import Path
 from typing import TYPE_CHECKING
 
 import filelock
 import pytest
+from django.contrib.auth import get_user_model
+from django.contrib.contenttypes.models import ContentType
+from guardian.shortcuts import clear_ct_cache
+from pytest_django.fixtures import Settings
+from rest_framework.test import APIClient
 
-from paperless_testing.factories import DocumentFactory
+from documents.tests.factories import DocumentFactory
+
+UserModelT = get_user_model()
 
 if TYPE_CHECKING:
     from documents.models import Document
-    from paperless_testing.dirs import PaperlessDirs
+
+
+@dataclass(frozen=True, slots=True)
+class PaperlessDirs:
+    """Standard Paperless-ngx directory layout for tests."""
+
+    media: Path
+    originals: Path
+    archive: Path
+    thumbnails: Path
 
 
 @pytest.fixture(scope="session")
-def document_samples_dir() -> Path:
+def samples_dir() -> Path:
     """Path to the shared test sample documents."""
     return Path(__file__).parent / "samples" / "documents"
 
 
+@pytest.fixture()
+def paperless_dirs(tmp_path: Path) -> PaperlessDirs:
+    """Create and return the directory structure for testing."""
+    media = tmp_path / "media"
+    dirs = PaperlessDirs(
+        media=media,
+        originals=media / "documents" / "originals",
+        archive=media / "documents" / "archive",
+        thumbnails=media / "documents" / "thumbnails",
+    )
+    for d in (dirs.originals, dirs.archive, dirs.thumbnails):
+        d.mkdir(parents=True)
+    return dirs
+
+
+@pytest.fixture()
+def _media_settings(paperless_dirs: PaperlessDirs, settings) -> None:
+    """Configure Django settings to point at temp directories."""
+    settings.MEDIA_ROOT = paperless_dirs.media
+    settings.ORIGINALS_DIR = paperless_dirs.originals
+    settings.ARCHIVE_DIR = paperless_dirs.archive
+    settings.THUMBNAIL_DIR = paperless_dirs.thumbnails
+    settings.MEDIA_LOCK = paperless_dirs.media / "media.lock"
+    settings.IGNORABLE_FILES = {".DS_Store", "Thumbs.db", "desktop.ini"}
+    settings.APP_LOGO = ""
+
+
 @pytest.fixture()
 def sample_doc(
-    paperless_dirs: "PaperlessDirs",
+    paperless_dirs: PaperlessDirs,
-    document_samples_dir: Path,
+    _media_settings: None,
+    samples_dir: Path,
 ) -> "Document":
     """Create a document with valid files and matching checksums."""
-    with filelock.FileLock(paperless_dirs.media_lock):
+    with filelock.FileLock(paperless_dirs.media / "media.lock"):
         shutil.copy(
-            document_samples_dir / "originals" / "0000001.pdf",
+            samples_dir / "originals" / "0000001.pdf",
-            paperless_dirs.originals_dir / "0000001.pdf",
+            paperless_dirs.originals / "0000001.pdf",
         )
         shutil.copy(
-            document_samples_dir / "archive" / "0000001.pdf",
+            samples_dir / "archive" / "0000001.pdf",
-            paperless_dirs.archive_dir / "0000001.pdf",
+            paperless_dirs.archive / "0000001.pdf",
         )
         shutil.copy(
-            document_samples_dir / "thumbnails" / "0000001.webp",
+            samples_dir / "thumbnails" / "0000001.webp",
-            paperless_dirs.thumbnail_dir / "0000001.webp",
+            paperless_dirs.thumbnails / "0000001.webp",
         )
 
     return DocumentFactory(
@@ -50,17 +97,95 @@ def sample_doc(
     )
 
 
-@pytest.fixture
+@pytest.fixture()
-def _search_index(paperless_dirs: "PaperlessDirs") -> None:
+def _search_index(
-    """Point the search backend at a fresh, empty index directory.
+    tmp_path: Path,
+    settings: Settings,
+) -> Generator[None, None, None]:
+    """Create a temp index directory and point INDEX_DIR at it.
 
-    paperless_dirs owns INDEX_DIR and resets the backend singleton on both
+    Resets the backend singleton before and after so each test gets a clean
-    sides of the test, so requesting it is all that is needed.
+    index rather than reusing a stale singleton from another test.
     """
+    from documents.search import reset_backend
+
+    index_dir = tmp_path / "index"
+    index_dir.mkdir()
+    settings.INDEX_DIR = index_dir
+    reset_backend()
+    yield
+    reset_backend()
+
+
+@pytest.fixture()
+def settings_timezone(settings: Settings) -> zoneinfo.ZoneInfo:
+    return zoneinfo.ZoneInfo(settings.TIME_ZONE)
 
 
 @pytest.fixture
-def searchable_document(_search_index: None) -> "Document":
+def rest_api_client():
+    """
+    The basic DRF ApiClient
+    """
+    yield APIClient()
+
+
+@pytest.fixture()
+def regular_user(django_user_model: type[UserModelT]) -> UserModelT:
+    """Unprivileged authenticated user for permission boundary tests."""
+    return django_user_model.objects.create_user(username="regular", password="regular")
+
+
+@pytest.fixture()
+def admin_client(rest_api_client: APIClient, admin_user: UserModelT) -> APIClient:
+    """Admin client pre-authenticated and sending the v10 Accept header."""
+    rest_api_client.force_authenticate(user=admin_user)
+    rest_api_client.credentials(HTTP_ACCEPT="application/json; version=10")
+    return rest_api_client
+
+
+@pytest.fixture()
+def v9_client(rest_api_client: APIClient, admin_user: UserModelT) -> APIClient:
+    """Admin client pre-authenticated and sending the v9 Accept header."""
+    rest_api_client.force_authenticate(user=admin_user)
+    rest_api_client.credentials(HTTP_ACCEPT="application/json; version=9")
+    return rest_api_client
+
+
+@pytest.fixture()
+def user_client(rest_api_client: APIClient, regular_user: UserModelT) -> APIClient:
+    """Regular-user client pre-authenticated and sending the v10 Accept header."""
+    rest_api_client.force_authenticate(user=regular_user)
+    rest_api_client.credentials(HTTP_ACCEPT="application/json; version=10")
+    return rest_api_client
+
+
+@pytest.fixture(autouse=True)
+def _clear_content_type_caches() -> None:
+    """Clear Django's ContentType cache and guardian's lru_cache before each test.
+
+    Tests that delete and reinsert ContentType/Permission rows (e.g. the
+    importer) corrupt both caches. Without this fixture a subsequent test on
+    the same xdist worker sees stale ContentType objects and guardian raises
+    MixedContentTypeError.
+    """
+    ContentType.objects.clear_cache()
+    clear_ct_cache()
+
+
+@pytest.fixture(scope="session", autouse=True)
+def faker_session_locale():
+    """Set Faker locale for reproducibility."""
+    return "en_US"
+
+
+@pytest.fixture(scope="session", autouse=True)
+def faker_seed():
+    return 12345
+
+
+@pytest.fixture
+def indexed_document(_search_index: None) -> "Document":
     """One searchable document, for tests about what the search endpoint
     returns rather than about what it finds.
     """

src/documents/tests/factories.py

@@ -5,7 +5,8 @@ Factory-boy factories for documents app models.
 from __future__ import annotations
 
 import factory
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
+from factory.django import DjangoModelFactory
 
 from documents.models import Correspondent
 from documents.models import Document
@@ -14,10 +15,11 @@ from documents.models import MatchingModel
 from documents.models import PaperlessTask
 from documents.models import StoragePath
 from documents.models import Tag
-from paperless_testing.typed_factory import TypedModelFactory
+
+UserModelT = get_user_model()
 
 
-class CorrespondentFactory(TypedModelFactory[Correspondent]):
+class CorrespondentFactory(DjangoModelFactory[Correspondent]):
     class Meta:
         model = Correspondent
 
@@ -26,7 +28,7 @@ class CorrespondentFactory(TypedModelFactory[Correspondent]):
     matching_algorithm = MatchingModel.MATCH_NONE
 
 
-class DocumentTypeFactory(TypedModelFactory[DocumentType]):
+class DocumentTypeFactory(DjangoModelFactory[DocumentType]):
     class Meta:
         model = DocumentType
 
@@ -35,7 +37,7 @@ class DocumentTypeFactory(TypedModelFactory[DocumentType]):
     matching_algorithm = MatchingModel.MATCH_NONE
 
 
-class TagFactory(TypedModelFactory[Tag]):
+class TagFactory(DjangoModelFactory[Tag]):
     class Meta:
         model = Tag
 
@@ -45,7 +47,7 @@ class TagFactory(TypedModelFactory[Tag]):
     is_inbox_tag = False
 
 
-class StoragePathFactory(TypedModelFactory[StoragePath]):
+class StoragePathFactory(DjangoModelFactory[StoragePath]):
     class Meta:
         model = StoragePath
 
@@ -57,7 +59,7 @@ class StoragePathFactory(TypedModelFactory[StoragePath]):
     matching_algorithm = MatchingModel.MATCH_NONE
 
 
-class DocumentFactory(TypedModelFactory[Document]):
+class DocumentFactory(DjangoModelFactory[Document]):
     class Meta:
         model = Document
 
@@ -69,24 +71,21 @@ class DocumentFactory(TypedModelFactory[Document]):
     storage_path = None
 
 
-class UserFactory(TypedModelFactory[User]):
+class UserFactory(DjangoModelFactory[UserModelT]):
     class Meta:
-        model = User
+        model = UserModelT
 
     username = factory.Sequence(lambda n: f"user{n}")
     is_staff = False
     is_superuser = False
-    # Hashing a real password costs about half a second per user, and no test
+    password = factory.django.Password("test")
-    # authenticates with its password. None gives the unusable password
-    # create_user() gives.
-    password = factory.django.Password(None)
 
     class Params:
         superuser = factory.Trait(is_staff=True, is_superuser=True)
         staff = factory.Trait(is_staff=True)
 
 
-class PaperlessTaskFactory(TypedModelFactory[PaperlessTask]):
+class PaperlessTaskFactory(DjangoModelFactory[PaperlessTask]):
     class Meta:
         model = PaperlessTask
 

src/documents/tests/helpers.py

@@ -1,10 +0,0 @@
-import re
-
-
-def dummy_preprocess(content: str) -> str:
-    """
-    Simpler, faster pre-processing for testing purposes
-    """
-    content = content.lower().strip()
-    content = re.sub(r"\s+", " ", content)
-    return content

src/documents/tests/management/test_management_sanity_checker.py

@@ -15,11 +15,11 @@ from rich.console import Console
 
 from documents.management.commands.document_sanity_checker import Command
 from documents.sanity_checker import SanityCheckMessages
-from paperless_testing.factories import DocumentFactory
+from documents.tests.factories import DocumentFactory
 
 if TYPE_CHECKING:
     from documents.models import Document
-    from paperless_testing.dirs import PaperlessDirs
+    from documents.tests.conftest import PaperlessDirs
 
 
 def _render_to_string(messages: SanityCheckMessages) -> str:
@@ -71,7 +71,7 @@ class TestRenderResultsWithIssues:
         assert "INFO" in output
         assert "No OCR data" in output
 
-    @pytest.mark.usefixtures("paperless_dirs")
+    @pytest.mark.usefixtures("_media_settings")
     def test_global_message(self) -> None:
         msgs = SanityCheckMessages()
         msgs.warning(None, "Orphaned file: /tmp/stray.pdf")
@@ -87,7 +87,7 @@ class TestRenderResultsWithIssues:
         assert "Thumbnail missing" in output
         assert "Checksum mismatch" in output
 
-    @pytest.mark.usefixtures("paperless_dirs")
+    @pytest.mark.usefixtures("_media_settings")
     def test_unknown_doc_pk(self) -> None:
         msgs = SanityCheckMessages()
         msgs.error(99999, "Ghost document")
@@ -184,6 +184,7 @@ class TestDocumentSanityCheckerCommand:
         assert "ERROR" in output
         assert "Original of document does not exist" in output
 
+    @pytest.mark.usefixtures("_media_settings")
     def test_checksum_mismatch(self, paperless_dirs: PaperlessDirs) -> None:
         """Lightweight document with zero-byte files triggers checksum mismatch."""
         doc = DocumentFactory(

src/documents/tests/search/conftest.py

@@ -9,21 +9,29 @@ from documents.search._backend import TantivyBackend
 from documents.search._backend import reset_backend
 from documents.search._schema import build_schema
 from documents.search._tokenizer import register_tokenizers
-from paperless_testing.factories import DocumentFactory
+from documents.tests.factories import DocumentFactory
 
 if TYPE_CHECKING:
     from collections.abc import Callable
     from collections.abc import Generator
+    from pathlib import Path
 
     from pytest_django.fixtures import Settings
 
     from documents.models import Document
-    from paperless_testing.dirs import PaperlessDirs
 
 
 @pytest.fixture
-def backend(paperless_dirs: PaperlessDirs) -> Generator[TantivyBackend, None, None]:
+def index_dir(tmp_path: Path, settings: Settings) -> Path:
-    b = TantivyBackend(path=paperless_dirs.index_dir)
+    path = tmp_path / "index"
+    path.mkdir()
+    settings.INDEX_DIR = path
+    return path
+
+
+@pytest.fixture
+def backend() -> Generator[TantivyBackend, None, None]:
+    b = TantivyBackend()  # path=None → in-memory index
     b.open()
     try:
         yield b

src/documents/tests/search/test_acceptance.py

@@ -14,6 +14,7 @@ from typing import TYPE_CHECKING
 
 import pytest
 import time_machine
+from django.contrib.auth.models import User
 
 from documents.models import CustomField
 from documents.models import CustomFieldInstance
@@ -21,8 +22,7 @@ from documents.models import DocumentType
 from documents.models import Note
 from documents.models import StoragePath
 from documents.search._query import parse_user_query
-from paperless_testing.factories import DocumentFactory
+from documents.tests.factories import DocumentFactory
-from paperless_testing.factories import UserFactory
 
 if TYPE_CHECKING:
     from collections.abc import Callable
@@ -148,7 +148,7 @@ class TestJsonSubpaths:
         THEN:
             - Only the document with alice's note matches
         """
-        alice = UserFactory(username="alice")
+        alice = User.objects.create_user(username="alice")
         doc_with_note = DocumentFactory(
             title="Has note",
             content="x",

src/documents/tests/search/test_backend.py

@@ -3,8 +3,10 @@ from pathlib import Path
 
 import pytest
 from django.contrib.auth.models import Group
+from django.contrib.auth.models import User
 from django.db import connection
 from django.test.utils import CaptureQueriesContext
+from guardian.shortcuts import assign_perm
 from pytest_mock import MockerFixture
 
 from documents.models import CustomField
@@ -17,12 +19,11 @@ from documents.search._backend import WriteBatch
 from documents.search._backend import get_backend
 from documents.search._backend import reset_backend
 from documents.signals.handlers import add_to_index
-from paperless_testing.factories import CorrespondentFactory
+from documents.tests.factories import CorrespondentFactory
-from paperless_testing.factories import DocumentFactory
+from documents.tests.factories import DocumentFactory
-from paperless_testing.factories import DocumentTypeFactory
+from documents.tests.factories import DocumentTypeFactory
-from paperless_testing.factories import TagFactory
+from documents.tests.factories import TagFactory
-from paperless_testing.factories import UserFactory
+from documents.tests.factories import UserFactory
-from paperless_testing.permissions import grant_object
 
 pytestmark = [pytest.mark.search, pytest.mark.django_db]
 
@@ -188,7 +189,7 @@ class TestAddOrUpdateIds:
             pk=1,
             owner=owner,
         )
-        grant_object(user, doc, "view_document")
+        assign_perm("view_document", user, doc)
 
         with backend.batch_update() as batch:
             batch.add_or_update_ids([doc.pk])
@@ -208,7 +209,7 @@ class TestAddOrUpdateIds:
             pk=1,
             owner=owner,
         )
-        grant_object(group, doc, "view_document")
+        assign_perm("view_document", group, doc)
 
         with backend.batch_update() as batch:
             batch.add_or_update_ids([doc.pk])
@@ -762,8 +763,8 @@ class TestSearchIds:
 
     def test_respects_permission_filter(self, backend: TantivyBackend) -> None:
         """search_ids must respect user permission filtering."""
-        owner = UserFactory(username="ids_owner")
+        owner = User.objects.create_user("ids_owner")
-        other = UserFactory(username="ids_other")
+        other = User.objects.create_user("ids_other")
         doc = Document.objects.create(
             title="private doc",
             content="secret keyword",
@@ -842,7 +843,7 @@ class TestRebuild:
             content="group secret keyword",
             owner=owner,
         )
-        grant_object(group, doc, "view_document")
+        assign_perm("view_document", group, doc)
 
         backend.rebuild(Document.objects.all())
 
@@ -947,8 +948,7 @@ class TestSingleton:
         yield
         reset_backend()
 
-    @pytest.mark.usefixtures("paperless_dirs")
+    def test_returns_same_instance_on_repeated_calls(self, index_dir) -> None:
-    def test_returns_same_instance_on_repeated_calls(self) -> None:
         """Singleton pattern: repeated calls to get_backend() must return the same instance."""
         assert get_backend() is get_backend()
 
@@ -965,8 +965,7 @@ class TestSingleton:
         assert b1 is not b2
         assert b2._path == tmp_path / "b"
 
-    @pytest.mark.usefixtures("paperless_dirs")
+    def test_reset_forces_new_instance(self, index_dir) -> None:
-    def test_reset_forces_new_instance(self) -> None:
         """reset_backend() must force creation of a new backend instance on next get_backend() call."""
         b1 = get_backend()
         reset_backend()
@@ -1072,7 +1071,7 @@ class TestFieldHandling:
 
     def test_notes_include_user_information(self, backend: TantivyBackend) -> None:
         """Notes must be indexed with user information when available for structured queries."""
-        user = UserFactory(username="notewriter")
+        user = User.objects.create_user("notewriter")
         doc = Document.objects.create(
             title="Doc with notes",
             content="test",
@@ -1174,7 +1173,7 @@ class TestHighlightHits:
         notes.note: prefix so the query targets notes content directly, but
         the snippet is generated from notes_text which stores the same text.
         """
-        user = UserFactory(username="hl_noteuser")
+        user = User.objects.create_user("hl_noteuser")
         doc = Document.objects.create(
             title="Doc with matching note",
             content="unrelated content",

src/documents/tests/search/test_documented_syntax.py

@@ -27,7 +27,7 @@ import time_machine
 from documents.models import Note
 from documents.models import Tag
 from documents.search._errors import InvalidDateQuery
-from paperless_testing.factories import DocumentFactory
+from documents.tests.factories import DocumentFactory
 
 if TYPE_CHECKING:
     from collections.abc import Callable
@@ -269,7 +269,7 @@ class TestDocumentedDateForms:
             yield
 
     @pytest.fixture
-    def dated(self, backend: TantivyBackend) -> dict[str, int]:
+    def dated(self, index_document: Callable[..., Document]) -> dict[str, int]:
         stamps = {
             "today": datetime(2026, 6, 15, 9, 0, tzinfo=UTC),
             "yesterday": datetime(2026, 6, 14, 9, 0, tzinfo=UTC),
@@ -279,14 +279,14 @@ class TestDocumentedDateForms:
             "january": datetime(2026, 1, 10, 10, 0, tzinfo=UTC),
             "old": datetime(2005, 3, 4, 15, 30, tzinfo=UTC),
         }
-        docs = {
+        return {
-            label: DocumentFactory(title=label, content="dated body", added=stamp)
+            label: index_document(
+                title=label,
+                content="dated body",
+                added=stamp,
+            ).pk
             for label, stamp in stamps.items()
         }
-        with backend.batch_update() as batch:
-            for doc in docs.values():
-                batch.add_or_update(doc)
-        return {label: doc.pk for label, doc in docs.items()}
 
     @pytest.mark.parametrize(
         ("query", "label"),

src/documents/tests/search/test_highlight_query_guard.py

@@ -29,7 +29,7 @@ from rest_framework import status
 
 from documents.search._backend import SearchMode
 from documents.search._query import parse_simple_text_highlight_query
-from paperless_testing.factories import DocumentFactory
+from documents.tests.factories import DocumentFactory
 
 if TYPE_CHECKING:
     from rest_framework.test import APIClient

src/documents/tests/search/test_json_field_prefixes.py

@@ -17,12 +17,12 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 import pytest
+from django.contrib.auth.models import User
 
 from documents.models import CustomField
 from documents.models import CustomFieldInstance
 from documents.models import Note
-from paperless_testing.factories import DocumentFactory
+from documents.tests.factories import DocumentFactory
-from paperless_testing.factories import UserFactory
 
 if TYPE_CHECKING:
     from collections.abc import Callable
@@ -53,7 +53,7 @@ class TestBareJsonFieldPrefixes:
               decoy's content match does not resurface through a demoted
               text search
         """
-        alice = UserFactory(username="alice")
+        alice = User.objects.create_user(username="alice")
         with_note = DocumentFactory(title="Has note", content="x")
         Note.objects.create(document=with_note, user=alice, note="crocodile")
         backend.add_or_update(with_note)
@@ -116,7 +116,7 @@ class TestBareJsonFieldPrefixes:
               document; the default-subpath resolution for the bare
               prefix does not interfere with explicit subpath addressing
         """
-        bob = UserFactory(username="bob")
+        bob = User.objects.create_user(username="bob")
         doc = DocumentFactory(title="Bob note", content="x")
         Note.objects.create(document=doc, user=bob, note="remark")
         backend.add_or_update(doc)

src/documents/tests/search/test_json_subpath_completeness.py

@@ -20,6 +20,7 @@ from typing import TYPE_CHECKING
 
 import pytest
 import tantivy
+from django.contrib.auth.models import User
 from whoosh_compat import FieldKind
 
 from documents.models import CustomField
@@ -27,7 +28,6 @@ from documents.models import CustomFieldInstance
 from documents.models import Document
 from documents.models import Note
 from documents.search._fields import PUBLIC_FIELDS
-from paperless_testing.factories import UserFactory
 
 if TYPE_CHECKING:
     from documents.search._backend import TantivyBackend
@@ -49,7 +49,7 @@ class TestJsonSubpathsAreWrittenAtIndexTime:
             - Every subpath PUBLIC_FIELDS declares for notes/custom_fields
               is present as a key in the document's stored JSON payload
         """
-        user = UserFactory(username="completeness-user")
+        user = User.objects.create_user(username="completeness-user")
         field = CustomField.objects.create(
             name="Completeness Field",
             data_type=CustomField.FieldDataType.STRING,

src/documents/tests/search/test_lock_backoff.py

@@ -15,7 +15,7 @@ from documents.search._backend import SearchIndexLockError
 from documents.search._backend import TantivyBackend
 from documents.tasks import index_document
 from documents.tasks import remove_document_from_index
-from paperless_testing.factories import DocumentFactory
+from documents.tests.factories import DocumentFactory
 
 if TYPE_CHECKING:
     from collections.abc import Generator

src/documents/tests/search/test_migration_fulltext_query_field_prefixes.py

@@ -1,6 +1,6 @@
 import pytest
 
-from paperless_testing.migrations import TestMigrations
+from documents.tests.utils import TestMigrations
 
 pytestmark = pytest.mark.search
 

src/documents/tests/search/test_permission_field_isolation.py

@@ -18,14 +18,13 @@ from typing import TYPE_CHECKING
 import pytest
 from django.contrib.auth.models import Group
 from django.contrib.auth.models import User
+from guardian.shortcuts import assign_perm
 
 from documents.models import Correspondent
 from documents.models import Document
 from documents.models import DocumentType
 from documents.models import StoragePath
 from documents.models import Tag
-from paperless_testing.factories import UserFactory
-from paperless_testing.permissions import grant_object
 
 if TYPE_CHECKING:
     from documents.search._backend import TantivyBackend
@@ -35,22 +34,22 @@ pytestmark = [pytest.mark.search, pytest.mark.django_db]
 
 @pytest.fixture
 def owner() -> User:
-    return UserFactory(username="owner")
+    return User.objects.create_user(username="owner")
 
 
 @pytest.fixture
 def stranger() -> User:
-    return UserFactory(username="stranger")
+    return User.objects.create_user(username="stranger")
 
 
 @pytest.fixture
 def viewer() -> User:
-    return UserFactory(username="viewer")
+    return User.objects.create_user(username="viewer")
 
 
 @pytest.fixture
 def group_member() -> User:
-    user = UserFactory(username="group_member")
+    user = User.objects.create_user(username="group_member")
     user.groups.add(Group.objects.create(name="accounting"))
     return user
 
@@ -128,7 +127,7 @@ class TestPermissionFilteringOnIndexedDocuments:
             checksum="perm-shared-user",
             owner=owner,
         )
-        grant_object(viewer, doc, "view_document")
+        assign_perm("view_document", viewer, doc)
         backend.add_or_update(doc)
 
         assert backend.search_ids("invoice", user=viewer) == [doc.pk]
@@ -158,7 +157,7 @@ class TestPermissionFilteringOnIndexedDocuments:
             checksum="perm-shared-group",
             owner=owner,
         )
-        grant_object(group_member.groups.first(), doc, "view_document")
+        assign_perm("view_document", group_member.groups.first(), doc)
         backend.add_or_update(doc)
 
         assert backend.search_ids("invoice", user=group_member) == [doc.pk]

src/documents/tests/search/test_schema.py

@@ -13,11 +13,11 @@ from documents.search._schema import needs_rebuild
 from documents.search._schema import schema_fingerprint
 
 if TYPE_CHECKING:
+    from pathlib import Path
+
     import tantivy
     from pytest_django.fixtures import Settings
 
-    from paperless_testing.dirs import PaperlessDirs
-
 
 pytestmark = pytest.mark.search
 
@@ -25,19 +25,16 @@ pytestmark = pytest.mark.search
 class TestNeedsRebuild:
     """needs_rebuild covers all sentinel-file states that require a full reindex."""
 
-    def test_returns_true_when_settings_file_missing(
+    def test_returns_true_when_settings_file_missing(self, index_dir: Path) -> None:
-        self,
+        assert needs_rebuild(index_dir) is True
-        paperless_dirs: PaperlessDirs,
-    ) -> None:
-        assert needs_rebuild(paperless_dirs.index_dir) is True
 
     def test_returns_false_when_version_and_language_match(
         self,
-        paperless_dirs: PaperlessDirs,
+        index_dir: Path,
         settings: Settings,
     ) -> None:
         settings.SEARCH_LANGUAGE = "en"
-        (paperless_dirs.index_dir / ".index_settings.json").write_text(
+        (index_dir / ".index_settings.json").write_text(
             json.dumps(
                 {
                     "schema_version": SCHEMA_VERSION,
@@ -46,51 +43,51 @@ class TestNeedsRebuild:
                 },
             ),
         )
-        assert needs_rebuild(paperless_dirs.index_dir) is False
+        assert needs_rebuild(index_dir) is False
 
     def test_returns_true_on_schema_version_mismatch(
         self,
-        paperless_dirs: PaperlessDirs,
+        index_dir: Path,
         settings: Settings,
     ) -> None:
         settings.SEARCH_LANGUAGE = None
-        (paperless_dirs.index_dir / ".index_settings.json").write_text(
+        (index_dir / ".index_settings.json").write_text(
             json.dumps({"schema_version": SCHEMA_VERSION - 1, "language": None}),
         )
-        assert needs_rebuild(paperless_dirs.index_dir) is True
+        assert needs_rebuild(index_dir) is True
 
     def test_returns_true_when_version_is_not_an_integer(
         self,
-        paperless_dirs: PaperlessDirs,
+        index_dir: Path,
         settings: Settings,
     ) -> None:
         settings.SEARCH_LANGUAGE = None
-        (paperless_dirs.index_dir / ".index_settings.json").write_text(
+        (index_dir / ".index_settings.json").write_text(
             json.dumps({"schema_version": "not-a-number", "language": None}),
         )
-        assert needs_rebuild(paperless_dirs.index_dir) is True
+        assert needs_rebuild(index_dir) is True
 
     def test_returns_true_when_language_key_missing(
         self,
-        paperless_dirs: PaperlessDirs,
+        index_dir: Path,
         settings: Settings,
     ) -> None:
         settings.SEARCH_LANGUAGE = "en"
-        (paperless_dirs.index_dir / ".index_settings.json").write_text(
+        (index_dir / ".index_settings.json").write_text(
             json.dumps({"schema_version": SCHEMA_VERSION}),
         )
-        assert needs_rebuild(paperless_dirs.index_dir) is True
+        assert needs_rebuild(index_dir) is True
 
     def test_returns_true_when_language_differs(
         self,
-        paperless_dirs: PaperlessDirs,
+        index_dir: Path,
         settings: Settings,
     ) -> None:
         settings.SEARCH_LANGUAGE = "de"
-        (paperless_dirs.index_dir / ".index_settings.json").write_text(
+        (index_dir / ".index_settings.json").write_text(
             json.dumps({"schema_version": SCHEMA_VERSION, "language": "en"}),
         )
-        assert needs_rebuild(paperless_dirs.index_dir) is True
+        assert needs_rebuild(index_dir) is True
 
 
 def _schema_fields(schema: tantivy.Schema) -> dict[str, dict]:

src/documents/tests/search/test_schema_fingerprint.py

@@ -35,8 +35,6 @@ if TYPE_CHECKING:
 
     from pytest_django.fixtures import SettingsWrapper
 
-    from paperless_testing.dirs import PaperlessDirs
-
 pytestmark = pytest.mark.search
 
 # The on-disk field layout of a v2 index, pinned as data. Any edit here is an
@@ -471,7 +469,7 @@ def _fingerprint_of(descriptors: list[FieldDescriptor]) -> str:
 class TestNeedsRebuildOnFingerprint:
     def test_matching_fingerprint_does_not_rebuild(
         self,
-        paperless_dirs: PaperlessDirs,
+        index_dir: Path,
         settings: SettingsWrapper,
     ) -> None:
         """
@@ -484,13 +482,13 @@ class TestNeedsRebuildOnFingerprint:
             - It returns False
         """
         settings.SEARCH_LANGUAGE = None
-        _sentinels(paperless_dirs.index_dir)
+        _sentinels(index_dir)
 
-        assert needs_rebuild(paperless_dirs.index_dir) is False
+        assert needs_rebuild(index_dir) is False
 
     def test_stale_fingerprint_rebuilds_despite_a_matching_version(
         self,
-        paperless_dirs: PaperlessDirs,
+        index_dir: Path,
         settings: SettingsWrapper,
         monkeypatch: pytest.MonkeyPatch,
     ) -> None:
@@ -507,7 +505,7 @@ class TestNeedsRebuildOnFingerprint:
               every subsequent write would raise
         """
         settings.SEARCH_LANGUAGE = None
-        _sentinels(paperless_dirs.index_dir)
+        _sentinels(index_dir)
         extended = [
             *field_descriptors(),
             FieldDescriptor(
@@ -521,11 +519,11 @@ class TestNeedsRebuildOnFingerprint:
         ]
         monkeypatch.setattr(_schema, "field_descriptors", lambda: extended)
 
-        assert needs_rebuild(paperless_dirs.index_dir) is True
+        assert needs_rebuild(index_dir) is True
 
     def test_reordered_schema_rebuilds(
         self,
-        paperless_dirs: PaperlessDirs,
+        index_dir: Path,
         settings: SettingsWrapper,
         monkeypatch: pytest.MonkeyPatch,
     ) -> None:
@@ -540,16 +538,16 @@ class TestNeedsRebuildOnFingerprint:
             - It returns True
         """
         settings.SEARCH_LANGUAGE = None
-        _sentinels(paperless_dirs.index_dir)
+        _sentinels(index_dir)
         reordered = field_descriptors()
         reordered[1], reordered[2] = reordered[2], reordered[1]
         monkeypatch.setattr(_schema, "field_descriptors", lambda: reordered)
 
-        assert needs_rebuild(paperless_dirs.index_dir) is True
+        assert needs_rebuild(index_dir) is True
 
     def test_missing_fingerprint_rebuilds(
         self,
-        paperless_dirs: PaperlessDirs,
+        index_dir: Path,
         settings: SettingsWrapper,
     ) -> None:
         """
@@ -563,15 +561,15 @@ class TestNeedsRebuildOnFingerprint:
               is rebuilt rather than trusted
         """
         settings.SEARCH_LANGUAGE = None
-        (paperless_dirs.index_dir / ".index_settings.json").write_text(
+        (index_dir / ".index_settings.json").write_text(
             json.dumps({"schema_version": SCHEMA_VERSION, "language": None}),
         )
 
-        assert needs_rebuild(paperless_dirs.index_dir) is True
+        assert needs_rebuild(index_dir) is True
 
     def test_written_sentinels_satisfy_the_check(
         self,
-        paperless_dirs: PaperlessDirs,
+        index_dir: Path,
         settings: SettingsWrapper,
     ) -> None:
         """
@@ -584,6 +582,6 @@ class TestNeedsRebuildOnFingerprint:
             - It returns False
         """
         settings.SEARCH_LANGUAGE = "en"
-        _write_sentinels(paperless_dirs.index_dir)
+        _write_sentinels(index_dir)
 
-        assert needs_rebuild(paperless_dirs.index_dir) is False
+        assert needs_rebuild(index_dir) is False

src/documents/tests/test_admin.py

@@ -16,11 +16,11 @@ from documents.models import Document
 from documents.models import Tag
 from documents.search import get_backend
 from documents.search import reset_backend
+from documents.tests.factories import DocumentFactory
+from documents.tests.factories import TagFactory
+from documents.tests.factories import UserFactory
+from documents.tests.utils import DirectoriesMixin
 from paperless.admin import PaperlessUserAdmin
-from paperless_testing.dirs import DirectoriesMixin
-from paperless_testing.factories import DocumentFactory
-from paperless_testing.factories import TagFactory
-from paperless_testing.factories import UserFactory
 
 
 @pytest.fixture

src/documents/tests/test_api_app_config.py

@@ -3,6 +3,7 @@ from io import BytesIO
 from pathlib import Path
 from unittest.mock import patch
 
+from django.contrib.auth.models import User
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test import override_settings
 from PIL import Image
@@ -10,11 +11,10 @@ from PIL.PngImagePlugin import PngInfo
 from rest_framework import status
 from rest_framework.test import APITestCase
 
+from documents.tests.utils import DirectoriesMixin
+from documents.tests.utils import read_streaming_response
 from paperless.models import ApplicationConfiguration
 from paperless.models import ColorConvertChoices
-from paperless_testing.dirs import DirectoriesMixin
-from paperless_testing.factories import UserFactory
-from paperless_testing.http import read_streaming_response
 
 
 class TestApiAppConfig(DirectoriesMixin, APITestCase):
@@ -23,7 +23,7 @@ class TestApiAppConfig(DirectoriesMixin, APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        user = UserFactory(username="temp_admin", superuser=True)
+        user = User.objects.create_superuser(username="temp_admin")
         self.client.force_authenticate(user=user)
 
     def test_api_get_config(self) -> None:
@@ -81,7 +81,6 @@ class TestApiAppConfig(DirectoriesMixin, APITestCase):
                 "ai_enabled": None,
                 "llm_embedding_backend": None,
                 "llm_embedding_model": None,
-                "llm_embedding_api_key": None,
                 "llm_embedding_endpoint": None,
                 "llm_embedding_chunk_size": None,
                 "llm_context_size": None,
@@ -268,7 +267,7 @@ class TestApiAppConfig(DirectoriesMixin, APITestCase):
         THEN:
             - old app_logo file is deleted
         """
-        admin = UserFactory(username="admin", superuser=True)
+        admin = User.objects.create_superuser(username="admin")
         self.client.force_login(user=admin)
         response = self.client.get("/logo/")
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
@@ -923,49 +922,6 @@ class TestApiAppConfig(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
         self.assertEqual(ApplicationConfiguration.objects.count(), 1)
 
-    def test_update_llm_embedding_api_key(self) -> None:
-        """
-        GIVEN:
-            - Existing config with llm_embedding_api_key specified
-        WHEN:
-            - API to update llm_embedding_api_key is called with all *s
-            - API to update llm_embedding_api_key is called with empty string
-        THEN:
-            - llm_embedding_api_key is unchanged
-            - llm_embedding_api_key is set to None
-        """
-        config = ApplicationConfiguration.objects.first()
-        assert config is not None
-        config.llm_embedding_api_key = "1234567890"
-        config.save()
-
-        # Test with all *
-        response = self.client.patch(
-            f"{self.ENDPOINT}1/",
-            json.dumps(
-                {
-                    "llm_embedding_api_key": "*" * 32,
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        config.refresh_from_db()
-        self.assertEqual(config.llm_embedding_api_key, "1234567890")
-        # Test with empty string
-        response = self.client.patch(
-            f"{self.ENDPOINT}1/",
-            json.dumps(
-                {
-                    "llm_embedding_api_key": "",
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        config.refresh_from_db()
-        self.assertEqual(config.llm_embedding_api_key, None)
-
     def test_update_llm_api_key(self) -> None:
         """
         GIVEN:

src/documents/tests/test_api_bulk_download.py

@@ -4,6 +4,8 @@ import json
 import shutil
 import zipfile
 
+from django.contrib.auth.models import Permission
+from django.contrib.auth.models import User
 from django.test import override_settings
 from django.utils import timezone
 from rest_framework import status
@@ -12,11 +14,9 @@ from rest_framework.test import APITestCase
 from documents.models import Correspondent
 from documents.models import Document
 from documents.models import DocumentType
+from documents.tests.utils import DirectoriesMixin
 from documents.tests.utils import SampleDirMixin
-from paperless_testing.dirs import DirectoriesMixin
+from documents.tests.utils import read_streaming_response
-from paperless_testing.factories import UserFactory
-from paperless_testing.http import read_streaming_response
-from paperless_testing.permissions import grant_global
 
 
 class TestBulkDownload(DirectoriesMixin, SampleDirMixin, APITestCase):
@@ -25,7 +25,7 @@ class TestBulkDownload(DirectoriesMixin, SampleDirMixin, APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        self.user = UserFactory(username="temp_admin", superuser=True)
+        self.user = User.objects.create_superuser(username="temp_admin")
         self.client.force_authenticate(user=self.user)
 
         self.doc1 = Document.objects.create(title="unrelated", checksum="A")
@@ -166,15 +166,7 @@ class TestBulkDownload(DirectoriesMixin, SampleDirMixin, APITestCase):
             ),
             content_type="application/json",
         )
-
+        response.close()
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response["Content-Type"], "application/zip")
-
-        with zipfile.ZipFile(io.BytesIO(read_streaming_response(response))) as zipf:
-            self.assertEqual(zipf.infolist()[0].compress_type, zipfile.ZIP_LZMA)
-
-            with self.doc2.source_file as f:
-                self.assertEqual(f.read(), zipf.read("2021-01-01 document A.pdf"))
 
     @override_settings(FILENAME_FORMAT="{correspondent}/{title}")
     def test_formatted_download_originals(self) -> None:
@@ -334,8 +326,10 @@ class TestBulkDownload(DirectoriesMixin, SampleDirMixin, APITestCase):
                 )
 
     def test_download_insufficient_permissions(self) -> None:
-        user = UserFactory(username="temp_user")
+        user = User.objects.create_user(username="temp_user")
-        grant_global(user, "view_document")
+        user.user_permissions.add(
+            Permission.objects.get(codename="view_document"),
+        )
         self.client.force_authenticate(user=user)
 
         self.doc2.owner = self.user

src/documents/tests/test_api_bulk_edit.py

@@ -2,30 +2,27 @@ import json
 from unittest import mock
 
 from auditlog.models import LogEntry
+from django.contrib.auth.models import Permission
 from django.contrib.auth.models import User
 from django.test import override_settings
+from guardian.shortcuts import assign_perm
 from rest_framework import status
 from rest_framework.test import APITestCase
 
 from documents.models import Correspondent
 from documents.models import CustomField
-from documents.models import CustomFieldInstance
 from documents.models import Document
 from documents.models import DocumentType
 from documents.models import StoragePath
 from documents.models import Tag
-from paperless_testing.dirs import DirectoriesMixin
+from documents.tests.utils import DirectoriesMixin
-from paperless_testing.factories import UserFactory
-from paperless_testing.permissions import grant_all_global
-from paperless_testing.permissions import grant_global
-from paperless_testing.permissions import grant_object
 
 
 class TestBulkEditAPI(DirectoriesMixin, APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        user = UserFactory(username="temp_admin", superuser=True)
+        user = User.objects.create_superuser(username="temp_admin")
         self.user = user
         self.client.force_authenticate(user=user)
 
@@ -287,9 +284,9 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
         m,
     ) -> None:
         self.setup_mock(m, "modify_custom_fields")
-        user = UserFactory(username="doc-owner")
+        user = User.objects.create_user(username="doc-owner")
-        grant_global(user, "change_document")
+        user.user_permissions.add(Permission.objects.get(codename="change_document"))
-        other_user = UserFactory(username="other-user")
+        other_user = User.objects.create_user(username="other-user")
         source_doc = Document.objects.create(
             checksum="source",
             title="Source",
@@ -790,8 +787,10 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
     @mock.patch("documents.serialisers.bulk_edit.set_storage_path")
     def test_api_bulk_edit_with_all_true_resolves_owned_duplicates(self, m) -> None:
         self.setup_mock(m, "set_storage_path")
-        user = UserFactory(username="duplicate-owner")
+        user = User.objects.create_user(username="duplicate-owner")
-        grant_global(user, "change_document")
+        user.user_permissions.add(
+            Permission.objects.get(codename="change_document"),
+        )
         first_duplicate = Document.objects.create(
             checksum="owned-duplicate",
             title="First duplicate",
@@ -1179,7 +1178,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
         user1 = User.objects.create(username="user1")
         self.client.force_authenticate(user=user1)
 
-        grant_object(user1, self.doc2, "view_document")
+        assign_perm("view_document", user1, self.doc2)
 
         response = self.client.post(
             "/api/documents/selection_data/",
@@ -1189,7 +1188,9 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
 
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
 
-        grant_global(user1, "view_document")
+        user1.user_permissions.add(
+            Permission.objects.get(codename="view_document"),
+        )
         user1 = User.objects.get(pk=user1.pk)
         self.client.force_authenticate(user=user1)
         response = self.client.post(
@@ -1532,7 +1533,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
         self.doc1.owner = User.objects.get(username="temp_admin")
         self.doc1.save()
         user1 = User.objects.create(username="user1")
-        grant_all_global(user1)
+        user1.user_permissions.add(*Permission.objects.all())
         user1.save()
         self.client.force_authenticate(user=user1)
 
@@ -1586,8 +1587,8 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
         self.doc1.owner = User.objects.get(username="temp_admin")
         self.doc1.save()
         user1 = User.objects.create(username="user1")
-        grant_object(user1, self.doc1, "view_document")
+        assign_perm("view_document", user1, self.doc1)
-        grant_all_global(user1)
+        user1.user_permissions.add(*Permission.objects.all())
         user1.save()
         self.client.force_authenticate(user=user1)
 
@@ -1608,7 +1609,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
         m.assert_not_called()
         self.assertEqual(response.content, b"Insufficient permissions")
 
-        grant_object(user1, self.doc1, "change_document")
+        assign_perm("change_document", user1, self.doc1)
 
         response = self.client.post(
             "/api/documents/bulk_edit/",
@@ -1785,36 +1786,6 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
                 self.assertIn(b"invalid pages specified", response.content)
         m.assert_not_called()
 
-    @mock.patch("documents.serialisers.bulk_edit.split")
-    def test_bulk_edit_split_rejects_unknown_page_count(self, m) -> None:
-        """
-        GIVEN:
-            - A legacy split bulk edit of a document without a page count
-        WHEN:
-            - API to bulk edit is called
-        THEN:
-            - API returns HTTP 400
-            - split is not called
-        """
-        self.setup_mock(m, "split")
-
-        for pages in ("1", "1-5000000"):
-            with self.subTest(pages=pages):
-                response = self.client.post(
-                    "/api/documents/bulk_edit/",
-                    json.dumps(
-                        {
-                            "documents": [self.doc1.id],
-                            "method": "split",
-                            "parameters": {"pages": pages},
-                        },
-                    ),
-                    content_type="application/json",
-                )
-                self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-                self.assertIn(b"document page count is unknown", response.content)
-        m.assert_not_called()
-
     @mock.patch("documents.serialisers.bulk_edit.split")
     def test_bulk_edit_split_parses_pages(self, m) -> None:
         """
@@ -1848,7 +1819,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
         self.doc1.owner = User.objects.get(username="temp_admin")
         self.doc1.save()
         user1 = User.objects.create(username="user1")
-        grant_all_global(user1)
+        user1.user_permissions.add(*Permission.objects.all())
         user1.save()
         self.client.force_authenticate(user=user1)
 
@@ -1909,7 +1880,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
         self.doc1.owner = User.objects.get(username="temp_admin")
         self.doc1.save()
         user1 = User.objects.create(username="user1")
-        grant_all_global(user1)
+        user1.user_permissions.add(*Permission.objects.all())
         user1.save()
         self.client.force_authenticate(user=user1)
 
@@ -1948,8 +1919,11 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
     @mock.patch("documents.views.bulk_edit.merge")
     def test_merge_and_delete_requires_change_permission(self, m) -> None:
         self.setup_mock(m, "merge")
-        user = UserFactory(username="no-change")
+        user = User.objects.create_user(username="no-change")
-        grant_global(user, "add_document", "delete_document")
+        user.user_permissions.add(
+            Permission.objects.get(codename="add_document"),
+            Permission.objects.get(codename="delete_document"),
+        )
         self.client.force_authenticate(user=user)
 
         response = self.client.post(
@@ -2336,7 +2310,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
         self.doc1.owner = User.objects.get(username="temp_admin")
         self.doc1.save()
         user1 = User.objects.create(username="user1")
-        grant_all_global(user1)
+        user1.user_permissions.add(*Permission.objects.all())
         user1.save()
         self.client.force_authenticate(user=user1)
 
@@ -2371,7 +2345,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
     @mock.patch("documents.views.bulk_edit.edit_pdf")
     def test_edit_pdf_update_requires_change_permission(self, m) -> None:
         self.setup_mock(m, "edit_pdf")
-        user = UserFactory(username="no-change")
+        user = User.objects.create_user(username="no-change")
         self.client.force_authenticate(user=user)
 
         response = self.client.post(
@@ -2398,8 +2372,11 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
     ) -> None:
         self.setup_mock(edit_pdf_mock, "edit_pdf")
         self.setup_mock(remove_password_mock, "remove_password")
-        user = UserFactory(username="no-delete")
+        user = User.objects.create_user(username="no-delete")
-        grant_global(user, "add_document", "change_document")
+        user.user_permissions.add(
+            Permission.objects.get(codename="add_document"),
+            Permission.objects.get(codename="change_document"),
+        )
         self.client.force_authenticate(user=user)
 
         cases = [
@@ -2486,7 +2463,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
         self.doc1.owner = User.objects.get(username="temp_admin")
         self.doc1.save()
         user1 = User.objects.create(username="user1")
-        grant_all_global(user1)
+        user1.user_permissions.add(*Permission.objects.all())
         user1.save()
         self.client.force_authenticate(user=user1)
 
@@ -2526,7 +2503,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
         WHEN:
             - API to bulk edit documents is called
         THEN:
-            - Audit log is created with the old and new correspondent
+            - Audit log is created
         """
         LogEntry.objects.all().delete()
         response = self.client.post(
@@ -2542,8 +2519,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
         )
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        entry = LogEntry.objects.get_for_object(self.doc1).get()
+        self.assertEqual(LogEntry.objects.filter(object_pk=self.doc1.id).count(), 1)
-        self.assertEqual(entry.changes, {"correspondent": [None, self.c2.id]})
 
     @override_settings(AUDIT_LOG_ENABLED=True)
     def test_bulk_edit_audit_log_enabled_tags(self) -> None:
@@ -2551,18 +2527,16 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
         GIVEN:
             - Audit log is enabled
         WHEN:
-            - API to bulk edit tags is called on an untagged document and a
+            - API to bulk edit tags is called
-              document with several tags
         THEN:
-            - Audit log is created for each document with its full tag list
+            - Audit log is created
-              before and after the edit
         """
         LogEntry.objects.all().delete()
         response = self.client.post(
             "/api/documents/bulk_edit/",
             json.dumps(
                 {
-                    "documents": [self.doc1.id, self.doc4.id],
+                    "documents": [self.doc1.id],
                     "method": "modify_tags",
                     "parameters": {
                         "add_tags": [self.t1.id],
@@ -2574,32 +2548,18 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
         )
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        entry = LogEntry.objects.get_for_object(self.doc1).get()
+        self.assertEqual(LogEntry.objects.filter(object_pk=self.doc1.id).count(), 1)
-        self.assertEqual(entry.changes, {"tags": [[], [self.t1.id]]})
-        entry = LogEntry.objects.get_for_object(self.doc4).get()
-        self.assertEqual(
-            entry.changes,
-            {"tags": [[self.t1.id, self.t2.id], [self.t1.id]]},
-        )
 
     @override_settings(AUDIT_LOG_ENABLED=True)
     def test_bulk_edit_audit_log_enabled_custom_fields(self) -> None:
         """
         GIVEN:
             - Audit log is enabled
-            - A document with two custom fields
         WHEN:
-            - API to bulk edit custom fields is called to add a third
+            - API to bulk edit custom fields is called
         THEN:
-            - Audit log is created with every custom field instance before and
+            - Audit log is created
-              after the edit
-            - Audit log is created for the new custom field instance
         """
-        cf3 = CustomField.objects.create(name="cf3", data_type="string")
-        existing = [
-            CustomFieldInstance.objects.create(document=self.doc1, field=field)
-            for field in (self.cf2, cf3)
-        ]
         LogEntry.objects.all().delete()
         response = self.client.post(
             "/api/documents/bulk_edit/",
@@ -2617,14 +2577,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
         )
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        added = CustomFieldInstance.objects.get(document=self.doc1, field=self.cf1)
+        self.assertEqual(LogEntry.objects.filter(object_pk=self.doc1.id).count(), 2)
-        existing_ids = [instance.id for instance in existing]
-        entry = LogEntry.objects.get_for_object(self.doc1).get()
-        self.assertEqual(
-            entry.changes,
-            {"custom_fields": [existing_ids, [*existing_ids, added.id]]},
-        )
-        self.assertEqual(LogEntry.objects.get_for_object(added).count(), 1)
 
     def test_api_bulk_edit_with_bad_search_query_returns_400(self) -> None:
         """

src/documents/tests/test_api_chat.py

@@ -4,22 +4,20 @@ from typing import TYPE_CHECKING
 from unittest import mock
 
 import pytest
+from django.contrib.auth.models import Permission
+from django.contrib.auth.models import User
 from rest_framework import status
 from rest_framework.test import APIClient
 from rest_framework.test import APITestCase
 
-from paperless_testing.factories import UserFactory
-from paperless_testing.permissions import grant_global
-
 if TYPE_CHECKING:
-    from django.contrib.auth.models import User
     from pytest_mock import MockerFixture
 
 
 class TestChatStreamingViewInputValidation(APITestCase):
     def setUp(self) -> None:
         super().setUp()
-        self.user = UserFactory(username="temp_admin", superuser=True)
+        self.user = User.objects.create_superuser(username="temp_admin")
         self.client.force_authenticate(user=self.user)
 
     def _mock_ai_enabled(self) -> mock.MagicMock:
@@ -115,7 +113,9 @@ class TestChatStreamingViewUnrestrictedFlag:
         needs to reach the view at all. Model-level only: says nothing
         about which documents (if any) this user can actually see.
         """
-        grant_global(regular_user, "view_document")
+        regular_user.user_permissions.add(
+            *Permission.objects.filter(codename="view_document"),
+        )
         return user_client
 
     @pytest.mark.parametrize(

src/documents/tests/test_api_custom_fields.py

@@ -4,24 +4,23 @@ from unittest import mock
 from unittest.mock import ANY
 
 from django.contrib.auth.models import Permission
+from django.contrib.auth.models import User
 from django.test import override_settings
+from guardian.shortcuts import assign_perm
 from rest_framework import status
 from rest_framework.test import APITestCase
 
 from documents.models import CustomField
 from documents.models import CustomFieldInstance
 from documents.models import Document
-from paperless_testing.dirs import DirectoriesMixin
+from documents.tests.utils import DirectoriesMixin
-from paperless_testing.factories import UserFactory
-from paperless_testing.permissions import grant_global
-from paperless_testing.permissions import grant_object
 
 
 class TestCustomFieldsAPI(DirectoriesMixin, APITestCase):
     ENDPOINT = "/api/custom_fields/"
 
     def setUp(self) -> None:
-        self.user = UserFactory(username="temp_admin", superuser=True)
+        self.user = User.objects.create_superuser(username="temp_admin")
         self.client.force_authenticate(user=self.user)
         return super().setUp()
 
@@ -1175,9 +1174,11 @@ class TestCustomFieldsAPI(DirectoriesMixin, APITestCase):
     def test_documentlink_patch_requires_change_permission_on_target_documents(
         self,
     ) -> None:
-        source_owner = UserFactory(username="source-owner")
+        source_owner = User.objects.create_user(username="source-owner")
-        grant_global(source_owner, "change_document")
+        source_owner.user_permissions.add(
-        other_user = UserFactory(username="other-user")
+            Permission.objects.get(codename="change_document"),
+        )
+        other_user = User.objects.create_user(username="other-user")
 
         source_doc = Document.objects.create(
             title="Source",
@@ -1220,9 +1221,11 @@ class TestCustomFieldsAPI(DirectoriesMixin, APITestCase):
     def test_documentlink_patch_allowed_with_change_permission_on_target_documents(
         self,
     ) -> None:
-        source_owner = UserFactory(username="source-owner")
+        source_owner = User.objects.create_user(username="source-owner")
-        grant_global(source_owner, "change_document")
+        source_owner.user_permissions.add(
-        other_user = UserFactory(username="other-user")
+            Permission.objects.get(codename="change_document"),
+        )
+        other_user = User.objects.create_user(username="other-user")
 
         source_doc = Document.objects.create(
             title="Source",
@@ -1241,7 +1244,7 @@ class TestCustomFieldsAPI(DirectoriesMixin, APITestCase):
             data_type=CustomField.FieldDataType.DOCUMENTLINK,
         )
 
-        grant_object(source_owner, target_doc, "change_document")
+        assign_perm("change_document", source_owner, target_doc)
         self.client.force_authenticate(user=source_owner)
 
         resp = self.client.patch(
@@ -1334,7 +1337,7 @@ class TestCustomFieldsAPI(DirectoriesMixin, APITestCase):
         self.assertEqual(results[0]["document_count"], 1)
 
         # Test as user without access to the document
-        non_superuser = UserFactory(username="non_superuser")
+        non_superuser = User.objects.create_user(username="non_superuser")
         non_superuser.user_permissions.add(
             *Permission.objects.exclude(codename="view_global_statistics"),
         )

src/documents/tests/test_api_document_versions.py

@@ -5,6 +5,8 @@ from typing import TYPE_CHECKING
 from unittest import mock
 
 from auditlog.models import LogEntry  # type: ignore[import-untyped]
+from django.contrib.auth.models import Permission
+from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.test import TestCase as DjangoTestCase
@@ -16,13 +18,10 @@ from documents.data_models import DocumentSource
 from documents.filters import EffectiveContentFilter
 from documents.filters import TitleContentFilter
 from documents.models import Document
+from documents.tests.utils import DirectoriesMixin
+from documents.tests.utils import read_streaming_response
 from documents.versioning import annotate_effective_content
 from documents.views import DocumentSelectionMixin
-from paperless_testing.dirs import DirectoriesMixin
-from paperless_testing.factories import DocumentFactory
-from paperless_testing.factories import UserFactory
-from paperless_testing.http import read_streaming_response
-from paperless_testing.permissions import grant_global
 
 if TYPE_CHECKING:
     from pathlib import Path
@@ -32,7 +31,7 @@ class TestDocumentVersioningApi(DirectoriesMixin, APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        self.user = UserFactory(username="temp_admin", superuser=True)
+        self.user = User.objects.create_superuser(username="temp_admin")
         self.client.force_authenticate(user=self.user)
 
     def _make_pdf_upload(self, name: str = "version.pdf") -> SimpleUploadedFile:
@@ -90,9 +89,11 @@ class TestDocumentVersioningApi(DirectoriesMixin, APITestCase):
         self.assertEqual(resp.status_code, status.HTTP_404_NOT_FOUND)
 
     def test_root_endpoint_returns_403_when_user_lacks_permission(self) -> None:
-        owner = UserFactory(username="owner")
+        owner = User.objects.create_user(username="owner")
-        viewer = UserFactory(username="viewer")
+        viewer = User.objects.create_user(username="viewer")
-        grant_global(viewer, "view_document")
+        viewer.user_permissions.add(
+            Permission.objects.get(codename="view_document"),
+        )
         root = Document.objects.create(
             title="root",
             checksum="root",
@@ -282,9 +283,11 @@ class TestDocumentVersioningApi(DirectoriesMixin, APITestCase):
         self.assertEqual(mock_backend.add_or_update.call_args[0][0].id, root.id)
 
     def test_delete_version_returns_403_without_permission(self) -> None:
-        owner = UserFactory(username="owner")
+        owner = User.objects.create_user(username="owner")
-        other = UserFactory(username="other")
+        other = User.objects.create_user(username="other")
-        grant_global(other, "delete_document")
+        other.user_permissions.add(
+            Permission.objects.get(codename="delete_document"),
+        )
         root = Document.objects.create(
             title="root",
             checksum="root",
@@ -368,9 +371,11 @@ class TestDocumentVersioningApi(DirectoriesMixin, APITestCase):
         self.assertTrue(resp.data["is_root"])
 
     def test_update_version_label_returns_403_without_permission(self) -> None:
-        owner = UserFactory(username="owner")
+        owner = User.objects.create_user(username="owner")
-        other = UserFactory(username="other")
+        other = User.objects.create_user(username="other")
-        grant_global(other, "change_document")
+        other.user_permissions.add(
+            Permission.objects.get(codename="change_document"),
+        )
         root = Document.objects.create(
             title="root",
             checksum="root",
@@ -548,9 +553,11 @@ class TestDocumentVersioningApi(DirectoriesMixin, APITestCase):
         self.assertEqual(resp.status_code, status.HTTP_404_NOT_FOUND)
 
     def test_metadata_returns_403_when_user_lacks_permission(self) -> None:
-        owner = UserFactory(username="owner")
+        owner = User.objects.create_user(username="owner")
-        other = UserFactory(username="other")
+        other = User.objects.create_user(username="other")
-        grant_global(other, "view_document")
+        other.user_permissions.add(
+            Permission.objects.get(codename="view_document"),
+        )
         doc = Document.objects.create(
             title="root",
             checksum="root",
@@ -646,8 +653,8 @@ class TestDocumentVersioningApi(DirectoriesMixin, APITestCase):
         self.assertEqual(resp.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
 
     def test_update_version_returns_403_without_permission(self) -> None:
-        owner = UserFactory(username="owner")
+        owner = User.objects.create_user(username="owner")
-        other = UserFactory(username="other")
+        other = User.objects.create_user(username="other")
         root = Document.objects.create(
             title="root",
             checksum="root",
@@ -665,8 +672,8 @@ class TestDocumentVersioningApi(DirectoriesMixin, APITestCase):
         self.assertEqual(resp.status_code, status.HTTP_403_FORBIDDEN)
 
     def test_update_version_requires_global_change_permission(self) -> None:
-        user = UserFactory(username="add-only")
+        user = User.objects.create_user(username="add-only")
-        grant_global(user, "add_document")
+        user.user_permissions.add(Permission.objects.get(codename="add_document"))
         root = Document.objects.create(
             title="root",
             checksum="root",
@@ -822,26 +829,6 @@ class TestDocumentVersioningApi(DirectoriesMixin, APITestCase):
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
         self.assertEqual(resp.data["content"], "v1-content")
 
-    def test_page_count_resolves_to_latest_version(self) -> None:
-        root = DocumentFactory(page_count=2)
-        DocumentFactory(root_document=root, version_index=1, page_count=1)
-        unversioned = DocumentFactory(page_count=5)
-
-        resp = self.client.get("/api/documents/?fields=id,page_count")
-        self.assertEqual(resp.status_code, status.HTTP_200_OK)
-        self.assertEqual(
-            {doc["id"]: doc["page_count"] for doc in resp.data["results"]},
-            {root.id: 1, unversioned.id: 5},
-        )
-
-        resp = self.client.get(f"/api/documents/{root.id}/")
-        self.assertEqual(resp.status_code, status.HTTP_200_OK)
-        self.assertEqual(resp.data["page_count"], 1)
-
-        resp = self.client.get(f"/api/documents/{root.id}/?version={root.id}")
-        self.assertEqual(resp.status_code, status.HTTP_200_OK)
-        self.assertEqual(resp.data["page_count"], 2)
-
     def _make_root_with_out_of_order_versions(self) -> tuple[Document, ...]:
         """
         A root whose newest version has a *lower* id than an older one, which is
@@ -991,7 +978,7 @@ class TestVersionAwareFilters(DjangoTestCase):
         superseded content -- selecting documents the list view, filtered by
         the same term, does not show.
         """
-        user = UserFactory(username="bulk_selection", superuser=True)
+        user = User.objects.create_superuser(username="bulk_selection")
 
         selected = DocumentSelectionMixin()._resolve_document_ids(
             user=user,
@@ -1018,7 +1005,7 @@ class TestBulkSelectionExcludesVersions(DjangoTestCase):
         "Select all matching" reconstructs the document list, which never
         contains version documents as rows of their own.
         """
-        user = UserFactory(username="bulk_versions", superuser=True)
+        user = User.objects.create_superuser(username="bulk_versions")
         root = Document.objects.create(
             title="shared-title root",
             checksum="bulk-root",

src/documents/tests/test_api_documents.py

@@ -23,6 +23,7 @@ from django.core.files.uploadedfile import SimpleUploadedFile
 from django.db import DataError
 from django.test import override_settings
 from django.utils import timezone
+from guardian.shortcuts import assign_perm
 from rest_framework import status
 from rest_framework.test import APITestCase
 
@@ -47,22 +48,18 @@ from documents.models import Workflow
 from documents.models import WorkflowAction
 from documents.models import WorkflowTrigger
 from documents.signals.handlers import run_workflows
+from documents.tests.factories import DocumentFactory
+from documents.tests.factories import TagFactory
 from documents.tests.utils import ConsumeTaskMixin
-from paperless_testing.dirs import DirectoriesMixin
+from documents.tests.utils import DirectoriesMixin
-from paperless_testing.factories import DocumentFactory
+from documents.tests.utils import read_streaming_response
-from paperless_testing.factories import TagFactory
-from paperless_testing.factories import UserFactory
-from paperless_testing.http import read_streaming_response
-from paperless_testing.permissions import grant_all_global
-from paperless_testing.permissions import grant_global
-from paperless_testing.permissions import grant_object
 
 
 class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        self.user = UserFactory(username="temp_admin", superuser=True)
+        self.user = User.objects.create_superuser(username="temp_admin")
         self.client.force_authenticate(user=self.user)
         cache.clear()
 
@@ -360,10 +357,10 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         with Path(filename).open("wb") as f:
             f.write(content)
 
-        user1 = UserFactory(username="test1")
+        user1 = User.objects.create_user(username="test1")
-        user2 = UserFactory(username="test2")
+        user2 = User.objects.create_user(username="test2")
-        grant_global(user1, "view_document")
+        user1.user_permissions.add(*Permission.objects.filter(codename="view_document"))
-        grant_global(user2, "view_document")
+        user2.user_permissions.add(*Permission.objects.filter(codename="view_document"))
 
         self.client.force_authenticate(user2)
 
@@ -386,7 +383,7 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         response = self.client.get(f"/api/documents/{doc.pk}/thumb/")
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
 
-        grant_object(user2, doc, "view_document")
+        assign_perm("view_document", user2, doc)
 
         response = self.client.get(f"/api/documents/{doc.pk}/download/")
         self.assertEqual(response.status_code, status.HTTP_200_OK)
@@ -763,8 +760,8 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
             - History is returned
         """
         # No auditlog permissions
-        user = UserFactory(username="test")
+        user = User.objects.create_user(username="test")
-        grant_global(user, "view_document")
+        user.user_permissions.add(*Permission.objects.filter(codename="view_document"))
         self.client.force_authenticate(user=user)
         doc = Document.objects.create(
             title="First title",
@@ -779,7 +776,7 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         # superuser
         user.is_superuser = True
         user.save()
-        user2 = UserFactory(username="test2")
+        user2 = User.objects.create_user(username="test2")
         doc2 = Document.objects.create(
             title="Second title",
             checksum="456",
@@ -1076,9 +1073,11 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         self.assertEqual(response.data["duplicate_documents"], [])
 
     def test_has_duplicates_filter_respects_document_permissions(self) -> None:
-        owner = UserFactory(username="duplicate-owner")
+        owner = User.objects.create_user(username="duplicate-owner")
-        requester = UserFactory(username="duplicate-requester")
+        requester = User.objects.create_user(username="duplicate-requester")
-        grant_global(requester, "view_document")
+        requester.user_permissions.add(
+            Permission.objects.get(codename="view_document"),
+        )
         visible_document = Document.objects.create(
             title="visible document",
             checksum="permission-match",
@@ -1097,7 +1096,7 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
             [document["id"] for document in response.data["results"]],
         )
 
-        grant_object(requester, hidden_duplicate, "view_document")
+        assign_perm("view_document", requester, hidden_duplicate)
         response = self.client.get("/api/documents/?has_duplicates=true")
         self.assertIn(
             visible_document.id,
@@ -1318,10 +1317,10 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         THEN:
             - Owner filters work correctly but still respect permissions
         """
-        u1 = UserFactory(username="user1")
+        u1 = User.objects.create_user("user1")
-        u2 = UserFactory(username="user2")
+        u2 = User.objects.create_user("user2")
-        grant_global(u1, "view_document")
+        u1.user_permissions.add(*Permission.objects.filter(codename="view_document"))
-        grant_global(u2, "view_document")
+        u2.user_permissions.add(*Permission.objects.filter(codename="view_document"))
 
         u1_doc1 = Document.objects.create(
             title="none1",
@@ -1354,7 +1353,7 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         )
 
         self.client.force_authenticate(user=u1)
-        grant_object(u1, u2_doc2, "view_document")
+        assign_perm("view_document", u1, u2_doc2)
 
         # Will not show any u1 docs or u2_doc1 which isn't shared
         response = self.client.get(f"/api/documents/?owner__id__none={u1.id}")
@@ -1401,7 +1400,7 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
             [u1_doc1.id, u1_doc2.id, u2_doc2.id],
         )
 
-        grant_object(u2, u1_doc1, "view_document")
+        assign_perm("view_document", u2, u1_doc1)
 
         # Will show only documents shared by user
         response = self.client.get(f"/api/documents/?shared_by__id={u1.id}")
@@ -1425,8 +1424,8 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
             - The document is returned exactly once, not once per permission path
             (regression test for https://github.com/paperless-ngx/paperless-ngx/issues/13331)
         """
-        user = UserFactory(username="user1")
+        user = User.objects.create_user("user1")
-        grant_global(user, "view_document")
+        user.user_permissions.add(*Permission.objects.filter(codename="view_document"))
         group = Group.objects.create(name="group1")
         user.groups.add(group)
 
@@ -1434,7 +1433,7 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         tag2 = TagFactory()
         doc = DocumentFactory(title="shared", owner=user)
         doc.tags.add(tag1, tag2)
-        grant_object(group, doc, "view_document")
+        assign_perm("view_document", group, doc)
 
         self.client.force_authenticate(user=user)
         response = self.client.get(
@@ -1453,9 +1452,11 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         THEN:
             - The document does not appear in their results
         """
-        owner = UserFactory(username="owner1")
+        owner = User.objects.create_user("owner1")
-        stranger = UserFactory(username="stranger1")
+        stranger = User.objects.create_user("stranger1")
-        grant_global(stranger, "view_document")
+        stranger.user_permissions.add(
+            *Permission.objects.filter(codename="view_document"),
+        )
 
         DocumentFactory(title="private", owner=owner)
 
@@ -1473,17 +1474,17 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         THEN:
             - Only the group member sees the document
         """
-        owner = UserFactory(username="owner2")
+        owner = User.objects.create_user("owner2")
-        member = UserFactory(username="member1")
+        member = User.objects.create_user("member1")
-        non_member = UserFactory(username="nonmember1")
+        non_member = User.objects.create_user("nonmember1")
         for u in (member, non_member):
-            grant_global(u, "view_document")
+            u.user_permissions.add(*Permission.objects.filter(codename="view_document"))
 
         group = Group.objects.create(name="group2")
         member.groups.add(group)
 
         doc = DocumentFactory(title="shared2", owner=owner)
-        grant_object(group, doc, "view_document")
+        assign_perm("view_document", group, doc)
 
         self.client.force_authenticate(user=member)
         response = self.client.get("/api/documents/")
@@ -1784,8 +1785,8 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         THEN:
             - Statistics only include inbox counts for tags accessible by the user
         """
-        u1 = UserFactory(username="user1")
+        u1 = User.objects.create_user("user1")
-        u2 = UserFactory(username="user2")
+        u2 = User.objects.create_user("user2")
         inbox_tag_u1 = Tag.objects.create(name="inbox_u1", is_inbox_tag=True, owner=u1)
         Tag.objects.create(name="inbox_u2", is_inbox_tag=True, owner=u2)
         doc_u1 = Document.objects.create(
@@ -1815,9 +1816,11 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         self.assertEqual(response.data["documents_inbox"], 0)
 
     def test_statistics_with_statistics_permission(self) -> None:
-        owner = UserFactory(username="owner")
+        owner = User.objects.create_user("owner")
-        stats_user = UserFactory(username="stats-user")
+        stats_user = User.objects.create_user("stats-user")
-        grant_global(stats_user, "view_global_statistics")
+        stats_user.user_permissions.add(
+            Permission.objects.get(codename="view_global_statistics"),
+        )
 
         inbox_tag = Tag.objects.create(
             name="stats_inbox",
@@ -1983,7 +1986,7 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         self.assertEqual(response.status_code, status.HTTP_405_METHOD_NOT_ALLOWED)
 
     def test_upload_insufficient_permissions(self) -> None:
-        self.client.force_authenticate(user=UserFactory(username="testuser2"))
+        self.client.force_authenticate(user=User.objects.create_user("testuser2"))
 
         with (Path(__file__).parent / "samples" / "simple.pdf").open("rb") as f:
             response = self.client.post(
@@ -2779,9 +2782,9 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         mock_get_date_parser.assert_not_called()
 
     def test_saved_views(self) -> None:
-        u1 = UserFactory(username="user1")
+        u1 = User.objects.create_user("user1")
-        u2 = UserFactory(username="user2")
+        u2 = User.objects.create_user("user2")
-        u3 = UserFactory(username="user3")
+        u3 = User.objects.create_user("user3")
 
         view_perm = Permission.objects.get(codename="view_savedview")
         change_perm = Permission.objects.get(codename="change_savedview")
@@ -2804,9 +2807,9 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
             sort_field="",
         )
 
-        grant_object(u1, v2, "view_savedview")
+        assign_perm("view_savedview", u1, v2)
-        grant_object(u1, v2, "change_savedview")
+        assign_perm("change_savedview", u1, v2)
-        grant_object(u1, v3, "view_savedview")
+        assign_perm("view_savedview", u1, v3)
 
         self.client.force_authenticate(user=u1)
 
@@ -3061,7 +3064,7 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         self.assertListEqual(saved_view_settings["sidebar_views_visible_ids"], [v2.id])
 
     def test_saved_view_create_update_patch(self) -> None:
-        UserFactory(username="user1")
+        User.objects.create_user("user1")
 
         view = {
             "name": "test",
@@ -3124,7 +3127,7 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
             - Display options are updated
             - Display fields are validated
         """
-        UserFactory(username="user1")
+        User.objects.create_user("user1")
 
         view = {
             "name": "test",
@@ -3565,11 +3568,11 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         THEN:
             - Notes are neither created nor deleted
         """
-        user1 = UserFactory(username="test1")
+        user1 = User.objects.create_user(username="test1")
-        grant_all_global(user1)
+        user1.user_permissions.add(*Permission.objects.all())
         user1.save()
 
-        user2 = UserFactory(username="test2")
+        user2 = User.objects.create_user(username="test2")
         user2.save()
 
         doc = Document.objects.create(
@@ -3589,7 +3592,7 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         self.assertEqual(resp.content, b"Insufficient permissions to view notes")
         self.assertEqual(resp.status_code, status.HTTP_403_FORBIDDEN)
 
-        grant_object(user1, doc, "view_document")
+        assign_perm("view_document", user1, doc)
 
         resp = self.client.post(
             f"/api/documents/{doc.pk}/notes/",
@@ -3613,8 +3616,12 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
 
     def test_notes_require_global_document_permissions(self) -> None:
-        user = UserFactory(username="note_editor")
+        user = User.objects.create_user(username="note_editor")
-        grant_global(user, "view_note", "add_note", "delete_note")
+        user.user_permissions.add(
+            *Permission.objects.filter(
+                codename__in=["view_note", "add_note", "delete_note"],
+            ),
+        )
         doc = Document.objects.create(
             title="test",
             mime_type="application/pdf",
@@ -3627,7 +3634,9 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         response = self.client.get(f"/api/documents/{doc.pk}/notes/")
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
 
-        grant_global(user, "view_document")
+        user.user_permissions.add(
+            Permission.objects.get(codename="view_document"),
+        )
         user = User.objects.get(pk=user.pk)
         self.client.force_authenticate(user)
         response = self.client.get(f"/api/documents/{doc.pk}/notes/")
@@ -3639,7 +3648,9 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         )
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
 
-        grant_global(user, "change_document")
+        user.user_permissions.add(
+            Permission.objects.get(codename="change_document"),
+        )
         user = User.objects.get(pk=user.pk)
         self.client.force_authenticate(user)
         response = self.client.post(
@@ -3786,12 +3797,12 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
             - Unique items are created
             - Non-unique items are not allowed
         """
-        user1 = UserFactory(username="test1")
+        user1 = User.objects.create_user(username="test1")
-        grant_global(user1, "add_tag")
+        user1.user_permissions.add(*Permission.objects.filter(codename="add_tag"))
         user1.save()
 
-        user2 = UserFactory(username="test2")
+        user2 = User.objects.create_user(username="test2")
-        grant_global(user2, "add_tag")
+        user2.user_permissions.add(*Permission.objects.filter(codename="add_tag"))
         user2.save()
 
         # User 1 creates tag 1 owned by user 1 by default
@@ -3846,12 +3857,12 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
             - Unique items are created
             - Non-unique items are not allowed on update
         """
-        user1 = UserFactory(username="test1")
+        user1 = User.objects.create_user(username="test1")
-        grant_global(user1, "change_tag")
+        user1.user_permissions.add(*Permission.objects.filter(codename="change_tag"))
         user1.save()
 
-        user2 = UserFactory(username="test2")
+        user2 = User.objects.create_user(username="test2")
-        grant_global(user2, "change_tag")
+        user2.user_permissions.add(*Permission.objects.filter(codename="change_tag"))
         user2.save()
 
         # Create name tag 1 owned by user 1
@@ -3982,11 +3993,11 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         THEN:
             - Links only shown if user has permissions
         """
-        user1 = UserFactory(username="test1")
+        user1 = User.objects.create_user(username="test1")
-        grant_all_global(user1)
+        user1.user_permissions.add(*Permission.objects.all())
         user1.save()
 
-        user2 = UserFactory(username="test2")
+        user2 = User.objects.create_user(username="test2")
         user2.save()
 
         doc = Document.objects.create(
@@ -4006,7 +4017,7 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         self.assertEqual(resp.content, b"Insufficient permissions to add share link")
         self.assertEqual(resp.status_code, status.HTTP_403_FORBIDDEN)
 
-        grant_object(user1, doc, "change_document")
+        assign_perm("change_document", user1, doc)
 
         resp = self.client.get(
             f"/api/documents/{doc.pk}/share_links/",
@@ -4023,11 +4034,11 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         THEN:
             - Share link creation is denied until view permission is granted
         """
-        user1 = UserFactory(username="test1")
+        user1 = User.objects.create_user(username="test1")
-        grant_global(user1, "add_sharelink")
+        user1.user_permissions.add(*Permission.objects.filter(codename="add_sharelink"))
         user1.save()
 
-        user2 = UserFactory(username="test2")
+        user2 = User.objects.create_user(username="test2")
         user2.save()
 
         doc = Document.objects.create(
@@ -4049,7 +4060,7 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         )
         self.assertEqual(create_resp.status_code, status.HTTP_403_FORBIDDEN)
 
-        grant_object(user1, doc, "view_document")
+        assign_perm("view_document", user1, doc)
 
         create_resp = self.client.post(
             "/api/share_links/",
@@ -4061,7 +4072,9 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         )
         self.assertEqual(create_resp.status_code, status.HTTP_403_FORBIDDEN)
 
-        grant_global(user1, "view_document")
+        user1.user_permissions.add(
+            Permission.objects.get(codename="view_document"),
+        )
         user1 = User.objects.get(pk=user1.pk)
         self.client.force_authenticate(user1)
         create_resp = self.client.post(
@@ -4084,11 +4097,11 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         THEN:
             - ASN +1 from user2's doc is returned for user1
         """
-        user1 = UserFactory(username="test1")
+        user1 = User.objects.create_user(username="test1")
-        grant_all_global(user1)
+        user1.user_permissions.add(*Permission.objects.all())
         user1.save()
 
-        user2 = UserFactory(username="test2")
+        user2 = User.objects.create_user(username="test2")
         user2.save()
 
         doc1 = Document.objects.create(
@@ -4128,8 +4141,8 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         THEN:
             - ASN 1 is returned
         """
-        user1 = UserFactory(username="test1")
+        user1 = User.objects.create_user(username="test1")
-        grant_all_global(user1)
+        user1.user_permissions.add(*Permission.objects.all())
         user1.save()
 
         doc1 = Document.objects.create(
@@ -4157,7 +4170,7 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         THEN:
             - Explicit error is returned
         """
-        user1 = UserFactory(username="test1", superuser=True)
+        user1 = User.objects.create_superuser(username="test1")
 
         self.client.force_authenticate(user1)
 
@@ -4335,8 +4348,8 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         THEN:
             - Error response is returned
         """
-        user1 = UserFactory(username="test1")
+        user1 = User.objects.create_user(username="test1")
-        grant_all_global(user1)
+        user1.user_permissions.add(*Permission.objects.all())
         user1.save()
 
         doc = Document.objects.create(
@@ -4441,7 +4454,7 @@ class TestDocumentApiTagColors(DirectoriesMixin, APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        self.user = UserFactory(username="temp_admin", superuser=True)
+        self.user = User.objects.create_superuser(username="temp_admin")
 
         self.client.force_authenticate(user=self.user)
 
@@ -4521,7 +4534,7 @@ class TestDocumentApiCustomFieldsSorting(DirectoriesMixin, APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        self.user = UserFactory(username="temp_admin", superuser=True)
+        self.user = User.objects.create_superuser(username="temp_admin")
         self.client.force_authenticate(user=self.user)
 
         self.doc1 = Document.objects.create(

src/documents/tests/test_api_email.py

@@ -2,16 +2,16 @@ import json
 import shutil
 from unittest import mock
 
+from django.contrib.auth.models import Permission
+from django.contrib.auth.models import User
 from django.core import mail
 from django.test import override_settings
 from rest_framework import status
 from rest_framework.test import APITestCase
 
 from documents.models import Document
+from documents.tests.utils import DirectoriesMixin
 from documents.tests.utils import SampleDirMixin
-from paperless_testing.dirs import DirectoriesMixin
-from paperless_testing.factories import UserFactory
-from paperless_testing.permissions import grant_global
 
 
 class TestEmail(DirectoriesMixin, SampleDirMixin, APITestCase):
@@ -20,7 +20,7 @@ class TestEmail(DirectoriesMixin, SampleDirMixin, APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        self.user = UserFactory(username="temp_admin", superuser=True)
+        self.user = User.objects.create_superuser(username="temp_admin")
         self.client.force_authenticate(user=self.user)
 
         self.doc1 = Document.objects.create(
@@ -303,8 +303,8 @@ class TestEmail(DirectoriesMixin, SampleDirMixin, APITestCase):
         THEN:
             - Forbidden response is returned
         """
-        user1 = UserFactory(username="test1")
+        user1 = User.objects.create_user(username="test1")
-        grant_global(user1, "view_document")
+        user1.user_permissions.add(*Permission.objects.filter(codename="view_document"))
 
         doc_owned = Document.objects.create(
             title="owned_doc",
@@ -338,8 +338,8 @@ class TestEmail(DirectoriesMixin, SampleDirMixin, APITestCase):
         THEN:
             - Request succeeds
         """
-        user1 = UserFactory(username="test1")
+        user1 = User.objects.create_user(username="test1")
-        grant_global(user1, "view_document")
+        user1.user_permissions.add(*Permission.objects.filter(codename="view_document"))
 
         self.client.force_authenticate(user1)
 

src/documents/tests/test_api_filter_by_custom_fields.py

@@ -4,6 +4,7 @@ from collections.abc import Callable
 from datetime import date
 from urllib.parse import quote
 
+from django.contrib.auth.models import User
 from rest_framework.test import APITestCase
 
 from documents.models import CustomField
@@ -12,8 +13,7 @@ from documents.models import Document
 from documents.models import SavedView
 from documents.models import SavedViewFilterRule
 from documents.serialisers import DocumentSerializer
-from paperless_testing.dirs import DirectoriesMixin
+from documents.tests.utils import DirectoriesMixin
-from paperless_testing.factories import UserFactory
 
 
 class DocumentWrapper:
@@ -35,7 +35,7 @@ class TestCustomFieldsSearch(DirectoriesMixin, APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        self.user = UserFactory(username="temp_admin", superuser=True)
+        self.user = User.objects.create_superuser(username="temp_admin")
         self.client.force_authenticate(user=self.user)
 
         # Create one custom field per type. The fields are called f"{type}_field".

src/documents/tests/test_api_objects.py

@@ -3,10 +3,12 @@ import json
 from unittest import mock
 
 from django.contrib.auth.models import Group
+from django.contrib.auth.models import Permission
 from django.contrib.auth.models import User
 from django.db import connection
 from django.test import override_settings
 from django.test.utils import CaptureQueriesContext
+from guardian.shortcuts import assign_perm
 from guardian.shortcuts import get_groups_with_perms
 from guardian.shortcuts import get_users_with_perms
 from rest_framework import status
@@ -19,17 +21,14 @@ from documents.models import Document
 from documents.models import DocumentType
 from documents.models import StoragePath
 from documents.models import Tag
-from paperless_testing.dirs import DirectoriesMixin
+from documents.tests.utils import DirectoriesMixin
-from paperless_testing.factories import UserFactory
-from paperless_testing.permissions import grant_global
-from paperless_testing.permissions import grant_object
 
 
 class TestApiObjects(DirectoriesMixin, APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        user = UserFactory(username="temp_admin", superuser=True)
+        user = User.objects.create_superuser(username="temp_admin")
         self.client.force_authenticate(user=user)
 
         self.tag1 = Tag.objects.create(name="t1", is_inbox_tag=True)
@@ -154,7 +153,7 @@ class TestApiObjects(DirectoriesMixin, APITestCase):
 
         # A newer document owned by another user must not leak through the
         # aggregate for a non-superuser who cannot view it
-        other = UserFactory(username="other")
+        other = User.objects.create_user(username="other")
         Document.objects.create(
             mime_type="application/pdf",
             correspondent=self.c1,
@@ -163,8 +162,10 @@ class TestApiObjects(DirectoriesMixin, APITestCase):
             owner=other,
         )
 
-        user = UserFactory(username="regular")
+        user = User.objects.create_user(username="regular")
-        grant_global(user, "view_correspondent")
+        user.user_permissions.add(
+            Permission.objects.get(codename="view_correspondent"),
+        )
         self.client.force_authenticate(user=user)
 
         response = self.client.get("/api/correspondents/?last_correspondence=true")
@@ -199,7 +200,7 @@ class TestApiStoragePaths(DirectoriesMixin, APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        user = UserFactory(username="temp_admin", superuser=True)
+        user = User.objects.create_superuser(username="temp_admin")
         self.client.force_authenticate(user=user)
 
         self.sp1 = StoragePath.objects.create(name="sp1", path="Something/{checksum}")
@@ -454,9 +455,11 @@ class TestApiStoragePaths(DirectoriesMixin, APITestCase):
         self.assertEqual(response.data, "folder/Something.pdf")
 
     def test_test_storage_path_requires_document_view_permission(self) -> None:
-        owner = UserFactory(username="owner")
+        owner = User.objects.create_user(username="owner")
-        unprivileged = UserFactory(username="unprivileged")
+        unprivileged = User.objects.create_user(username="unprivileged")
-        grant_global(unprivileged, "view_document")
+        unprivileged.user_permissions.add(
+            Permission.objects.get(codename="view_document"),
+        )
         document = Document.objects.create(
             mime_type="application/pdf",
             owner=owner,
@@ -478,15 +481,15 @@ class TestApiStoragePaths(DirectoriesMixin, APITestCase):
         self.assertIn("document", response.data)
 
     def test_test_storage_path_allows_shared_document_view_permission(self) -> None:
-        owner = UserFactory(username="owner")
+        owner = User.objects.create_user(username="owner")
-        viewer = UserFactory(username="viewer")
+        viewer = User.objects.create_user(username="viewer")
         document = Document.objects.create(
             mime_type="application/pdf",
             owner=owner,
             title="Shared",
             checksum="123",
         )
-        grant_object(viewer, document, "view_document")
+        assign_perm("view_document", viewer, document)
 
         self.client.force_authenticate(user=viewer)
         response = self.client.post(
@@ -501,7 +504,9 @@ class TestApiStoragePaths(DirectoriesMixin, APITestCase):
         )
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
 
-        grant_global(viewer, "view_document")
+        viewer.user_permissions.add(
+            Permission.objects.get(codename="view_document"),
+        )
         viewer = User.objects.get(pk=viewer.pk)
         self.client.force_authenticate(user=viewer)
         response = self.client.post(
@@ -540,12 +545,14 @@ class TestApiStoragePaths(DirectoriesMixin, APITestCase):
     def test_test_storage_path_exposes_basic_document_context_but_not_sensitive_owner_data(
         self,
     ) -> None:
-        owner = UserFactory(
+        owner = User.objects.create_user(
             username="owner",
             password="password",
             email="owner@example.com",
         )
-        grant_global(owner, "view_document")
+        owner.user_permissions.add(
+            Permission.objects.get(codename="view_document"),
+        )
         document = Document.objects.create(
             mime_type="application/pdf",
             owner=owner,
@@ -607,8 +614,8 @@ class TestApiStoragePaths(DirectoriesMixin, APITestCase):
     def test_test_storage_path_includes_related_objects_for_visible_document(
         self,
     ) -> None:
-        owner = UserFactory(username="owner")
+        owner = User.objects.create_user(username="owner")
-        viewer = UserFactory(username="viewer")
+        viewer = User.objects.create_user(username="viewer")
         private_correspondent = Correspondent.objects.create(
             name="Private Correspondent",
             owner=owner,
@@ -620,8 +627,10 @@ class TestApiStoragePaths(DirectoriesMixin, APITestCase):
             title="Document",
             checksum="123",
         )
-        grant_object(viewer, document, "view_document")
+        assign_perm("view_document", viewer, document)
-        grant_global(viewer, "view_document")
+        viewer.user_permissions.add(
+            Permission.objects.get(codename="view_document"),
+        )
 
         self.client.force_authenticate(user=viewer)
         response = self.client.post(
@@ -653,7 +662,7 @@ class TestApiStoragePaths(DirectoriesMixin, APITestCase):
         self.assertEqual(response.data, "Private Correspondent.pdf")
 
     def test_test_storage_path_superuser_can_view_private_related_objects(self) -> None:
-        owner = UserFactory(username="owner")
+        owner = User.objects.create_user(username="owner")
         private_correspondent = Correspondent.objects.create(
             name="Private Correspondent",
             owner=owner,
@@ -684,8 +693,8 @@ class TestApiStoragePaths(DirectoriesMixin, APITestCase):
     def test_test_storage_path_includes_doc_type_storage_path_and_tags(
         self,
     ) -> None:
-        owner = UserFactory(username="owner")
+        owner = User.objects.create_user(username="owner")
-        viewer = UserFactory(username="viewer")
+        viewer = User.objects.create_user(username="viewer")
         private_document_type = DocumentType.objects.create(
             name="Private Type",
             owner=owner,
@@ -708,8 +717,10 @@ class TestApiStoragePaths(DirectoriesMixin, APITestCase):
             checksum="123",
         )
         document.tags.add(private_tag)
-        grant_object(viewer, document, "view_document")
+        assign_perm("view_document", viewer, document)
-        grant_global(viewer, "view_document")
+        viewer.user_permissions.add(
+            Permission.objects.get(codename="view_document"),
+        )
 
         self.client.force_authenticate(user=viewer)
         response = self.client.post(
@@ -745,8 +756,8 @@ class TestApiStoragePaths(DirectoriesMixin, APITestCase):
     def test_test_storage_path_includes_custom_fields_for_visible_document(
         self,
     ) -> None:
-        owner = UserFactory(username="owner")
+        owner = User.objects.create_user(username="owner")
-        viewer = UserFactory(username="viewer")
+        viewer = User.objects.create_user(username="viewer")
         document = Document.objects.create(
             mime_type="application/pdf",
             owner=owner,
@@ -762,8 +773,10 @@ class TestApiStoragePaths(DirectoriesMixin, APITestCase):
             field=custom_field,
             value_int=42,
         )
-        grant_object(viewer, document, "view_document")
+        assign_perm("view_document", viewer, document)
-        grant_global(viewer, "view_document")
+        viewer.user_permissions.add(
+            Permission.objects.get(codename="view_document"),
+        )
 
         self.client.force_authenticate(user=viewer)
         response = self.client.post(
@@ -785,7 +798,7 @@ class TestBulkEditObjects(APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        self.temp_admin = UserFactory(username="temp_admin", superuser=True)
+        self.temp_admin = User.objects.create_superuser(username="temp_admin")
         self.client.force_authenticate(user=self.temp_admin)
 
         self.t1 = Tag.objects.create(name="t1")
@@ -1017,7 +1030,9 @@ class TestBulkEditObjects(APITestCase):
         THEN:
             - User is able to delete objects
         """
-        grant_global(self.user1, "delete_tag")
+        self.user1.user_permissions.add(
+            *Permission.objects.filter(codename="delete_tag"),
+        )
         self.user1.save()
         self.client.force_authenticate(user=self.user1)
 
@@ -1047,7 +1062,9 @@ class TestBulkEditObjects(APITestCase):
         self.t2.owner = User.objects.get(username="temp_admin")
         self.t2.save()
 
-        grant_global(self.user1, "delete_tag")
+        self.user1.user_permissions.add(
+            *Permission.objects.filter(codename="delete_tag"),
+        )
         self.user1.save()
         self.client.force_authenticate(user=self.user1)
 
@@ -1080,7 +1097,9 @@ class TestBulkEditObjects(APITestCase):
         self.t2.owner = User.objects.get(username="temp_admin")
         self.t2.save()
 
-        grant_global(self.user1, "delete_tag")
+        self.user1.user_permissions.add(
+            *Permission.objects.filter(codename="delete_tag"),
+        )
         self.user1.save()
         self.client.force_authenticate(user=self.user1)
 

src/documents/tests/test_api_permissions.py

@@ -5,7 +5,9 @@ from unittest import mock
 from allauth.mfa.models import Authenticator
 from allauth.mfa.totp.internal import auth as totp_auth
 from django.contrib.auth.models import Group
+from django.contrib.auth.models import Permission
 from django.contrib.auth.models import User
+from guardian.shortcuts import assign_perm
 from guardian.shortcuts import get_perms
 from guardian.shortcuts import get_users_with_perms
 from rest_framework import status
@@ -17,11 +19,7 @@ from documents.models import DocumentType
 from documents.models import MatchingModel
 from documents.models import StoragePath
 from documents.models import Tag
-from paperless_testing.dirs import DirectoriesMixin
+from documents.tests.utils import DirectoriesMixin
-from paperless_testing.factories import UserFactory
-from paperless_testing.permissions import grant_all_global
-from paperless_testing.permissions import grant_global
-from paperless_testing.permissions import grant_object
 
 
 class TestApiAuth(DirectoriesMixin, APITestCase):
@@ -95,14 +93,14 @@ class TestApiAuth(DirectoriesMixin, APITestCase):
         self.assertNotIn("X-Version", response)
 
     def test_api_version_with_auth(self) -> None:
-        user = UserFactory(username="test", superuser=True)
+        user = User.objects.create_superuser(username="test")
         self.client.force_authenticate(user)
         response = self.client.get("/api/documents/")
         self.assertIn("X-Api-Version", response)
         self.assertIn("X-Version", response)
 
     def test_api_insufficient_permissions(self) -> None:
-        user = UserFactory(username="test")
+        user = User.objects.create_user(username="test")
         self.client.force_authenticate(user)
 
         Document.objects.create(title="Test")
@@ -139,8 +137,8 @@ class TestApiAuth(DirectoriesMixin, APITestCase):
         )
 
     def test_api_sufficient_permissions(self) -> None:
-        user = UserFactory(username="test")
+        user = User.objects.create_user(username="test")
-        grant_all_global(user)
+        user.user_permissions.add(*Permission.objects.all())
         user.is_staff = True
         self.client.force_authenticate(user)
 
@@ -168,9 +166,9 @@ class TestApiAuth(DirectoriesMixin, APITestCase):
         )
 
     def test_api_get_object_permissions(self) -> None:
-        user1 = UserFactory(username="test1")
+        user1 = User.objects.create_user(username="test1")
-        user2 = UserFactory(username="test2")
+        user2 = User.objects.create_user(username="test2")
-        grant_global(user1, "view_document")
+        user1.user_permissions.add(*Permission.objects.filter(codename="view_document"))
         self.client.force_authenticate(user1)
 
         self.assertEqual(
@@ -207,7 +205,7 @@ class TestApiAuth(DirectoriesMixin, APITestCase):
         THEN:
             - Object created with current user as owner
         """
-        user1 = UserFactory(username="user1", superuser=True)
+        user1 = User.objects.create_superuser(username="user1")
 
         self.client.force_authenticate(user1)
 
@@ -236,7 +234,7 @@ class TestApiAuth(DirectoriesMixin, APITestCase):
         THEN:
             - Object created with no owner
         """
-        user1 = UserFactory(username="user1", superuser=True)
+        user1 = User.objects.create_superuser(username="user1")
 
         self.client.force_authenticate(user1)
 
@@ -267,7 +265,7 @@ class TestApiAuth(DirectoriesMixin, APITestCase):
         THEN:
             - Object permissions are set appropriately
         """
-        user1 = UserFactory(username="user1", superuser=True)
+        user1 = User.objects.create_superuser(username="user1")
         user2 = User.objects.create(username="user2")
         group1 = Group.objects.create(name="group1")
 
@@ -315,7 +313,7 @@ class TestApiAuth(DirectoriesMixin, APITestCase):
         THEN:
             - Object permissions are set appropriately
         """
-        user1 = UserFactory(username="user1", superuser=True)
+        user1 = User.objects.create_superuser(username="user1")
         user2 = User.objects.create(username="user2")
         group1 = Group.objects.create(name="group1")
 
@@ -365,7 +363,7 @@ class TestApiAuth(DirectoriesMixin, APITestCase):
             mime_type="application/pdf",
             content="this is a document",
         )
-        user1 = UserFactory(username="user1", superuser=True)
+        user1 = User.objects.create_superuser(username="user1")
         user2 = User.objects.create(username="user2")
         group1 = Group.objects.create(name="group1")
 
@@ -415,16 +413,16 @@ class TestApiAuth(DirectoriesMixin, APITestCase):
             mime_type="application/pdf",
             content="this is a document",
         )
-        user1 = UserFactory(username="user1", superuser=True)
+        user1 = User.objects.create_superuser(username="user1")
         user2 = User.objects.create(username="user2")
         group1 = Group.objects.create(name="group1")
         doc.owner = user1
         doc.save()
 
-        grant_object(user2, doc, "view_document")
+        assign_perm("view_document", user2, doc)
-        grant_object(user2, doc, "change_document")
+        assign_perm("change_document", user2, doc)
-        grant_object(group1, doc, "view_document")
+        assign_perm("view_document", group1, doc)
-        grant_object(group1, doc, "change_document")
+        assign_perm("change_document", group1, doc)
 
         self.client.force_authenticate(user1)
 
@@ -448,9 +446,11 @@ class TestApiAuth(DirectoriesMixin, APITestCase):
         self.assertIn("change_document", get_perms(group1, doc))
 
     def test_document_permissions_change_requires_owner(self) -> None:
-        owner = UserFactory(username="owner")
+        owner = User.objects.create_user(username="owner")
-        editor = UserFactory(username="editor")
+        editor = User.objects.create_user(username="editor")
-        grant_all_global(editor)
+        editor.user_permissions.add(
+            *Permission.objects.all(),
+        )
 
         doc = Document.objects.create(
             title="Ownered doc",
@@ -460,8 +460,8 @@ class TestApiAuth(DirectoriesMixin, APITestCase):
             owner=owner,
         )
 
-        grant_object(editor, doc, "view_document")
+        assign_perm("view_document", editor, doc)
-        grant_object(editor, doc, "change_document")
+        assign_perm("change_document", editor, doc)
 
         self.client.force_authenticate(editor)
         response = self.client.patch(
@@ -499,9 +499,9 @@ class TestApiAuth(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
 
     def test_dynamic_permissions_fields(self) -> None:
-        user1 = UserFactory(username="user1")
+        user1 = User.objects.create_user(username="user1")
-        grant_global(user1, "view_document")
+        user1.user_permissions.add(*Permission.objects.filter(codename="view_document"))
-        user2 = UserFactory(username="user2")
+        user2 = User.objects.create_user(username="user2")
 
         Document.objects.create(title="Test", content="content 1", checksum="1")
         doc2 = Document.objects.create(
@@ -523,10 +523,10 @@ class TestApiAuth(DirectoriesMixin, APITestCase):
             owner=user1,
         )
 
-        grant_object(user1, doc2, "view_document")
+        assign_perm("view_document", user1, doc2)
-        grant_object(user1, doc3, "view_document")
+        assign_perm("view_document", user1, doc3)
-        grant_object(user1, doc3, "change_document")
+        assign_perm("change_document", user1, doc3)
-        grant_object(user2, doc4, "view_document")
+        assign_perm("view_document", user2, doc4)
 
         self.client.force_authenticate(user1)
 
@@ -574,8 +574,8 @@ class TestApiAuth(DirectoriesMixin, APITestCase):
         owned by someone else with no explicit guardian grant -- mirrors
         guardian's own ObjectPermissionChecker.has_perm() superuser shortcut.
         """
-        superuser = UserFactory(username="admin", superuser=True)
+        superuser = User.objects.create_superuser(username="admin")
-        other_user = UserFactory(username="user2")
+        other_user = User.objects.create_user(username="user2")
         Document.objects.create(
             title="Test",
             content="content",
@@ -602,7 +602,7 @@ class TestApiAuth(DirectoriesMixin, APITestCase):
         THEN:
             - MFA required error is returned
         """
-        user1 = UserFactory(username="user1")
+        user1 = User.objects.create_user(username="user1")
         user1.set_password("password")
         user1.save()
 
@@ -626,7 +626,7 @@ class TestApiAuth(DirectoriesMixin, APITestCase):
         THEN:
             - MFA code is required
         """
-        user1 = UserFactory(username="user1")
+        user1 = User.objects.create_user(username="user1")
         user1.set_password("password")
         user1.save()
 
@@ -688,7 +688,7 @@ class TestApiUser(DirectoriesMixin, APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        self.user = UserFactory(username="temp_admin", superuser=True)
+        self.user = User.objects.create_superuser(username="temp_admin")
         self.client.force_authenticate(user=self.user)
 
     def test_get_users(self) -> None:
@@ -858,8 +858,10 @@ class TestApiUser(DirectoriesMixin, APITestCase):
         )
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
 
-        regular_user = UserFactory(username="regular_user")
+        regular_user = User.objects.create_user(username="regular_user")
-        grant_all_global(regular_user)
+        regular_user.user_permissions.add(
+            *Permission.objects.all(),
+        )
         self.client.force_authenticate(regular_user)
         Authenticator.objects.create(
             user=user1,
@@ -883,9 +885,9 @@ class TestApiUser(DirectoriesMixin, APITestCase):
             - Only superusers can change superuser status
         """
 
-        user1 = UserFactory(username="user1")
+        user1 = User.objects.create_user(username="user1")
-        grant_all_global(user1)
+        user1.user_permissions.add(*Permission.objects.all())
-        user2 = UserFactory(username="user2", superuser=True)
+        user2 = User.objects.create_superuser(username="user2")
 
         self.client.force_authenticate(user1)
 
@@ -970,9 +972,9 @@ class TestApiUser(DirectoriesMixin, APITestCase):
             - Only superusers can change staff status
         """
 
-        user1 = UserFactory(username="user1")
+        user1 = User.objects.create_user(username="user1")
-        grant_all_global(user1)
+        user1.user_permissions.add(*Permission.objects.all())
-        user2 = UserFactory(username="user2", superuser=True)
+        user2 = User.objects.create_superuser(username="user2")
 
         self.client.force_authenticate(user1)
 
@@ -1025,7 +1027,7 @@ class TestApiGroup(DirectoriesMixin, APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        self.user = UserFactory(username="temp_admin", superuser=True)
+        self.user = User.objects.create_superuser(username="temp_admin")
         self.client.force_authenticate(user=self.user)
 
     def test_get_groups(self) -> None:
@@ -1126,7 +1128,7 @@ class TestBulkEditObjectPermissions(APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        self.temp_admin = UserFactory(username="temp_admin", superuser=True)
+        self.temp_admin = User.objects.create_superuser(username="temp_admin")
         self.client.force_authenticate(user=self.temp_admin)
 
         self.t1 = Tag.objects.create(name="t1")
@@ -1274,7 +1276,7 @@ class TestBulkEditObjectPermissions(APITestCase):
             },
         }
 
-        grant_object(self.user3, self.t1, "view_tag")
+        assign_perm("view_tag", self.user3, self.t1)
         self.t1.owner = self.user3
         self.t1.save()
 
@@ -1371,9 +1373,13 @@ class TestBulkEditObjectPermissions(APITestCase):
         """
         self.t1.owner = self.user2
         self.t1.save()
-        grant_object(self.user1, self.t1, "view_tag")
+        assign_perm("view_tag", self.user1, self.t1)
-        grant_object(self.user1, self.t1, "change_tag")
+        assign_perm("change_tag", self.user1, self.t1)
-        grant_global(self.user1, "view_tag", "change_tag")
+        self.user1.user_permissions.add(
+            *Permission.objects.filter(
+                codename__in=["view_tag", "change_tag"],
+            ),
+        )
         user1 = User.objects.get(pk=self.user1.pk)
         self.client.force_authenticate(user=user1)
 
@@ -1420,9 +1426,13 @@ class TestBulkEditObjectPermissions(APITestCase):
         """
         owned = Tag.objects.create(name="owned", owner=self.user1)
         shared = Tag.objects.create(name="shared", owner=self.user2)
-        grant_object(self.user1, shared, "view_tag")
+        assign_perm("view_tag", self.user1, shared)
-        grant_object(self.user1, shared, "change_tag")
+        assign_perm("change_tag", self.user1, shared)
-        grant_global(self.user1, "view_tag", "change_tag")
+        self.user1.user_permissions.add(
+            *Permission.objects.filter(
+                codename__in=["view_tag", "change_tag"],
+            ),
+        )
         user1 = User.objects.get(pk=self.user1.pk)
         self.client.force_authenticate(user=user1)
 
@@ -1463,10 +1473,14 @@ class TestBulkEditObjectPermissions(APITestCase):
         """
         self.t1.owner = self.user2
         self.t1.save()
-        grant_object(self.user1, self.t1, "view_tag")
+        assign_perm("view_tag", self.user1, self.t1)
-        grant_object(self.user1, self.t1, "change_tag")
+        assign_perm("change_tag", self.user1, self.t1)
-        grant_object(self.user1, self.t1, "delete_tag")
+        assign_perm("delete_tag", self.user1, self.t1)
-        grant_global(self.user1, "view_tag", "change_tag", "delete_tag")
+        self.user1.user_permissions.add(
+            *Permission.objects.filter(
+                codename__in=["view_tag", "change_tag", "delete_tag"],
+            ),
+        )
         user1 = User.objects.get(pk=self.user1.pk)
         self.client.force_authenticate(user=user1)
 
@@ -1571,7 +1585,7 @@ class TestBulkEditObjectPermissions(APITestCase):
             - Request succeeds and null is treated as an empty user list,
               so the existing view permission is removed
         """
-        grant_object(self.user1, self.t1, "view_tag")
+        assign_perm("view_tag", self.user1, self.t1)
 
         response = self.client.post(
             "/api/bulk_edit_objects/",
@@ -1666,7 +1680,7 @@ class TestFullPermissionsFlag(APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        self.admin = UserFactory(username="admin", superuser=True)
+        self.admin = User.objects.create_superuser(username="admin")
 
     def test_full_perms_flag(self) -> None:
         """

src/documents/tests/test_api_post_document_nfc.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import unicodedata
 from typing import TYPE_CHECKING
 from unittest import mock
@@ -9,11 +7,8 @@ import pytest
 from django.core.files.uploadedfile import SimpleUploadedFile
 
 if TYPE_CHECKING:
-    from rest_framework.test import APIClient
-
     from documents.data_models import ConsumableDocument
     from documents.data_models import DocumentMetadataOverrides
-    from paperless_testing.dirs import PaperlessDirs
 
 
 @pytest.fixture()
@@ -23,14 +18,22 @@ def consume_file_mock():
         yield m
 
 
+@pytest.fixture()
+def directories(tmp_path, settings, _media_settings):
+    scratch = tmp_path / "scratch"
+    scratch.mkdir()
+    settings.SCRATCH_DIR = scratch
+    return scratch
+
+
 @pytest.mark.django_db
 class TestPostDocumentNFCNormalization:
     def test_nfd_filename_normalized_to_nfc(
         self,
-        admin_client: APIClient,
+        admin_client,
         consume_file_mock: mock.MagicMock,
-        paperless_dirs: PaperlessDirs,
+        directories,
-    ) -> None:
+    ):
         """Uploaded file with NFD filename must have its name stored as NFC."""
         nfd = unicodedata.normalize("NFD", "Rechnung März.pdf")
         nfc = unicodedata.normalize("NFC", "Rechnung März.pdf")
@@ -66,10 +69,10 @@ class TestPostDocumentNFCNormalization:
 
     def test_already_nfc_filename_unchanged(
         self,
-        admin_client: APIClient,
+        admin_client,
         consume_file_mock: mock.MagicMock,
-        paperless_dirs: PaperlessDirs,
+        directories,
-    ) -> None:
+    ):
         """Uploaded file with already-NFC filename must pass through unchanged."""
         nfc = unicodedata.normalize("NFC", "Invoice_2024.pdf")
 

src/documents/tests/test_api_profile.py

@@ -8,8 +8,7 @@ from rest_framework import status
 from rest_framework.authtoken.models import Token
 from rest_framework.test import APITestCase
 
-from paperless_testing.dirs import DirectoriesMixin
+from documents.tests.utils import DirectoriesMixin
-from paperless_testing.factories import UserFactory
 
 
 # see allauth.socialaccount.providers.openid.provider.OpenIDProvider
@@ -56,23 +55,23 @@ class TestApiProfile(DirectoriesMixin, APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        self.user = UserFactory(
+        self.user = User.objects.create_superuser(
             username="temp_admin",
             first_name="firstname",
             last_name="surname",
-            superuser=True,
         )
         self.client.force_authenticate(user=self.user)
 
-    def setupSocialAccount(self) -> SocialAccount:
+    def setupSocialAccount(self) -> None:
         SocialApp.objects.create(
             name="Keycloak",
             provider="openid_connect",
             provider_id="keycloak-test",
         )
-        social_account = SocialAccount(uid="123456789", provider="keycloak-test")
+        self.user.socialaccount_set.add(
-        self.user.socialaccount_set.add(social_account, bulk=False)
+            SocialAccount(uid="123456789", provider="keycloak-test"),
-        return social_account
+            bulk=False,
+        )
 
     def test_get_profile(self) -> None:
         """
@@ -110,17 +109,19 @@ class TestApiProfile(DirectoriesMixin, APITestCase):
         THEN:
             - Profile is returned with social accounts
         """
-        social_account = self.setupSocialAccount()
+        self.setupSocialAccount()
 
-        openid_provider = MockOpenIDConnectProvider(
+        openid_provider = (
+            MockOpenIDConnectProvider(
                 app=SocialApp.objects.get(provider_id="keycloak-test"),
+            ),
         )
         mock_list_providers.return_value = [
             openid_provider,
         ]
         mock_get_provider_account.return_value = MockOpenIDConnectProviderAccount(
             mock_social_account_dict={
-                "name": openid_provider.name,
+                "name": openid_provider[0].name,
             },
         )
 
@@ -132,7 +133,7 @@ class TestApiProfile(DirectoriesMixin, APITestCase):
             response.data["social_accounts"],
             [
                 {
-                    "id": social_account.pk,
+                    "id": 1,
                     "provider": "keycloak-test",
                     "name": "Keycloak",
                 },
@@ -149,7 +150,7 @@ class TestApiProfile(DirectoriesMixin, APITestCase):
         THEN:
             - Profile is returned with "Unknown App" as name
         """
-        social_account = self.setupSocialAccount()
+        self.setupSocialAccount()
 
         # Remove the social app
         SocialApp.objects.get(provider_id="keycloak-test").delete()
@@ -162,7 +163,7 @@ class TestApiProfile(DirectoriesMixin, APITestCase):
             response.data["social_accounts"],
             [
                 {
-                    "id": social_account.pk,
+                    "id": 1,
                     "provider": "keycloak-test",
                     "name": "Unknown App",
                 },
@@ -400,7 +401,7 @@ class TestApiTOTPViews(APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        self.user = UserFactory(username="temp_admin", superuser=True)
+        self.user = User.objects.create_superuser(username="temp_admin")
         self.client.force_authenticate(user=self.user)
 
     def test_get_totp(self) -> None:

src/documents/tests/test_api_search.py

@@ -7,8 +7,10 @@ import time_machine
 from dateutil.relativedelta import relativedelta
 from django.contrib.auth.models import Group
 from django.contrib.auth.models import Permission
+from django.contrib.auth.models import User
 from django.test import override_settings
 from django.utils import timezone
+from guardian.shortcuts import assign_perm
 from rest_framework import status
 from rest_framework.test import APITestCase
 
@@ -25,13 +27,10 @@ from documents.models import Tag
 from documents.models import Workflow
 from documents.search import get_backend
 from documents.search import reset_backend
+from documents.tests.factories import DocumentFactory
+from documents.tests.utils import DirectoriesMixin
 from paperless_mail.models import MailAccount
 from paperless_mail.models import MailRule
-from paperless_testing.dirs import DirectoriesMixin
-from paperless_testing.factories import DocumentFactory
-from paperless_testing.factories import UserFactory
-from paperless_testing.permissions import grant_global
-from paperless_testing.permissions import grant_object
 
 pytestmark = pytest.mark.search
 
@@ -41,7 +40,7 @@ class TestDocumentSearchApi(DirectoriesMixin, APITestCase):
         super().setUp()
         reset_backend()
 
-        self.user = UserFactory(username="temp_admin", superuser=True)
+        self.user = User.objects.create_superuser(username="temp_admin")
         self.client.force_authenticate(user=self.user)
 
     def tearDown(self) -> None:
@@ -950,9 +949,9 @@ class TestDocumentSearchApi(DirectoriesMixin, APITestCase):
         THEN:
             - Terms only within docs user has access to are returned
         """
-        u1 = UserFactory(username="user1")
+        u1 = User.objects.create_user("user1")
-        u2 = UserFactory(username="user2")
+        u2 = User.objects.create_user("user2")
-        grant_global(u1, "view_document")
+        u1.user_permissions.add(Permission.objects.get(codename="view_document"))
 
         self.client.force_authenticate(user=u1)
 
@@ -992,7 +991,7 @@ class TestDocumentSearchApi(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data, ["applebaum", "apples"])
 
-        grant_object(u1, d3, "view_document")
+        assign_perm("view_document", u1, d3)
         backend.add_or_update(d3)
 
         response = self.client.get("/api/search/autocomplete/?term=app")
@@ -1000,10 +999,10 @@ class TestDocumentSearchApi(DirectoriesMixin, APITestCase):
         self.assertEqual(response.data, ["applebaum", "apples", "appletini"])
 
     def test_search_autocomplete_group_revocation_is_immediate(self) -> None:
-        user = UserFactory(username="group-user")
+        user = User.objects.create_user("group-user")
-        owner = UserFactory(username="document-owner")
+        owner = User.objects.create_user("document-owner")
         group = Group.objects.create(name="temporary-viewers")
-        grant_global(user, "view_document")
+        user.user_permissions.add(Permission.objects.get(codename="view_document"))
         user.groups.add(group)
 
         document = Document.objects.create(
@@ -1012,7 +1011,7 @@ class TestDocumentSearchApi(DirectoriesMixin, APITestCase):
             checksum="group-revocation",
             owner=owner,
         )
-        grant_object(group, document, "view_document")
+        assign_perm("view_document", group, document)
         get_backend().add_or_update(document)
         self.client.force_authenticate(user=user)
 
@@ -1092,9 +1091,11 @@ class TestDocumentSearchApi(DirectoriesMixin, APITestCase):
         self.assertIsNone(response.data["corrected_query"])
 
     def test_search_spelling_suggestion_suppressed_for_private_terms(self) -> None:
-        owner = UserFactory(username="owner")
+        owner = User.objects.create_user("owner")
-        attacker = UserFactory(username="attacker")
+        attacker = User.objects.create_user("attacker")
-        grant_global(attacker, "view_document")
+        attacker.user_permissions.add(
+            Permission.objects.get(codename="view_document"),
+        )
 
         backend = get_backend()
         for i in range(5):
@@ -1221,9 +1222,11 @@ class TestDocumentSearchApi(DirectoriesMixin, APITestCase):
         THEN:
             - The request is rejected
         """
-        owner = UserFactory(username="owner")
+        owner = User.objects.create_user("owner")
-        attacker = UserFactory(username="attacker")
+        attacker = User.objects.create_user("attacker")
-        grant_global(attacker, "view_document")
+        attacker.user_permissions.add(
+            Permission.objects.get(codename="view_document"),
+        )
 
         private_seed = Document.objects.create(
             title="private bank statement",
@@ -1531,11 +1534,11 @@ class TestDocumentSearchApi(DirectoriesMixin, APITestCase):
             - Only owned docs are returned for regular users
             - All docs are returned for superuser
         """
-        superuser = UserFactory(username="superuser", superuser=True)
+        superuser = User.objects.create_superuser("superuser")
-        u1 = UserFactory(username="user1")
+        u1 = User.objects.create_user("user1")
-        u2 = UserFactory(username="user2")
+        u2 = User.objects.create_user("user2")
-        grant_global(u1, "view_document")
+        u1.user_permissions.add(*Permission.objects.filter(codename="view_document"))
-        grant_global(u2, "view_document")
+        u2.user_permissions.add(*Permission.objects.filter(codename="view_document"))
 
         Document.objects.create(checksum="1", content="test 1", owner=u1)
         Document.objects.create(checksum="2", content="test 2", owner=u2)
@@ -1585,10 +1588,10 @@ class TestDocumentSearchApi(DirectoriesMixin, APITestCase):
         THEN:
             - Only docs with granted view permissions are returned
         """
-        u1 = UserFactory(username="user1")
+        u1 = User.objects.create_user("user1")
-        u2 = UserFactory(username="user2")
+        u2 = User.objects.create_user("user2")
-        grant_global(u1, "view_document")
+        u1.user_permissions.add(*Permission.objects.filter(codename="view_document"))
-        grant_global(u2, "view_document")
+        u2.user_permissions.add(*Permission.objects.filter(codename="view_document"))
 
         d1 = Document.objects.create(checksum="1", content="test 1", owner=u1)
         d2 = Document.objects.create(checksum="2", content="test 2", owner=u2)
@@ -1613,9 +1616,9 @@ class TestDocumentSearchApi(DirectoriesMixin, APITestCase):
         r = self.client.get("/api/documents/?query=test&owner__isnull=true")
         self.assertEqual(r.data["count"], 1)
 
-        grant_object(u1, d2, "view_document")
+        assign_perm("view_document", u1, d2)
-        grant_object(u1, d3, "view_document")
+        assign_perm("view_document", u1, d3)
-        grant_object(u2, d1, "view_document")
+        assign_perm("view_document", u2, d1)
 
         backend.add_or_update(d1)
         backend.add_or_update(d2)
@@ -1638,8 +1641,8 @@ class TestDocumentSearchApi(DirectoriesMixin, APITestCase):
         self.assertEqual(r.data["count"], 1)
 
     def test_search_sorting(self) -> None:
-        u1 = UserFactory(username="user1")
+        u1 = User.objects.create_user("user1")
-        u2 = UserFactory(username="user2")
+        u2 = User.objects.create_user("user2")
         c1 = Correspondent.objects.create(name="corres Ax")
         c2 = Correspondent.objects.create(name="corres Cx")
         c3 = Correspondent.objects.create(name="corres Bx")
@@ -1889,8 +1892,8 @@ class TestDocumentSearchApi(DirectoriesMixin, APITestCase):
             pk=5,
         )
 
-        user1 = UserFactory(username="bank user1")
+        user1 = User.objects.create_user("bank user1")
-        user2 = UserFactory(username="user2", superuser=True)
+        user2 = User.objects.create_superuser("user2")
         group1 = Group.objects.create(name="bank group1")
         Group.objects.create(name="group2")
 
@@ -1922,7 +1925,7 @@ class TestDocumentSearchApi(DirectoriesMixin, APITestCase):
             sort_field="",
             owner=user2,
         )
-        grant_object(user1, shared_view, "view_savedview")
+        assign_perm("view_savedview", user1, shared_view)
         mail_account1 = MailAccount.objects.create(name="bank mail account 1")
         mail_account2 = MailAccount.objects.create(name="mail account 2")
         mail_rule1 = MailRule.objects.create(
@@ -2015,9 +2018,12 @@ class TestDocumentSearchApi(DirectoriesMixin, APITestCase):
         self.assertEqual(returned.get(root.id), "latest content")
 
     def test_global_search_filters_owned_mail_objects(self) -> None:
-        user1 = UserFactory(username="mail-search-user")
+        user1 = User.objects.create_user("mail-search-user")
-        user2 = UserFactory(username="other-mail-search-user")
+        user2 = User.objects.create_user("other-mail-search-user")
-        grant_global(user1, "view_mailaccount", "view_mailrule")
+        user1.user_permissions.add(
+            Permission.objects.get(codename="view_mailaccount"),
+            Permission.objects.get(codename="view_mailrule"),
+        )
 
         own_account = MailAccount.objects.create(
             name="bank owned account",

src/documents/tests/test_api_search_errors.py

@@ -33,7 +33,7 @@ class TestSearchQueryErrorStillBecomesA400:
         self,
         admin_client: APIClient,
         monkeypatch: pytest.MonkeyPatch,
-        searchable_document: Document,
+        indexed_document: Document,
     ) -> None:
         """
         GIVEN:
@@ -68,7 +68,7 @@ class TestLibraryDefectsPropagate:
         self,
         admin_client: APIClient,
         monkeypatch: pytest.MonkeyPatch,
-        searchable_document: Document,
+        indexed_document: Document,
     ) -> None:
         """
         GIVEN:
@@ -98,7 +98,7 @@ class TestLibraryDefectsPropagate:
         self,
         admin_client: APIClient,
         monkeypatch: pytest.MonkeyPatch,
-        searchable_document: Document,
+        indexed_document: Document,
     ) -> None:
         """
         GIVEN:
@@ -141,7 +141,7 @@ class TestSelectionPathsAgreeWithSearch:
         self,
         admin_client: APIClient,
         monkeypatch: pytest.MonkeyPatch,
-        searchable_document: Document,
+        indexed_document: Document,
     ) -> None:
         """
         GIVEN:
@@ -181,7 +181,7 @@ class TestSelectionPathsAgreeWithSearch:
         self,
         admin_client: APIClient,
         monkeypatch: pytest.MonkeyPatch,
-        searchable_document: Document,
+        indexed_document: Document,
     ) -> None:
         """
         GIVEN:
@@ -221,7 +221,7 @@ class TestSelectionPathsAgreeWithSearch:
         self,
         admin_client: APIClient,
         monkeypatch: pytest.MonkeyPatch,
-        searchable_document: Document,
+        indexed_document: Document,
     ) -> None:
         """
         GIVEN:
@@ -259,7 +259,7 @@ class TestSelectionPathsAgreeWithSearch:
         self,
         admin_client: APIClient,
         monkeypatch: pytest.MonkeyPatch,
-        searchable_document: Document,
+        indexed_document: Document,
     ) -> None:
         """
         GIVEN:
@@ -287,7 +287,7 @@ class TestSelectionPathsAgreeWithSearch:
             {
                 "documents": [],
                 "all": True,
-                "filters": {"more_like_id": searchable_document.pk},
+                "filters": {"more_like_id": indexed_document.pk},
             },
             format="json",
         )
@@ -298,7 +298,7 @@ class TestSelectionPathsAgreeWithSearch:
         self,
         admin_client: APIClient,
         monkeypatch: pytest.MonkeyPatch,
-        searchable_document: Document,
+        indexed_document: Document,
     ) -> None:
         """
         GIVEN:
@@ -328,7 +328,7 @@ class TestSelectionPathsAgreeWithSearch:
                 {
                     "documents": [],
                     "all": True,
-                    "filters": {"more_like_id": searchable_document.pk},
+                    "filters": {"more_like_id": indexed_document.pk},
                 },
                 format="json",
             )

src/documents/tests/test_api_search_query_length.py

@@ -36,7 +36,7 @@ class TestGetSearchEndpointEnforcesTheCap:
     def test_query_one_over_the_cap_is_a_400(
         self,
         admin_client: APIClient,
-        searchable_document: Document,
+        indexed_document: Document,
     ) -> None:
         """
         GIVEN:
@@ -66,7 +66,7 @@ class TestGetSearchEndpointEnforcesTheCap:
     def test_query_at_exactly_the_cap_is_accepted(
         self,
         admin_client: APIClient,
-        searchable_document: Document,
+        indexed_document: Document,
     ) -> None:
         """
         GIVEN:
@@ -86,7 +86,7 @@ class TestGetSearchEndpointEnforcesTheCap:
     def test_an_ordinary_query_is_unaffected(
         self,
         admin_client: APIClient,
-        searchable_document: Document,
+        indexed_document: Document,
     ) -> None:
         """
         GIVEN:
@@ -112,7 +112,7 @@ class TestPostSelectionPathsEnforceTheCap:
     def test_bulk_edit_query_one_over_the_cap_is_a_400(
         self,
         admin_client: APIClient,
-        searchable_document: Document,
+        indexed_document: Document,
     ) -> None:
         """
         GIVEN:
@@ -154,7 +154,7 @@ class TestPostSelectionPathsEnforceTheCap:
         self,
         bulk_update_task_mock: mock.MagicMock,
         admin_client: APIClient,
-        searchable_document: Document,
+        indexed_document: Document,
     ) -> None:
         """
         GIVEN:
@@ -187,7 +187,7 @@ class TestPostSelectionPathsEnforceTheCap:
     def test_bulk_download_query_one_over_the_cap_is_a_400(
         self,
         admin_client: APIClient,
-        searchable_document: Document,
+        indexed_document: Document,
     ) -> None:
         """
         GIVEN:
@@ -236,7 +236,7 @@ class TestGlobalSearchEnforcesTheCapToo:
     def test_query_one_over_the_cap_is_a_400(
         self,
         admin_client: APIClient,
-        searchable_document: Document,
+        indexed_document: Document,
     ) -> None:
         """
         GIVEN:
@@ -260,7 +260,7 @@ class TestGlobalSearchEnforcesTheCapToo:
     def test_query_at_exactly_the_cap_is_accepted(
         self,
         admin_client: APIClient,
-        searchable_document: Document,
+        indexed_document: Document,
     ) -> None:
         """
         GIVEN:

src/documents/tests/test_api_search_unterminated_date_range.py

@@ -38,7 +38,7 @@ class TestUnterminatedBracketReturnsA400:
     def test_unterminated_bracket_is_a_400(
         self,
         admin_client: APIClient,
-        searchable_document: Document,
+        indexed_document: Document,
         query: str,
     ) -> None:
         """
@@ -59,7 +59,7 @@ class TestUnterminatedBracketReturnsA400:
     def test_properly_closed_bracket_still_searches_cleanly(
         self,
         admin_client: APIClient,
-        searchable_document: Document,
+        indexed_document: Document,
     ) -> None:
         """
         GIVEN:

src/documents/tests/test_api_status.py

@@ -5,6 +5,8 @@ from datetime import timedelta
 from pathlib import Path
 from unittest import mock
 
+from django.contrib.auth.models import Permission
+from django.contrib.auth.models import User
 from django.test import override_settings
 from django.utils import timezone
 from rest_framework import status
@@ -12,10 +14,8 @@ from rest_framework.test import APITestCase
 
 from documents.models import PaperlessTask
 from documents.permissions import has_system_status_permission
+from documents.tests.factories import PaperlessTaskFactory
 from paperless import version
-from paperless_testing.factories import PaperlessTaskFactory
-from paperless_testing.factories import UserFactory
-from paperless_testing.permissions import grant_global
 
 
 class TestSystemStatus(APITestCase):
@@ -23,7 +23,9 @@ class TestSystemStatus(APITestCase):
 
     def setUp(self) -> None:
         super().setUp()
-        self.user = UserFactory(username="temp_admin", superuser=True)
+        self.user = User.objects.create_superuser(
+            username="temp_admin",
+        )
         self.tmp_dir = Path(tempfile.mkdtemp())
         self.override = override_settings(MEDIA_ROOT=self.tmp_dir)
         self.override.enable()
@@ -94,7 +96,7 @@ class TestSystemStatus(APITestCase):
         response = self.client.get(self.ENDPOINT)
         self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)
         self.assertEqual(response["WWW-Authenticate"], "Token")
-        normal_user = UserFactory(username="normal_user")
+        normal_user = User.objects.create_user(username="normal_user")
         self.client.force_login(normal_user)
         response = self.client.get(self.ENDPOINT)
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
@@ -105,8 +107,10 @@ class TestSystemStatus(APITestCase):
         response = self.client.get(self.ENDPOINT)
         self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)
 
-        user = UserFactory(username="status_user")
+        user = User.objects.create_user(username="status_user")
-        grant_global(user, "view_system_monitoring")
+        user.user_permissions.add(
+            Permission.objects.get(codename="view_system_monitoring"),
+        )
 
         self.client.force_login(user)
         response = self.client.get(self.ENDPOINT)

src/documents/tests/test_api_tasks.py

@@ -11,21 +11,22 @@ from datetime import timedelta
 from unittest import mock
 
 import pytest
+from django.contrib.auth.models import Permission
 from django.contrib.auth.models import User
 from django.utils import timezone
+from guardian.shortcuts import assign_perm
 from rest_framework import status
 from rest_framework.test import APIClient
 
 from documents.filters import PaperlessTaskFilterSet
 from documents.models import PaperlessTask
-from paperless_testing.factories import DocumentFactory
+from documents.tests.factories import DocumentFactory
-from paperless_testing.factories import PaperlessTaskFactory
+from documents.tests.factories import PaperlessTaskFactory
-from paperless_testing.permissions import grant_global
-from paperless_testing.permissions import grant_object
 
 pytestmark = pytest.mark.api
 
 ENDPOINT = "/api/tasks/"
+ACCEPT_V10 = "application/json; version=10"
 ACCEPT_V9 = "application/json; version=9"
 
 
@@ -345,16 +346,21 @@ class TestGetTasksV10:
         self,
         admin_user: User,
         regular_user: User,
-        user_client: APIClient,
     ) -> None:
         """Regular users see their own tasks and unowned (system) tasks; other users' tasks are hidden."""
-        grant_global(regular_user, "view_paperlesstask")
+        regular_user.user_permissions.add(
+            Permission.objects.get(codename="view_paperlesstask"),
+        )
+
+        client = APIClient()
+        client.force_authenticate(user=regular_user)
+        client.credentials(HTTP_ACCEPT=ACCEPT_V10)
 
         PaperlessTaskFactory(owner=admin_user)  # other user — not visible
         unowned_task = PaperlessTaskFactory()  # unowned (system task) — visible
         own_task = PaperlessTaskFactory(owner=regular_user)
 
-        response = user_client.get(ENDPOINT)
+        response = client.get(ENDPOINT)
 
         assert response.status_code == status.HTTP_200_OK
         assert response.data["count"] == 2
@@ -584,7 +590,9 @@ class TestGetTasksV9:
         regular_user: User,
     ) -> None:
         """Non-staff users see their own tasks plus unowned tasks via v9 API."""
-        grant_global(regular_user, "view_paperlesstask")
+        regular_user.user_permissions.add(
+            Permission.objects.get(codename="view_paperlesstask"),
+        )
 
         client = APIClient()
         client.force_authenticate(user=regular_user)
@@ -724,17 +732,19 @@ class TestAcknowledge:
 
         assert response.status_code == status.HTTP_403_FORBIDDEN
 
-    def test_succeeds_with_change_permission(
+    def test_succeeds_with_change_permission(self, regular_user: User) -> None:
-        self,
-        regular_user: User,
-        user_client: APIClient,
-    ) -> None:
         """Users granted change_paperlesstask permission can acknowledge tasks."""
-        grant_global(regular_user, "change_paperlesstask")
+        regular_user.user_permissions.add(
+            Permission.objects.get(codename="change_paperlesstask"),
+        )
         regular_user.save()
 
+        client = APIClient()
+        client.force_authenticate(user=regular_user)
+        client.credentials(HTTP_ACCEPT=ACCEPT_V10)
+
         task = PaperlessTaskFactory()
-        response = user_client.post(
+        response = client.post(
             ENDPOINT + "acknowledge/",
             {"tasks": [task.id]},
             format="json",
@@ -797,7 +807,9 @@ class TestSummaryPermissions:
         regular_user,
     ) -> None:
         """A user with view_system_monitoring but no document permissions can access summary/."""
-        grant_global(regular_user, "view_system_monitoring")
+        regular_user.user_permissions.add(
+            Permission.objects.get(codename="view_system_monitoring"),
+        )
 
         response = user_client.get(ENDPOINT + "summary/")
 
@@ -810,7 +822,9 @@ class TestSummaryPermissions:
         admin_user,
     ) -> None:
         """Monitoring user sees aggregate data for all tasks, not just unowned ones."""
-        grant_global(regular_user, "view_system_monitoring")
+        regular_user.user_permissions.add(
+            Permission.objects.get(codename="view_system_monitoring"),
+        )
         PaperlessTaskFactory(
             owner=admin_user,
             task_type=PaperlessTask.TaskType.CONSUME_FILE,
@@ -831,7 +845,9 @@ class TestSummaryPermissions:
     ) -> None:
         """A regular user with view_paperlesstask but not view_system_monitoring sees only
         their own tasks and unowned tasks in the summary, not other users' tasks."""
-        grant_global(regular_user, "view_paperlesstask")
+        regular_user.user_permissions.add(
+            Permission.objects.get(codename="view_paperlesstask"),
+        )
 
         PaperlessTaskFactory(
             owner=regular_user,
@@ -996,7 +1012,9 @@ class TestDuplicateDocumentsPermissions:
 
     @pytest.fixture()
     def user_v9_client(self, regular_user: User) -> APIClient:
-        grant_global(regular_user, "view_paperlesstask")
+        regular_user.user_permissions.add(
+            Permission.objects.get(codename="view_paperlesstask"),
+        )
         client = APIClient()
         client.force_authenticate(user=regular_user)
         client.credentials(HTTP_ACCEPT=ACCEPT_V9)
@@ -1067,7 +1085,7 @@ class TestDuplicateDocumentsPermissions:
     ) -> None:
         """A user with explicit guardian view_document permission sees the duplicate_of document."""
         doc = DocumentFactory(owner=admin_user, title="Granted Doc")
-        grant_object(regular_user, doc, "view_document")
+        assign_perm("view_document", regular_user, doc)
         PaperlessTaskFactory(
             owner=regular_user,
             status=PaperlessTask.Status.SUCCESS,

src/documents/tests/test_api_trash.py

@@ -1,21 +1,21 @@
 from datetime import date
 
+from django.contrib.auth.models import Permission
+from django.contrib.auth.models import User
 from django.core.cache import cache
 from rest_framework import status
 from rest_framework.test import APITestCase
 
 from documents.models import Document
-from paperless_testing.dirs import DirectoriesMixin
+from documents.tests.utils import DirectoriesMixin
-from paperless_testing.factories import UserFactory
-from paperless_testing.permissions import grant_all_global
 
 
 class TestTrashAPI(DirectoriesMixin, APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        self.user = UserFactory(username="temp_admin")
+        self.user = User.objects.create_user(username="temp_admin")
-        grant_all_global(self.user)
+        self.user.user_permissions.add(*Permission.objects.all())
         self.client.force_authenticate(user=self.user)
         cache.clear()
 
@@ -70,7 +70,7 @@ class TestTrashAPI(DirectoriesMixin, APITestCase):
         self.assertEqual(Document.global_objects.count(), 0)
 
     def test_trash_list_requires_global_document_view_permission(self) -> None:
-        user = UserFactory(username="trash_owner")
+        user = User.objects.create_user(username="trash_owner")
         document = Document.objects.create(title="Owned", owner=user)
         document.delete()
         self.client.force_authenticate(user)
@@ -140,7 +140,7 @@ class TestTrashAPI(DirectoriesMixin, APITestCase):
             created=date(2023, 1, 2),
         )
         document_not_owned.delete()
-        user2 = UserFactory(username="user2")
+        user2 = User.objects.create_user(username="user2")
         document_u2 = Document.objects.create(
             title="Title3",
             content="content3",
@@ -158,7 +158,7 @@ class TestTrashAPI(DirectoriesMixin, APITestCase):
         self.assertEqual(resp.data["results"][1]["id"], document_u1.pk)
 
         # superuser sees all documents
-        superuser = UserFactory(username="superuser", superuser=True)
+        superuser = User.objects.create_superuser(username="superuser")
         self.client.force_authenticate(user=superuser)
         resp = self.client.get("/api/trash/")
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
@@ -174,7 +174,7 @@ class TestTrashAPI(DirectoriesMixin, APITestCase):
             - 403 Forbidden
         """
 
-        user2 = UserFactory(username="user2")
+        user2 = User.objects.create_user(username="user2")
         document = Document.objects.create(
             title="Title",
             content="content",

src/documents/tests/test_api_uisettings.py

@@ -1,13 +1,13 @@
 import json
 
 from django.contrib.auth.models import Permission
+from django.contrib.auth.models import User
 from django.test import override_settings
 from rest_framework import status
 from rest_framework.test import APITestCase
 
+from documents.tests.utils import DirectoriesMixin
 from paperless.version import __full_version_str__
-from paperless_testing.dirs import DirectoriesMixin
-from paperless_testing.factories import UserFactory
 
 
 class TestApiUiSettings(DirectoriesMixin, APITestCase):
@@ -15,7 +15,7 @@ class TestApiUiSettings(DirectoriesMixin, APITestCase):
 
     def setUp(self) -> None:
         super().setUp()
-        self.test_user = UserFactory(username="test", superuser=True)
+        self.test_user = User.objects.create_superuser(username="test")
         self.test_user.first_name = "Test"
         self.test_user.last_name = "User"
         self.test_user.save()
@@ -91,7 +91,7 @@ class TestApiUiSettings(DirectoriesMixin, APITestCase):
         )
 
     def test_api_set_ui_settings_insufficient_global_permissions(self) -> None:
-        not_superuser = UserFactory(username="test_not_superuser")
+        not_superuser = User.objects.create_user(username="test_not_superuser")
         self.client.force_authenticate(user=not_superuser)
 
         settings = {
@@ -111,7 +111,7 @@ class TestApiUiSettings(DirectoriesMixin, APITestCase):
         self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
 
     def test_api_set_ui_settings_sufficient_global_permissions(self) -> None:
-        not_superuser = UserFactory(username="test_not_superuser")
+        not_superuser = User.objects.create_user(username="test_not_superuser")
         not_superuser.user_permissions.add(
             *Permission.objects.filter(codename__contains="uisettings"),
         )

src/documents/tests/test_api_workflows.py

@@ -14,8 +14,7 @@ from documents.models import Tag
 from documents.models import Workflow
 from documents.models import WorkflowAction
 from documents.models import WorkflowTrigger
-from paperless_testing.dirs import DirectoriesMixin
+from documents.tests.utils import DirectoriesMixin
-from paperless_testing.factories import UserFactory
 
 
 class TestApiWorkflows(DirectoriesMixin, APITestCase):
@@ -26,7 +25,7 @@ class TestApiWorkflows(DirectoriesMixin, APITestCase):
     def setUp(self) -> None:
         super().setUp()
 
-        user = UserFactory(username="temp_admin", superuser=True)
+        user = User.objects.create_superuser(username="temp_admin")
         self.client.force_authenticate(user=user)
         self.user2 = User.objects.create(username="user2")
         self.user3 = User.objects.create(username="user3")

src/documents/tests/test_barcodes.py

@@ -2,8 +2,8 @@ import shutil
 from collections.abc import Generator
 from contextlib import contextmanager
 from pathlib import Path
+from unittest import mock
 
-import pytest
 from django.conf import settings
 from django.test import TestCase
 from django.test import override_settings
@@ -18,11 +18,11 @@ from documents.models import Document
 from documents.models import Tag
 from documents.plugins.base import StopConsumeTaskError
 from documents.tests.utils import ConsumeTaskMixin
+from documents.tests.utils import DirectoriesMixin
+from documents.tests.utils import DummyProgressManager
+from documents.tests.utils import FileSystemAssertsMixin
 from documents.tests.utils import SampleDirMixin
 from paperless.models import ApplicationConfiguration
-from paperless_testing.assertions import FileSystemAssertsMixin
-from paperless_testing.dirs import DirectoriesMixin
-from paperless_testing.fakes.progress import FakeProgressManager
 
 
 class GetReaderPluginMixin:
@@ -31,7 +31,7 @@ class GetReaderPluginMixin:
         reader = BarcodePlugin(
             ConsumableDocument(DocumentSource.ConsumeFolder, original_file=filepath),
             DocumentMetadataOverrides(),
-            FakeProgressManager(filepath.name, None),
+            DummyProgressManager(filepath.name, None),
             self.dirs.scratch_dir,
             "task-id",
         )
@@ -86,7 +86,6 @@ class TestBarcode(
             self.assertDictEqual(separator_page_numbers, {1: False})
 
     @override_settings(CONSUMER_ENABLE_ASN_BARCODE=True)
-    @pytest.mark.usefixtures("fake_progress_manager")
     def test_asn_barcode_duplicate_in_trash_fails(self) -> None:
         """
         GIVEN:
@@ -111,6 +110,7 @@ class TestBarcode(
         dupe_asn = settings.SCRATCH_DIR / "barcode-39-asn-123-second.pdf"
         shutil.copy(test_file, dupe_asn)
 
+        with mock.patch("documents.tasks.ProgressManager", DummyProgressManager):
             with self.assertRaisesRegex(ConsumerError, r"ASN 123.*trash"):
                 tasks.consume_file(
                     ConsumableDocument(
@@ -606,7 +606,6 @@ class TestBarcodeNewConsume(
     TestCase,
 ):
     @override_settings(CONSUMER_ENABLE_BARCODES=True)
-    @pytest.mark.usefixtures("fake_progress_manager")
     def test_consume_barcode_file(self) -> None:
         """
         GIVEN:
@@ -625,6 +624,7 @@ class TestBarcodeNewConsume(
 
         overrides = DocumentMetadataOverrides(tag_ids=[1, 2, 9])
 
+        with mock.patch("documents.tasks.ProgressManager", DummyProgressManager):
             self.assertEqual(
                 tasks.consume_file(
                     ConsumableDocument(
@@ -660,7 +660,7 @@ class TestAsnBarcode(DirectoriesMixin, SampleDirMixin, GetReaderPluginMixin, Tes
         reader = BarcodePlugin(
             ConsumableDocument(DocumentSource.ConsumeFolder, original_file=filepath),
             DocumentMetadataOverrides(),
-            FakeProgressManager(filepath.name, None),
+            DummyProgressManager(filepath.name, None),
             self.dirs.scratch_dir,
             "task-id",
         )
@@ -745,7 +745,6 @@ class TestAsnBarcode(DirectoriesMixin, SampleDirMixin, GetReaderPluginMixin, Tes
             self.assertEqual(asn, None)
 
     @override_settings(CONSUMER_ENABLE_ASN_BARCODE=True)
-    @pytest.mark.usefixtures("fake_progress_manager")
     def test_consume_barcode_file_asn_assignment(self) -> None:
         """
         GIVEN:
@@ -763,6 +762,7 @@ class TestAsnBarcode(DirectoriesMixin, SampleDirMixin, GetReaderPluginMixin, Tes
         dst = settings.SCRATCH_DIR / "barcode-39-asn-123.pdf"
         shutil.copy(test_file, dst)
 
+        with mock.patch("documents.tasks.ProgressManager", DummyProgressManager):
             tasks.consume_file(
                 ConsumableDocument(
                     source=DocumentSource.ConsumeFolder,
@@ -819,7 +819,7 @@ class TestTagBarcode(DirectoriesMixin, SampleDirMixin, GetReaderPluginMixin, Tes
         reader = BarcodePlugin(
             ConsumableDocument(DocumentSource.ConsumeFolder, original_file=filepath),
             DocumentMetadataOverrides(),
-            FakeProgressManager(filepath.name, None),
+            DummyProgressManager(filepath.name, None),
             self.dirs.scratch_dir,
             "task-id",
         )
@@ -1024,7 +1024,6 @@ class TestTagBarcode(DirectoriesMixin, SampleDirMixin, GetReaderPluginMixin, Tes
         CELERY_TASK_ALWAYS_EAGER=True,
         OCR_MODE="auto",
     )
-    @pytest.mark.usefixtures("fake_progress_manager")
     def test_consume_barcode_file_tag_split_and_assignment(self) -> None:
         """
         GIVEN:
@@ -1043,6 +1042,7 @@ class TestTagBarcode(DirectoriesMixin, SampleDirMixin, GetReaderPluginMixin, Tes
         dst = settings.SCRATCH_DIR / "split-by-tag-basic.pdf"
         shutil.copy(test_file, dst)
 
+        with mock.patch("documents.tasks.ProgressManager", DummyProgressManager):
             result = tasks.consume_file(
                 ConsumableDocument(
                     source=DocumentSource.ConsumeFolder,

src/documents/tests/test_bulk_edit.py

@@ -10,6 +10,7 @@ from django.contrib.auth.models import User
 from django.db import connection
 from django.test import TestCase
 from django.test.utils import CaptureQueriesContext
+from guardian.shortcuts import assign_perm
 from guardian.shortcuts import get_groups_with_perms
 from guardian.shortcuts import get_users_with_perms
 
@@ -22,8 +23,7 @@ from documents.models import DocumentType
 from documents.models import StoragePath
 from documents.models import Tag
 from documents.permissions import set_permissions_for_objects
-from paperless_testing.dirs import DirectoriesMixin
+from documents.tests.utils import DirectoriesMixin
-from paperless_testing.permissions import grant_object
 
 
 class TestBulkEdit(DirectoriesMixin, TestCase):
@@ -440,7 +440,7 @@ class TestBulkEdit(DirectoriesMixin, TestCase):
     def test_set_permissions(self, m) -> None:
         doc_ids = [self.doc1.id, self.doc2.id, self.doc3.id]
 
-        grant_object(self.group1, self.doc1, "view_document")
+        assign_perm("view_document", self.group1, self.doc1)
 
         permissions = {
             "view": {
@@ -482,8 +482,8 @@ class TestBulkEdit(DirectoriesMixin, TestCase):
         self.doc1.owner = self.user1
         self.doc1.save()
 
-        grant_object(self.user1, self.doc1, "view_document")
+        assign_perm("view_document", self.user1, self.doc1)
-        grant_object(self.group1, self.doc1, "view_document")
+        assign_perm("view_document", self.group1, self.doc1)
 
         permissions = {
             "view": {
@@ -609,7 +609,7 @@ class TestBulkEdit(DirectoriesMixin, TestCase):
         self.doc1.owner = self.user1
         self.doc1.save()
         self.user1.groups.add(self.group1)
-        grant_object(self.group1, self.doc1, "view_document")
+        assign_perm("view_document", self.group1, self.doc1)
 
         bulk_edit.set_permissions(
             [self.doc1.id],

src/documents/tests/test_classifier.py

@@ -1,4 +1,5 @@
 import pickle
+import re
 import warnings
 from datetime import UTC
 from datetime import datetime
@@ -27,13 +28,21 @@ from documents.models import DocumentType
 from documents.models import MatchingModel
 from documents.models import StoragePath
 from documents.models import Tag
-from documents.tests.helpers import dummy_preprocess
+from documents.tests.factories import DocumentFactory
+from documents.tests.factories import TagFactory
+from documents.tests.utils import DirectoriesMixin
 from paperless.settings import CLASSIFIER_LANGUAGES
 from paperless.signed_pickle import HMAC_SIZE
 from paperless.signed_pickle import signed_pickle_dumps
-from paperless_testing.dirs import DirectoriesMixin
+
-from paperless_testing.factories import DocumentFactory
+
-from paperless_testing.factories import TagFactory
+def dummy_preprocess(content: str) -> str:
+    """
+    Simpler, faster pre-processing for testing purposes
+    """
+    content = content.lower().strip()
+    content = re.sub(r"\s+", " ", content)
+    return content
 
 
 class TestClassifier(DirectoriesMixin, TestCase):