test(search): move schema fingerprint/version tests from PR2

Both files exercise documents.search._schema exclusively (build_schema,
schema_fingerprint, needs_rebuild, open_or_rebuild_index) with no
dependency on whoosh-compat query routing, so they belong with the
schema/field-registry work rather than PR2's query rewrite.

docs/api.md

@@ -302,8 +302,7 @@ The following methods are supported:
 - `delete`
   - No `parameters` required
 - `reprocess`
-  - Optional `parameters`: `{ "remote_ocr": true }` to send the documents to the
-    remote OCR engine, see [Remote OCR](usage.md#remote-ocr). Defaults to false.
+  - No `parameters` required
 - `set_permissions`
   - Requires `parameters`:
     - `"set_permissions": PERMISSIONS_OBJ` (see format [above](#permissions)) and / or

docs/configuration.md

@@ -2066,18 +2066,6 @@ password. All of these options come from their similarly-named [Django settings]
 
     Defaults to None.
 
-#### [`PAPERLESS_REMOTE_OCR_MODE=<str>`](#PAPERLESS_REMOTE_OCR_MODE) {#PAPERLESS_REMOTE_OCR_MODE}
-
-: Which documents are sent to the remote OCR engine.
-
-    - `always`: every document of a supported file type is sent to the remote
-      engine, bypassing the local OCR engine.
-    - `workflow_only`: documents are processed locally unless a workflow
-      explicitly enables remote OCR for them, letting you use the remote engine
-      selectively.
-
-    Defaults to "always".
-
 ## AI {#ai}
 
 #### [`PAPERLESS_AI_ENABLED=<bool>`](#PAPERLESS_AI_ENABLED) {#PAPERLESS_AI_ENABLED}

docs/development.md

@@ -456,20 +456,6 @@ def score(
     return 10
 ```
 
-**Remote services**
-
-If your parser sends document content to a remote service, declare it:
-
-```python
-class MyCustomParser:
-    uses_remote_service = True
-```
-
-Paperless-ngx excludes such parsers when the document being consumed has not
-been marked for remote processing, so users can keep remote OCR off by default
-and enable it selectively with a workflow. Parsers that do not declare the
-attribute are treated as fully local and are always considered.
-
 **Archive and rendition flags**
 
 ```python

docs/usage.md

@@ -654,19 +654,6 @@ happened while it was still encrypted, that original version will likewise be mi
 **Current limitation**: Passwords are stored as a simple list without descriptions. To handle
 multiple PDF types with different passwords, create separate workflows for each use case.
 
-##### Remote OCR {#workflow-action-remote-ocr}
-
-"Remote OCR" actions send the document to the configured remote OCR engine instead of processing it
-locally. To use remote OCR selectively, set the [remote OCR mode](configuration.md#PAPERLESS_REMOTE_OCR_MODE)
-to `workflow_only` then add this action to a workflow that matches only the documents you
-want sent to the remote engine. See [Remote OCR](#remote-ocr) for the engine setup. The action only works with
-a **Consumption Started** trigger.
-
-The action takes no options, its presence is what enables remote OCR for a matching document.
-
-If the remote engine is not configured, or does not support the document's file type, the document is
-processed locally instead and a warning is written to the log.
-
 #### Workflow placeholders
 
 Titles and webhook payloads can be generated by workflows using [Jinja templates](https://jinja.palletsprojects.com/en/3.1.x/templates/).
@@ -1103,19 +1090,11 @@ Paperless-ngx supports performing OCR on documents using remote services. At the
 [Microsoft's Azure "Document Intelligence" service](https://azure.microsoft.com/en-us/products/ai-services/ai-document-intelligence).
 This is of course a paid service (with a free tier) which requires an Azure account and subscription. Azure AI is not affiliated with
 Paperless-ngx in any way. When enabled, Paperless-ngx will automatically send appropriate documents to Azure for OCR processing, bypassing
-the local OCR engine. See the [configuration](configuration.md#PAPERLESS_REMOTE_OCR_ENGINE) options for more details. These
-settings can be supplied as environment variables or via **Application Configuration**.
+the local OCR engine. See the [configuration](configuration.md#PAPERLESS_REMOTE_OCR_ENGINE) options for more details.
 
 Additionally, when using a commercial service with this feature, consider both potential costs as well as any associated file size
 or page limitations (e.g. with a free tier).
 
-By default, every document of a supported file type is sent to the remote engine. To use it more selectively, set the
-[remote OCR mode](configuration.md#PAPERLESS_REMOTE_OCR_MODE) to `workflow_only`. Documents are then processed locally
-unless a [remote OCR workflow action](#workflow-action-remote-ocr) enables it for them, so you can limit the remote
-engine to particular documents.
-
-Setting the mode to `workflow_only` also allows the **Reprocess** actions to selectively use remote OCR for individual documents.
-
 ## Architecture
 
 Paperless-ngx consists of the following components:

pyproject.toml

@@ -40,6 +40,7 @@ dependencies = [
   "djangorestframework~=3.16",
   "drf-spectacular~=0.30",
   "drf-spectacular-sidecar~=2026.7.1",
+  "drf-writable-nested~=0.7.1",
   "filelock~=3.32.0",
   "flower~=2.0.1",
   "gotenberg-client~=0.14.0",
@@ -76,6 +77,7 @@ dependencies = [
   "torch~=2.13.0",
   "watchfiles>=1.2",
   "whitenoise~=6.11",
+  "whoosh-compat[tantivy]==0.1",
   "zxing-cpp~=3.1.0",
 ]
 [project.optional-dependencies]

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

@@ -14,48 +14,43 @@
                 <a ngbNavLink>{{category}}</a>
                 <ng-template ngbNavContent>
                     <div class="p-3">
-                        @for (section of getCategorySections(category); track section) {
-                            @if (section) {
-                                <h5 class="mt-4 mb-3">{{section}}</h5>
-                            }
-                            <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-2">
-                                @for (option of getCategoryOptions(category, section); track option.key) {
-                                    <div class="col">
-                                        <div class="card bg-light">
-                                            <div class="card-body">
-                                                <div class="card-title d-flex align-items-center">
-                                                    <h6 class="mb-0">
-                                                      {{option.title}}
-                                                    </h6>
-                                                    <a class="btn btn-sm btn-link" title="Read the documentation about this setting" i18n-title [href]="getDocsUrl(option.config_key)" target="_blank" referrerpolicy="no-referrer">
-                                                        <i-bs name="info-circle"></i-bs>
-                                                    </a>
-                                                    @if (isSet(option.key)) {
-                                                      <button type="button" class="btn btn-sm btn-link text-danger ms-auto pe-0" title="Reset" i18n-title (click)="resetOption(option.key)">
-                                                          <i-bs class="me-1" name="x"></i-bs><ng-container i18n>Reset</ng-container>
-                                                      </button>
-                                                    }
-                                                </div>
-                                                <div class="mb-n3">
-                                                    @switch (option.type) {
-                                                        @case (ConfigOptionType.Select) { <pngx-input-select [formControlName]="option.key" [error]="errors[option.key]" [items]="option.choices" [allowNull]="true"></pngx-input-select> }
-                                                        @case (ConfigOptionType.Number) { <pngx-input-number [formControlName]="option.key" [error]="errors[option.key]" [showAdd]="false"></pngx-input-number> }
-                                                        @case (ConfigOptionType.Boolean) { <pngx-input-switch [formControlName]="option.key" [error]="errors[option.key]" [showUnsetNote]="true" [horizontal]="true" title="Enable" i18n-title></pngx-input-switch> }
-                                                        @case (ConfigOptionType.String) { <pngx-input-text [formControlName]="option.key" [error]="errors[option.key]"></pngx-input-text> }
-                                                        @case (ConfigOptionType.JSON) { <pngx-input-text [formControlName]="option.key" [error]="errors[option.key]"></pngx-input-text> }
-                                                        @case (ConfigOptionType.File) { <pngx-input-file [formControlName]="option.key" (upload)="uploadFile($event, option.key)" [error]="errors[option.key]"></pngx-input-file> }
-                                                        @case (ConfigOptionType.Password) { <pngx-input-password [formControlName]="option.key" [error]="errors[option.key]"></pngx-input-password> }
-                                                    }
-                                                </div>
-                                                @if (option.note) {
-                                                    <div class="form-text fst-italic">{{option.note}}</div>
+                        <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-2">
+                            @for (option of getCategoryOptions(category); track option.key) {
+                                <div class="col">
+                                    <div class="card bg-light">
+                                        <div class="card-body">
+                                            <div class="card-title d-flex align-items-center">
+                                                <h6 class="mb-0">
+                                                  {{option.title}}
+                                                </h6>
+                                                <a class="btn btn-sm btn-link" title="Read the documentation about this setting" i18n-title [href]="getDocsUrl(option.config_key)" target="_blank" referrerpolicy="no-referrer">
+                                                    <i-bs name="info-circle"></i-bs>
+                                                </a>
+                                                @if (isSet(option.key)) {
+                                                  <button type="button" class="btn btn-sm btn-link text-danger ms-auto pe-0" title="Reset" i18n-title (click)="resetOption(option.key)">
+                                                      <i-bs class="me-1" name="x"></i-bs><ng-container i18n>Reset</ng-container>
+                                                  </button>
                                                 }
                                             </div>
+                                            <div class="mb-n3">
+                                                @switch (option.type) {
+                                                    @case (ConfigOptionType.Select) { <pngx-input-select [formControlName]="option.key" [error]="errors[option.key]" [items]="option.choices" [allowNull]="true"></pngx-input-select> }
+                                                    @case (ConfigOptionType.Number) { <pngx-input-number [formControlName]="option.key" [error]="errors[option.key]" [showAdd]="false"></pngx-input-number> }
+                                                    @case (ConfigOptionType.Boolean) { <pngx-input-switch [formControlName]="option.key" [error]="errors[option.key]" [showUnsetNote]="true" [horizontal]="true" title="Enable" i18n-title></pngx-input-switch> }
+                                                    @case (ConfigOptionType.String) { <pngx-input-text [formControlName]="option.key" [error]="errors[option.key]"></pngx-input-text> }
+                                                    @case (ConfigOptionType.JSON) { <pngx-input-text [formControlName]="option.key" [error]="errors[option.key]"></pngx-input-text> }
+                                                    @case (ConfigOptionType.File) { <pngx-input-file [formControlName]="option.key" (upload)="uploadFile($event, option.key)" [error]="errors[option.key]"></pngx-input-file> }
+                                                    @case (ConfigOptionType.Password) { <pngx-input-password [formControlName]="option.key" [error]="errors[option.key]"></pngx-input-password> }
+                                                }
+                                            </div>
+                                            @if (option.note) {
+                                                <div class="form-text fst-italic">{{option.note}}</div>
+                                            }
                                         </div>
                                     </div>
-                                }
-                            </div>
-                        }
+                                </div>
+                            }
+                        </div>
                     </div>
                 </ng-template>
             </li>

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

@@ -8,11 +8,7 @@ import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { NgSelectModule } from '@ng-select/ng-select'
 import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
 import { of, throwError } from 'rxjs'
-import {
-  ConfigCategory,
-  ConfigSection,
-  OutputTypeConfig,
-} from 'src/app/data/paperless-config'
+import { OutputTypeConfig } from 'src/app/data/paperless-config'
 import { ConfigService } from 'src/app/services/config.service'
 import { SettingsService } from 'src/app/services/settings.service'
 import { ToastService } from 'src/app/services/toast.service'
@@ -162,24 +158,4 @@ describe('ConfigComponent', () => {
     component.resetOption('barcodes_enabled')
     expect(component.configForm.get('barcodes_enabled').value).toBeNull()
   })
-
-  it('should group options into sections within a category, or not', () => {
-    const sections = component.getCategorySections(ConfigCategory.OCR)
-    expect(sections).toEqual([null, ConfigSection.RemoteOCR])
-    expect(
-      component
-        .getCategoryOptions(ConfigCategory.OCR)
-        .map((option) => option.key)
-    ).toContain('output_type')
-    expect(
-      component
-        .getCategoryOptions(ConfigCategory.OCR, ConfigSection.RemoteOCR)
-        .map((option) => option.key)
-    ).toEqual([
-      'remote_ocr_engine',
-      'remote_ocr_api_key',
-      'remote_ocr_endpoint',
-      'remote_ocr_mode',
-    ])
-  })
 })

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

@@ -74,20 +74,8 @@ export class ConfigComponent
     return Object.values(ConfigCategory)
   }
 
-  getCategorySections(category: string): string[] {
-    return [
-      ...new Set(
-        PaperlessConfigOptions.filter((o) => o.category === category).map(
-          (o) => o.section ?? null // null means no section
-        )
-      ),
-    ]
-  }
-
-  getCategoryOptions(category: string, section: string = null): ConfigOption[] {
-    return PaperlessConfigOptions.filter(
-      (o) => o.category === category && (o.section ?? null) === section
-    )
+  getCategoryOptions(category: string): ConfigOption[] {
+    return PaperlessConfigOptions.filter((o) => o.category === category)
   }
 
   initialConfig: PaperlessConfig

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

@@ -2,7 +2,7 @@
   <button class="navbar-toggler d-md-none collapsed border-0" type="button" data-toggle="collapse"
     data-target="#sidebarMenu" aria-controls="sidebarMenu" aria-expanded="false" aria-label="Toggle navigation"
     (click)="closeMobileSearch(); toggleMenuCollapsed()">
-    <i-bs width="1.5em" height="1.5em" name="list"></i-bs>
+    <span class="navbar-toggler-icon"></span>
   </button>
   <a class="navbar-brand d-flex align-items-center me-0 ps-md-3 py-0 order-sm-0"
     [ngClass]="{ 'slim': slimSidebarEnabled, '' : !slimSidebarEnabled }"
@@ -29,9 +29,9 @@
       </div>
     }
   </a>
-  <div class="search-container flex-grow-1 py-2 pb-3 pb-sm-2 me-sm-auto order-3 order-sm-1"
+  <div class="search-container flex-grow-1 py-2 pb-3 pb-sm-2 px-3 ps-md-3 me-sm-auto order-3 order-sm-1"
     [class.mobile-hidden]="mobileSearchHidden()">
-    <div class="col-12 header-search mx-auto">
+    <div class="col-12 header-search">
       <pngx-global-search></pngx-global-search>
     </div>
   </div>
@@ -90,7 +90,7 @@
         <ul class="nav flex-column">
           <li class="nav-item app-link">
             <a class="nav-link" routerLink="dashboard" routerLinkActive="active" (click)="closeMenu()"
-              ngbPopover="Dashboard" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+              ngbPopover="Dashboard" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
               container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
               <i-bs class="me-2" name="house"></i-bs><span><ng-container i18n>Dashboard</ng-container></span>
             </a>
@@ -99,7 +99,7 @@
             <a class="nav-link" routerLink="documents" routerLinkActive="active"
               [routerLinkActiveOptions]="{ paths: 'exact', queryParams: 'ignored', matrixParams: 'ignored', fragment: 'ignored' }"
               (click)="closeMenu()"
-              ngbPopover="Documents" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+              ngbPopover="Documents" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
               container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
               <i-bs class="me-2" name="files"></i-bs><span><ng-container i18n>Documents</ng-container></span>
             </a>
@@ -118,7 +118,7 @@
                   (cdkDragEnded)="onDragEnd($event)">
                   <a class="nav-link" routerLink="view/{{view.id}}"
                     routerLinkActive="active" (click)="closeMenu()" [ngbPopover]="view.name"
-                    [disablePopover]="!slimSidebarPopoversEnabled" placement="end" container="body" triggers="mouseenter:mouseleave"
+                    [disablePopover]="!slimSidebarEnabled" placement="end" container="body" triggers="mouseenter:mouseleave"
                     popoverClass="popover-slim">
                     <i-bs class="me-2" [name]="view.icon || 'funnel'"></i-bs><span><div class="d-inline-flex view-name"><span class="overflow-hidden" [class.text-wrap]="!slimSidebarEnabled">{{view.name}}</span></div>
                         @if (showSidebarCounts && !slimSidebarEnabled) {
@@ -156,7 +156,7 @@
               <li class="nav-item w-100 app-link">
                 <a class="nav-link app-link" [class.text-truncate]="!slimSidebarEnabled" routerLink="documents/{{d.id}}"
                   routerLinkActive="active" (click)="closeMenu()" [ngbPopover]="d.title | documentTitle"
-                  [disablePopover]="!slimSidebarPopoversEnabled" placement="end" container="body" triggers="mouseenter:mouseleave"
+                  [disablePopover]="!slimSidebarEnabled" placement="end" container="body" triggers="mouseenter:mouseleave"
                   popoverClass="popover-slim">
                   <i-bs class="me-2" name="file-text"></i-bs><span>{{d.title | documentTitle}}</span>
                   <span class="close flex-column justify-content-center"
@@ -170,7 +170,7 @@
               <li class="nav-item w-100 app-link">
                 <button type="button" class="nav-link nav-link-action app-link w-100 text-start"
                   [class.text-truncate]="!slimSidebarEnabled" (click)="closeAll()"
-                  ngbPopover="Close all" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+                  ngbPopover="Close all" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
                   container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                   <i-bs class="me-2" name="x"></i-bs><span><ng-container i18n>Close all</ng-container></span>
                 </button>
@@ -189,7 +189,7 @@
                 <div class="d-flex align-items-center attributes-row">
                   <a class="nav-link flex-fill" routerLink="attributes" routerLinkActive="active"
                     [routerLinkActiveOptions]="{ exact: !(slimSidebarEnabled || attributesSectionsCollapsed) }" (click)="closeMenu()"
-                    ngbPopover="Attributes" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+                    ngbPopover="Attributes" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
                     container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                     <i-bs name="stack"></i-bs><span class="ms-2"><ng-container i18n>Attributes</ng-container></span>
                   </a>
@@ -241,7 +241,7 @@
             }
             <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.SavedView }">
               <a class="nav-link" routerLink="savedviews" routerLinkActive="active" (click)="closeMenu()"
-                ngbPopover="Saved Views" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+                ngbPopover="Saved Views" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
                 container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                 <i-bs class="me-2" name="window-stack"></i-bs><span><ng-container i18n>Saved Views</ng-container></span>
               </a>
@@ -250,7 +250,7 @@
               *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Workflow }"
               tourAnchor="tour.workflows">
               <a class="nav-link" routerLink="workflows" routerLinkActive="active" (click)="closeMenu()"
-                ngbPopover="Workflows" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+                ngbPopover="Workflows" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
                 container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                 <i-bs class="me-2" name="boxes"></i-bs><span><ng-container i18n>Workflows</ng-container></span>
               </a>
@@ -258,14 +258,14 @@
             <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.MailAccount }"
               tourAnchor="tour.mail">
               <a class="nav-link" routerLink="mail" routerLinkActive="active" (click)="closeMenu()" ngbPopover="Mail"
-                i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end" container="body"
+                i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end" container="body"
                 triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                 <i-bs class="me-2" name="envelope"></i-bs><span><ng-container i18n>Mail</ng-container></span>
               </a>
             </li>
             <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.Document }">
               <a class="nav-link" routerLink="trash" routerLinkActive="active" (click)="closeMenu()" ngbPopover="Trash"
-                i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end" container="body"
+                i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end" container="body"
                 triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                 <i-bs class="me-2" name="trash"></i-bs><span><ng-container i18n>Trash</ng-container></span>
               </a>
@@ -281,21 +281,21 @@
             <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.UISettings }"
               tourAnchor="tour.settings">
               <a class="nav-link" routerLink="settings" routerLinkActive="active" (click)="closeMenu()"
-                ngbPopover="Settings" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+                ngbPopover="Settings" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
                 container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                 <i-bs class="me-2" name="gear"></i-bs><span><ng-container i18n>Settings</ng-container></span>
               </a>
             </li>
             <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.AppConfig }">
               <a class="nav-link" routerLink="config" routerLinkActive="active" (click)="closeMenu()"
-                ngbPopover="Configuration" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+                ngbPopover="Configuration" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
                 container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                 <i-bs class="me-2" name="sliders2-vertical"></i-bs><span><ng-container i18n>Configuration</ng-container></span>
               </a>
             </li>
             <li class="nav-item app-link" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.User }">
               <a class="nav-link" routerLink="usersgroups" routerLinkActive="active" (click)="closeMenu()"
-                ngbPopover="Users & Groups" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+                ngbPopover="Users & Groups" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
                 container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                 <i-bs class="me-2" name="people"></i-bs><span><ng-container i18n>Users & Groups</ng-container></span>
               </a>
@@ -304,7 +304,7 @@
               *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.PaperlessTask }"
               tourAnchor="tour.file-tasks">
               <a class="nav-link" routerLink="tasks" routerLinkActive="active" (click)="closeMenu()"
-                ngbPopover="Tasks" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
+                ngbPopover="Tasks" i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end"
                 container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                 <i-bs class="me-2" name="list-task"></i-bs><span><ng-container i18n>Tasks</ng-container>@if (tasksService.needsAttentionTasks.length > 0) {
                   <span><span class="badge bg-danger ms-2 d-inline">{{tasksService.needsAttentionTasks.length}}</span></span>
@@ -317,26 +317,26 @@
             @if (permissionsService.isAdmin()) {
               <li class="nav-item app-link">
                 <a class="nav-link" routerLink="logs" routerLinkActive="active" (click)="closeMenu()" ngbPopover="Logs"
-                  i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end" container="body"
+                  i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end" container="body"
                   triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                   <i-bs class="me-2" name="text-left"></i-bs><span><ng-container i18n>Logs</ng-container></span>
                 </a>
               </li>
             }
             <li class="nav-item mt-2" tourAnchor="tour.outro">
-              <a class="text-muted small d-flex align-items-center flex-wrap text-decoration-none nav-anchor"
+              <a class="px-3 py-2 text-muted small d-flex align-items-center flex-wrap text-decoration-none"
                 target="_blank" rel="noopener noreferrer" href="https://docs.paperless-ngx.com" ngbPopover="Documentation"
-                i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end" container="body"
+                i18n-ngbPopover [disablePopover]="!slimSidebarEnabled" placement="end" container="body"
                 triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                 <i-bs class="d-flex me-2" name="question-circle"></i-bs><span><ng-container i18n>Documentation</ng-container></span>
               </a>
             </li>
             <li class="nav-item" [class.visually-hidden]="slimSidebarEnabled">
-              <div class="text-muted small d-flex align-items-center flex-wrap nav-label">
+              <div class="px-3 py-0 text-muted small d-flex align-items-center flex-wrap">
                 <div class="me-3">
                   <a class="text-muted text-decoration-none" target="_blank" rel="noopener noreferrer"
                     href="https://github.com/paperless-ngx/paperless-ngx" ngbPopover="GitHub" i18n-ngbPopover
-                    [disablePopover]="!slimSidebarPopoversEnabled" placement="end" container="body"
+                    [disablePopover]="!slimSidebarEnabled" placement="end" container="body"
                     triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                     {{ versionString }}
                   </a>

src-ui/src/app/components/app-frame/app-frame.component.scss

@@ -67,23 +67,6 @@
   main.mobile-search-hidden {
     padding-top: 56px;
   }
-
-  .navbar-toggler {
-    padding-left: calc(12px - (1.5em * 2.5 / 16));
-  }
-}
-
-.search-container {
-  padding-left: 1rem;
-  padding-right: 1rem;
-}
-
-// Below sm the search gets its own full-width row, so line it up with main's content edge
-@media (max-width: 575.98px) {
-  .search-container {
-    padding-left: 12px;
-    padding-right: 12px;
-  }
 }
 
 main {
@@ -114,7 +97,7 @@ main {
 
     li.nav-item span.badge {
       display: inline-block;
-      margin-right: -4px;
+      margin-right: 2px;
     }
   }
 
@@ -158,11 +141,18 @@ main {
     }
   }
 
+  .sidebar.slim {
+    li.nav-item span.badge {
+      display: inline-block;
+      margin-right: 2px;
+    }
+  }
+
   .sidebar-slim-toggler {
     display: block;
     position: fixed;
     left: calc(var(--pngx-sidebar-width) - 12px);
-    bottom: 16px;
+    top: 72px;
     z-index: 996;
     --bs-btn-padding-x: 0.35rem;
     --bs-btn-padding-y: 0.125rem;
@@ -237,10 +227,6 @@ main {
   }
 }
 
-.sidebar .nav-anchor, .sidebar .nav-label {
-  padding: .25rem .7rem;
-}
-
 .attributes-row {
   border-radius: .55rem;
   margin: .1rem 0;
@@ -458,7 +444,7 @@ main {
 
 .header-search {
   width: 100%;
-  max-width: 55rem;
+  max-width: 44rem;
 }
 
 @media screen and (max-width: 575.98px) {
@@ -472,7 +458,6 @@ main {
 
   .navbar-toggler {
     grid-area: toggler;
-    color: var(--pngx-primary-text-contrast);
     text-align: left;
   }
 

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

@@ -278,10 +278,6 @@ export class AppFrameComponent
       })
   }
 
-  get slimSidebarPopoversEnabled(): boolean {
-    return this.slimSidebarEnabled && !this.isMobileViewport()
-  }
-
   get attributesSectionsCollapsed(): boolean {
     this.settingsService.trackChanges()
     return this.settingsService

src-ui/src/app/components/common/confirm-dialog/reprocess-confirm-dialog/reprocess-confirm-dialog.component.html

@@ -1,28 +0,0 @@
-<div class="modal-header">
-  <h4 class="modal-title" id="modal-basic-title">{{title}}</h4>
-  <button type="button" class="btn-close" aria-label="Close" (click)="cancel()">
-  </button>
-</div>
-<div class="modal-body">
-  @if (messageBold) {
-    <p class="text-break"><b>{{messageBold}}</b></p>
-  }
-  @if (message) {
-    <p class="mb-0 text-break" [innerHTML]="message"></p>
-  }
-  @if (showRemoteOcr) {
-    <div class="form-check mt-3">
-      <input class="form-check-input" type="checkbox" id="reprocessRemoteOcr" [(ngModel)]="remoteOcr" />
-      <label class="form-check-label" for="reprocessRemoteOcr" i18n>Use remote OCR</label>
-      <div class="form-text" i18n>Sends the document to the configured remote OCR service, which may incur costs.</div>
-    </div>
-  }
-</div>
-<div class="modal-footer">
-  <button type="button" class="btn" [class]="cancelBtnClass" (click)="cancel()" [disabled]="!buttonsEnabled">
-    <span class="d-inline-block" style="padding-bottom: 1px;">{{cancelBtnCaption}}</span>
-  </button>
-  <button type="button" class="btn" [class]="btnClass" (click)="confirm()" [disabled]="!confirmButtonEnabled || !buttonsEnabled">
-    {{btnCaption}}
-  </button>
-</div>

src-ui/src/app/components/common/confirm-dialog/reprocess-confirm-dialog/reprocess-confirm-dialog.component.spec.ts

@@ -1,72 +0,0 @@
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
-import { provideHttpClientTesting } from '@angular/common/http/testing'
-import { ComponentFixture, TestBed } from '@angular/core/testing'
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'
-import { RemoteOCRModeConfig } from 'src/app/data/paperless-config'
-import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
-import { SettingsService } from 'src/app/services/settings.service'
-import { ReprocessConfirmDialogComponent } from './reprocess-confirm-dialog.component'
-
-describe('ReprocessConfirmDialogComponent', () => {
-  let component: ReprocessConfirmDialogComponent
-  let fixture: ComponentFixture<ReprocessConfirmDialogComponent>
-  let settingsService: SettingsService
-
-  const createComponent = (configured: boolean, mode: string) => {
-    settingsService.set(SETTINGS_KEYS.REMOTE_OCR_CONFIGURED, configured)
-    settingsService.set(SETTINGS_KEYS.REMOTE_OCR_MODE, mode)
-
-    fixture = TestBed.createComponent(ReprocessConfirmDialogComponent)
-    component = fixture.componentInstance
-    fixture.detectChanges()
-  }
-
-  beforeEach(async () => {
-    TestBed.configureTestingModule({
-      providers: [
-        NgbActiveModal,
-        provideHttpClient(withInterceptorsFromDi()),
-        provideHttpClientTesting(),
-      ],
-      imports: [ReprocessConfirmDialogComponent],
-    }).compileComponents()
-
-    settingsService = TestBed.inject(SettingsService)
-  })
-
-  it('should not request remote OCR by default', () => {
-    createComponent(true, RemoteOCRModeConfig.WORKFLOW_ONLY)
-
-    expect(component.remoteOcr).toBeFalsy()
-  })
-
-  it('should not offer remote OCR when no engine is configured', () => {
-    createComponent(false, RemoteOCRModeConfig.WORKFLOW_ONLY)
-
-    expect(component.showRemoteOcr).toBeFalsy()
-    expect(
-      fixture.nativeElement.querySelector('#reprocessRemoteOcr')
-    ).toBeNull()
-  })
-
-  it('should not offer remote OCR when it already handles every document', () => {
-    createComponent(true, RemoteOCRModeConfig.ALWAYS)
-
-    expect(component.showRemoteOcr).toBeFalsy()
-    expect(
-      fixture.nativeElement.querySelector('#reprocessRemoteOcr')
-    ).toBeNull()
-  })
-
-  it('should offer remote OCR when configured and selective', () => {
-    createComponent(true, RemoteOCRModeConfig.WORKFLOW_ONLY)
-
-    expect(component.showRemoteOcr).toBeTruthy()
-    const checkbox = fixture.nativeElement.querySelector('#reprocessRemoteOcr')
-    expect(checkbox).not.toBeNull()
-
-    checkbox.click()
-    fixture.detectChanges()
-    expect(component.remoteOcr).toBeTruthy()
-  })
-})

src-ui/src/app/components/common/confirm-dialog/reprocess-confirm-dialog/reprocess-confirm-dialog.component.ts

@@ -1,20 +0,0 @@
-import { Component, inject } from '@angular/core'
-import { FormsModule } from '@angular/forms'
-import { SettingsService } from 'src/app/services/settings.service'
-import { ConfirmDialogComponent } from '../confirm-dialog.component'
-
-@Component({
-  selector: 'pngx-reprocess-confirm-dialog',
-  templateUrl: './reprocess-confirm-dialog.component.html',
-  imports: [FormsModule],
-})
-export class ReprocessConfirmDialogComponent extends ConfirmDialogComponent {
-  private settings = inject(SettingsService)
-
-  remoteOcr: boolean = false
-
-  public get showRemoteOcr(): boolean {
-    // Hidden when it is not configured, or when it already handles every document anyway.
-    return this.settings.remoteOCRIsSelectable
-  }
-}

src-ui/src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.html

@@ -455,13 +455,6 @@
           </div>
         </div>
       }
-      @case (WorkflowActionType.RemoteOcr) {
-        <div class="row">
-          <div class="col">
-            <p class="text-muted small" i18n>The document will be sent to the configured remote OCR service. May incur costs.</p>
-          </div>
-        </div>
-      }
     }
   </div>
 </ng-template>

src-ui/src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.spec.ts

@@ -29,7 +29,6 @@ import {
   DocumentSource,
   WorkflowTriggerType,
 } from 'src/app/data/workflow-trigger'
-import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
 import { IfOwnerDirective } from 'src/app/directives/if-owner.directive'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { CorrespondentService } from 'src/app/services/rest/correspondent.service'
@@ -225,12 +224,7 @@ describe('WorkflowEditDialogComponent', () => {
     ).toEqual('Document Added')
     expect(component.getTriggerTypeOptionName(null)).toEqual('')
     expect(component.sourceOptions).toEqual(DOCUMENT_SOURCE_OPTIONS)
-    // Remote OCR is absent until the workflow has a consumption trigger
-    expect(component.actionTypeOptions).toEqual(
-      WORKFLOW_ACTION_OPTIONS.filter(
-        (a) => a.id !== WorkflowActionType.RemoteOcr
-      )
-    )
+    expect(component.actionTypeOptions).toEqual(WORKFLOW_ACTION_OPTIONS)
     expect(
       component.getActionTypeOptionName(WorkflowActionType.Assignment)
     ).toEqual('Assignment')
@@ -243,104 +237,7 @@ describe('WorkflowEditDialogComponent', () => {
     jest.spyOn(settingsService, 'get').mockReturnValue(false)
     component.ngOnInit()
     expect(component.actionTypeOptions).toEqual(
-      WORKFLOW_ACTION_OPTIONS.filter(
-        (a) =>
-          a.id !== WorkflowActionType.Email &&
-          a.id !== WorkflowActionType.RemoteOcr
-      )
-    )
-  })
-
-  it('should offer remote OCR only for consumption workflows', () => {
-    jest.spyOn(settingsService, 'get').mockReturnValue(true)
-
-    // A consumption trigger makes the action reachable
-    component.object = {
-      name: 'Workflow 1',
-      order: 0,
-      enabled: true,
-      triggers: [{ type: WorkflowTriggerType.Consumption }],
-      actions: [],
-    } as Workflow
-    component.ngOnInit()
-    expect(component.actionTypeOptions.map((a) => a.id)).toContain(
-      WorkflowActionType.RemoteOcr
-    )
-
-    // Any other trigger type runs after the document has been parsed
-    component.object = {
-      name: 'Workflow 2',
-      order: 0,
-      enabled: true,
-      triggers: [{ type: WorkflowTriggerType.DocumentAdded }],
-      actions: [],
-    } as Workflow
-    component.ngOnInit()
-    expect(component.actionTypeOptions.map((a) => a.id)).not.toContain(
-      WorkflowActionType.RemoteOcr
-    )
-  })
-
-  it('should offer remote OCR on a trigger added to a new workflow', () => {
-    jest.spyOn(settingsService, 'get').mockReturnValue(true)
-    component.ngOnInit()
-
-    // Nothing for the action to apply to yet
-    expect(component.actionTypeOptions.map((a) => a.id)).not.toContain(
-      WorkflowActionType.RemoteOcr
-    )
-
-    // addTrigger creates the form field with emitEvent false, so the options
-    // have to be computed on read rather than cached from valueChanges
-    component.addTrigger()
-    expect(component.actionTypeOptions.map((a) => a.id)).toContain(
-      WorkflowActionType.RemoteOcr
-    )
-
-    // Switching that trigger to a type that runs after parsing removes it
-    component.triggerFields
-      .at(0)
-      .get('type')
-      .setValue(WorkflowTriggerType.DocumentAdded)
-    expect(component.actionTypeOptions.map((a) => a.id)).not.toContain(
-      WorkflowActionType.RemoteOcr
-    )
-  })
-
-  it('should keep remote OCR listed when an action already uses it', () => {
-    jest.spyOn(settingsService, 'get').mockReturnValue(true)
-
-    // Otherwise changing the trigger would silently blank the selection
-    component.object = {
-      name: 'Workflow 1',
-      order: 0,
-      enabled: true,
-      triggers: [{ type: WorkflowTriggerType.DocumentAdded }],
-      actions: [{ type: WorkflowActionType.RemoteOcr }],
-    } as Workflow
-    component.ngOnInit()
-
-    expect(component.actionTypeOptions.map((a) => a.id)).toContain(
-      WorkflowActionType.RemoteOcr
-    )
-  })
-
-  it('should not offer remote OCR when no engine is configured', () => {
-    jest
-      .spyOn(settingsService, 'get')
-      .mockImplementation((key) => key !== SETTINGS_KEYS.REMOTE_OCR_CONFIGURED)
-
-    component.object = {
-      name: 'Workflow 1',
-      order: 0,
-      enabled: true,
-      triggers: [{ type: WorkflowTriggerType.Consumption }],
-      actions: [],
-    } as Workflow
-    component.ngOnInit()
-
-    expect(component.actionTypeOptions.map((a) => a.id)).not.toContain(
-      WorkflowActionType.RemoteOcr
+      WORKFLOW_ACTION_OPTIONS.filter((a) => a.id !== WorkflowActionType.Email)
     )
   })
 

src-ui/src/app/components/common/edit-dialog/workflow-edit-dialog/workflow-edit-dialog.component.ts

@@ -148,10 +148,6 @@ export const WORKFLOW_ACTION_OPTIONS = [
     id: WorkflowActionType.MoveToTrash,
     name: $localize`Move to trash`,
   },
-  {
-    id: WorkflowActionType.RemoteOcr,
-    name: $localize`Remote OCR`,
-  },
 ]
 
 export enum TriggerFilterType {
@@ -508,6 +504,8 @@ export class WorkflowEditDialogComponent
 
   expandedItem: number = null
 
+  readonly allowedActionTypes = signal([])
+
   private readonly triggerFilterOptionsMap = new WeakMap<
     FormArray,
     TriggerFilterOption[]
@@ -550,40 +548,13 @@ export class WorkflowEditDialogComponent
       this.checkRemovalActionFields.bind(this)
     )
     this.checkRemovalActionFields(this.objectForm.value)
-  }
-
-  private allowedActionTypes: typeof WORKFLOW_ACTION_OPTIONS = null
-
-  private getAllowedActionTypes() {
-    let allowed = WORKFLOW_ACTION_OPTIONS
-
-    if (!this.settingsService.get(SETTINGS_KEYS.EMAIL_ENABLED)) {
-      allowed = allowed.filter((a) => a.id !== WorkflowActionType.Email)
-    }
-
-    // Remote OCR is decided before the document is parsed, so it is only
-    // offered for workflows that run at consumption.
-    const formWorkflow: Workflow = this.objectForm?.value
-    const remoteOcrUsable =
-      this.settingsService.get(SETTINGS_KEYS.REMOTE_OCR_CONFIGURED) &&
-      (formWorkflow?.triggers?.some(
-        (trigger) => trigger.type === WorkflowTriggerType.Consumption
-      ) ||
-        formWorkflow?.actions?.some(
-          (action) => action.type === WorkflowActionType.RemoteOcr
-        ))
-    if (!remoteOcrUsable) {
-      allowed = allowed.filter((a) => a.id !== WorkflowActionType.RemoteOcr)
-    }
-
-    if (
-      this.allowedActionTypes?.length === allowed.length &&
-      this.allowedActionTypes.every((a, i) => a.id === allowed[i].id)
-    ) {
-      return this.allowedActionTypes
-    }
-    this.allowedActionTypes = allowed
-    return allowed
+    this.allowedActionTypes.set(
+      this.settingsService.get(SETTINGS_KEYS.EMAIL_ENABLED)
+        ? WORKFLOW_ACTION_OPTIONS
+        : WORKFLOW_ACTION_OPTIONS.filter(
+            (a) => a.id !== WorkflowActionType.Email
+          )
+    )
   }
 
   private checkRemovalActionFields(formWorkflow: Workflow) {
@@ -1308,8 +1279,7 @@ export class WorkflowEditDialogComponent
 
   get actionTypeOptions() {
     this.settingsService.trackChanges()
-    // Computed on read rather than cached
-    return this.getAllowedActionTypes()
+    return this.allowedActionTypes()
   }
 
   getActionTypeOptionName(type: WorkflowActionType): string {

src-ui/src/app/components/common/page-header/page-header.component.html

@@ -1,6 +1,6 @@
-<div class="row pt-3 pb-2 align-items-center">
+<div class="row pt-3 pb-3 pb-md-2 align-items-center">
   <div class="col-md text-truncate">
-    <h3 class="d-flex align-items-center mb-2 mb-md-1" style="line-height: 1.4">
+    <h3 class="d-flex align-items-center mb-1" style="line-height: 1.4">
       <span class="text-truncate">{{title()}}</span>
       @if (id()) {
         <span class="badge bg-primary text-primary-text-contrast ms-3 small fs-normal cursor-pointer" (click)="copyID()">
@@ -12,10 +12,10 @@
         </span>
       }
       @if (subTitle()) {
-        <span class="page-subtitle h6 mb-0 mt-1 fw-normal ms-md-3 text-truncate" style="line-height: 1.4">{{subTitle()}}</span>
+        <span class="h6 mb-0 mt-1 d-block d-md-inline fw-normal ms-md-3 text-truncate" style="line-height: 1.4">{{subTitle()}}</span>
       }
       @if (info()) {
-        <button class="btn btn-sm btn-link text-muted p-0 ms-2 p-md-2 ms-md-0" title="What's this?" i18n-title type="button" [ngbPopover]="infoPopover" [autoClose]="true">
+        <button class="btn btn-sm btn-link text-muted p-0 p-md-2" title="What's this?" i18n-title type="button" [ngbPopover]="infoPopover" [autoClose]="true">
           <i-bs name="question-circle"></i-bs>
         </button>
         <ng-template #infoPopover>

src-ui/src/app/components/common/page-header/page-header.component.scss

@@ -1,6 +1,5 @@
 h3 {
     min-height: calc(1.325rem + 0.9vw);
-    flex-wrap: wrap;
 
     .badge {
         font-size: 0.65rem;
@@ -8,16 +7,6 @@ h3 {
     }
 }
 
-// Drop the subtitle onto its own and shrink it
-@media (max-width: 767.98px) {
-    h3 > .page-subtitle {
-        flex: 0 0 100%;
-        margin-top: 0 !important;
-        font-size: .7rem;
-        line-height: 1.3 !important;
-    }
-}
-
 :host {
   display: block;
   margin-bottom: .35rem;

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

@@ -963,24 +963,12 @@ describe('DocumentDetailComponent', () => {
     component.reprocess()
     const modalCloseSpy = jest.spyOn(openModal, 'close')
     openModal.componentInstance.confirmClicked.next()
-    expect(reprocessSpy).toHaveBeenCalledWith({ documents: [doc.id] }, false)
+    expect(reprocessSpy).toHaveBeenCalledWith({ documents: [doc.id] })
     expect(modalSpy).toHaveBeenCalled()
     expect(toastSpy).toHaveBeenCalled()
     expect(modalCloseSpy).toHaveBeenCalled()
   })
 
-  it('should pass remote OCR choice when reprocessing', () => {
-    initNormally()
-    const reprocessSpy = jest.spyOn(documentService, 'reprocessDocuments')
-    reprocessSpy.mockReturnValue(of(true))
-    let openModal: NgbModalRef
-    modalService.activeInstances.subscribe((modal) => (openModal = modal[0]))
-    component.reprocess()
-    openModal.componentInstance.remoteOcr = true
-    openModal.componentInstance.confirmClicked.next()
-    expect(reprocessSpy).toHaveBeenCalledWith({ documents: [doc.id] }, true)
-  })
-
   it('should show error if redo ocr call fails', () => {
     initNormally()
     const reprocessSpy = jest.spyOn(documentService, 'reprocessDocuments')

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

@@ -97,7 +97,6 @@ import { ISODateAdapter } from 'src/app/utils/ngb-iso-date-adapter'
 import * as UTIF from 'utif'
 import { DocumentDetailFieldID } from '../admin/settings/settings.component'
 import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component'
-import { ReprocessConfirmDialogComponent } from '../common/confirm-dialog/reprocess-confirm-dialog/reprocess-confirm-dialog.component'
 import { PasswordRemovalConfirmDialogComponent } from '../common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component'
 import { CustomFieldsDropdownComponent } from '../common/custom-fields-dropdown/custom-fields-dropdown.component'
 import { CorrespondentEditDialogComponent } from '../common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component'
@@ -1399,7 +1398,7 @@ export class DocumentDetailComponent
   }
 
   reprocess() {
-    let modal = this.modalService.open(ReprocessConfirmDialogComponent, {
+    let modal = this.modalService.open(ConfirmDialogComponent, {
       backdrop: 'static',
     })
     modal.componentInstance.title = $localize`Reprocess confirm`
@@ -1410,10 +1409,7 @@ export class DocumentDetailComponent
     modal.componentInstance.confirmClicked.subscribe(() => {
       modal.componentInstance.buttonsEnabled.set(false)
       this.documentsService
-        .reprocessDocuments(
-          { documents: [this.document().id] },
-          modal.componentInstance.remoteOcr
-        )
+        .reprocessDocuments({ documents: [this.document().id] })
         .subscribe({
           next: () => {
             this.toastService.showInfo(

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

@@ -1122,7 +1122,6 @@ describe('BulkEditorComponent', () => {
     req.flush(true)
     expect(req.request.body).toEqual({
       documents: [3, 4],
-      remote_ocr: false,
     })
     httpTestingController.match(
       `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`

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

@@ -52,7 +52,6 @@ import { flattenTags } from 'src/app/utils/flatten-tags'
 import { queryParamsFromFilterRules } from 'src/app/utils/query-params'
 import { MergeAsVersionsConfirmDialogComponent } from '../../common/confirm-dialog/merge-as-versions-confirm-dialog/merge-as-versions-confirm-dialog.component'
 import { MergeConfirmDialogComponent } from '../../common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component'
-import { ReprocessConfirmDialogComponent } from '../../common/confirm-dialog/reprocess-confirm-dialog/reprocess-confirm-dialog.component'
 import { RotateConfirmDialogComponent } from '../../common/confirm-dialog/rotate-confirm-dialog/rotate-confirm-dialog.component'
 import { CorrespondentEditDialogComponent } from '../../common/edit-dialog/correspondent-edit-dialog/correspondent-edit-dialog.component'
 import { CustomFieldEditDialogComponent } from '../../common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component'
@@ -917,7 +916,7 @@ export class BulkEditorComponent
   }
 
   reprocessSelected() {
-    let modal = this.modalService.open(ReprocessConfirmDialogComponent, {
+    let modal = this.modalService.open(ConfirmDialogComponent, {
       backdrop: 'static',
     })
     modal.componentInstance.title = $localize`Reprocess confirm`
@@ -931,10 +930,7 @@ export class BulkEditorComponent
         modal.componentInstance.buttonsEnabled.set(false)
         this.executeDocumentAction(
           modal,
-          this.documentService.reprocessDocuments(
-            this.getSelectionQuery(),
-            modal.componentInstance.remoteOcr
-          )
+          this.documentService.reprocessDocuments(this.getSelectionQuery())
         )
       })
   }

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

@@ -54,10 +54,6 @@ export const ConfigCategory = {
   AI: $localize`AI Settings`,
 }
 
-export const ConfigSection = {
-  RemoteOCR: $localize`Remote OCR`,
-}
-
 export const LLMEmbeddingBackendConfig = {
   OPENAI_LIKE: 'openai-like',
   HUGGINGFACE: 'huggingface',
@@ -69,15 +65,6 @@ export const LLMBackendConfig = {
   OLLAMA: 'ollama',
 }
 
-export const RemoteOCREngineConfig = {
-  AZURE_AI: 'azureai',
-}
-
-export const RemoteOCRModeConfig = {
-  ALWAYS: 'always',
-  WORKFLOW_ONLY: 'workflow_only',
-}
-
 export interface ConfigOption {
   key: string
   title: string
@@ -85,7 +72,6 @@ export interface ConfigOption {
   choices?: Array<{ id: string; name: string }>
   config_key?: string
   category: string
-  section?: string
   note?: string
 }
 
@@ -195,43 +181,6 @@ export const PaperlessConfigOptions: ConfigOption[] = [
     config_key: 'PAPERLESS_OCR_USER_ARGS',
     category: ConfigCategory.OCR,
   },
-  {
-    key: 'remote_ocr_engine',
-    title: $localize`Remote OCR Engine`,
-    type: ConfigOptionType.Select,
-    choices: mapToItems(RemoteOCREngineConfig),
-    config_key: 'PAPERLESS_REMOTE_OCR_ENGINE',
-    category: ConfigCategory.OCR,
-    section: ConfigSection.RemoteOCR,
-    note: $localize`Enabling remote OCR sends documents to a third-party service for processing. Consider the privacy implications as well as potential costs before enabling.`,
-  },
-  {
-    key: 'remote_ocr_api_key',
-    title: $localize`Remote OCR API Key`,
-    type: ConfigOptionType.Password,
-    config_key: 'PAPERLESS_REMOTE_OCR_API_KEY',
-    category: ConfigCategory.OCR,
-    section: ConfigSection.RemoteOCR,
-  },
-  {
-    key: 'remote_ocr_endpoint',
-    title: $localize`Remote OCR Endpoint`,
-    type: ConfigOptionType.String,
-    config_key: 'PAPERLESS_REMOTE_OCR_ENDPOINT',
-    category: ConfigCategory.OCR,
-    section: ConfigSection.RemoteOCR,
-    note: $localize`Required when using the Azure AI engine.`,
-  },
-  {
-    key: 'remote_ocr_mode',
-    title: $localize`Remote OCR Mode`,
-    type: ConfigOptionType.Select,
-    choices: mapToItems(RemoteOCRModeConfig),
-    config_key: 'PAPERLESS_REMOTE_OCR_MODE',
-    category: ConfigCategory.OCR,
-    section: ConfigSection.RemoteOCR,
-    note: $localize`Which documents are sent to the remote engine. Use 'workflow_only' to keep remote OCR off unless a workflow enables it for a document.`,
-  },
   {
     key: 'app_logo',
     title: $localize`Application Logo`,
@@ -449,10 +398,6 @@ export interface PaperlessConfig extends ObjectWithId {
   barcode_enable_tag: boolean
   barcode_tag_mapping: object
   barcode_tag_split: boolean
-  remote_ocr_engine: string
-  remote_ocr_api_key: string
-  remote_ocr_endpoint: string
-  remote_ocr_mode: string
   ai_enabled: boolean
   llm_embedding_backend: string
   llm_embedding_model: string

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

@@ -1,6 +1,5 @@
 import { PdfEditorEditMode } from '../components/common/pdf-editor/pdf-editor-edit-mode'
 import { PdfZoomScale } from '../components/common/pdf-viewer/pdf-viewer.types'
-import { RemoteOCRModeConfig } from './paperless-config'
 import { User } from './user'
 
 export interface UiSettings {
@@ -95,8 +94,6 @@ export const SETTINGS_KEYS = {
   OUTLOOK_OAUTH_URL: 'outlook_oauth_url',
   EMAIL_ENABLED: 'email_enabled',
   AI_ENABLED: 'ai_enabled',
-  REMOTE_OCR_CONFIGURED: 'remote_ocr:configured',
-  REMOTE_OCR_MODE: 'remote_ocr:mode',
 }
 
 export const SETTINGS: UiSetting[] = [
@@ -350,14 +347,4 @@ export const SETTINGS: UiSetting[] = [
     type: 'string',
     default: PdfEditorEditMode.Create,
   },
-  {
-    key: SETTINGS_KEYS.REMOTE_OCR_CONFIGURED,
-    type: 'boolean',
-    default: false,
-  },
-  {
-    key: SETTINGS_KEYS.REMOTE_OCR_MODE,
-    type: 'string',
-    default: RemoteOCRModeConfig.ALWAYS,
-  },
 ]

src-ui/src/app/data/workflow-action.ts

@@ -7,7 +7,6 @@ export enum WorkflowActionType {
   Webhook = 4,
   PasswordRemoval = 5,
   MoveToTrash = 6,
-  RemoteOcr = 7,
 }
 
 export interface WorkflowActionEmail extends ObjectWithId {

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

@@ -284,21 +284,6 @@ describe(`DocumentService`, () => {
     expect(req.request.method).toEqual('POST')
     expect(req.request.body).toEqual({
       documents: ids,
-      remote_ocr: false,
-    })
-  })
-
-  it('should request remote OCR when reprocessing with it enabled', () => {
-    const ids = [1, 2, 3]
-    subscription = service
-      .reprocessDocuments({ documents: ids }, true)
-      .subscribe()
-    const req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}${endpoint}/reprocess/`
-    )
-    expect(req.request.body).toEqual({
-      documents: ids,
-      remote_ocr: true,
     })
   })
 

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

@@ -349,13 +349,9 @@ export class DocumentService extends AbstractPaperlessService<Document> {
     })
   }
 
-  reprocessDocuments(
-    selection: DocumentSelectionQuery,
-    remoteOcr: boolean = false
-  ) {
+  reprocessDocuments(selection: DocumentSelectionQuery) {
     return this.http.post(this.getResourceUrl(null, 'reprocess'), {
       ...selection,
-      remote_ocr: remoteOcr,
     })
   }
 

src-ui/src/app/services/settings.service.spec.ts

@@ -13,7 +13,6 @@ import { environment } from 'src/environments/environment'
 import { CustomFieldDataType } from '../data/custom-field'
 import { DEFAULT_DISPLAY_FIELDS, DisplayField } from '../data/document'
 import { SavedView } from '../data/saved-view'
-import { RemoteOCRModeConfig } from '../data/paperless-config'
 import { SETTINGS_KEYS, UiSettings } from '../data/ui-settings'
 import { PermissionsService } from './permissions.service'
 import { CustomFieldsService } from './rest/custom-fields.service'
@@ -435,26 +434,4 @@ describe('SettingsService', () => {
         ).name
     ).toEqual(customFields[0].name)
   })
-  it('should offer remote OCR only when configured and selective', () => {
-    settingsService.set(SETTINGS_KEYS.REMOTE_OCR_CONFIGURED, false)
-    settingsService.set(
-      SETTINGS_KEYS.REMOTE_OCR_MODE,
-      RemoteOCRModeConfig.WORKFLOW_ONLY
-    )
-    expect(settingsService.remoteOCRIsSelectable).toBeFalsy()
-
-    // configured, but already handling every document
-    settingsService.set(SETTINGS_KEYS.REMOTE_OCR_CONFIGURED, true)
-    settingsService.set(
-      SETTINGS_KEYS.REMOTE_OCR_MODE,
-      RemoteOCRModeConfig.ALWAYS
-    )
-    expect(settingsService.remoteOCRIsSelectable).toBeFalsy()
-
-    settingsService.set(
-      SETTINGS_KEYS.REMOTE_OCR_MODE,
-      RemoteOCRModeConfig.WORKFLOW_ONLY
-    )
-    expect(settingsService.remoteOCRIsSelectable).toBeTruthy()
-  })
 })

src-ui/src/app/services/settings.service.ts

@@ -19,7 +19,6 @@ import {
 } from 'src/app/utils/color'
 import { DEFAULT_APP_TITLE, environment } from 'src/environments/environment'
 import { DEFAULT_DISPLAY_FIELDS, DisplayField } from '../data/document'
-import { RemoteOCRModeConfig } from '../data/paperless-config'
 import { SavedView } from '../data/saved-view'
 import {
   PAPERLESS_GREEN_HEX,
@@ -688,17 +687,6 @@ export class SettingsService {
     return this.settingIsSet(SETTINGS_KEYS.UPDATE_CHECKING_ENABLED)
   }
 
-  /**
-   * Offering remote OCR as a  choice only makes sense when an engine
-   * is configured but is not already handling every document.
-   */
-  get remoteOCRIsSelectable(): boolean {
-    return (
-      this.get(SETTINGS_KEYS.REMOTE_OCR_CONFIGURED) &&
-      this.get(SETTINGS_KEYS.REMOTE_OCR_MODE) !== RemoteOCRModeConfig.ALWAYS
-    )
-  }
-
   offerTour(): boolean {
     return this.dashboardIsEmpty() && !this.get(SETTINGS_KEYS.TOUR_COMPLETE)
   }

src-ui/src/main.ts

@@ -118,7 +118,6 @@ import {
   journalBookmarkFill,
   journals,
   link,
-  list,
   listNested,
   listTask,
   listUl,
@@ -366,7 +365,6 @@ const icons = {
   journalBookmarkFill,
   journals,
   link,
-  list,
   listNested,
   listTask,
   listUl,

src-ui/src/styles.scss

@@ -536,7 +536,6 @@ ul.pagination {
 }
 
 .nav-underline {
-  gap: calc(0.5 * var(--bs-nav-underline-gap)) var(--bs-nav-underline-gap);
   .nav-link {
     &.active, &:hover, &:focus {
       color: var(--bs-primary);

src/documents/bulk_edit.py

@@ -27,7 +27,7 @@ from documents.models import DocumentType
 from documents.models import PaperlessTask
 from documents.models import StoragePath
 from documents.models import Tag
-from documents.permissions import set_permissions_for_objects
+from documents.permissions import set_permissions_for_object
 from documents.plugins.helpers import DocumentsStatusManager
 from documents.tasks import bulk_update_documents
 from documents.tasks import consume_file
@@ -305,49 +305,33 @@ def modify_custom_fields(
         else [(field, None) for field in add_custom_fields]
     )
 
-    custom_fields_by_id: dict[int, CustomField] = {
-        cf.id: cf
-        for cf in CustomField.objects.filter(
-            id__in=[int(field) for field, _ in add_custom_fields],
-        )
-    }
-    # Deferred, not `.only()`: these objects get cached onto the FK
-    # descriptor of newly-created CustomFieldInstance rows below, and
-    # downstream post_save receivers (e.g. the filename-generation signal)
-    # touch other Document fields -- `.only("pk")` would just turn that into
-    # a deferred-field reload per document, trading one N+1 for another.
-    # `content` is the one field guaranteed to be both large (full OCR text)
-    # and unused by anything this function or its receivers touch.
-    docs_by_id: dict[int, Document] = {
-        doc.id: doc
-        for doc in Document.objects.filter(id__in=affected_docs).defer("content")
-    }
+    custom_fields = CustomField.objects.filter(
+        id__in=[int(field) for field, _ in add_custom_fields],
+    ).distinct()
     for field_id, value in add_custom_fields:
-        custom_field = custom_fields_by_id[field_id]
-        value_field = CustomFieldInstance.TYPE_TO_DATA_STORE_NAME_MAP[
-            custom_field.data_type
-        ]
         for doc_id in affected_docs:
-            defaults = {value_field: value}
-            if (
-                custom_field.data_type == CustomField.FieldDataType.DOCUMENTLINK
-                and value
-                and doc_id in value
-            ):
-                # Prevent self-linking
-                continue
-            # Pass the already-resolved objects, not bare ids: this caches
-            # them on the FK descriptor of any newly-created instance, so a
-            # later `.field`/`.document` access (e.g. auditlog's post_save
-            # receiver calling `str(instance)`, which touches `.field.name`)
-            # doesn't trigger its own per-instance re-fetch.
+            defaults = {}
+            custom_field = custom_fields.get(id=field_id)
+            if custom_field:
+                value_field = CustomFieldInstance.TYPE_TO_DATA_STORE_NAME_MAP[
+                    custom_field.data_type
+                ]
+                defaults[value_field] = value
+                if (
+                    custom_field.data_type == CustomField.FieldDataType.DOCUMENTLINK
+                    and value
+                    and doc_id in value
+                ):
+                    # Prevent self-linking
+                    continue
             CustomFieldInstance.objects.update_or_create(
-                document=docs_by_id[doc_id],
-                field=custom_field,
+                document_id=doc_id,
+                field_id=field_id,
                 defaults=defaults,
             )
             if custom_field.data_type == CustomField.FieldDataType.DOCUMENTLINK:
-                reflect_doclinks(docs_by_id[doc_id], custom_field, value)
+                doc = Document.objects.get(id=doc_id)
+                reflect_doclinks(doc, custom_field, value)
 
     # For doc link fields that are being removed, remove symmetrical links
     for doclink_being_removed_instance in CustomFieldInstance.objects.filter(
@@ -355,10 +339,12 @@ def modify_custom_fields(
         field__id__in=remove_custom_fields,
         field__data_type=CustomField.FieldDataType.DOCUMENTLINK,
         value_document_ids__isnull=False,
-    ).select_related("field"):
+    ):
         for target_doc_id in doclink_being_removed_instance.value:
             remove_doclink(
-                document=docs_by_id[doclink_being_removed_instance.document_id],
+                document=Document.objects.get(
+                    id=doclink_being_removed_instance.document.id,
+                ),
                 field=doclink_being_removed_instance.field,
                 target_doc_id=target_doc_id,
             )
@@ -413,16 +399,10 @@ def delete(doc_ids: list[int]) -> Literal["OK"]:
     return "OK"
 
 
-def reprocess(doc_ids: list[int], *, remote_ocr: bool = False) -> Literal["OK"]:
-    """
-    Re-run parsing for the given documents.
-
-    Consumption workflows do not run here, so ``remote_ocr`` is how the user
-    asks for the remote engine when it is not configured to handle everything.
-    """
+def reprocess(doc_ids: list[int]) -> Literal["OK"]:
     for document_id in doc_ids:
         update_document_content_maybe_archive_file.apply_async(
-            kwargs={"document_id": document_id, "remote_ocr": remote_ocr},
+            kwargs={"document_id": document_id},
             headers={"trigger_source": PaperlessTask.TriggerSource.MANUAL},
         )
 
@@ -444,13 +424,10 @@ def set_permissions(
     else:
         qs.update(owner=owner)
 
+    for doc in qs:
+        set_permissions_for_object(permissions=set_permissions, object=doc, merge=merge)
+
     affected_docs = list(qs.values_list("pk", flat=True))
-    set_permissions_for_objects(
-        permissions=set_permissions,
-        model=Document,
-        pks=affected_docs,
-        merge=merge,
-    )
 
     bulk_update_documents.apply_async(
         kwargs={"document_ids": affected_docs},

src/documents/consumer.py

@@ -53,7 +53,6 @@ from documents.utils import copy_basic_file_stats
 from documents.utils import copy_file_with_basic_stats
 from documents.utils import run_subprocess
 from paperless.config import OcrConfig
-from paperless.config import RemoteOCRConfig
 from paperless.models import ArchiveFileGenerationChoices
 from paperless.parsers import ParserContext
 from paperless.parsers import ParserProtocol
@@ -452,19 +451,12 @@ class ConsumerPlugin(
                 except Exception as e:
                     self.log.error(f"Error attempting to clean PDF: {e}")
 
-            # Workflows have already run at this point, so the metadata knows
-            # whether this document was singled out for remote OCR
-            allow_remote = (
-                self.metadata.remote_ocr or RemoteOCRConfig().remote_ocr_by_default
-            )
-
             # Based on the mime type, get the parser for that type
             parser_class: type[ParserProtocol] | None = (
                 get_parser_registry().get_parser_for_file(
                     mime_type,
                     self.filename,
                     self.working_copy,
-                    allow_remote=allow_remote,
                 )
             )
             if not parser_class:
@@ -473,16 +465,6 @@ class ConsumerPlugin(
                     f"Unsupported mime type {mime_type}",
                 )
 
-            if self.metadata.remote_ocr and not getattr(
-                parser_class,
-                "uses_remote_service",
-                False,
-            ):
-                self.log.warning(
-                    "Remote OCR was requested for this document but no remote "
-                    "parser is available for it, processing locally instead.",
-                )
-
             # Notify all listeners that we're going to do some work.
 
             document_consumption_started.send(

src/documents/data_models.py

@@ -34,7 +34,6 @@ class DocumentMetadataOverrides:
     skip_asn_if_exists: bool = False
     version_label: str | None = None
     actor_id: int | None = None
-    remote_ocr: bool = False
 
     def update(self, other: "DocumentMetadataOverrides") -> "DocumentMetadataOverrides":
         """
@@ -58,8 +57,6 @@ class DocumentMetadataOverrides:
             self.actor_id = other.actor_id
         if other.skip_asn_if_exists:
             self.skip_asn_if_exists = True
-        if other.remote_ocr:
-            self.remote_ocr = True
         if other.version_label is not None:
             self.version_label = other.version_label
 
@@ -129,7 +126,7 @@ class DocumentMetadataOverrides:
         )
         overrides.custom_fields = {
             custom_field.field.id: custom_field.value
-            for custom_field in doc.custom_fields.select_related("field").all()
+            for custom_field in doc.custom_fields.all()
         }
 
         groups_with_perms = get_groups_with_perms(

src/documents/migrations/0024_alter_workflowaction_type.py

@@ -1,30 +0,0 @@
-# Generated by Django 5.2.16 on 2026-08-10 17:27
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("documents", "0023_savedview_icon"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="workflowaction",
-            name="type",
-            field=models.PositiveSmallIntegerField(
-                choices=[
-                    (1, "Assignment"),
-                    (2, "Removal"),
-                    (3, "Email"),
-                    (4, "Webhook"),
-                    (5, "Password removal"),
-                    (6, "Move to trash"),
-                    (7, "Remote OCR"),
-                ],
-                default=1,
-                verbose_name="Workflow Action Type",
-            ),
-        ),
-    ]

src/documents/models.py

@@ -1670,10 +1670,6 @@ class WorkflowAction(models.Model):
             6,
             _("Move to trash"),
         )
-        REMOTE_OCR = (
-            7,
-            _("Remote OCR"),
-        )
 
     type = models.PositiveSmallIntegerField(
         _("Workflow Action Type"),

src/documents/permissions.py

@@ -173,182 +173,6 @@ def set_permissions_for_object(
                         )
 
 
-def _resolve_permissions(codenames: set[str], ctype: ContentType) -> list[Permission]:
-    """
-    Resolves `codenames` to Permission rows, raising like the single-object
-    assign_perm() this bulk path replaces does (via a `.get()` internally)
-    if any codename doesn't exist -- e.g. a client-supplied action name that
-    was never validated (BulkEditObjectsSerializer._validate_permissions
-    calls validate_set_permissions() only for its side-effecting id checks
-    and discards the filtered dict it returns, so an unrecognized action key
-    reaches this function as-is). A plain `.filter()` with no existence
-    check would otherwise silently build zero rows and no-op instead of
-    reporting the bad input.
-    """
-    permission_objs = list(
-        Permission.objects.filter(content_type=ctype, codename__in=codenames),
-    )
-    missing = codenames - {p.codename for p in permission_objs}
-    if missing:
-        raise Permission.DoesNotExist(
-            f"Permission matching query does not exist for codename(s): "
-            f"{', '.join(sorted(missing))}",
-        )
-    return permission_objs
-
-
-# Target number of permission rows to build in Python before handing them to
-# bulk_create -- keeps peak memory bounded for a large "apply to all" call,
-# independent of bulk_create's own batch_size (which only caps the size of
-# each INSERT statement, not how many row objects exist in memory at once).
-_PERMISSION_ROW_CHUNK_SIZE = 5000
-
-
-def _apply_bulk_permission_entry(
-    *,
-    perm_model: type[UserObjectPermission] | type[GroupObjectPermission],
-    identity_model: type[User] | type[Group],
-    identity_field: str,
-    ids: list[int],
-    codename: str,
-    permission_objs: list[Permission],
-    ctype: ContentType,
-    object_pks: list[str],
-    merge: bool,
-) -> None:
-    # Only the ids are needed to build permission rows (via `<field>_id=`),
-    # so avoid fetching full User/Group rows for identities that may not
-    # even end up being granted anything new.
-    add_ids = set(
-        identity_model.objects.filter(id__in=ids).values_list("id", flat=True),
-    )
-
-    if not merge:
-        existing_ids = set(
-            perm_model.objects.filter(
-                content_type=ctype,
-                object_pk__in=object_pks,
-                permission__codename=codename,
-            ).values_list(f"{identity_field}_id", flat=True),
-        )
-        remove_ids = existing_ids - add_ids
-        if remove_ids:
-            perm_model.objects.filter(
-                content_type=ctype,
-                object_pk__in=object_pks,
-                permission__codename=codename,
-                **{f"{identity_field}_id__in": remove_ids},
-            ).delete()
-
-    if not add_ids:
-        return
-
-    rows_per_pk = len(permission_objs) * len(add_ids)
-    pks_per_chunk = max(1, _PERMISSION_ROW_CHUNK_SIZE // rows_per_pk)
-    for start in range(0, len(object_pks), pks_per_chunk):
-        pk_chunk = object_pks[start : start + pks_per_chunk]
-        rows = [
-            perm_model(
-                content_type=ctype,
-                object_pk=pk,
-                permission=permission_obj,
-                **{f"{identity_field}_id": identity_id},
-            )
-            for permission_obj in permission_objs
-            for pk in pk_chunk
-            for identity_id in add_ids
-        ]
-        # ignore_conflicts skips only rows that already exist as an exact
-        # (identity, permission, object) match -- the same de-dup the
-        # underlying (user|group, permission, object_pk) unique constraint
-        # already enforces for the single-object assign_perm() this
-        # replaces, so it doesn't change what counts as "already granted".
-        # batch_size caps how many rows go into a single INSERT so a huge
-        # chunk doesn't build one enormous statement.
-        perm_model.objects.bulk_create(rows, ignore_conflicts=True, batch_size=1000)
-
-
-def set_permissions_for_objects(
-    permissions: dict,
-    model: type[Model],
-    pks: QuerySet | list,
-    *,
-    merge: bool = False,
-) -> None:
-    """
-    Bulk equivalent of set_permissions_for_object: applies the same
-    permission changes to every object identified by `pks` at once.
-
-    Takes a model + pks (rather than model instances) deliberately -- the
-    permission rows built below only ever need `pk`, `content_type`, and
-    identity ids, so callers shouldn't have to fetch full rows (with every
-    other field) just to hand them to this function.
-
-    Deliberately does not use guardian's queryset/list-aware assign_perm:
-    passing a list as the object routes to bulk_assign_perm, which skips
-    creating a direct permission row for anyone who already has the
-    permission via ANY group membership (it checks
-    ObjectPermissionChecker.has_perm, which is group-inheritance-aware) --
-    unlike the single-object assign_perm this replaces, which always
-    ensures a direct row via get_or_create regardless of group-derived
-    access. Losing that guarantee would mean a later revocation of the
-    group's grant silently strips access an admin explicitly asked to be
-    direct. Bulk-creating rows straight against the permission models
-    instead (see _apply_bulk_permission_entry) preserves the original
-    always-create-a-direct-row semantics while still batching every object
-    and every identity into one query per action, rather than one query per
-    (object, user) pair.
-    """
-    object_pks = [str(pk) for pk in pks]
-    if not object_pks:
-        return
-
-    model_name = model.__name__.lower()
-    ctype = ContentType.objects.get_for_model(model)
-
-    for action, entry in permissions.items():
-        codename = f"{action}_{model_name}"
-        implied_codenames = {codename}
-        if action == "change":
-            # change gives view too
-            implied_codenames.add(f"view_{model_name}")
-
-        # Resolved once per action (not once per users/groups branch) and
-        # shared between both below -- also where an unrecognized action
-        # name (see _resolve_permissions) is caught.
-        permission_objs = (
-            _resolve_permissions(implied_codenames, ctype)
-            if "users" in entry or "groups" in entry
-            else []
-        )
-
-        if "users" in entry:
-            _apply_bulk_permission_entry(
-                perm_model=UserObjectPermission,
-                identity_model=User,
-                identity_field="user",
-                ids=entry["users"],
-                codename=codename,
-                permission_objs=permission_objs,
-                ctype=ctype,
-                object_pks=object_pks,
-                merge=merge,
-            )
-
-        if "groups" in entry:
-            _apply_bulk_permission_entry(
-                perm_model=GroupObjectPermission,
-                identity_model=Group,
-                identity_field="group",
-                ids=entry["groups"],
-                codename=codename,
-                permission_objs=permission_objs,
-                ctype=ctype,
-                object_pks=object_pks,
-                merge=merge,
-            )
-
-
 def permitted_object_ids(
     user: User | None,
     model: type[Model],

src/documents/search/_fields.py

@@ -0,0 +1,42 @@
+from __future__ import annotations
+
+from whoosh_compat import FieldKind
+from whoosh_compat import FieldSpec
+from whoosh_compat import SubpathSpec
+
+# Internal-only schema fields with no query-syntax meaning of their own
+# (sort shadow fields, bigram CJK fields, simple_title/simple_content,
+# autocomplete_word, notes_text) are NOT represented here, they are
+# declared in _schema.py's field_descriptors().
+#
+# analyzer/pattern_normalizer are deliberately left at FieldSpec's default
+# (None): they're language-specific and only meaningful to whoosh-compat's
+# parser, so _registry.py attaches them per-language via dataclasses.replace()
+# rather than PUBLIC_FIELDS declaring them itself. _schema.py only reads
+# name/kind/fast and never sees the analyzer at all.
+PUBLIC_FIELDS: tuple[FieldSpec, ...] = (
+    FieldSpec("title", FieldKind.TEXT),
+    FieldSpec("content", FieldKind.TEXT),
+    FieldSpec("correspondent", FieldKind.TEXT),
+    FieldSpec("document_type", FieldKind.TEXT, aliases=("type",)),
+    FieldSpec("storage_path", FieldKind.TEXT, aliases=("path",)),
+    FieldSpec("original_filename", FieldKind.TEXT),
+    FieldSpec("tag", FieldKind.TEXT, comma_values=True),
+    FieldSpec("checksum", FieldKind.KEYWORD),
+    FieldSpec("asn", FieldKind.U64, fast=True),
+    FieldSpec("page_count", FieldKind.U64, fast=True),
+    FieldSpec("num_notes", FieldKind.U64, fast=True),
+    FieldSpec("created", FieldKind.DATE, date_only=True, fast=True),
+    FieldSpec("modified", FieldKind.DATETIME, fast=True),
+    FieldSpec("added", FieldKind.DATETIME, fast=True),
+    FieldSpec(
+        "notes",
+        FieldKind.JSON,
+        subpaths={"user": SubpathSpec(), "note": SubpathSpec(default=True)},
+    ),
+    FieldSpec(
+        "custom_fields",
+        FieldKind.JSON,
+        subpaths={"name": SubpathSpec(), "value": SubpathSpec(default=True)},
+    ),
+)

src/documents/search/_registry.py

@@ -0,0 +1,91 @@
+from __future__ import annotations
+
+import dataclasses
+from typing import TYPE_CHECKING
+
+from whoosh_compat import FieldKind
+from whoosh_compat import FieldRegistry
+
+from documents.search._fields import PUBLIC_FIELDS
+from documents.search._tokenizer import ascii_fold
+from documents.search._tokenizer import paperless_text_analyzer
+from documents.search._tokenizer import stem_pattern_text
+
+if TYPE_CHECKING:
+    from whoosh_compat import PatternNormalizer
+
+_registry_cache: dict[str | None, FieldRegistry] = {}
+
+
+def _identity_analyzer(text: str) -> list[str]:
+    """Analyzer for KEYWORD fields indexed with the raw tokenizer (no splitting)."""
+    return [text]
+
+
+def _fold_normalizer(text: str) -> str:
+    """Wildcard/regex literal-run normalizer for fields indexed without stemming."""
+    return ascii_fold(text.lower())
+
+
+def _make_pattern_normalizer(language: str | None) -> PatternNormalizer:
+    """Build the wildcard/regex literal-run normalizer for a search language."""
+
+    def _pattern_normalizer(text: str) -> tuple[str, ...]:
+        """Normalize a literal run into the forms a term may match.
+
+        TEXT index terms go through lowercase -> ascii_fold -> stem, so a
+        pattern that skips stemming can never match one: "invoice*" would look
+        for a term starting with "invoice" while the index holds "invoic". The
+        run is therefore offered stemmed as well. KEYWORD fields are indexed
+        raw and get _fold_normalizer instead, so their patterns stay literal.
+
+        Both forms are returned, as alternatives, because neither is a prefix
+        of the other in general: English stemming substitutes as well as
+        truncates ("copy" -> "copi"), so the stem alone loses the compounds
+        the typed run reaches ("copyright") while the typed run alone loses
+        the inflections the stem reaches ("copies"). whoosh-compat ORs the
+        alternatives per literal run and deduplicates them, so a run the
+        stemmer leaves alone costs exactly the one branch it did before.
+
+        Inside a bracket class the emitter calls this once per character and
+        uses the answer only if it is a single one-character form; two forms
+        there leave the character as typed. A stemmer does not change a lone
+        character, so the two forms deduplicate to one and the class body is
+        folded as before.
+        """
+        folded = ascii_fold(text.lower())
+        stemmed = stem_pattern_text(folded, language)
+        return (folded, stemmed)
+
+    return _pattern_normalizer
+
+
+def get_field_registry(language: str | None) -> FieldRegistry:
+    """Build (or return the cached) FieldRegistry for the given search language.
+
+    Cached keyed by language, rebuilt on the same trigger register_tokenizers()
+    uses (settings.SEARCH_LANGUAGE change). A fresh call with a new language
+    builds and caches a new registry rather than mutating the old one.
+    """
+    if language in _registry_cache:
+        return _registry_cache[language]
+
+    text_analyzer = paperless_text_analyzer(language).analyze
+    pattern_normalizer = _make_pattern_normalizer(language)
+
+    specs = [
+        dataclasses.replace(
+            field,
+            analyzer=_identity_analyzer
+            if field.kind is FieldKind.KEYWORD
+            else text_analyzer,
+            pattern_normalizer=_fold_normalizer
+            if field.kind is FieldKind.KEYWORD
+            else pattern_normalizer,
+        )
+        for field in PUBLIC_FIELDS
+    ]
+
+    registry = FieldRegistry(specs)
+    _registry_cache[language] = registry
+    return registry

src/documents/search/_schema.py

@@ -1,14 +1,19 @@
 from __future__ import annotations
 
+import hashlib
 import json
 import logging
 import shutil
 from typing import TYPE_CHECKING
 from typing import Final
+from typing import NamedTuple
 from typing import cast
 
 import tantivy
 from django.conf import settings
+from whoosh_compat import FieldKind
+
+from documents.search._fields import PUBLIC_FIELDS
 
 if TYPE_CHECKING:
     from pathlib import Path
@@ -16,7 +21,185 @@ if TYPE_CHECKING:
 logger = logging.getLogger("paperless.search")
 
 # v1 - Initial tantivy schema format
-SCHEMA_VERSION: Final[int] = 1
+# v2 - build_schema() derived from PUBLIC_FIELDS, changing the field declaration
+#      order, and the write-only correspondent/document_type/storage_path/tag id
+#      columns dropped. tantivy compares schemas by ordered field list, so an
+#      index built by v1 rejects every write against the v2 schema.
+SCHEMA_VERSION: Final[int] = 2
+
+
+class FieldDescriptor(NamedTuple):
+    """One tantivy field, in declaration order.
+
+    The descriptor vocabulary is paperless', not tantivy-py's: it is both the
+    input to the SchemaBuilder and the input to schema_fingerprint(), so the
+    persisted fingerprint cannot move under a tantivy-py upgrade.
+    """
+
+    name: str
+    kind: str
+    stored: bool
+    indexed: bool
+    fast: bool
+    tokenizer: str | None
+
+
+# (schema kind, tokenizer) for the FieldKind -> FieldDescriptor mapping that
+# doesn't need special-casing. JSON is handled separately below since it can
+# emit a second, synthetic descriptor.
+_KIND_TABLE: Final[dict[FieldKind, tuple[str, str | None]]] = {
+    FieldKind.TEXT: ("text", "paperless_text"),
+    FieldKind.KEYWORD: ("text", "raw"),
+    FieldKind.U64: ("u64", None),
+    FieldKind.DATE: ("date", None),
+    FieldKind.DATETIME: ("date", None),
+}
+# Kinds whose fast-field flag follows FieldSpec.fast rather than always False.
+_FAST_FROM_FIELD: Final[frozenset[FieldKind]] = frozenset(
+    {FieldKind.U64, FieldKind.DATE, FieldKind.DATETIME},
+)
+
+
+def _public_field_descriptors() -> list[FieldDescriptor]:
+    """Descriptors for the query-visible fields declared in PUBLIC_FIELDS."""
+    descriptors: list[FieldDescriptor] = []
+    for field in PUBLIC_FIELDS:
+        if field.kind is FieldKind.JSON:
+            descriptors.append(
+                FieldDescriptor(
+                    field.name,
+                    "json",
+                    stored=True,
+                    indexed=True,
+                    fast=False,
+                    tokenizer="paperless_text",
+                ),
+            )
+            if field.name == "notes":
+                # Plain-text companion for snippet generation: tantivy's
+                # SnippetGenerator does not support JSON fields. Schema-only,
+                # no query-syntax meaning, not in PUBLIC_FIELDS.
+                descriptors.append(
+                    FieldDescriptor(
+                        "notes_text",
+                        "text",
+                        stored=True,
+                        indexed=True,
+                        fast=False,
+                        tokenizer="paperless_text",
+                    ),
+                )
+            continue
+        schema_kind, tokenizer = _KIND_TABLE[field.kind]
+        descriptors.append(
+            FieldDescriptor(
+                field.name,
+                schema_kind,
+                stored=True,
+                indexed=True,
+                fast=field.fast if field.kind in _FAST_FROM_FIELD else False,
+                tokenizer=tokenizer,
+            ),
+        )
+    return descriptors
+
+
+def field_descriptors() -> list[FieldDescriptor]:
+    """Every field of the document index, in the order tantivy declares them.
+
+    tantivy compares schemas by *ordered* field list, so the order here is
+    part of the on-disk contract: schema_fingerprint() hashes it and
+    needs_rebuild() acts on the result.
+    """
+    return [
+        FieldDescriptor(
+            "id",
+            "u64",
+            stored=True,
+            indexed=True,
+            fast=True,
+            tokenizer=None,
+        ),
+        *_public_field_descriptors(),
+        # Shadow sort fields - fast, not stored
+        *(
+            FieldDescriptor(
+                name,
+                "text",
+                stored=False,
+                indexed=True,
+                fast=True,
+                tokenizer="simple_analyzer",
+            )
+            for name in ("title_sort", "correspondent_sort", "type_sort")
+        ),
+        # CJK support - not stored, indexed only
+        *(
+            FieldDescriptor(
+                name,
+                "text",
+                stored=False,
+                indexed=True,
+                fast=False,
+                tokenizer="bigram_analyzer",
+            )
+            for name in (
+                "bigram_content",
+                "bigram_title",
+                "bigram_correspondent",
+                "bigram_document_type",
+                "bigram_tag",
+            )
+        ),
+        # Simple substring search support for title/content - not stored,
+        # indexed only
+        *(
+            FieldDescriptor(
+                name,
+                "text",
+                stored=False,
+                indexed=True,
+                fast=False,
+                tokenizer="simple_search_analyzer",
+            )
+            for name in ("simple_title", "simple_content")
+        ),
+        # Autocomplete prefix scan via terms_with_prefix, which walks the
+        # field's term dictionary - so the field must be indexed (term dict),
+        # not stored. The stored value is never read back, so storing it only
+        # wastes space.
+        FieldDescriptor(
+            "autocomplete_word",
+            "text",
+            stored=False,
+            indexed=True,
+            fast=False,
+            tokenizer="raw",
+        ),
+        # Permission filter columns, read by build_permission_filter.
+        *(
+            FieldDescriptor(
+                name,
+                "u64",
+                stored=False,
+                indexed=True,
+                fast=True,
+                tokenizer=None,
+            )
+            for name in ("owner_id", "viewer_id", "viewer_group_id")
+        ),
+    ]
+
+
+def schema_fingerprint() -> str:
+    """Hash of the field descriptors, stamped into .index_settings.json.
+
+    Changes whenever a field is added, removed, retyped, re-optioned or
+    reordered, so an index built from a different schema shape is detected
+    even when SCHEMA_VERSION was not bumped.
+    """
+    payload = json.dumps([list(descriptor) for descriptor in field_descriptors()])
+    return hashlib.blake2b(payload.encode()).hexdigest()
 
 
 def build_schema() -> tantivy.Schema:
@@ -32,85 +215,37 @@ def build_schema() -> tantivy.Schema:
     """
     sb = tantivy.SchemaBuilder()
 
-    sb.add_unsigned_field("id", stored=True, indexed=True, fast=True)
-    sb.add_text_field("checksum", stored=True, tokenizer_name="raw")
-
-    for field in (
-        "title",
-        "correspondent",
-        "document_type",
-        "storage_path",
-        "original_filename",
-        "content",
-    ):
-        sb.add_text_field(field, stored=True, tokenizer_name="paperless_text")
-
-    # Shadow sort fields - fast, not stored/indexed
-    for field in ("title_sort", "correspondent_sort", "type_sort"):
-        sb.add_text_field(
-            field,
-            stored=False,
-            tokenizer_name="simple_analyzer",
-            fast=True,
-        )
-
-    # CJK support - not stored, indexed only
-    sb.add_text_field("bigram_content", stored=False, tokenizer_name="bigram_analyzer")
-    sb.add_text_field("bigram_title", stored=False, tokenizer_name="bigram_analyzer")
-    sb.add_text_field(
-        "bigram_correspondent",
-        stored=False,
-        tokenizer_name="bigram_analyzer",
-    )
-    sb.add_text_field(
-        "bigram_document_type",
-        stored=False,
-        tokenizer_name="bigram_analyzer",
-    )
-    sb.add_text_field("bigram_tag", stored=False, tokenizer_name="bigram_analyzer")
-
-    # Simple substring search support for title/content - not stored, indexed only
-    sb.add_text_field(
-        "simple_title",
-        stored=False,
-        tokenizer_name="simple_search_analyzer",
-    )
-    sb.add_text_field(
-        "simple_content",
-        stored=False,
-        tokenizer_name="simple_search_analyzer",
-    )
-
-    # Autocomplete prefix scan via terms_with_prefix, which walks the field's
-    # term dictionary - so the field must be indexed (term dict), not stored.
-    # The stored value is never read back, so storing it only wastes space.
-    sb.add_text_field("autocomplete_word", stored=False, tokenizer_name="raw")
-
-    sb.add_text_field("tag", stored=True, tokenizer_name="paperless_text")
-
-    # JSON fields — structured queries: notes.user:alice, custom_fields.name:invoice
-    sb.add_json_field("notes", stored=True, tokenizer_name="paperless_text")
-    # Plain-text companion for notes — tantivy's SnippetGenerator does not support
-    # JSON fields, so highlights require a text field with the same content.
-    sb.add_text_field("notes_text", stored=True, tokenizer_name="paperless_text")
-    sb.add_json_field("custom_fields", stored=True, tokenizer_name="paperless_text")
-
-    for field in (
-        "correspondent_id",
-        "document_type_id",
-        "storage_path_id",
-        "tag_id",
-        "owner_id",
-        "viewer_id",
-        "viewer_group_id",
-    ):
-        sb.add_unsigned_field(field, stored=False, indexed=True, fast=True)
-
-    for field in ("created", "modified", "added"):
-        sb.add_date_field(field, stored=True, indexed=True, fast=True)
-
-    for field in ("asn", "page_count", "num_notes"):
-        sb.add_unsigned_field(field, stored=True, indexed=True, fast=True)
+    for descriptor in field_descriptors():
+        if descriptor.kind == "text":
+            sb.add_text_field(
+                descriptor.name,
+                stored=descriptor.stored,
+                fast=descriptor.fast,
+                tokenizer_name=cast("str", descriptor.tokenizer),
+            )
+        elif descriptor.kind == "json":
+            sb.add_json_field(
+                descriptor.name,
+                stored=descriptor.stored,
+                fast=descriptor.fast,
+                tokenizer_name=cast("str", descriptor.tokenizer),
+            )
+        elif descriptor.kind == "u64":
+            sb.add_unsigned_field(
+                descriptor.name,
+                stored=descriptor.stored,
+                indexed=descriptor.indexed,
+                fast=descriptor.fast,
+            )
+        elif descriptor.kind == "date":
+            sb.add_date_field(
+                descriptor.name,
+                stored=descriptor.stored,
+                indexed=descriptor.indexed,
+                fast=descriptor.fast,
+            )
+        else:
+            raise ValueError(f"Unknown schema field kind: {descriptor.kind}")
 
     return sb.build()
 
@@ -119,9 +254,9 @@ def needs_rebuild(index_dir: Path) -> bool:
     """
     Check if the search index needs rebuilding.
 
-    Reads .index_settings.json to compare the stored schema version and
-    search language against the current configuration. Returns True if the
-    file is missing, unparsable, or either value mismatches.
+    Reads .index_settings.json to compare the stored schema version, search
+    language and schema fingerprint against the current configuration. Returns
+    True if the file is missing, unparsable, or any value mismatches.
 
     Args:
         index_dir: Path to the search index directory
@@ -140,6 +275,9 @@ def needs_rebuild(index_dir: Path) -> bool:
         if "language" not in data or data["language"] != settings.SEARCH_LANGUAGE:
             logger.info("Search index language changed - rebuilding.")
             return True
+        if data.get("schema_fingerprint") != schema_fingerprint():
+            logger.info("Search index schema fingerprint mismatch - rebuilding.")
+            return True
     except ValueError:
         return True
     return False
@@ -170,6 +308,7 @@ def _write_sentinels(index_dir: Path) -> None:
             {
                 "schema_version": SCHEMA_VERSION,
                 "language": settings.SEARCH_LANGUAGE,
+                "schema_fingerprint": schema_fingerprint(),
             },
         ),
     )

src/documents/search/_tokenizer.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import logging
+from functools import cache
 from typing import Final
 
 import tantivy
@@ -71,7 +72,7 @@ def register_tokenizers(index: tantivy.Index, language: str | None) -> None:
         use fast=True and Tantivy requires fast-field tokenizers to exist
         even for documents that omit those fields.
     """
-    index.register_tokenizer("paperless_text", _paperless_text(language))
+    index.register_tokenizer("paperless_text", paperless_text_analyzer(language))
     index.register_tokenizer("simple_analyzer", _simple_analyzer())
     index.register_tokenizer("bigram_analyzer", _bigram_analyzer())
     index.register_tokenizer("simple_search_analyzer", _simple_search_analyzer())
@@ -79,7 +80,7 @@ def register_tokenizers(index: tantivy.Index, language: str | None) -> None:
     index.register_fast_field_tokenizer("simple_analyzer", _simple_analyzer())
 
 
-def _paperless_text(language: str | None) -> tantivy.TextAnalyzer:
+def paperless_text_analyzer(language: str | None) -> tantivy.TextAnalyzer:
     """Main full-text tokenizer for content, title, etc: simple -> remove_long(129) -> lowercase -> ascii_fold [-> stemmer]"""
     builder = (
         tantivy.TextAnalyzerBuilder(tantivy.Tokenizer.simple())
@@ -100,6 +101,54 @@ def _paperless_text(language: str | None) -> tantivy.TextAnalyzer:
     return builder.build()
 
 
+@cache
+def _pattern_stemmer(language: str | None) -> tantivy.TextAnalyzer | None:
+    """The stemming tail of paperless_text_analyzer, over a whole literal run.
+
+    Same language gate and same Snowball stemmer paperless_text_analyzer
+    applies at index time, so query patterns follow SEARCH_LANGUAGE. Returns
+    None when that gate disables stemming; paperless_text_analyzer already
+    warns about an unsupported language, so this stays quiet.
+
+    The raw tokenizer keeps the run whole (a wildcard literal is a fragment,
+    not necessarily a word), and remove_long is kept so an over-long run is
+    treated the same way the index treats it.
+    """
+    if not language:
+        return None
+    tantivy_lang = _LANGUAGE_MAP.get(language.lower())
+    if tantivy_lang is None:
+        return None
+    return (
+        tantivy.TextAnalyzerBuilder(tantivy.Tokenizer.raw())
+        .filter(tantivy.Filter.remove_long(_TOKEN_REMOVE_LONG_LIMIT))
+        .filter(tantivy.Filter.stemmer(tantivy_lang))
+        .build()
+    )
+
+
+def stem_pattern_text(text: str, language: str | None) -> str:
+    """Stem an already lowercased/ascii-folded run the way index terms are.
+
+    Returns text unchanged when stemming is disabled for language, and also
+    when the stem step does not yield exactly one token: remove_long drops a run
+    past the length limit, leaving no stem to substitute. Falling back to the
+    text as typed is the safe direction for a pattern prefix, since it can only
+    be as narrow as it was before stemming was considered.
+
+    The raw tokenizer emits one token whatever the input and the stemmer is
+    1-to-1, so only the zero-token case can fire today; the guard covers both
+    counts so a tokenizer change cannot turn this into an IndexError.
+    """
+    analyzer = _pattern_stemmer(language)
+    if analyzer is None:
+        return text
+    tokens = analyzer.analyze(text)
+    if len(tokens) != 1:
+        return text
+    return tokens[0]
+
+
 def _simple_analyzer() -> tantivy.TextAnalyzer:
     """Tokenizer for shadow sort fields (title_sort, correspondent_sort, type_sort): simple -> lowercase -> ascii_fold."""
     return (

src/documents/serialisers.py

@@ -1,10 +1,8 @@
 from __future__ import annotations
 
-import contextlib
 import logging
 import math
 import re
-from collections.abc import Iterable
 from datetime import datetime
 from datetime import timedelta
 from decimal import Decimal
@@ -26,7 +24,6 @@ from django.core.validators import MaxValueValidator
 from django.core.validators import MinValueValidator
 from django.core.validators import RegexValidator
 from django.core.validators import integer_validator
-from django.db import DataError
 from django.db.models import Count
 from django.db.models import Q
 from django.db.models.functions import Lower
@@ -40,12 +37,12 @@ from django.utils.timezone import make_aware
 from django.utils.translation import gettext as _
 from drf_spectacular.utils import extend_schema_field
 from drf_spectacular.utils import extend_schema_serializer
+from drf_writable_nested.serializers import NestedUpdateMixin
 from guardian.core import ObjectPermissionChecker
 from guardian.shortcuts import get_users_with_perms
 from guardian.utils import get_group_obj_perms_model
 from guardian.utils import get_user_obj_perms_model
 from rest_framework import fields
-from rest_framework import relations
 from rest_framework import serializers
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.fields import SerializerMethodField
@@ -745,100 +742,22 @@ class TagSerializer(MatchingModelSerializer, OwnedObjectSerializer):
         return super().validate(attrs)
 
 
-class _BatchingManyRelatedField(serializers.ManyRelatedField):
-    """
-    `ManyRelatedField.to_internal_value` resolves each id in the submitted
-    list with its own `child_relation.to_internal_value()` call -- one query
-    per item on every PATCH/PUT that sets a `many=True` relation field.
-    Batch-resolve them instead, falling back to the child relation's normal
-    (query-per-item) validation for anything that isn't a plausible int pk,
-    so bad input still gets the usual DRF validation error rather than being
-    silently dropped.
-    """
-
-    @staticmethod
-    def _normalize_pk(item) -> int | None:
-        # Excludes bool: DRF's own PrimaryKeyRelatedField rejects it too
-        # (True == 1 would otherwise silently match pk 1).
-        if isinstance(item, bool):
-            return None
-        try:
-            return int(item)
-        except (TypeError, ValueError):
-            return None
-
-    def to_internal_value(self, data):
-        if isinstance(data, str) or not hasattr(data, "__iter__"):
-            self.fail("not_a_list", input_type=type(data).__name__)
-        if not self.allow_empty and len(data) == 0:
-            self.fail("empty")
-
-        item_pks = [(item, self._normalize_pk(item)) for item in data]
-        candidate_pks = {pk for _, pk in item_pks if pk is not None}
-
-        # Django's IntegerFieldOverflow guard (-> EmptyResultSet, i.e. no
-        # match) only covers exact/gt/gte/lt/lte lookups, not `in` -- an
-        # out-of-range int in `pk__in=` reaches the DB driver as-is and
-        # raises OverflowError (SQLite) / DataError (Postgres) instead of
-        # cleanly matching nothing. The per-item `exact`-lookup fallback
-        # below IS covered, so on that failure just skip the batch and let
-        # every item resolve individually -- each still costs one query,
-        # but reports the normal validation error instead of a raw 500.
-        try:
-            resolved_by_pk = {
-                obj.pk: obj
-                for obj in self.child_relation.get_queryset().filter(
-                    pk__in=candidate_pks,
-                )
-            }
-        except (OverflowError, DataError):
-            resolved_by_pk = {}
-
-        result = []
-        for item, pk in item_pks:
-            obj = resolved_by_pk.get(pk) if pk is not None else None
-            result.append(
-                obj if obj is not None else self.child_relation.to_internal_value(item),
-            )
-        return result
-
-
-class BatchResolvingPrimaryKeyRelatedField(serializers.PrimaryKeyRelatedField):
-    """
-    A PrimaryKeyRelatedField whose `many=True` form (a DRF ManyRelatedField)
-    resolves all submitted ids with one batched query instead of one query
-    per id. Subclasses only need to implement `get_queryset()` as usual --
-    only `TagsField` is used with `many=True` today, but this is the base
-    for all four so the fix isn't tag-specific: if a future PR puts
-    `many=True` on correspondent/document_type/storage_path, it inherits the
-    same batching instead of reintroducing this as a new bug to rediscover.
-    """
-
-    @classmethod
-    def many_init(cls, *args, **kwargs):
-        list_kwargs = {"child_relation": cls(*args, **kwargs)}
-        for key, value in kwargs.items():
-            if key in relations.MANY_RELATION_KWARGS:
-                list_kwargs[key] = value
-        return _BatchingManyRelatedField(**list_kwargs)
-
-
-class CorrespondentField(BatchResolvingPrimaryKeyRelatedField[Correspondent]):
+class CorrespondentField(serializers.PrimaryKeyRelatedField[Correspondent]):
     def get_queryset(self):
         return Correspondent.objects.all()
 
 
-class TagsField(BatchResolvingPrimaryKeyRelatedField[Tag]):
+class TagsField(serializers.PrimaryKeyRelatedField[Tag]):
     def get_queryset(self):
         return Tag.objects.all()
 
 
-class DocumentTypeField(BatchResolvingPrimaryKeyRelatedField[DocumentType]):
+class DocumentTypeField(serializers.PrimaryKeyRelatedField[DocumentType]):
     def get_queryset(self):
         return DocumentType.objects.all()
 
 
-class StoragePathField(BatchResolvingPrimaryKeyRelatedField[StoragePath]):
+class StoragePathField(serializers.PrimaryKeyRelatedField[StoragePath]):
     def get_queryset(self):
         return StoragePath.objects.all()
 
@@ -957,106 +876,8 @@ def validate_documentlink_targets(user, doc_ids):
         )
 
 
-# A CustomField lookup cache scoped to a single field/serializer instance
-# only helps within that one instance's own validation pass. Several call
-# sites, though, build more than one CustomFieldInstanceSerializer (or its
-# CustomFieldInstanceListSerializer/field) for the same request and pass
-# each of them `context=self.context` -- the *same* dict object, not a
-# copy -- e.g. bulk-edit's _validate_custom_field_values() constructing a
-# fresh CustomFieldInstanceSerializer per submitted field. That context
-# dict is already request-scoped (DRF builds it fresh per request via
-# get_serializer_context()), so stashing the resolved CustomField objects
-# there -- rather than in some new global/thread-local cache -- lets every
-# one of those separately-instantiated serializers reuse them for free
-# while staying entirely within DRF's existing, already-request-scoped
-# machinery.
-_CUSTOM_FIELD_CONTEXT_CACHE_KEY = "_custom_field_lookup_cache"
-
-
-class _CachingCustomFieldPrimaryKeyField(serializers.PrimaryKeyRelatedField):
-    """
-    Resolves CustomField ids with as few queries as possible: a per-instance
-    cache for repeat lookups on this exact field instance, backed by a
-    shared cache on the serializer context (see _CUSTOM_FIELD_CONTEXT_CACHE_KEY
-    above) so later, separately-instantiated fields for the same request
-    reuse what was already resolved instead of re-querying.
-    """
-
-    def __init__(self, **kwargs: Any) -> None:
-        super().__init__(**kwargs)
-        self._cache: dict[int, CustomField] = {}
-
-    def _shared_cache(self) -> dict[int, CustomField]:
-        return self.context.setdefault(_CUSTOM_FIELD_CONTEXT_CACHE_KEY, {})
-
-    @staticmethod
-    def _normalize_pk(data: Any) -> int | None:
-        """
-        Returns `data` coerced to the int a valid CustomField pk would be,
-        or None if `data` isn't a plausible pk (wrong type, unhashable,
-        non-numeric, or a bool -- DRF itself rejects bools as pks since
-        `True == 1` would otherwise silently match). None tells callers to
-        leave `data` alone and let `super().to_internal_value()` report the
-        normal validation error instead of touching the cache/queryset with
-        it directly.
-        """
-        if isinstance(data, bool):
-            return None
-        try:
-            return int(data)
-        except (TypeError, ValueError):
-            return None
-
-    def prefetch(self, ids: Iterable[Any]) -> None:
-        shared_cache = self._shared_cache()
-        candidates = {pk for i in ids if (pk := self._normalize_pk(i)) is not None}
-        missing = {
-            i for i in candidates if i not in self._cache and i not in shared_cache
-        }
-        if missing:
-            for obj in self.get_queryset().filter(pk__in=missing):
-                shared_cache[obj.pk] = obj
-        for i in candidates:
-            obj = shared_cache.get(i)
-            if obj is not None:
-                self._cache[i] = obj
-
-    def to_internal_value(self, data: Any) -> CustomField:
-        pk = self._normalize_pk(data)
-        if pk is None:
-            return super().to_internal_value(data)
-        if pk in self._cache:
-            return self._cache[pk]
-        shared_cache = self._shared_cache()
-        if pk in shared_cache:
-            obj = shared_cache[pk]
-            self._cache[pk] = obj
-            return obj
-        obj: CustomField = super().to_internal_value(data)
-        self._cache[obj.pk] = obj
-        shared_cache[obj.pk] = obj
-        return obj
-
-
-class CustomFieldInstanceListSerializer(serializers.ListSerializer):
-    def to_internal_value(self, data: Any) -> list[Any]:
-        if isinstance(data, list):
-            field_ids = []
-            for item in data:
-                if not isinstance(item, dict) or "field" not in item:
-                    continue
-                try:
-                    hash(item["field"])
-                except TypeError:
-                    continue
-                field_ids.append(item["field"])
-            if field_ids:
-                self.child.fields["field"].prefetch(field_ids)
-        return super().to_internal_value(data)
-
-
 class CustomFieldInstanceSerializer(serializers.ModelSerializer[CustomFieldInstance]):
-    field = _CachingCustomFieldPrimaryKeyField(queryset=CustomField.objects.all())
+    field = serializers.PrimaryKeyRelatedField(queryset=CustomField.objects.all())
     value = ReadWriteSerializerMethodField(allow_null=True)
 
     def create(self, validated_data):
@@ -1157,7 +978,6 @@ class CustomFieldInstanceSerializer(serializers.ModelSerializer[CustomFieldInsta
 
     class Meta:
         model = CustomFieldInstance
-        list_serializer_class = CustomFieldInstanceListSerializer
         fields = [
             "value",
             "field",
@@ -1223,6 +1043,7 @@ class DocumentVersionInfoSerializer(serializers.Serializer[_DocumentVersionInfo]
 )
 class DocumentSerializer(
     OwnedObjectSerializer,
+    NestedUpdateMixin,
     DocumentUpdateFieldsModelSerializer,
 ):
     correspondent = CorrespondentField(allow_null=True)
@@ -1437,60 +1258,16 @@ class DocumentSerializer(
                     if tag not in inbox_tags_not_being_added
                 ]
 
-        custom_fields_data = validated_data.pop("custom_fields", None)
-
-        actor_context = (
-            set_actor(self.user)
-            if settings.AUDIT_LOG_ENABLED
-            else contextlib.nullcontext()
-        )
-        with actor_context:
+        if settings.AUDIT_LOG_ENABLED:
+            with set_actor(self.user):
+                super().update(instance, validated_data)
+        else:
             super().update(instance, validated_data)
-            if custom_fields_data is not None:
-                self._sync_custom_fields(instance, custom_fields_data)
 
+        # hard delete custom field instances that were soft deleted
+        CustomFieldInstance.deleted_objects.filter(document=instance).delete()
         return instance
 
-    def _sync_custom_fields(
-        self,
-        instance: Document,
-        custom_fields_data: list[dict],
-    ) -> None:
-        """
-        Create/update a CustomFieldInstance for every (field, value) pair in
-        custom_fields_data, then hard-delete any of the document's existing
-        instances whose field wasn't included.
-
-        Replaces drf-writable-nested's generic
-        update_or_create_reverse_relations()/delete_reverse_relations_if_need():
-        that machinery always matched submitted items by an instance "id"
-        this client payload never sends, so its own pk-matching never did
-        anything for this field -- the real upsert semantics were always
-        CustomFieldInstanceSerializer.create()'s update_or_create() below.
-
-        On a partial (PATCH) update, DRF skips the "value" field's required
-        check on the first validation pass because it's absent entirely from
-        the payload item, not merely null. drf-writable-nested happened to
-        re-enforce that check itself, by re-validating each item against a
-        freshly built, non-partial child serializer before saving. Reproduce
-        that specific guarantee explicitly here, since CustomFieldInstance's
-        "value" is not optional.
-        """
-        for item in custom_fields_data:
-            if "value" not in item:
-                raise serializers.ValidationError(
-                    {"custom_fields": [{"value": ["This field is required."]}]},
-                )
-
-        kept_field_ids: set[int] = set()
-        serializer = CustomFieldInstanceSerializer()
-        for item in custom_fields_data:
-            kept_field_ids.add(item["field"].pk)
-            serializer.create({**item, "document": instance})
-        CustomFieldInstance.objects.filter(document=instance).exclude(
-            field_id__in=kept_field_ids,
-        ).hard_delete()
-
     def __init__(self, *args, **kwargs) -> None:
         self.truncate_content = kwargs.pop("truncate_content", False)
 
@@ -2018,7 +1795,7 @@ class DeleteDocumentsSerializer(DocumentSelectionSerializer):
 
 
 class ReprocessDocumentsSerializer(DocumentSelectionSerializer):
-    remote_ocr = serializers.BooleanField(required=False, default=False)
+    pass
 
 
 class BulkEditSerializer(
@@ -2360,13 +2137,6 @@ class BulkEditSerializer(
                         f"Page {op['page']} is out of bounds for document with {doc.page_count} pages.",
                     )
 
-    def _validate_parameters_reprocess(self, parameters) -> None:
-        if "remote_ocr" in parameters:
-            if not isinstance(parameters["remote_ocr"], bool):
-                raise serializers.ValidationError("remote_ocr must be a boolean")
-        else:
-            parameters["remote_ocr"] = False
-
     def validate_parameters_remove_password(self, parameters):
         if "password" not in parameters:
             raise serializers.ValidationError("password not specified")
@@ -2431,8 +2201,6 @@ class BulkEditSerializer(
             self._validate_parameters_edit_pdf(parameters, attrs["documents"][0])
         elif method == bulk_edit.remove_password:
             self.validate_parameters_remove_password(parameters)
-        elif method == bulk_edit.reprocess:
-            self._validate_parameters_reprocess(parameters)
 
         return attrs
 
@@ -3535,41 +3303,6 @@ class WorkflowSerializer(serializers.ModelSerializer[Workflow]):
             "actions",
         ]
 
-    def validate(self, attrs):
-        attrs = super().validate(attrs)
-
-        if "actions" in attrs:
-            has_remote_ocr_action = any(
-                action.get("type") == WorkflowAction.WorkflowActionType.REMOTE_OCR
-                for action in attrs["actions"]
-            )
-        else:
-            has_remote_ocr_action = self.instance is not None and (
-                self.instance.actions.filter(
-                    type=WorkflowAction.WorkflowActionType.REMOTE_OCR,
-                ).exists()
-            )
-
-        if "triggers" in attrs:
-            has_consumption_trigger = any(
-                trigger.get("type") == WorkflowTrigger.WorkflowTriggerType.CONSUMPTION
-                for trigger in attrs["triggers"]
-            )
-        else:
-            has_consumption_trigger = self.instance is not None and (
-                self.instance.triggers.filter(
-                    type=WorkflowTrigger.WorkflowTriggerType.CONSUMPTION,
-                ).exists()
-            )
-
-        # Remote OCR can only work with consumption triggers
-        if has_remote_ocr_action and not has_consumption_trigger:
-            raise serializers.ValidationError(
-                "Remote OCR actions require a consumption started trigger",
-            )
-
-        return attrs
-
     def update_triggers_and_actions(
         self,
         instance: Workflow,

src/documents/signals/handlers.py

@@ -973,17 +973,6 @@ def run_workflows(
                     )
                 elif action.type == WorkflowAction.WorkflowActionType.MOVE_TO_TRASH:
                     has_move_to_trash_action = True
-                elif action.type == WorkflowAction.WorkflowActionType.REMOTE_OCR:
-                    if use_overrides and overrides:
-                        overrides.remote_ocr = True
-                    else:
-                        # If a workflow has a consumption trigger *and* another type,
-                        # the document has already been parsed by the time the other one fires
-                        logger.debug(
-                            "Remote OCR action only applies to consumption "
-                            "triggers, ignoring",
-                            extra={"group": logging_group},
-                        )
 
             if not use_overrides:
                 # limit title to 128 characters

src/documents/tasks.py

@@ -67,7 +67,6 @@ from documents.utils import identity
 from documents.versioning import annotate_effective_content
 from documents.workflows.utils import get_workflows_for_trigger
 from paperless.config import AIConfig
-from paperless.config import RemoteOCRConfig
 from paperless.logging import consume_task_id
 from paperless.parsers import ParserContext
 from paperless.parsers.registry import get_parser_registry
@@ -339,17 +338,10 @@ def bulk_update_documents(document_ids) -> None:
 
 
 @shared_task
-def update_document_content_maybe_archive_file(
-    document_id,
-    *,
-    remote_ocr: bool = False,
-) -> None:
+def update_document_content_maybe_archive_file(document_id) -> None:
     """
     Re-creates OCR content and thumbnail for a document, and archive file if
     it exists.
-
-    Remote OCR is used only when the engine is configured to handle everything
-    or if explicitly asked for via ``remote_ocr``.
     """
     document = Document.objects.get(id=document_id)
 
@@ -359,7 +351,6 @@ def update_document_content_maybe_archive_file(
         mime_type,
         document.original_filename or "",
         document.source_path,
-        allow_remote=remote_ocr or RemoteOCRConfig().remote_ocr_by_default,
     )
 
     if not parser_class:

src/documents/tests/search/test_fields.py

@@ -0,0 +1,10 @@
+from whoosh_compat import FieldKind
+
+from documents.search._fields import PUBLIC_FIELDS
+
+
+class TestPublicFields:
+    def test_json_fields_have_subpaths(self) -> None:
+        for field in PUBLIC_FIELDS:
+            if field.kind is FieldKind.JSON:
+                assert field.subpaths, f"{field.name} is JSON but has no subpaths"

src/documents/tests/search/test_json_subpath_completeness.py

@@ -0,0 +1,83 @@
+"""Every declared JSON subpath must actually be written to the index.
+
+PUBLIC_FIELDS declares each JSON field's subpaths (e.g. ``notes`` ->
+{"user", "note"}), but nothing coupled that declaration to what
+``_backend.py``'s document builder actually writes into the JSON blob at
+index time. A subpath declared but never written would be
+queryable-but-always-empty -- syntactically valid, silently matching
+nothing -- with no test failure anywhere.
+
+This indexes one real document carrying values for every JSON field
+(a Note, a CustomFieldInstance) and inspects the document's own stored
+JSON payload, rather than running field-specific queries: that way a
+future JSON field's subpaths are covered automatically, without a new
+per-subpath query having to be added by hand each time.
+"""
+
+from __future__ import annotations
+
+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
+from documents.models import CustomFieldInstance
+from documents.models import Document
+from documents.models import Note
+from documents.search._fields import PUBLIC_FIELDS
+
+if TYPE_CHECKING:
+    from documents.search._backend import TantivyBackend
+
+pytestmark = [pytest.mark.search, pytest.mark.django_db]
+
+
+class TestJsonSubpathsAreWrittenAtIndexTime:
+    def test_every_declared_json_subpath_appears_in_the_stored_document(
+        self,
+        backend: TantivyBackend,
+    ) -> None:
+        user = User.objects.create_user(username="completeness-user")
+        field = CustomField.objects.create(
+            name="Completeness Field",
+            data_type=CustomField.FieldDataType.STRING,
+        )
+        doc = Document.objects.create(
+            title="Completeness doc",
+            content="x",
+            checksum="json-subpath-completeness",
+        )
+        Note.objects.create(document=doc, user=user, note="a note")
+        CustomFieldInstance.objects.create(
+            document=doc,
+            field=field,
+            value_text="a value",
+        )
+        backend.add_or_update(doc)
+
+        index = backend._index
+        searcher = index.searcher()
+        hits = searcher.search(
+            tantivy.Query.term_query(index.schema, "id", doc.pk),
+            limit=1,
+        ).hits
+        assert hits, "the document was not indexed"
+        stored = searcher.doc(hits[0][1]).to_dict()
+
+        json_fields = [f for f in PUBLIC_FIELDS if f.kind is FieldKind.JSON]
+        assert json_fields, "no JSON fields declared - fixture is stale"
+        for field_spec in json_fields:
+            stored_values = stored.get(field_spec.name)
+            assert stored_values, (
+                f"{field_spec.name} was not written to the index at all"
+            )
+            written_keys = stored_values[0].keys()
+            for subpath in field_spec.subpaths:
+                assert subpath in written_keys, (
+                    f"{field_spec.name}.{subpath} is declared in PUBLIC_FIELDS "
+                    "but _backend.py's document builder never writes it - it "
+                    "would be queryable but always empty"
+                )

src/documents/tests/search/test_keyword_pattern_literal.py

@@ -0,0 +1,60 @@
+"""Wildcard patterns on KEYWORD fields must stay literal.
+
+``checksum`` is the only KEYWORD field: it is indexed with the raw tokenizer,
+so its terms are never lowercased, folded or stemmed. Running its wildcard
+patterns through the stemming normalizer rewrote hex prefixes ("ceded" ->
+"cede") and returned documents whose checksum did not start with what the user
+typed, which for an identity field is a wrong answer.
+
+This covers only the registry-level normalizer, which is all that exists to
+prove at this point in the stack: user queries are not yet routed through
+whoosh-compat (that lands with the query-layer PR), so the same fact proven
+end to end against real indexed documents lives in
+``test_checksum_prefix_queries.py``.
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import pytest
+
+from documents.search._registry import get_field_registry
+
+if TYPE_CHECKING:
+    from whoosh_compat import FieldRegistry
+    from whoosh_compat import PatternNormalizer
+
+pytestmark = [pytest.mark.search, pytest.mark.django_db]
+
+
+def _normalizer(registry: FieldRegistry, name: str) -> PatternNormalizer:
+    ref = registry.make_ref(name)
+    assert ref is not None
+    resolved = registry.resolve(ref)
+    assert resolved is not None
+    assert resolved.spec.pattern_normalizer is not None
+    return resolved.spec.pattern_normalizer
+
+
+class TestKeywordPatternNormalizer:
+    @pytest.mark.parametrize(
+        "run",
+        [
+            pytest.param("ceded", id="stems_to_cede"),
+            pytest.param("added", id="stems_to_ad"),
+            pytest.param("cafed", id="stems_to_cafe"),
+        ],
+    )
+    def test_keyword_runs_are_folded_not_stemmed(self, run: str) -> None:
+        """One form, the run as typed: a KEYWORD pattern must never be widened
+        to a stem, which would return checksums that do not start with what
+        the user typed."""
+        normalize = _normalizer(get_field_registry("en"), "checksum")
+        assert normalize(run) == run
+
+    def test_text_runs_still_offer_their_stem(self) -> None:
+        """A TEXT field offers the stem alongside the typed run, so a term
+        matching either one is reachable."""
+        normalize = _normalizer(get_field_registry("en"), "title")
+        assert tuple(normalize("Running")) == ("running", "run")

src/documents/tests/search/test_registry.py

@@ -0,0 +1,149 @@
+from collections.abc import Sequence
+
+import pytest
+from whoosh_compat import FieldKind
+from whoosh_compat import FieldRegistry
+from whoosh_compat.fields import ResolvedField
+
+from documents.search._fields import PUBLIC_FIELDS
+from documents.search._registry import get_field_registry
+
+
+@pytest.fixture
+def registry() -> FieldRegistry:
+    return get_field_registry(None)
+
+
+def _resolve(registry: FieldRegistry, name: str) -> ResolvedField:
+    ref = registry.make_ref(name)
+    assert ref is not None, f"{name} is not a valid field ref"
+    resolved = registry.resolve(ref)
+    assert resolved is not None, f"{name} did not resolve"
+    return resolved
+
+
+def _distinct_forms(result: str | Sequence[str]) -> tuple[str, ...]:
+    """The forms a term may match, in order, the way whoosh-compat's emitter
+    reads a pattern_normalizer's answer: a bare str is one form, a sequence is
+    several, deduplicated."""
+    if isinstance(result, str):
+        return (result,)
+    return tuple(dict.fromkeys(result))
+
+
+class TestFieldRegistry:
+    def test_internal_id_fields_are_not_registered(
+        self,
+        registry: FieldRegistry,
+    ) -> None:
+        for name in (
+            "tag_id",
+            "owner_id",
+            "viewer_id",
+            "correspondent_id",
+            "document_type_id",
+            "storage_path_id",
+            "viewer_group_id",
+        ):
+            assert name not in registry
+
+    def test_no_queryable_field_name_ends_in_id(self) -> None:
+        # The list above names the seven that were dropped; this catches the
+        # eighth. Internal *_id columns are written for permission filtering
+        # and joins, and whoosh only exposed them as query fields by accident,
+        # so a new one reaching the query surface is a leak rather than a
+        # feature. Checked against PUBLIC_FIELDS rather than the registry so
+        # an internal field is caught where it is declared.
+        leaked = [f.name for f in PUBLIC_FIELDS if f.name.endswith("_id")]
+        assert not leaked, f"internal id fields reached the query surface: {leaked}"
+
+    def test_type_alias_resolves_to_document_type(
+        self,
+        registry: FieldRegistry,
+    ) -> None:
+        assert _resolve(registry, "type").spec.name == "document_type"
+
+    def test_path_alias_resolves_to_storage_path(self, registry: FieldRegistry) -> None:
+        assert _resolve(registry, "path").spec.name == "storage_path"
+
+    def test_notes_json_subpaths_resolve(self, registry: FieldRegistry) -> None:
+        resolved = _resolve(registry, "notes.user")
+        assert resolved.spec.name == "notes"
+        assert resolved.json_path == "user"
+        assert resolved.is_subpath is True
+
+    def test_custom_fields_json_subpaths_resolve(self, registry: FieldRegistry) -> None:
+        for raw in ("custom_fields.name", "custom_fields.value"):
+            _resolve(registry, raw)
+
+    def test_unregistered_json_subpath_does_not_resolve(
+        self,
+        registry: FieldRegistry,
+    ) -> None:
+        # An unregistered subpath is not even a valid FieldRef: make_ref
+        # returns None for a dotted name whose subpath isn't registered
+        # (it doesn't produce a ref for resolve() to then reject).
+        assert registry.make_ref("notes.bogus") is None
+
+    def test_tag_is_comma_values(self, registry: FieldRegistry) -> None:
+        assert _resolve(registry, "tag").spec.comma_values is True
+
+    def test_correspondent_is_not_comma_values(self, registry: FieldRegistry) -> None:
+        # "tag" is the only field that opts in. This is only observable here:
+        # end to end the two readings of "correspondent:foo,bar" agree,
+        # because the analyzer splits the literal value on the comma anyway,
+        # so a result-level test cannot tell a value list from literal text.
+        assert _resolve(registry, "correspondent").spec.comma_values is False
+
+    def test_created_is_date_kind(self, registry: FieldRegistry) -> None:
+        resolved = _resolve(registry, "created")
+        assert resolved.spec.kind is FieldKind.DATE
+        assert resolved.spec.date_only is True
+
+    def test_analyzer_lowercases_and_ascii_folds(self, registry: FieldRegistry) -> None:
+        # title uses the paperless_text analyzer: simple -> remove_long ->
+        # lowercase -> ascii_fold [-> stemmer]. With no language configured
+        # (None), no stemmer runs, so "Café" folds to the single token "cafe".
+        resolved = _resolve(registry, "title")
+        assert resolved.spec.analyzer is not None
+        assert resolved.spec.analyzer("Café") == ["cafe"]
+
+    def test_checksum_analyzer_is_identity_single_token(
+        self,
+        registry: FieldRegistry,
+    ) -> None:
+        # checksum uses the raw tokenizer at index time (no splitting).
+        resolved = _resolve(registry, "checksum")
+        assert resolved.spec.analyzer is not None
+        assert resolved.spec.analyzer("ABC-123") == ["ABC-123"]
+
+    def test_pattern_normalizer_follows_the_registry_language(
+        self,
+        registry: FieldRegistry,
+    ) -> None:
+        # Index terms are stemmed, so patterns offer their stem too, using the
+        # registry's own language: "Running" has to reach the indexed "run".
+        # Without a language the index holds surface forms, so there is no
+        # second form and the run is only case/accent-folded.
+        resolved = _resolve(registry, "title")
+        assert resolved.spec.pattern_normalizer is not None
+        assert _distinct_forms(resolved.spec.pattern_normalizer("Running")) == (
+            "running",
+        )
+
+        resolved_en = _resolve(get_field_registry("en"), "title")
+        assert resolved_en.spec.pattern_normalizer is not None
+        assert _distinct_forms(resolved_en.spec.pattern_normalizer("Running")) == (
+            "running",
+            "run",
+        )
+
+    def test_registry_is_cached_per_language(self) -> None:
+        a = get_field_registry("en")
+        b = get_field_registry("en")
+        assert a is b
+
+    def test_registry_rebuilds_on_language_change(self) -> None:
+        a = get_field_registry("en")
+        b = get_field_registry("de")
+        assert a is not b

src/documents/tests/search/test_schema.py

@@ -1,12 +1,20 @@
 from __future__ import annotations
 
 import json
+from datetime import UTC
+from datetime import datetime
 from typing import TYPE_CHECKING
 
 import pytest
+import tantivy
 
+from documents.search._fields import PUBLIC_FIELDS
 from documents.search._schema import SCHEMA_VERSION
+from documents.search._schema import build_schema
+from documents.search._schema import field_descriptors
 from documents.search._schema import needs_rebuild
+from documents.search._schema import schema_fingerprint
+from documents.search._tokenizer import register_tokenizers
 
 if TYPE_CHECKING:
     from pathlib import Path
@@ -29,7 +37,13 @@ class TestNeedsRebuild:
     ) -> None:
         settings.SEARCH_LANGUAGE = "en"
         (index_dir / ".index_settings.json").write_text(
-            json.dumps({"schema_version": SCHEMA_VERSION, "language": "en"}),
+            json.dumps(
+                {
+                    "schema_version": SCHEMA_VERSION,
+                    "language": "en",
+                    "schema_fingerprint": schema_fingerprint(),
+                },
+            ),
         )
         assert needs_rebuild(index_dir) is False
 
@@ -76,3 +90,72 @@ class TestNeedsRebuild:
             json.dumps({"schema_version": SCHEMA_VERSION, "language": "en"}),
         )
         assert needs_rebuild(index_dir) is True
+
+
+def _schema_fields(schema: tantivy.Schema) -> dict[str, dict]:
+    """{name: field-state} for every field declared on a tantivy Schema.
+
+    tantivy-py 0.26 exposes no public introspection API on Schema (no
+    __iter__, get_field, to_json, etc.) -- __reduce__() (used internally for
+    pickling) is the only way to recover the field list, so we lean on it
+    here for test assertions only.
+    """
+    state = schema.__reduce__()[1][0]
+    return {field["name"]: field for field in state["inner"]}
+
+
+class TestSchemaMatchesPublicFields:
+    def test_every_public_field_is_in_the_schema(self) -> None:
+        schema = build_schema()
+        schema_field_names = set(_schema_fields(schema))
+        for field in PUBLIC_FIELDS:
+            assert field.name in schema_field_names, (
+                f"{field.name} is in PUBLIC_FIELDS but missing from build_schema()"
+            )
+
+    def test_asn_page_count_num_notes_are_fast_unsigned_fields(self) -> None:
+        # Spot-check kind-derived construction for the U64 fields.
+        schema = build_schema()
+        doc = tantivy.Document()
+        doc.add_unsigned("id", 1)
+        doc.add_text("checksum", "x")
+        doc.add_unsigned("asn", 42)
+        doc.add_unsigned("page_count", 3)
+        doc.add_unsigned("num_notes", 0)
+        doc.add_date("created", datetime(2020, 1, 1, tzinfo=UTC))
+        doc.add_date("modified", datetime(2020, 1, 1, tzinfo=UTC))
+        doc.add_date("added", datetime(2020, 1, 1, tzinfo=UTC))
+        index = tantivy.Index(schema)
+        register_tokenizers(index, None)
+        writer = index.writer()
+        writer.add_document(doc)
+        writer.commit()
+        index.reload()
+        searcher = index.searcher()
+        results = searcher.search(tantivy.Query.term_query(schema, "asn", 42), limit=1)
+        assert len(results.hits) == 1
+
+
+class TestFastFlagAgreement:
+    def test_every_public_field_fast_flag_matches_the_built_schema(self) -> None:
+        # whoosh-compat's registry trusts PUBLIC_FIELDS' fast flag when resolving
+        # field:* existence checks (its FAST_FIELD strategy); a fast=True
+        # entry whose actual tantivy column is not fast would make those
+        # searches silently match nothing at search time. Only the U64 and
+        # DATE descriptors can carry the flag today, so this
+        # pins the agreement for EVERY kind: a future fast=True
+        # TEXT/KEYWORD/JSON entry the builder silently ignores fails here
+        # instead of at a user's query.
+        #
+        # field_descriptors() (not tantivy-py's __reduce__() pickling
+        # internals) is used as the probe here: it is exactly the input
+        # build_schema()'s SchemaBuilder consumes for the `fast` kwarg on
+        # every field kind, so it pins the same agreement without depending
+        # on a private pickled representation surviving a tantivy-py
+        # upgrade.
+        descriptor_fast = {d.name: d.fast for d in field_descriptors()}
+        for public_field in PUBLIC_FIELDS:
+            assert descriptor_fast[public_field.name] == public_field.fast, (
+                f"{public_field.name}: PUBLIC_FIELDS says fast={public_field.fast} but"
+                f" field_descriptors() says fast={descriptor_fast[public_field.name]}"
+            )

src/documents/tests/search/test_schema_fingerprint.py

@@ -0,0 +1,492 @@
+"""The schema fingerprint stamped into .index_settings.json.
+
+tantivy compares schemas by *ordered* field list, and `tantivy.Index(schema,
+path=...)` (what every write path does) raises on any difference. SCHEMA_VERSION
+is the manual guard against that, but build_schema() is edited for *parser*
+reasons - adding an alias, flipping fast=True, adding a subpath - by people not
+thinking about the on-disk index, and forgetting the bump is exactly how this
+branch's bug happened.
+
+The fingerprint is the automatic guard: it hashes the field descriptor list that
+build_schema() itself iterates, so any change to a field's name, kind, options
+or *position* forces a rebuild on its own.
+"""
+
+from __future__ import annotations
+
+import hashlib
+import json
+from typing import TYPE_CHECKING
+
+import pytest
+import tantivy
+
+from documents.search import _schema
+from documents.search._schema import SCHEMA_VERSION
+from documents.search._schema import FieldDescriptor
+from documents.search._schema import _write_sentinels
+from documents.search._schema import build_schema
+from documents.search._schema import field_descriptors
+from documents.search._schema import needs_rebuild
+from documents.search._schema import schema_fingerprint
+
+if TYPE_CHECKING:
+    from pathlib import Path
+
+    from pytest_django.fixtures import SettingsWrapper
+
+pytestmark = pytest.mark.search
+
+# The on-disk field layout of a v2 index, pinned as data. Any edit here is an
+# index-format change: it must come with a rebuild, which the fingerprint now
+# forces automatically. Reproduced from build_schema()'s output as it stood
+# before the descriptor refactor, so it also pins that the refactor changed
+# nothing.
+PINNED_DESCRIPTORS: tuple[FieldDescriptor, ...] = (
+    FieldDescriptor("id", "u64", stored=True, indexed=True, fast=True, tokenizer=None),
+    FieldDescriptor(
+        "title",
+        "text",
+        stored=True,
+        indexed=True,
+        fast=False,
+        tokenizer="paperless_text",
+    ),
+    FieldDescriptor(
+        "content",
+        "text",
+        stored=True,
+        indexed=True,
+        fast=False,
+        tokenizer="paperless_text",
+    ),
+    FieldDescriptor(
+        "correspondent",
+        "text",
+        stored=True,
+        indexed=True,
+        fast=False,
+        tokenizer="paperless_text",
+    ),
+    FieldDescriptor(
+        "document_type",
+        "text",
+        stored=True,
+        indexed=True,
+        fast=False,
+        tokenizer="paperless_text",
+    ),
+    FieldDescriptor(
+        "storage_path",
+        "text",
+        stored=True,
+        indexed=True,
+        fast=False,
+        tokenizer="paperless_text",
+    ),
+    FieldDescriptor(
+        "original_filename",
+        "text",
+        stored=True,
+        indexed=True,
+        fast=False,
+        tokenizer="paperless_text",
+    ),
+    FieldDescriptor(
+        "tag",
+        "text",
+        stored=True,
+        indexed=True,
+        fast=False,
+        tokenizer="paperless_text",
+    ),
+    FieldDescriptor(
+        "checksum",
+        "text",
+        stored=True,
+        indexed=True,
+        fast=False,
+        tokenizer="raw",
+    ),
+    FieldDescriptor("asn", "u64", stored=True, indexed=True, fast=True, tokenizer=None),
+    FieldDescriptor(
+        "page_count",
+        "u64",
+        stored=True,
+        indexed=True,
+        fast=True,
+        tokenizer=None,
+    ),
+    FieldDescriptor(
+        "num_notes",
+        "u64",
+        stored=True,
+        indexed=True,
+        fast=True,
+        tokenizer=None,
+    ),
+    FieldDescriptor(
+        "created",
+        "date",
+        stored=True,
+        indexed=True,
+        fast=True,
+        tokenizer=None,
+    ),
+    FieldDescriptor(
+        "modified",
+        "date",
+        stored=True,
+        indexed=True,
+        fast=True,
+        tokenizer=None,
+    ),
+    FieldDescriptor(
+        "added",
+        "date",
+        stored=True,
+        indexed=True,
+        fast=True,
+        tokenizer=None,
+    ),
+    FieldDescriptor(
+        "notes",
+        "json",
+        stored=True,
+        indexed=True,
+        fast=False,
+        tokenizer="paperless_text",
+    ),
+    FieldDescriptor(
+        "notes_text",
+        "text",
+        stored=True,
+        indexed=True,
+        fast=False,
+        tokenizer="paperless_text",
+    ),
+    FieldDescriptor(
+        "custom_fields",
+        "json",
+        stored=True,
+        indexed=True,
+        fast=False,
+        tokenizer="paperless_text",
+    ),
+    FieldDescriptor(
+        "title_sort",
+        "text",
+        stored=False,
+        indexed=True,
+        fast=True,
+        tokenizer="simple_analyzer",
+    ),
+    FieldDescriptor(
+        "correspondent_sort",
+        "text",
+        stored=False,
+        indexed=True,
+        fast=True,
+        tokenizer="simple_analyzer",
+    ),
+    FieldDescriptor(
+        "type_sort",
+        "text",
+        stored=False,
+        indexed=True,
+        fast=True,
+        tokenizer="simple_analyzer",
+    ),
+    FieldDescriptor(
+        "bigram_content",
+        "text",
+        stored=False,
+        indexed=True,
+        fast=False,
+        tokenizer="bigram_analyzer",
+    ),
+    FieldDescriptor(
+        "bigram_title",
+        "text",
+        stored=False,
+        indexed=True,
+        fast=False,
+        tokenizer="bigram_analyzer",
+    ),
+    FieldDescriptor(
+        "bigram_correspondent",
+        "text",
+        stored=False,
+        indexed=True,
+        fast=False,
+        tokenizer="bigram_analyzer",
+    ),
+    FieldDescriptor(
+        "bigram_document_type",
+        "text",
+        stored=False,
+        indexed=True,
+        fast=False,
+        tokenizer="bigram_analyzer",
+    ),
+    FieldDescriptor(
+        "bigram_tag",
+        "text",
+        stored=False,
+        indexed=True,
+        fast=False,
+        tokenizer="bigram_analyzer",
+    ),
+    FieldDescriptor(
+        "simple_title",
+        "text",
+        stored=False,
+        indexed=True,
+        fast=False,
+        tokenizer="simple_search_analyzer",
+    ),
+    FieldDescriptor(
+        "simple_content",
+        "text",
+        stored=False,
+        indexed=True,
+        fast=False,
+        tokenizer="simple_search_analyzer",
+    ),
+    FieldDescriptor(
+        "autocomplete_word",
+        "text",
+        stored=False,
+        indexed=True,
+        fast=False,
+        tokenizer="raw",
+    ),
+    FieldDescriptor(
+        "owner_id",
+        "u64",
+        stored=False,
+        indexed=True,
+        fast=True,
+        tokenizer=None,
+    ),
+    FieldDescriptor(
+        "viewer_id",
+        "u64",
+        stored=False,
+        indexed=True,
+        fast=True,
+        tokenizer=None,
+    ),
+    FieldDescriptor(
+        "viewer_group_id",
+        "u64",
+        stored=False,
+        indexed=True,
+        fast=True,
+        tokenizer=None,
+    ),
+)
+
+
+def _schema_fields(schema: tantivy.Schema) -> list[dict]:
+    """The tantivy-level field list, in declaration order.
+
+    tantivy-py 0.26 exposes no public introspection API on Schema, so
+    __reduce__() (its pickling hook) is the only way to recover the field list.
+    It is used here, in a test, precisely because it is the representation the
+    persisted fingerprint must NOT depend on.
+    """
+    return schema.__reduce__()[1][0]["inner"]
+
+
+def _sentinels(index_dir: Path, **overrides: object) -> None:
+    data = {
+        "schema_version": SCHEMA_VERSION,
+        "language": None,
+        "schema_fingerprint": schema_fingerprint(),
+    }
+    data.update(overrides)
+    (index_dir / ".index_settings.json").write_text(json.dumps(data))
+
+
+class TestDescriptorsDescribeTheBuiltSchema:
+    def test_descriptors_match_the_pinned_field_layout(self) -> None:
+        assert tuple(field_descriptors()) == PINNED_DESCRIPTORS
+
+    def test_built_schema_matches_the_descriptors(self) -> None:
+        """The descriptors are not a parallel description - they are the input.
+
+        Reading the built schema back proves the loop honours every option, so
+        a descriptor edit cannot claim a shape the SchemaBuilder did not build.
+        """
+        kinds = {"text": "text", "json": "json_object", "u64": "u64", "date": "date"}
+        built = [
+            (
+                field["name"],
+                field["type"],
+                field["options"]["stored"],
+                bool(field["options"].get("fast")),
+                (field["options"].get("indexing") or {}).get("tokenizer"),
+            )
+            for field in _schema_fields(build_schema())
+        ]
+        expected = [
+            (
+                descriptor.name,
+                kinds[descriptor.kind],
+                descriptor.stored,
+                descriptor.fast,
+                descriptor.tokenizer,
+            )
+            for descriptor in field_descriptors()
+        ]
+        assert built == expected
+
+
+class TestFingerprintSensitivity:
+    def test_a_field_option_change_moves_the_fingerprint(
+        self,
+        monkeypatch: pytest.MonkeyPatch,
+    ) -> None:
+        before = schema_fingerprint()
+        changed = field_descriptors()
+        changed[1] = changed[1]._replace(fast=True)
+        monkeypatch.setattr(_schema, "field_descriptors", lambda: changed)
+
+        assert schema_fingerprint() != before
+
+    def test_reordering_alone_moves_the_fingerprint(
+        self,
+        monkeypatch: pytest.MonkeyPatch,
+    ) -> None:
+        """The original bug: same fields, different declaration order.
+
+        A set- or dict-based fingerprint would be blind to this, and tantivy
+        would reject every write against the existing index.
+        """
+        before = schema_fingerprint()
+        swapped = field_descriptors()
+        swapped[1], swapped[2] = swapped[2], swapped[1]
+        monkeypatch.setattr(_schema, "field_descriptors", lambda: swapped)
+
+        assert schema_fingerprint() != before
+
+    def test_repeated_calls_agree(self) -> None:
+        assert schema_fingerprint() == schema_fingerprint()
+
+
+class TestFingerprintIsIndependentOfTantivy:
+    def test_a_tantivy_option_key_addition_would_not_move_it(self) -> None:
+        """A tantivy-py upgrade must not force a global reindex.
+
+        Hashing schema.__reduce__() would do exactly that: the simulated new
+        option key below changes that payload for every user with no schema
+        change at all.
+        """
+        fields = _schema_fields(build_schema())
+        upgraded = [
+            {**field, "options": {**field["options"], "coerce": True}}
+            for field in fields
+        ]
+        assert _hash(upgraded) != _hash(fields)
+        assert schema_fingerprint() == _fingerprint_of(field_descriptors())
+
+    def test_fingerprint_never_touches_the_schema_builder(
+        self,
+        monkeypatch: pytest.MonkeyPatch,
+    ) -> None:
+        before = schema_fingerprint()
+
+        class _RemovedSchemaBuilder:
+            def __init__(self) -> None:
+                raise AssertionError("tantivy.SchemaBuilder was consulted")
+
+        monkeypatch.setattr(tantivy, "SchemaBuilder", _RemovedSchemaBuilder)
+        with pytest.raises(AssertionError):
+            build_schema()
+
+        assert schema_fingerprint() == before
+
+
+def _hash(payload: object) -> str:
+    return hashlib.blake2b(json.dumps(payload).encode()).hexdigest()
+
+
+def _fingerprint_of(descriptors: list[FieldDescriptor]) -> str:
+    return _hash([list(descriptor) for descriptor in descriptors])
+
+
+class TestNeedsRebuildOnFingerprint:
+    def test_matching_fingerprint_does_not_rebuild(
+        self,
+        index_dir: Path,
+        settings: SettingsWrapper,
+    ) -> None:
+        settings.SEARCH_LANGUAGE = None
+        _sentinels(index_dir)
+
+        assert needs_rebuild(index_dir) is False
+
+    def test_stale_fingerprint_rebuilds_despite_a_matching_version(
+        self,
+        index_dir: Path,
+        settings: SettingsWrapper,
+        monkeypatch: pytest.MonkeyPatch,
+    ) -> None:
+        """The failure this task exists to prevent: schema edited, version not
+        bumped. Without the fingerprint check, `reindex --if-needed` reports the
+        index up to date and every write then raises."""
+        settings.SEARCH_LANGUAGE = None
+        _sentinels(index_dir)
+        extended = [
+            *field_descriptors(),
+            FieldDescriptor(
+                "new_field",
+                "u64",
+                stored=False,
+                indexed=True,
+                fast=True,
+                tokenizer=None,
+            ),
+        ]
+        monkeypatch.setattr(_schema, "field_descriptors", lambda: extended)
+
+        assert needs_rebuild(index_dir) is True
+
+    def test_reordered_schema_rebuilds(
+        self,
+        index_dir: Path,
+        settings: SettingsWrapper,
+        monkeypatch: pytest.MonkeyPatch,
+    ) -> None:
+        settings.SEARCH_LANGUAGE = None
+        _sentinels(index_dir)
+        reordered = field_descriptors()
+        reordered[1], reordered[2] = reordered[2], reordered[1]
+        monkeypatch.setattr(_schema, "field_descriptors", lambda: reordered)
+
+        assert needs_rebuild(index_dir) is True
+
+    def test_missing_fingerprint_rebuilds(
+        self,
+        index_dir: Path,
+        settings: SettingsWrapper,
+    ) -> None:
+        """No seeding: an index whose schema shape nobody recorded is rebuilt
+        rather than trusted."""
+        settings.SEARCH_LANGUAGE = None
+        (index_dir / ".index_settings.json").write_text(
+            json.dumps({"schema_version": SCHEMA_VERSION, "language": None}),
+        )
+
+        assert needs_rebuild(index_dir) is True
+
+    def test_written_sentinels_satisfy_the_check(
+        self,
+        index_dir: Path,
+        settings: SettingsWrapper,
+    ) -> None:
+        settings.SEARCH_LANGUAGE = "en"
+        _write_sentinels(index_dir)
+
+        assert needs_rebuild(index_dir) is False

src/documents/tests/search/test_schema_version.py

@@ -0,0 +1,164 @@
+"""SCHEMA_VERSION must change whenever build_schema()'s field list or order does.
+
+tantivy compares schemas by *ordered* field list. ``Index.open()`` loads the
+schema from the index's own ``meta.json``, so reads against an index built by an
+older release keep working after a field reorder. Writes do not:
+``WriteBatch.__enter__`` calls ``tantivy.Index(build_schema(), path=...)``, an
+open-or-create that raises ``ValueError`` on any schema difference. Nothing
+catches that ValueError, so consumption, index_document and bulk edit all
+hard-fail while ``/api/status/`` still reports the index healthy.
+
+The only thing that saves such an install is ``needs_rebuild()`` noticing the
+version stamped in ``.index_settings.json`` is stale.
+"""
+
+from __future__ import annotations
+
+import json
+from typing import TYPE_CHECKING
+
+import pytest
+import tantivy
+from django.conf import settings as django_settings
+
+from documents.search._schema import build_schema
+from documents.search._schema import needs_rebuild
+from documents.search._schema import open_or_rebuild_index
+
+if TYPE_CHECKING:
+    from pathlib import Path
+
+pytestmark = [pytest.mark.search]
+
+RELEASED_V1_SCHEMA_VERSION = 1
+
+
+def _build_released_v1_schema() -> tantivy.Schema:
+    """Frozen copy of build_schema() as shipped in v3.0.x (schema version 1).
+
+    Deliberately duplicated rather than imported: it must keep describing the
+    on-disk layout of already-deployed indexes even as build_schema() evolves.
+    """
+    sb = tantivy.SchemaBuilder()
+
+    sb.add_unsigned_field("id", stored=True, indexed=True, fast=True)
+    sb.add_text_field("checksum", stored=True, tokenizer_name="raw")
+
+    for field in (
+        "title",
+        "correspondent",
+        "document_type",
+        "storage_path",
+        "original_filename",
+        "content",
+    ):
+        sb.add_text_field(field, stored=True, tokenizer_name="paperless_text")
+
+    for field in ("title_sort", "correspondent_sort", "type_sort"):
+        sb.add_text_field(
+            field,
+            stored=False,
+            tokenizer_name="simple_analyzer",
+            fast=True,
+        )
+
+    for field in (
+        "bigram_content",
+        "bigram_title",
+        "bigram_correspondent",
+        "bigram_document_type",
+        "bigram_tag",
+    ):
+        sb.add_text_field(field, stored=False, tokenizer_name="bigram_analyzer")
+
+    for field in ("simple_title", "simple_content"):
+        sb.add_text_field(field, stored=False, tokenizer_name="simple_search_analyzer")
+
+    sb.add_text_field("autocomplete_word", stored=False, tokenizer_name="raw")
+    sb.add_text_field("tag", stored=True, tokenizer_name="paperless_text")
+
+    sb.add_json_field("notes", stored=True, tokenizer_name="paperless_text")
+    sb.add_text_field("notes_text", stored=True, tokenizer_name="paperless_text")
+    sb.add_json_field("custom_fields", stored=True, tokenizer_name="paperless_text")
+
+    for field in (
+        "correspondent_id",
+        "document_type_id",
+        "storage_path_id",
+        "tag_id",
+        "owner_id",
+        "viewer_id",
+        "viewer_group_id",
+    ):
+        sb.add_unsigned_field(field, stored=False, indexed=True, fast=True)
+
+    for field in ("created", "modified", "added"):
+        sb.add_date_field(field, stored=True, indexed=True, fast=True)
+
+    for field in ("asn", "page_count", "num_notes"):
+        sb.add_unsigned_field(field, stored=True, indexed=True, fast=True)
+
+    return sb.build()
+
+
+@pytest.fixture
+def released_v1_index(tmp_path: Path) -> Path:
+    """An index directory as a v3.0.x install would leave it on disk."""
+    index_dir = tmp_path / "index"
+    index_dir.mkdir()
+    tantivy.Index(_build_released_v1_schema(), path=str(index_dir))
+    (index_dir / ".index_settings.json").write_text(
+        json.dumps(
+            {
+                "schema_version": RELEASED_V1_SCHEMA_VERSION,
+                "language": django_settings.SEARCH_LANGUAGE,
+            },
+        ),
+    )
+    return index_dir
+
+
+class TestUpgradeFromReleasedV1Index:
+    def test_released_v1_index_is_flagged_for_rebuild(
+        self,
+        released_v1_index: Path,
+    ) -> None:
+        """The current schema differs from v1's, so the sentinel must be stale.
+
+        If this fails, `document_index reindex --if-needed` prints "Search index
+        is up to date" and skips, leaving the mismatched index in place.
+        """
+        assert needs_rebuild(released_v1_index) is True
+
+    def test_v1_index_rejects_writes_against_the_current_schema(
+        self,
+        released_v1_index: Path,
+    ) -> None:
+        """The failure mode the version bump exists to prevent.
+
+        This is exactly what WriteBatch.__enter__ does on every index write.
+        """
+        with pytest.raises(ValueError, match="schema does not match"):
+            tantivy.Index(build_schema(), path=str(released_v1_index))
+
+    def test_opening_a_v1_index_leaves_it_writable(
+        self,
+        released_v1_index: Path,
+    ) -> None:
+        """End to end: open_or_rebuild_index must hand back an index that the
+        write path can reopen. Before the version bump, needs_rebuild() returned
+        False here, the stale directory survived untouched, and every subsequent
+        write raised the ValueError above."""
+        open_or_rebuild_index(released_v1_index)
+
+        tantivy.Index(build_schema(), path=str(released_v1_index))
+
+    def test_rebuilt_index_is_not_rebuilt_again(
+        self,
+        released_v1_index: Path,
+    ) -> None:
+        """The rebuild must stamp the version it actually wrote, otherwise every
+        startup wipes and reindexes the whole corpus."""
+        open_or_rebuild_index(released_v1_index)
+
+        assert needs_rebuild(released_v1_index) is False

src/documents/tests/search/test_tokenizer.py

@@ -7,8 +7,8 @@ import pytest
 import tantivy
 
 from documents.search._tokenizer import _bigram_analyzer
-from documents.search._tokenizer import _paperless_text
 from documents.search._tokenizer import _simple_search_analyzer
+from documents.search._tokenizer import paperless_text_analyzer
 from documents.search._tokenizer import register_tokenizers
 
 if TYPE_CHECKING:
@@ -25,7 +25,7 @@ class TestTokenizers:
         sb.add_text_field("content", stored=True, tokenizer_name="paperless_text")
         schema = sb.build()
         idx = tantivy.Index(schema, path=None)
-        idx.register_tokenizer("paperless_text", _paperless_text(""))
+        idx.register_tokenizer("paperless_text", paperless_text_analyzer(""))
         return idx
 
     @pytest.fixture

src/documents/tests/test_api_app_config.py

@@ -72,10 +72,6 @@ class TestApiAppConfig(DirectoriesMixin, APITestCase):
                 "barcode_enable_tag": None,
                 "barcode_tag_mapping": None,
                 "barcode_tag_split": None,
-                "remote_ocr_engine": None,
-                "remote_ocr_api_key": None,
-                "remote_ocr_endpoint": None,
-                "remote_ocr_mode": None,
                 "ai_enabled": False,
                 "llm_embedding_backend": None,
                 "llm_embedding_model": None,
@@ -874,49 +870,6 @@ class TestApiAppConfig(DirectoriesMixin, APITestCase):
         config.refresh_from_db()
         self.assertEqual(config.llm_api_key, None)
 
-    def test_update_remote_ocr_api_key(self) -> None:
-        """
-        GIVEN:
-            - Existing config with remote_ocr_api_key specified
-        WHEN:
-            - API to update remote_ocr_api_key is called with all *s
-            - API to update remote_ocr_api_key is called with empty string
-        THEN:
-            - remote_ocr_api_key is unchanged
-            - remote_ocr_api_key is set to None
-        """
-        config = ApplicationConfiguration.objects.first()
-        assert config is not None
-        config.remote_ocr_api_key = "1234567890"
-        config.save()
-
-        # Test with all *
-        response = self.client.patch(
-            f"{self.ENDPOINT}1/",
-            json.dumps(
-                {
-                    "remote_ocr_api_key": "*" * 32,
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        config.refresh_from_db()
-        self.assertEqual(config.remote_ocr_api_key, "1234567890")
-        # Test with empty string
-        response = self.client.patch(
-            f"{self.ENDPOINT}1/",
-            json.dumps(
-                {
-                    "remote_ocr_api_key": "",
-                },
-            ),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        config.refresh_from_db()
-        self.assertEqual(config.remote_ocr_api_key, None)
-
     def test_enable_ai_index_triggers_update(self) -> None:
         """
         GIVEN:

src/documents/tests/test_api_bulk_edit.py

@@ -532,29 +532,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
         m.assert_called_once()
         args, kwargs = m.call_args
         self.assertEqual(args[0], [self.doc1.id])
-        self.assertEqual(kwargs, {"remote_ocr": False})
-
-    @mock.patch("documents.views.bulk_edit.reprocess")
-    def test_reprocess_documents_endpoint_remote_ocr(self, m) -> None:
-        """
-        GIVEN:
-            - API data to reprocess a document with remote OCR requested
-        WHEN:
-            - API is called
-        THEN:
-            - reprocess is called with remote_ocr=True
-        """
-        self.setup_mock(m, "reprocess")
-        response = self.client.post(
-            "/api/documents/reprocess/",
-            json.dumps({"documents": [self.doc1.id], "remote_ocr": True}),
-            content_type="application/json",
-        )
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        m.assert_called_once()
-        args, kwargs = m.call_args
-        self.assertEqual(args[0], [self.doc1.id])
-        self.assertEqual(kwargs, {"remote_ocr": True})
+        self.assertEqual(len(kwargs), 0)
 
     @mock.patch("documents.serialisers.bulk_edit.set_storage_path")
     def test_api_set_storage_path(self, m) -> None:
@@ -1575,29 +1553,6 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
                             ),
                         )
 
-    def test_legacy_bulk_edit_reprocess_invalid_remote_ocr(self) -> None:
-        """
-        GIVEN:
-            - The deprecated bulk_edit endpoint with a non-boolean remote_ocr
-        WHEN:
-            - API is called
-        THEN:
-            - The request is rejected rather than passed through to the task
-        """
-        response = self.client.post(
-            "/api/documents/bulk_edit/",
-            json.dumps(
-                {
-                    "documents": [self.doc1.id],
-                    "method": "reprocess",
-                    "parameters": {"remote_ocr": "yes please"},
-                },
-            ),
-            content_type="application/json",
-        )
-
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-
     @mock.patch("documents.views.bulk_edit.edit_pdf")
     def test_edit_pdf(self, m) -> None:
         self.setup_mock(m, "edit_pdf")

src/documents/tests/test_api_custom_fields.py

@@ -5,9 +5,7 @@ from unittest.mock import ANY
 
 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 rest_framework import status
 from rest_framework.test import APITestCase
@@ -15,9 +13,6 @@ from rest_framework.test import APITestCase
 from documents.models import CustomField
 from documents.models import CustomFieldInstance
 from documents.models import Document
-from documents.serialisers import CustomFieldInstanceSerializer
-from documents.serialisers import DocumentSerializer
-from documents.tests.factories import DocumentFactory
 from documents.tests.utils import DirectoriesMixin
 
 
@@ -535,137 +530,6 @@ class TestCustomFieldsAPI(DirectoriesMixin, APITestCase):
         doc.refresh_from_db()
         self.assertEqual(len(doc.custom_fields.all()), 10)
 
-    def test_document_serializer_custom_fields_validation_batches_field_lookup(
-        self,
-    ) -> None:
-        """
-        GIVEN:
-            - A document is being validated with several custom field values
-              at once (as happens on every PATCH/PUT/POST)
-        WHEN:
-            - The serializer is validated
-        THEN:
-            - The referenced CustomField objects are resolved with a single
-              query, not one query per custom field
-        """
-        doc = DocumentFactory(mime_type="application/pdf")
-        custom_fields = [
-            CustomField.objects.create(
-                name=f"Test Custom Field {i}",
-                data_type=CustomField.FieldDataType.STRING,
-            )
-            for i in range(5)
-        ]
-
-        serializer = DocumentSerializer(
-            doc,
-            data={
-                "custom_fields": [
-                    {"field": custom_field.id, "value": "test value"}
-                    for custom_field in custom_fields
-                ],
-            },
-            partial=True,
-        )
-
-        with CaptureQueriesContext(connection) as ctx:
-            self.assertTrue(serializer.is_valid(), serializer.errors)
-
-        custom_field_lookups = [
-            query
-            for query in ctx.captured_queries
-            if 'FROM "documents_customfield" WHERE "documents_customfield"."id"'
-            in query["sql"]
-        ]
-        self.assertEqual(
-            len(custom_field_lookups),
-            1,
-            "Expected a single batched query to resolve the custom fields, "
-            f"got {len(custom_field_lookups)}: {custom_field_lookups}",
-        )
-
-    def test_custom_field_lookup_reuses_shared_context_cache(self) -> None:
-        """
-        GIVEN:
-            - A CustomField has already been resolved once, by a serializer
-              sharing a given `context` dict
-        WHEN:
-            - A second, separately-instantiated CustomFieldInstanceSerializer
-              validates the same field id, sharing that same context
-              (this mirrors what real call sites do, e.g. bulk-edit's
-              validate_custom_fields()/_validate_custom_field_values()
-              constructing a fresh CustomFieldInstanceSerializer per
-              submitted field, all sharing the outer serializer's context)
-        THEN:
-            - No additional query is issued to resolve the CustomField
-        """
-        custom_field = CustomField.objects.create(
-            name="Test Custom Field",
-            data_type=CustomField.FieldDataType.STRING,
-        )
-
-        context: dict = {}
-        first_pass = CustomFieldInstanceSerializer(
-            data={"field": custom_field.id, "value": "a"},
-            context=context,
-        )
-        self.assertTrue(first_pass.is_valid(), first_pass.errors)
-
-        second_pass = CustomFieldInstanceSerializer(
-            data={"field": custom_field.id, "value": "b"},
-            context=context,
-        )
-        with CaptureQueriesContext(connection) as ctx:
-            self.assertTrue(second_pass.is_valid(), second_pass.errors)
-
-        custom_field_lookups = [
-            query
-            for query in ctx.captured_queries
-            if 'FROM "documents_customfield" WHERE "documents_customfield"."id"'
-            in query["sql"]
-        ]
-        self.assertEqual(
-            len(custom_field_lookups),
-            0,
-            "Expected the second, separately-instantiated serializer to reuse "
-            f"the already-resolved CustomField, got: {custom_field_lookups}",
-        )
-
-    def test_custom_field_validation_rejects_malformed_field_value(self) -> None:
-        """
-        GIVEN:
-            - A document is being validated with a malformed custom_fields
-              entry whose "field" value is neither a valid CustomField id
-              nor a type DRF's own PrimaryKeyRelatedField can safely reject
-              on its own (unhashable, or a non-numeric scalar)
-        WHEN:
-            - The serializer is validated
-        THEN:
-            - A normal validation error is raised, not an unhandled
-              TypeError/ValueError escaping past DRF's validation layer
-        """
-        doc = DocumentFactory(mime_type="application/pdf")
-
-        bad_field_values = {
-            "unhashable-list": [],
-            "unhashable-dict": {},
-            "non-numeric-scalar": "abc",
-        }
-        for case_id, bad_field_value in bad_field_values.items():
-            with self.subTest(case_id):
-                serializer = DocumentSerializer(
-                    doc,
-                    data={
-                        "custom_fields": [
-                            {"field": bad_field_value, "value": "test value"},
-                        ],
-                    },
-                    partial=True,
-                )
-
-                self.assertFalse(serializer.is_valid())
-                self.assertIn("custom_fields", serializer.errors)
-
     def test_change_custom_field_instance_value(self) -> None:
         """
         GIVEN:
@@ -796,72 +660,6 @@ class TestCustomFieldsAPI(DirectoriesMixin, APITestCase):
         assert _cf_4 is not None
         self.assertEqual(_cf_4.value, date_value)
 
-    def test_delete_custom_field_instance_is_hard_deleted_not_soft_deleted(
-        self,
-    ) -> None:
-        """
-        GIVEN:
-            - A document has two custom field instances
-        WHEN:
-            - A PATCH request updates custom_fields to omit one of them
-        THEN:
-            - The omitted instance is immediately hard-deleted: it is gone
-              from both the default manager and the soft-deleted manager,
-              not left in a soft-deleted, not-yet-purged state
-        """
-        doc = Document.objects.create(
-            title="WOW",
-            content="the content",
-            checksum="123-hard-delete",
-            mime_type="application/pdf",
-        )
-        kept_field = CustomField.objects.create(
-            name="Kept Field",
-            data_type=CustomField.FieldDataType.STRING,
-        )
-        removed_field = CustomField.objects.create(
-            name="Removed Field",
-            data_type=CustomField.FieldDataType.STRING,
-        )
-
-        resp = self.client.patch(
-            f"/api/documents/{doc.id}/",
-            data={
-                "custom_fields": [
-                    {"field": kept_field.id, "value": "keep me"},
-                    {"field": removed_field.id, "value": "remove me"},
-                ],
-            },
-            format="json",
-        )
-        self.assertEqual(resp.status_code, status.HTTP_200_OK)
-        self.assertEqual(CustomFieldInstance.objects.count(), 2)
-
-        resp = self.client.patch(
-            f"/api/documents/{doc.id}/",
-            data={
-                "custom_fields": [
-                    {"field": kept_field.id, "value": "keep me"},
-                ],
-            },
-            format="json",
-        )
-        self.assertEqual(resp.status_code, status.HTTP_200_OK)
-
-        self.assertEqual(CustomFieldInstance.objects.count(), 1)
-        self.assertEqual(
-            CustomFieldInstance.deleted_objects.filter(field=removed_field).count(),
-            0,
-            "Removed custom field instance should be hard-deleted, not left "
-            "soft-deleted",
-        )
-        self.assertEqual(
-            CustomFieldInstance.global_objects.filter(field=removed_field).count(),
-            0,
-            "Removed custom field instance should not exist at all, even in "
-            "the all-rows manager",
-        )
-
     def test_custom_field_validation(self) -> None:
         """
         GIVEN:
@@ -1553,81 +1351,6 @@ class TestCustomFieldsAPI(DirectoriesMixin, APITestCase):
         results = response.data["results"]
         self.assertEqual(results[0]["document_count"], 0)
 
-    def test_document_update_custom_fields_sync_query_count(self) -> None:
-        """
-        GIVEN:
-            - A document already has 3 custom field instances attached
-        WHEN:
-            - A PATCH request updates 2 of them, adds 1 new one, and omits
-              the 3rd (which should be deleted)
-        THEN:
-            - The omitted custom field is removed via exactly one
-              delete-shaped query, not drf-writable-nested's old two-step
-              soft-delete-then-hard-delete-after pattern (two delete
-              passes)
-        """
-        doc = Document.objects.create(
-            title="WOW",
-            content="the content",
-            checksum="123-sync-count",
-            mime_type="application/pdf",
-        )
-        fields = [
-            CustomField.objects.create(
-                name=f"Sync Field {i}",
-                data_type=CustomField.FieldDataType.STRING,
-            )
-            for i in range(4)
-        ]
-        # Attach the first 3 up front; the 4th is added in the PATCH below,
-        # and the 3rd is omitted (so it should be deleted).
-        for field in fields[:3]:
-            CustomFieldInstance.objects.create(
-                document=doc,
-                field=field,
-                value_text="initial",
-            )
-        self.assertEqual(CustomFieldInstance.objects.count(), 3)
-
-        with CaptureQueriesContext(connection) as ctx:
-            resp = self.client.patch(
-                f"/api/documents/{doc.id}/",
-                data={
-                    "custom_fields": [
-                        {"field": fields[0].id, "value": "updated 0"},
-                        {"field": fields[1].id, "value": "updated 1"},
-                        {"field": fields[3].id, "value": "new 3"},
-                    ],
-                },
-                format="json",
-            )
-        self.assertEqual(resp.status_code, status.HTTP_200_OK)
-
-        delete_queries = [
-            q
-            for q in ctx.captured_queries
-            if 'DELETE FROM "documents_customfieldinstance"' in q["sql"]
-            or (
-                'UPDATE "documents_customfieldinstance"' in q["sql"]
-                and '"deleted_at"' in q["sql"]
-                and '"deleted_at" = NULL' not in q["sql"]
-            )
-        ]
-        self.assertEqual(
-            len(delete_queries),
-            1,
-            "Expected exactly one delete/soft-delete-marking query for the "
-            f"omitted custom field, got {len(delete_queries)}: {delete_queries}",
-        )
-
-        self.assertEqual(CustomFieldInstance.objects.count(), 3)
-        doc.refresh_from_db()
-        values = {cfi.field_id: cfi.value for cfi in doc.custom_fields.all()}
-        self.assertEqual(values[fields[0].id], "updated 0")
-        self.assertEqual(values[fields[1].id], "updated 1")
-        self.assertEqual(values[fields[3].id], "new 3")
-        self.assertNotIn(fields[2].id, values)
-
     def test_patch_document_invalid_date_custom_field_returns_validation_error(
         self,
     ) -> None:

src/documents/tests/test_api_documents.py

@@ -1,6 +1,5 @@
 import datetime
 import json
-import re
 import shutil
 import tempfile
 import uuid
@@ -22,9 +21,7 @@ from django.core import mail
 from django.core.cache import cache
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.db import DataError
-from django.db import connection
 from django.test import override_settings
-from django.test.utils import CaptureQueriesContext
 from django.utils import timezone
 from guardian.shortcuts import assign_perm
 from rest_framework import status
@@ -255,82 +252,6 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         doc.refresh_from_db()
         self.assertEqual(doc.created, date(2023, 6, 28))
 
-    def test_document_update_tags_batches_tag_lookup(self) -> None:
-        """
-        GIVEN:
-            - A document is being updated with several tags at once
-        WHEN:
-            - API PATCH request is made setting the document's tags
-        THEN:
-            - The referenced Tag objects are resolved with a single batched
-              query, not one query per tag
-        """
-        doc = Document.objects.create(
-            title="none",
-            checksum="123",
-            mime_type="application/pdf",
-        )
-        tags = [TagFactory() for _ in range(8)]
-
-        with CaptureQueriesContext(connection) as ctx:
-            response = self.client.patch(
-                f"/api/documents/{doc.pk}/",
-                {"tags": [t.id for t in tags]},
-                format="json",
-            )
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-
-        # Match `"documents_tag"."id" = <literal>` (a single-row WHERE lookup)
-        # but not the same substring appearing as a JOIN's ON condition
-        # (`"documents_tag"."id" = "documents_document_tags"."tag_id"`),
-        # which is a legitimate, unrelated response-serialization query.
-        single_tag_lookup_re = re.compile(r'"documents_tag"\."id" = \d')
-        single_tag_lookups = [
-            q for q in ctx.captured_queries if single_tag_lookup_re.search(q["sql"])
-        ]
-        self.assertEqual(
-            len(single_tag_lookups),
-            0,
-            "Expected tags to be resolved with a batched query, not "
-            f"per-tag lookups, got: {single_tag_lookups}",
-        )
-
-        doc.refresh_from_db()
-        self.assertCountEqual(
-            doc.tags.values_list("id", flat=True),
-            [t.id for t in tags],
-        )
-
-    def test_document_update_tags_rejects_out_of_range_id(self) -> None:
-        """
-        GIVEN:
-            - A document is being updated with a tag id too large for the
-              database's integer column
-        WHEN:
-            - API PATCH request is made setting the document's tags
-        THEN:
-            - A normal 400 validation error is returned, not an unhandled
-              OverflowError/DataError escaping as a 500
-
-        Django's IntegerFieldOverflow guard converts an out-of-range int
-        into a clean "no match" for exact/gt/gte/lt/lte lookups, but not for
-        `in` -- the batched tag resolution uses `pk__in=`, so this has to be
-        guarded explicitly rather than relying on Django to do it.
-        """
-        doc = Document.objects.create(
-            title="none",
-            checksum="123",
-            mime_type="application/pdf",
-        )
-
-        response = self.client.patch(
-            f"/api/documents/{doc.pk}/",
-            {"tags": [99999999999999999999999999999]},
-            format="json",
-        )
-
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-
     def test_document_update_legacy_created_format(self) -> None:
         """
         GIVEN:

src/documents/tests/test_api_objects.py

@@ -2,15 +2,10 @@ import datetime
 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
 from rest_framework.test import APITestCase
 
@@ -820,59 +815,6 @@ class TestBulkEditObjects(APITestCase):
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(StoragePath.objects.count(), 0)
 
-    def test_bulk_objects_set_permissions_query_count_independent_of_object_count(
-        self,
-    ) -> None:
-        """
-        GIVEN:
-            - Many tags are being bulk-edited to set permissions at once
-        WHEN:
-            - bulk_edit_objects API endpoint is called with set_permissions
-              operation over a small batch vs. a much larger one
-        THEN:
-            - The number of queries issued is the same either way -- each
-              user/group is applied across all tags with one batched call,
-              not one call per (tag, user) pair
-        """
-        group1 = Group.objects.create(name="perm-group")
-        permissions = {
-            "view": {"users": [self.user1.id, self.user2.id], "groups": [group1.id]},
-            "change": {"users": [self.user1.id], "groups": [group1.id]},
-        }
-
-        def run_with_n_tags(n: int) -> int:
-            tags = [Tag.objects.create(name=f"perm-tag-{n}-{i}") for i in range(n)]
-            with CaptureQueriesContext(connection) as ctx:
-                response = self.client.post(
-                    "/api/bulk_edit_objects/",
-                    json.dumps(
-                        {
-                            "objects": [t.id for t in tags],
-                            "object_type": "tags",
-                            "operation": "set_permissions",
-                            "permissions": permissions,
-                            "merge": False,
-                        },
-                    ),
-                    content_type="application/json",
-                )
-            self.assertEqual(response.status_code, status.HTTP_200_OK)
-            for tag in tags:
-                self.assertEqual(get_users_with_perms(tag).count(), 2)
-                self.assertEqual(get_groups_with_perms(tag).count(), 1)
-            return len(ctx.captured_queries)
-
-        small_batch_queries = run_with_n_tags(5)
-        large_batch_queries = run_with_n_tags(50)
-
-        self.assertEqual(
-            small_batch_queries,
-            large_batch_queries,
-            "Expected the same query count regardless of tag count, got "
-            f"{small_batch_queries} queries for 5 tags vs. "
-            f"{large_batch_queries} for 50",
-        )
-
     def test_bulk_objects_delete_all_filtered(self) -> None:
         """
         GIVEN:

src/documents/tests/test_api_uisettings.py

@@ -60,10 +60,6 @@ class TestApiUiSettings(DirectoriesMixin, APITestCase):
                 },
                 "email_enabled": False,
                 "ai_enabled": False,
-                "remote_ocr": {
-                    "configured": False,
-                    "mode": "always",
-                },
             },
         )
 
@@ -158,50 +154,6 @@ class TestApiUiSettings(DirectoriesMixin, APITestCase):
             str(response.data["settings"]),
         )
 
-    @override_settings(
-        REMOTE_OCR_ENGINE="azureai",
-        REMOTE_OCR_API_KEY="somekey",
-        REMOTE_OCR_ENDPOINT="https://example.cognitiveservices.azure.com",
-        REMOTE_OCR_MODE="workflow_only",
-    )
-    def test_settings_reports_remote_ocr_when_configured(self) -> None:
-        """
-        GIVEN:
-            - A fully configured remote OCR engine in workflow_only mode
-        WHEN:
-            - The ui_settings endpoint is called
-        THEN:
-            - The UI is told remote OCR is available and selective, so it can
-              offer it where it would actually change something
-        """
-        response = self.client.get(self.ENDPOINT, format="json")
-
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(
-            response.data["settings"]["remote_ocr"],
-            {"configured": True, "mode": "workflow_only"},
-        )
-
-    @override_settings(
-        REMOTE_OCR_ENGINE="azureai",
-        REMOTE_OCR_API_KEY=None,
-        REMOTE_OCR_ENDPOINT=None,
-    )
-    def test_settings_reports_remote_ocr_incompletely_configured(self) -> None:
-        """
-        GIVEN:
-            - An engine named but missing its endpoint and API key
-        WHEN:
-            - The ui_settings endpoint is called
-        THEN:
-            - It is reported as not configured, matching what the parser
-              registry will actually do
-        """
-        response = self.client.get(self.ENDPOINT, format="json")
-
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertFalse(response.data["settings"]["remote_ocr"]["configured"])
-
     @override_settings(
         OAUTH_CALLBACK_BASE_URL="http://localhost:8000",
         GMAIL_OAUTH_CLIENT_ID="abc123",

src/documents/tests/test_api_workflows.py

@@ -506,141 +506,6 @@ class TestApiWorkflows(DirectoriesMixin, APITestCase):
 
         self.assertEqual(Workflow.objects.count(), 1)
 
-    def test_api_create_remote_ocr_action_requires_consumption_trigger(
-        self,
-    ) -> None:
-        """
-        GIVEN:
-            - API request to create a workflow with a remote OCR action
-            - No consumption started trigger, so the action could never run
-        WHEN:
-            - API is called
-        THEN:
-            - Correct HTTP 400 response
-            - No objects are created
-        """
-        existing_count = Workflow.objects.count()
-
-        response = self.client.post(
-            self.ENDPOINT,
-            json.dumps(
-                {
-                    "name": "Remote OCR too late",
-                    "order": 1,
-                    "triggers": [
-                        {
-                            "type": WorkflowTrigger.WorkflowTriggerType.DOCUMENT_ADDED,
-                        },
-                    ],
-                    "actions": [
-                        {
-                            "type": WorkflowAction.WorkflowActionType.REMOTE_OCR,
-                        },
-                    ],
-                },
-            ),
-            content_type="application/json",
-        )
-
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        self.assertEqual(Workflow.objects.count(), existing_count)
-
-    def test_api_create_remote_ocr_action_with_consumption_trigger(self) -> None:
-        """
-        GIVEN:
-            - API request to create a workflow with a remote OCR action
-            - A consumption started trigger alongside another trigger type
-        WHEN:
-            - API is called
-        THEN:
-            - The workflow is created, the action applies to consumption only
-        """
-        response = self.client.post(
-            self.ENDPOINT,
-            json.dumps(
-                {
-                    "name": "Remote OCR on consume",
-                    "order": 1,
-                    "triggers": [
-                        {
-                            "type": WorkflowTrigger.WorkflowTriggerType.CONSUMPTION,
-                            "filter_filename": "*.pdf",
-                        },
-                        {
-                            "type": WorkflowTrigger.WorkflowTriggerType.DOCUMENT_ADDED,
-                        },
-                    ],
-                    "actions": [
-                        {
-                            "type": WorkflowAction.WorkflowActionType.REMOTE_OCR,
-                        },
-                    ],
-                },
-            ),
-            content_type="application/json",
-        )
-
-        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
-
-    def test_api_partial_update_adds_remote_ocr_action(self) -> None:
-        """
-        GIVEN:
-            - An existing workflow with a consumption started trigger
-        WHEN:
-            - A partial update adds a remote OCR action without resubmitting triggers
-        THEN:
-            - The existing trigger is considered and the update succeeds
-        """
-        response = self.client.patch(
-            f"{self.ENDPOINT}{self.workflow.id}/",
-            json.dumps(
-                {
-                    "actions": [
-                        {
-                            "type": WorkflowAction.WorkflowActionType.REMOTE_OCR,
-                        },
-                    ],
-                },
-            ),
-            content_type="application/json",
-        )
-
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(
-            self.workflow.actions.get().type,
-            WorkflowAction.WorkflowActionType.REMOTE_OCR,
-        )
-
-    def test_api_partial_update_cannot_remove_remote_ocr_trigger(self) -> None:
-        """
-        GIVEN:
-            - An existing workflow with a remote OCR action
-            - An existing consumption started trigger
-        WHEN:
-            - A partial update replaces the trigger without resubmitting actions
-        THEN:
-            - The existing action is considered and the update is rejected
-        """
-        self.action.type = WorkflowAction.WorkflowActionType.REMOTE_OCR
-        self.action.save()
-
-        response = self.client.patch(
-            f"{self.ENDPOINT}{self.workflow.id}/",
-            json.dumps(
-                {
-                    "triggers": [
-                        {
-                            "type": WorkflowTrigger.WorkflowTriggerType.DOCUMENT_UPDATED,
-                        },
-                    ],
-                },
-            ),
-            content_type="application/json",
-        )
-
-        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
-        self.assertEqual(self.workflow.triggers.get(), self.trigger)
-
     def test_api_create_workflow_trigger_action_empty_fields(self) -> None:
         """
         GIVEN:

src/documents/tests/test_bulk_edit.py

@@ -5,11 +5,8 @@ from unittest import mock
 
 import pikepdf
 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 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,7 +19,6 @@ from documents.models import Document
 from documents.models import DocumentType
 from documents.models import StoragePath
 from documents.models import Tag
-from documents.permissions import set_permissions_for_objects
 from documents.tests.utils import DirectoriesMixin
 
 
@@ -348,100 +344,6 @@ class TestBulkEdit(DirectoriesMixin, TestCase):
         assert _cf_3 is not None
         self.assertNotIn(self.doc3.id, _cf_3.value)
 
-    def test_modify_custom_fields_batches_field_lookup(self) -> None:
-        """
-        GIVEN:
-            - Several documents are being bulk-edited to add several custom
-              fields at once
-        WHEN:
-            - modify_custom_fields runs
-        THEN:
-            - Each CustomField is resolved with one batched query total, not
-              once per (field, document) pair
-        """
-        docs = [
-            Document.objects.create(checksum=f"batch-{i}", title=f"batch-{i}")
-            for i in range(6)
-        ]
-        fields = [
-            CustomField.objects.create(
-                name=f"Batch Field {i}",
-                data_type=CustomField.FieldDataType.STRING,
-            )
-            for i in range(4)
-        ]
-
-        with CaptureQueriesContext(connection) as ctx:
-            bulk_edit.modify_custom_fields(
-                [doc.id for doc in docs],
-                add_custom_fields=[field.id for field in fields],
-                remove_custom_fields=[],
-            )
-
-        field_lookups = [
-            q
-            for q in ctx.captured_queries
-            if 'FROM "documents_customfield"' in q["sql"]
-        ]
-        self.assertEqual(
-            len(field_lookups),
-            1,
-            "Expected a single batched query to resolve the custom fields, "
-            f"got {len(field_lookups)}: {field_lookups}",
-        )
-
-        for doc in docs:
-            self.assertEqual(doc.custom_fields.count(), len(fields))
-
-    def test_modify_custom_fields_batches_document_lookup_for_documentlink(
-        self,
-    ) -> None:
-        """
-        GIVEN:
-            - Several documents are being bulk-edited to add a DOCUMENTLINK
-              custom field at once
-        WHEN:
-            - modify_custom_fields runs
-        THEN:
-            - The Document rows needed to reflect the symmetrical links are
-              resolved with one batched query total, not once per document
-        """
-        docs = [
-            Document.objects.create(checksum=f"link-{i}", title=f"link-{i}")
-            for i in range(6)
-        ]
-        target = Document.objects.create(checksum="link-target", title="link-target")
-        doclink_field = CustomField.objects.create(
-            name="Related",
-            data_type=CustomField.FieldDataType.DOCUMENTLINK,
-        )
-
-        with CaptureQueriesContext(connection) as ctx:
-            bulk_edit.modify_custom_fields(
-                [doc.id for doc in docs],
-                add_custom_fields={doclink_field.id: [target.id]},
-                remove_custom_fields=[],
-            )
-
-        single_document_lookups = [
-            q
-            for q in ctx.captured_queries
-            if 'FROM "documents_document"' in q["sql"]
-            and '"documents_document"."id" = ' in q["sql"]
-        ]
-        self.assertEqual(
-            len(single_document_lookups),
-            0,
-            "Expected document rows to come from a batched query, not "
-            f"per-document lookups, got: {single_document_lookups}",
-        )
-
-        for doc in docs:
-            self.assertEqual(
-                doc.custom_fields.get(field=doclink_field).value,
-                [target.id],
-            )
-
     def test_modify_custom_fields_doclink_self_link(self) -> None:
         """
         GIVEN:
@@ -608,132 +510,6 @@ class TestBulkEdit(DirectoriesMixin, TestCase):
         )
         self.assertEqual(groups_with_perms.count(), 2)
 
-    @mock.patch("documents.tasks.bulk_update_documents.apply_async")
-    def test_set_permissions_query_count_independent_of_document_count(
-        self,
-        m,
-    ) -> None:
-        """
-        GIVEN:
-            - Many documents are being bulk-edited to set permissions at once
-        WHEN:
-            - set_permissions runs over a small batch vs. a much larger one
-        THEN:
-            - The number of queries issued is the same either way -- each
-              user/group is applied across all documents with one batched
-              call, not one call per (document, user) pair
-        """
-        permissions = {
-            "view": {
-                "users": [self.user1.id, self.user2.id],
-                "groups": [self.group2.id],
-            },
-            "change": {
-                "users": [self.user1.id],
-                "groups": [self.group2.id],
-            },
-        }
-
-        def run_with_n_documents(n: int) -> int:
-            docs = [
-                Document.objects.create(checksum=f"perm-{n}-{i}", title=f"perm-{n}-{i}")
-                for i in range(n)
-            ]
-            with CaptureQueriesContext(connection) as ctx:
-                bulk_edit.set_permissions(
-                    [doc.id for doc in docs],
-                    set_permissions=permissions,
-                    owner=self.owner,
-                    merge=False,
-                )
-            for doc in docs:
-                self.assertEqual(get_users_with_perms(doc).count(), 2)
-                self.assertEqual(get_groups_with_perms(doc).count(), 1)
-            return len(ctx.captured_queries)
-
-        small_batch_queries = run_with_n_documents(5)
-        large_batch_queries = run_with_n_documents(50)
-
-        self.assertEqual(
-            small_batch_queries,
-            large_batch_queries,
-            "Expected the same query count regardless of document count, got "
-            f"{small_batch_queries} queries for 5 documents vs. "
-            f"{large_batch_queries} for 50",
-        )
-
-    @mock.patch("documents.tasks.bulk_update_documents.apply_async")
-    def test_set_permissions_grants_direct_perm_even_if_already_granted_via_group(
-        self,
-        m,
-    ) -> None:
-        """
-        GIVEN:
-            - A user already has view access to a document via group
-              membership, with no direct grant of their own
-        WHEN:
-            - set_permissions explicitly grants that same user direct view
-              access via bulk_edit
-        THEN:
-            - A direct permission grant is created for the user, not skipped
-              because they already have equivalent access via the group
-
-        Regression test: guardian's queryset-aware assign_perm() (routed to
-        when the target is a list/queryset) skips creating a direct row for
-        anyone whose ObjectPermissionChecker.has_perm() already returns True
-        -- which includes group-derived access. The single-object assign_perm
-        this bulk path replaces has no such check; it always ensures a
-        direct row via get_or_create. Losing that guarantee would mean
-        revoking the group's grant later silently strips access that was
-        supposed to be explicit.
-        """
-        self.doc1.owner = self.user1
-        self.doc1.save()
-        self.user1.groups.add(self.group1)
-        assign_perm("view_document", self.group1, self.doc1)
-
-        bulk_edit.set_permissions(
-            [self.doc1.id],
-            set_permissions={
-                "view": {"users": [self.user1.id], "groups": []},
-            },
-            merge=True,
-        )
-
-        direct_users = get_users_with_perms(
-            self.doc1,
-            only_with_perms_in=["view_document"],
-            with_group_users=False,
-        )
-        self.assertIn(self.user1, direct_users)
-
-    def test_set_permissions_for_objects_raises_for_unknown_action(self) -> None:
-        """
-        GIVEN:
-            - An unrecognized permission action name with users to grant it
-              to
-        WHEN:
-            - set_permissions_for_objects is called
-        THEN:
-            - Permission.DoesNotExist is raised, not a silent no-op
-
-        Regression test: the endpoint that calls this
-        (BulkEditObjectPermissionsView) never actually validates action
-        names against the raw client-supplied permissions dict --
-        BulkEditObjectsSerializer._validate_permissions calls
-        validate_set_permissions() only for its side-effecting user/group id
-        checks and discards the filtered dict it returns -- so a bogus
-        action key reaches this function as-is. Resolving the Permission via
-        a bare `.filter()` (which returns empty instead of raising) would
-        silently drop the grant and report success.
-        """
-        with self.assertRaises(Permission.DoesNotExist):
-            set_permissions_for_objects(
-                {"not_a_real_action": {"users": [self.user1.id], "groups": []}},
-                Document,
-                [self.doc1.pk],
-            )
-
     @mock.patch("documents.models.Document.delete")
     def test_delete_documents_old_uuid_field(self, m) -> None:
         m.side_effect = Exception("Data too long for column 'transaction_id' at row 1")
@@ -2006,56 +1782,3 @@ class TestPDFActions(DirectoriesMixin, TestCase):
 
         self.assertIn("wrong password", str(exc.exception))
         self.assertIn("Error removing password from document", cm.output[0])
-
-
-class TestBulkEditReprocess(DirectoriesMixin, TestCase):
-    def setUp(self) -> None:
-        super().setUp()
-
-        self.doc = Document.objects.create(
-            title="test",
-            checksum="A",
-            mime_type="application/pdf",
-        )
-
-    @mock.patch("documents.bulk_edit.update_document_content_maybe_archive_file")
-    def test_reprocess_defaults_to_local(self, mock_task: mock.Mock) -> None:
-        """
-        GIVEN:
-            - A reprocess request that says nothing about remote OCR
-        WHEN:
-            - reprocess is called
-        THEN:
-            - The task is queued without asking for the remote engine
-        """
-        result = bulk_edit.reprocess([self.doc.id])
-
-        self.assertEqual(result, "OK")
-        mock_task.apply_async.assert_called_once()
-        _, kwargs = mock_task.apply_async.call_args
-        self.assertEqual(
-            kwargs["kwargs"],
-            {"document_id": self.doc.id, "remote_ocr": False},
-        )
-
-    @mock.patch("documents.bulk_edit.update_document_content_maybe_archive_file")
-    def test_reprocess_passes_remote_ocr(self, mock_task: mock.Mock) -> None:
-        """
-        GIVEN:
-            - A reprocess request that explicitly asks for remote OCR
-        WHEN:
-            - reprocess is called
-        THEN:
-            - The request is forwarded to the task for every document
-        """
-        other = Document.objects.create(
-            title="test2",
-            checksum="B",
-            mime_type="application/pdf",
-        )
-
-        bulk_edit.reprocess([self.doc.id, other.id], remote_ocr=True)
-
-        self.assertEqual(mock_task.apply_async.call_count, 2)
-        for call in mock_task.apply_async.call_args_list:
-            self.assertTrue(call.kwargs["kwargs"]["remote_ocr"])

src/documents/tests/test_consumer.py

@@ -1559,72 +1559,6 @@ class PostConsumeTestCase(DirectoriesMixin, GetConsumerMixin, TestCase):
                         consumer.run_post_consume_script(doc)
 
 
-class TestConsumerRemoteOCR(
-    DirectoriesMixin,
-    FileSystemAssertsMixin,
-    GetConsumerMixin,
-    TestCase,
-):
-    """
-    The consumer resolves the remote OCR mode and the per-document request from
-    workflows into the allow_remote flag it hands to the parser registry.
-    """
-
-    def setUp(self) -> None:
-        super().setUp()
-
-        patcher = mock.patch("documents.consumer.get_parser_registry")
-        self.mock_registry = patcher.start()
-        self.mock_registry.return_value.get_parser_for_file.return_value = DummyParser
-        self.addCleanup(patcher.stop)
-
-    def _consume(self, *, overrides: DocumentMetadataOverrides | None = None) -> bool:
-        src = (
-            Path(__file__).parent
-            / "samples"
-            / "documents"
-            / "originals"
-            / "0000001.pdf"
-        )
-        dst = self.dirs.scratch_dir / "sample.pdf"
-        shutil.copy(src, dst)
-
-        with self.get_consumer(dst, overrides=overrides) as consumer:
-            consumer.run()
-
-        _, kwargs = self.mock_registry.return_value.get_parser_for_file.call_args
-        return kwargs["allow_remote"]
-
-    @override_settings(REMOTE_OCR_MODE="always")
-    def test_always_mode_allows_remote(self) -> None:
-        """
-        GIVEN: Remote OCR mode is 'always'.
-        WHEN:  A document is consumed without any workflow asking for it.
-        THEN:  The registry is allowed to pick the remote parser.
-        """
-        self.assertTrue(self._consume())
-
-    @override_settings(REMOTE_OCR_MODE="workflow_only")
-    def test_workflow_only_mode_denies_remote_by_default(self) -> None:
-        """
-        GIVEN: Remote OCR mode is 'workflow_only'.
-        WHEN:  A document is consumed and nothing asked for remote OCR.
-        THEN:  The remote parser is excluded.
-        """
-        self.assertFalse(self._consume())
-
-    @override_settings(REMOTE_OCR_MODE="workflow_only")
-    def test_workflow_only_mode_allows_remote_when_requested(self) -> None:
-        """
-        GIVEN: Remote OCR mode is 'workflow_only'.
-        WHEN:  A workflow set remote_ocr on the metadata overrides.
-        THEN:  The registry is allowed to pick the remote parser.
-        """
-        self.assertTrue(
-            self._consume(overrides=DocumentMetadataOverrides(remote_ocr=True)),
-        )
-
-
 class TestMetadataOverrides(TestCase):
     def test_update_skip_asn_if_exists(self) -> None:
         base = DocumentMetadataOverrides()
@@ -1632,20 +1566,6 @@ class TestMetadataOverrides(TestCase):
         base.update(incoming)
         self.assertTrue(base.skip_asn_if_exists)
 
-    def test_update_remote_ocr(self) -> None:
-        base = DocumentMetadataOverrides()
-        base.update(DocumentMetadataOverrides(remote_ocr=True))
-        self.assertTrue(base.remote_ocr)
-
-    def test_update_remote_ocr_is_not_unset(self) -> None:
-        """
-        A later workflow that says nothing must not undo an earlier one that
-        asked for remote OCR.
-        """
-        base = DocumentMetadataOverrides(remote_ocr=True)
-        base.update(DocumentMetadataOverrides())
-        self.assertTrue(base.remote_ocr)
-
     def test_update_actor_and_version_label(self) -> None:
         base = DocumentMetadataOverrides(
             actor_id=1,

src/documents/tests/test_data_models.py

@@ -1,58 +0,0 @@
-from django.db import connection
-from django.test import TestCase
-from django.test.utils import CaptureQueriesContext
-
-from documents.data_models import DocumentMetadataOverrides
-from documents.models import CustomField
-from documents.models import CustomFieldInstance
-from documents.tests.factories import DocumentFactory
-from documents.tests.utils import DirectoriesMixin
-
-
-class TestDocumentMetadataOverridesFromDocument(DirectoriesMixin, TestCase):
-    def test_from_document_batches_custom_field_lookup_after_refresh_from_db(
-        self,
-    ) -> None:
-        """
-        GIVEN:
-            - A document has several custom field values
-            - The document instance has just been refreshed from the database,
-              which drops any prefetched related objects (as
-              send_websocket_document_updated does before building overrides)
-        WHEN:
-            - DocumentMetadataOverrides.from_document() reads the document's
-              custom field values
-        THEN:
-            - The referenced CustomField objects are resolved with a single
-              query, not one query per custom field
-        """
-        doc = DocumentFactory(mime_type="application/pdf")
-        for i in range(5):
-            CustomFieldInstance.objects.create(
-                document=doc,
-                field=CustomField.objects.create(
-                    name=f"Test Custom Field {i}",
-                    data_type=CustomField.FieldDataType.STRING,
-                ),
-                value_text="value",
-            )
-
-        doc.refresh_from_db()
-
-        with CaptureQueriesContext(connection) as ctx:
-            overrides = DocumentMetadataOverrides.from_document(doc)
-
-        self.assertEqual(len(overrides.custom_fields), 5)
-        unbatched_field_lookups = [
-            query
-            for query in ctx.captured_queries
-            if 'FROM "documents_customfield" WHERE "documents_customfield"."id"'
-            in query["sql"]
-        ]
-        self.assertEqual(
-            unbatched_field_lookups,
-            [],
-            "Expected CustomField data to come from the CustomFieldInstance "
-            "join, not a separate per-instance lookup, "
-            f"got: {unbatched_field_lookups}",
-        )

src/documents/tests/test_tasks.py

@@ -287,45 +287,6 @@ class TestUpdateContent(DirectoriesMixin, TestCase):
         self.assertNotEqual(Document.objects.get(pk=doc.pk).content, "test")
 
 
-class TestUpdateContentRemoteOCR(DirectoriesMixin, TestCase):
-    """
-    Consumption workflows do not run on reprocess, so the remote parser is
-    used only in 'always' mode or when the caller explicitly asks for it.
-    """
-
-    def setUp(self) -> None:
-        super().setUp()
-
-        patcher = mock.patch("documents.tasks.get_parser_registry")
-        self.mock_registry = patcher.start()
-        self.mock_registry.return_value.get_parser_for_file.return_value = None
-        self.addCleanup(patcher.stop)
-
-        self.doc = Document.objects.create(
-            title="test",
-            content="my document",
-            checksum="wow",
-            mime_type="application/pdf",
-        )
-
-    def _allow_remote(self, **kwargs) -> bool:
-        tasks.update_document_content_maybe_archive_file(self.doc.pk, **kwargs)
-        _, call_kwargs = self.mock_registry.return_value.get_parser_for_file.call_args
-        return call_kwargs["allow_remote"]
-
-    @override_settings(REMOTE_OCR_MODE="always")
-    def test_always_mode_allows_remote(self) -> None:
-        self.assertTrue(self._allow_remote())
-
-    @override_settings(REMOTE_OCR_MODE="workflow_only")
-    def test_workflow_only_mode_denies_remote_by_default(self) -> None:
-        self.assertFalse(self._allow_remote())
-
-    @override_settings(REMOTE_OCR_MODE="workflow_only")
-    def test_workflow_only_mode_allows_remote_when_requested(self) -> None:
-        self.assertTrue(self._allow_remote(remote_ocr=True))
-
-
 class TestAIIndex(DirectoriesMixin, TestCase):
     @override_settings(
         AI_ENABLED=True,

src/documents/tests/test_workflows.py

@@ -5409,82 +5409,3 @@ class TestDateWorkflowLocalization(
             document = Document.objects.first()
             assert document is not None
             assert document.title == expected_title
-
-
-class TestRemoteOCRWorkflowAction(DirectoriesMixin, SampleDirMixin, APITestCase):
-    def _make_workflow(self, trigger_type) -> None:
-        trigger = WorkflowTrigger.objects.create(type=trigger_type)
-        action = WorkflowAction.objects.create(
-            type=WorkflowAction.WorkflowActionType.REMOTE_OCR,
-        )
-        w = Workflow.objects.create(name="Remote OCR", order=0)
-        w.triggers.add(trigger)
-        w.actions.add(action)
-        w.save()
-
-    def test_consumption_trigger_requests_remote_ocr(self) -> None:
-        """
-        GIVEN:
-            - A consumption workflow with a remote OCR action
-        WHEN:
-            - A matching document is consumed
-        THEN:
-            - The overrides ask for remote OCR, which is what the consumer
-              reads when choosing a parser
-        """
-        self._make_workflow(WorkflowTrigger.WorkflowTriggerType.CONSUMPTION)
-
-        test_file = shutil.copy(
-            self.SAMPLE_DIR / "simple.pdf",
-            self.dirs.scratch_dir / "simple.pdf",
-        )
-        overrides = DocumentMetadataOverrides()
-
-        run_workflows(
-            WorkflowTrigger.WorkflowTriggerType.CONSUMPTION,
-            ConsumableDocument(
-                source=DocumentSource.ConsumeFolder,
-                original_file=test_file,
-            ),
-            overrides=overrides,
-        )
-
-        self.assertTrue(overrides.remote_ocr)
-
-    def test_other_trigger_types_are_ignored(self) -> None:
-        """
-        GIVEN:
-            - A workflow with a remote OCR action that also has a
-              non-consumption trigger, which is a valid combination
-        WHEN:
-            - The non-consumption trigger fires
-        THEN:
-            - The action is skipped, since the document has already been
-              parsed by this point
-        """
-        trigger = WorkflowTrigger.objects.create(
-            type=WorkflowTrigger.WorkflowTriggerType.CONSUMPTION,
-        )
-        updated_trigger = WorkflowTrigger.objects.create(
-            type=WorkflowTrigger.WorkflowTriggerType.DOCUMENT_UPDATED,
-        )
-        action = WorkflowAction.objects.create(
-            type=WorkflowAction.WorkflowActionType.REMOTE_OCR,
-        )
-        w = Workflow.objects.create(name="Remote OCR", order=0)
-        w.triggers.add(trigger, updated_trigger)
-        w.actions.add(action)
-        w.save()
-
-        doc = Document.objects.create(
-            title="sample test",
-            original_filename="sample.pdf",
-        )
-
-        with self.assertLogs("paperless.handlers", level="DEBUG") as cm:
-            run_workflows(
-                WorkflowTrigger.WorkflowTriggerType.DOCUMENT_UPDATED,
-                doc,
-            )
-
-        self.assertIn("only applies to consumption triggers", "".join(cm.output))

src/documents/views.py

@@ -178,7 +178,7 @@ from documents.permissions import has_perms_owner_aware
 from documents.permissions import has_system_status_permission
 from documents.permissions import permitted_document_ids
 from documents.permissions import permitted_object_ids
-from documents.permissions import set_permissions_for_objects
+from documents.permissions import set_permissions_for_object
 from documents.plugins.date_parsing import get_date_parser
 from documents.schema import generate_object_with_permissions_schema
 from documents.search import SearchHit
@@ -239,10 +239,8 @@ from paperless import version
 from paperless.celery import app as celery_app
 from paperless.config import AIConfig
 from paperless.config import GeneralConfig
-from paperless.config import RemoteOCRConfig
 from paperless.models import ApplicationConfiguration
 from paperless.parsers.registry import get_parser_registry
-from paperless.parsers.remote import RemoteEngineConfig
 from paperless.serialisers import GroupSerializer
 from paperless.serialisers import UserSerializer
 from paperless.views import StandardPagination
@@ -4102,11 +4100,6 @@ class UiSettingsView(GenericAPIView[Any]):
 
         ui_settings["auditlog_enabled"] = settings.AUDIT_LOG_ENABLED
 
-        ui_settings["remote_ocr"] = {
-            "configured": RemoteEngineConfig.from_app_config().engine_is_valid(),
-            "mode": RemoteOCRConfig().remote_ocr_mode,
-        }
-
         if settings.GMAIL_OAUTH_ENABLED or settings.OUTLOOK_OAUTH_ENABLED:
             manager = PaperlessMailOAuth2Manager()
             if settings.GMAIL_OAUTH_ENABLED:
@@ -4917,12 +4910,12 @@ class BulkEditObjectsView(PassUserMixin):
                     qs_owner_update.update(owner=owner)
 
                 if "permissions" in serializer.validated_data:
-                    set_permissions_for_objects(
-                        permissions=permissions,
-                        model=object_class,
-                        pks=qs.values_list("pk", flat=True),
-                        merge=merge,
-                    )
+                    for obj in qs:
+                        set_permissions_for_object(
+                            permissions=permissions,
+                            object=obj,
+                            merge=merge,
+                        )
 
             except Exception as e:
                 logger.warning(

src/locale/en_US/LC_MESSAGES/django.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: paperless-ngx\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-08-24 21:43+0000\n"
+"POT-Creation-Date: 2026-08-19 18:18+0000\n"
 "PO-Revision-Date: 2022-02-17 04:17\n"
 "Last-Translator: \n"
 "Language-Team: English\n"
@@ -89,7 +89,7 @@ msgstr ""
 msgid "Automatic"
 msgstr ""
 
-#: documents/models.py:65 documents/models.py:606 documents/models.py:1924
+#: documents/models.py:65 documents/models.py:606 documents/models.py:1920
 #: paperless_mail/models.py:23 paperless_mail/models.py:143
 msgid "name"
 msgstr ""
@@ -272,7 +272,7 @@ msgid "Optional short label for a document version."
 msgstr ""
 
 #: documents/models.py:340 documents/models.py:922 documents/models.py:976
-#: documents/models.py:1967
+#: documents/models.py:1963
 msgid "document"
 msgstr ""
 
@@ -1385,202 +1385,198 @@ msgid "Move to trash"
 msgstr ""
 
 #: documents/models.py:1675
-msgid "Remote OCR"
-msgstr ""
-
-#: documents/models.py:1679
 msgid "Workflow Action Type"
 msgstr ""
 
-#: documents/models.py:1684 documents/models.py:1926
+#: documents/models.py:1680 documents/models.py:1922
 #: paperless_mail/models.py:145
 msgid "order"
 msgstr ""
 
-#: documents/models.py:1687
+#: documents/models.py:1683
 msgid "assign title"
 msgstr ""
 
-#: documents/models.py:1691
+#: documents/models.py:1687
 msgid "Assign a document title, must  be a Jinja2 template, see documentation."
 msgstr ""
 
-#: documents/models.py:1699 paperless_mail/models.py:274
+#: documents/models.py:1695 paperless_mail/models.py:274
 msgid "assign this tag"
 msgstr ""
 
-#: documents/models.py:1708 paperless_mail/models.py:282
+#: documents/models.py:1704 paperless_mail/models.py:282
 msgid "assign this document type"
 msgstr ""
 
-#: documents/models.py:1717 paperless_mail/models.py:296
+#: documents/models.py:1713 paperless_mail/models.py:296
 msgid "assign this correspondent"
 msgstr ""
 
-#: documents/models.py:1726
+#: documents/models.py:1722
 msgid "assign this storage path"
 msgstr ""
 
-#: documents/models.py:1735
+#: documents/models.py:1731
 msgid "assign this owner"
 msgstr ""
 
-#: documents/models.py:1742
+#: documents/models.py:1738
 msgid "grant view permissions to these users"
 msgstr ""
 
-#: documents/models.py:1749
+#: documents/models.py:1745
 msgid "grant view permissions to these groups"
 msgstr ""
 
-#: documents/models.py:1756
+#: documents/models.py:1752
 msgid "grant change permissions to these users"
 msgstr ""
 
-#: documents/models.py:1763
+#: documents/models.py:1759
 msgid "grant change permissions to these groups"
 msgstr ""
 
-#: documents/models.py:1770
+#: documents/models.py:1766
 msgid "assign these custom fields"
 msgstr ""
 
-#: documents/models.py:1774
+#: documents/models.py:1770
 msgid "custom field values"
 msgstr ""
 
-#: documents/models.py:1778
+#: documents/models.py:1774
 msgid "Optional values to assign to the custom fields."
 msgstr ""
 
-#: documents/models.py:1787
+#: documents/models.py:1783
 msgid "remove these tag(s)"
 msgstr ""
 
-#: documents/models.py:1792
+#: documents/models.py:1788
 msgid "remove all tags"
 msgstr ""
 
-#: documents/models.py:1799
+#: documents/models.py:1795
 msgid "remove these document type(s)"
 msgstr ""
 
-#: documents/models.py:1804
+#: documents/models.py:1800
 msgid "remove all document types"
 msgstr ""
 
-#: documents/models.py:1811
+#: documents/models.py:1807
 msgid "remove these correspondent(s)"
 msgstr ""
 
-#: documents/models.py:1816
+#: documents/models.py:1812
 msgid "remove all correspondents"
 msgstr ""
 
-#: documents/models.py:1823
+#: documents/models.py:1819
 msgid "remove these storage path(s)"
 msgstr ""
 
-#: documents/models.py:1828
+#: documents/models.py:1824
 msgid "remove all storage paths"
 msgstr ""
 
-#: documents/models.py:1835
+#: documents/models.py:1831
 msgid "remove these owner(s)"
 msgstr ""
 
-#: documents/models.py:1840
+#: documents/models.py:1836
 msgid "remove all owners"
 msgstr ""
 
-#: documents/models.py:1847
+#: documents/models.py:1843
 msgid "remove view permissions for these users"
 msgstr ""
 
-#: documents/models.py:1854
+#: documents/models.py:1850
 msgid "remove view permissions for these groups"
 msgstr ""
 
-#: documents/models.py:1861
+#: documents/models.py:1857
 msgid "remove change permissions for these users"
 msgstr ""
 
-#: documents/models.py:1868
+#: documents/models.py:1864
 msgid "remove change permissions for these groups"
 msgstr ""
 
-#: documents/models.py:1873
+#: documents/models.py:1869
 msgid "remove all permissions"
 msgstr ""
 
-#: documents/models.py:1880
+#: documents/models.py:1876
 msgid "remove these custom fields"
 msgstr ""
 
-#: documents/models.py:1885
+#: documents/models.py:1881
 msgid "remove all custom fields"
 msgstr ""
 
-#: documents/models.py:1894
+#: documents/models.py:1890
 msgid "email"
 msgstr ""
 
-#: documents/models.py:1903
+#: documents/models.py:1899
 msgid "webhook"
 msgstr ""
 
-#: documents/models.py:1907
+#: documents/models.py:1903
 msgid "passwords"
 msgstr ""
 
-#: documents/models.py:1911
+#: documents/models.py:1907
 msgid ""
 "Passwords to try when removing PDF protection. Separate with commas or new "
 "lines."
 msgstr ""
 
-#: documents/models.py:1916
+#: documents/models.py:1912
 msgid "workflow action"
 msgstr ""
 
-#: documents/models.py:1917
+#: documents/models.py:1913
 msgid "workflow actions"
 msgstr ""
 
-#: documents/models.py:1932
+#: documents/models.py:1928
 msgid "triggers"
 msgstr ""
 
-#: documents/models.py:1939
+#: documents/models.py:1935
 msgid "actions"
 msgstr ""
 
-#: documents/models.py:1942 paperless_mail/models.py:154
+#: documents/models.py:1938 paperless_mail/models.py:154
 msgid "enabled"
 msgstr ""
 
-#: documents/models.py:1953
+#: documents/models.py:1949
 msgid "workflow"
 msgstr ""
 
-#: documents/models.py:1957
+#: documents/models.py:1953
 msgid "workflow trigger type"
 msgstr ""
 
-#: documents/models.py:1971
+#: documents/models.py:1967
 msgid "date run"
 msgstr ""
 
-#: documents/models.py:1977
+#: documents/models.py:1973
 msgid "workflow run"
 msgstr ""
 
-#: documents/models.py:1978
+#: documents/models.py:1974
 msgid "workflow runs"
 msgstr ""
 
 #: documents/serialisers.py:523 documents/serialisers.py:875
-#: documents/serialisers.py:2827 documents/views.py:311 documents/views.py:2612
+#: documents/serialisers.py:2818 documents/views.py:309 documents/views.py:2610
 #: paperless_mail/serialisers.py:155
 msgid "Insufficient permissions."
 msgstr ""
@@ -1589,39 +1585,39 @@ msgstr ""
 msgid "Invalid color."
 msgstr ""
 
-#: documents/serialisers.py:2304
+#: documents/serialisers.py:2295
 #, python-format
 msgid "File type %(type)s not supported"
 msgstr ""
 
-#: documents/serialisers.py:2348
+#: documents/serialisers.py:2339
 #, python-format
 msgid "Custom field id must be an integer: %(id)s"
 msgstr ""
 
-#: documents/serialisers.py:2355
+#: documents/serialisers.py:2346
 #, python-format
 msgid "Custom field with id %(id)s does not exist"
 msgstr ""
 
-#: documents/serialisers.py:2372 documents/serialisers.py:2382
+#: documents/serialisers.py:2363 documents/serialisers.py:2373
 msgid ""
 "Custom fields must be a list of integers or an object mapping ids to values."
 msgstr ""
 
-#: documents/serialisers.py:2377
+#: documents/serialisers.py:2368
 msgid "Some custom fields don't exist or were specified twice."
 msgstr ""
 
-#: documents/serialisers.py:2524
+#: documents/serialisers.py:2515
 msgid "Invalid variable detected."
 msgstr ""
 
-#: documents/serialisers.py:2883
+#: documents/serialisers.py:2874
 msgid "Duplicate document identifiers are not allowed."
 msgstr ""
 
-#: documents/serialisers.py:2913 documents/views.py:4606
+#: documents/serialisers.py:2904 documents/views.py:4599
 #, python-format
 msgid "Documents not found: %(ids)s"
 msgstr ""
@@ -1889,36 +1885,36 @@ msgstr ""
 msgid "Unable to parse URI {value}"
 msgstr ""
 
-#: documents/views.py:304 documents/views.py:2609
+#: documents/views.py:302 documents/views.py:2607
 msgid "Invalid more_like_id"
 msgstr ""
 
-#: documents/views.py:1586
+#: documents/views.py:1584
 msgid "Invalid AI configuration."
 msgstr ""
 
-#: documents/views.py:1597
+#: documents/views.py:1595
 msgid "AI backend request timed out."
 msgstr ""
 
-#: documents/views.py:2434 documents/views.py:2755
+#: documents/views.py:2432 documents/views.py:2753
 msgid "Specify only one of text, title_search, query, or more_like_id."
 msgstr ""
 
-#: documents/views.py:4619
+#: documents/views.py:4612
 #, python-format
 msgid "Insufficient permissions to share document %(id)s."
 msgstr ""
 
-#: documents/views.py:4665
+#: documents/views.py:4658
 msgid "Bundle is already being processed."
 msgstr ""
 
-#: documents/views.py:4726
+#: documents/views.py:4719
 msgid "The share link bundle is still being prepared. Please try again later."
 msgstr ""
 
-#: documents/views.py:4736
+#: documents/views.py:4729
 msgid "The share link bundle is unavailable."
 msgstr ""
 
@@ -2002,203 +1998,175 @@ msgstr ""
 msgid "CMYK"
 msgstr ""
 
-#: paperless/models.py:82
-msgid "Azure AI Document Intelligence"
-msgstr ""
-
-#: paperless/models.py:90
-msgid "All supported documents"
-msgstr ""
-
-#: paperless/models.py:91
-msgid "Only when a workflow enables it"
-msgstr ""
-
-#: paperless/models.py:95 paperless/models.py:105
+#: paperless/models.py:78 paperless/models.py:88
 msgid "OpenAI-compatible"
 msgstr ""
 
-#: paperless/models.py:96
+#: paperless/models.py:79
 msgid "Huggingface"
 msgstr ""
 
-#: paperless/models.py:97 paperless/models.py:106
+#: paperless/models.py:80 paperless/models.py:89
 msgid "Ollama"
 msgstr ""
 
-#: paperless/models.py:115
+#: paperless/models.py:98
 msgid "Sets the output PDF type"
 msgstr ""
 
-#: paperless/models.py:127
+#: paperless/models.py:110
 msgid "Do OCR from page 1 to this value"
 msgstr ""
 
-#: paperless/models.py:133
+#: paperless/models.py:116
 msgid "Do OCR using these languages"
 msgstr ""
 
-#: paperless/models.py:140
+#: paperless/models.py:123
 msgid "Sets the OCR mode"
 msgstr ""
 
-#: paperless/models.py:148
+#: paperless/models.py:131
 msgid "Controls archive file generation"
 msgstr ""
 
-#: paperless/models.py:156
+#: paperless/models.py:139
 msgid "Sets image DPI fallback value"
 msgstr ""
 
-#: paperless/models.py:163
+#: paperless/models.py:146
 msgid "Controls the unpaper cleaning"
 msgstr ""
 
-#: paperless/models.py:170
+#: paperless/models.py:153
 msgid "Enables deskew"
 msgstr ""
 
-#: paperless/models.py:173
+#: paperless/models.py:156
 msgid "Enables page rotation"
 msgstr ""
 
-#: paperless/models.py:178
+#: paperless/models.py:161
 msgid "Sets the threshold for rotation of pages"
 msgstr ""
 
-#: paperless/models.py:184
+#: paperless/models.py:167
 msgid "Sets the maximum image size for decompression"
 msgstr ""
 
-#: paperless/models.py:190
+#: paperless/models.py:173
 msgid "Sets the Ghostscript color conversion strategy"
 msgstr ""
 
-#: paperless/models.py:198
+#: paperless/models.py:181
 msgid "Adds additional user arguments for OCRMyPDF"
 msgstr ""
 
-#: paperless/models.py:207
+#: paperless/models.py:190
 msgid "Application title"
 msgstr ""
 
-#: paperless/models.py:214
+#: paperless/models.py:197
 msgid "Application logo"
 msgstr ""
 
-#: paperless/models.py:229
+#: paperless/models.py:212
 msgid "Enables barcode scanning"
 msgstr ""
 
-#: paperless/models.py:235
+#: paperless/models.py:218
 msgid "Enables barcode TIFF support"
 msgstr ""
 
-#: paperless/models.py:241
+#: paperless/models.py:224
 msgid "Sets the barcode string"
 msgstr ""
 
-#: paperless/models.py:249
+#: paperless/models.py:232
 msgid "Retains split pages"
 msgstr ""
 
-#: paperless/models.py:255
+#: paperless/models.py:238
 msgid "Enables ASN barcode"
 msgstr ""
 
-#: paperless/models.py:261
+#: paperless/models.py:244
 msgid "Sets the ASN barcode prefix"
 msgstr ""
 
-#: paperless/models.py:269
+#: paperless/models.py:252
 msgid "Sets the barcode upscale factor"
 msgstr ""
 
-#: paperless/models.py:276
+#: paperless/models.py:259
 msgid "Sets the barcode DPI"
 msgstr ""
 
-#: paperless/models.py:283
+#: paperless/models.py:266
 msgid "Sets the maximum pages for barcode"
 msgstr ""
 
-#: paperless/models.py:290
+#: paperless/models.py:273
 msgid "Enables tag barcode"
 msgstr ""
 
-#: paperless/models.py:296
+#: paperless/models.py:279
 msgid "Sets the tag barcode mapping"
 msgstr ""
 
-#: paperless/models.py:302
+#: paperless/models.py:285
 msgid "Enables splitting on tag barcodes"
 msgstr ""
 
-#: paperless/models.py:312
-msgid "Sets the remote OCR engine"
-msgstr ""
-
-#: paperless/models.py:321
-msgid "Sets the remote OCR API key"
-msgstr ""
-
-#: paperless/models.py:329
-msgid "Sets the remote OCR endpoint"
-msgstr ""
-
-#: paperless/models.py:337
-msgid "Sets which documents are sent to the remote OCR engine"
-msgstr ""
-
-#: paperless/models.py:349
+#: paperless/models.py:294
 msgid "Enables AI features"
 msgstr ""
 
-#: paperless/models.py:355
+#: paperless/models.py:300
 msgid "Sets the LLM embedding backend"
 msgstr ""
 
-#: paperless/models.py:363
+#: paperless/models.py:308
 msgid "Sets the LLM embedding model"
 msgstr ""
 
-#: paperless/models.py:370
+#: paperless/models.py:315
 msgid "Sets the LLM embedding endpoint, optional"
 msgstr ""
 
-#: paperless/models.py:377
+#: paperless/models.py:322
 msgid "Sets the LLM embedding chunk size"
 msgstr ""
 
-#: paperless/models.py:383
+#: paperless/models.py:328
 msgid "Sets the LLM context size"
 msgstr ""
 
-#: paperless/models.py:389
+#: paperless/models.py:334
 msgid "Sets the LLM backend"
 msgstr ""
 
-#: paperless/models.py:397
+#: paperless/models.py:342
 msgid "Sets the LLM model"
 msgstr ""
 
-#: paperless/models.py:404
+#: paperless/models.py:349
 msgid "Sets the LLM API key"
 msgstr ""
 
-#: paperless/models.py:411
+#: paperless/models.py:356
 msgid "Sets the LLM endpoint, optional"
 msgstr ""
 
-#: paperless/models.py:418
+#: paperless/models.py:363
 msgid "Sets the LLM output language"
 msgstr ""
 
-#: paperless/models.py:425
+#: paperless/models.py:370
 msgid "Sets the LLM timeout in seconds"
 msgstr ""
 
-#: paperless/models.py:431
+#: paperless/models.py:376
 msgid "paperless application settings"
 msgstr ""
 

src/paperless/checks.py

@@ -337,6 +337,20 @@ def check_deprecated_v2_ocr_env_vars(
     return warnings
 
 
+@register()
+def check_remote_parser_configured(app_configs: Any, **kwargs: Any) -> list[Error]:
+    if settings.REMOTE_OCR_ENGINE == "azureai" and not (
+        settings.REMOTE_OCR_ENDPOINT and settings.REMOTE_OCR_API_KEY
+    ):
+        return [
+            Error(
+                "Azure AI remote parser requires endpoint and API key to be configured.",
+            ),
+        ]
+
+    return []
+
+
 def get_tesseract_langs():
     proc = subprocess.run(
         [shutil.which("tesseract"), "--list-langs"],

src/paperless/config.py

@@ -9,7 +9,6 @@ from paperless.models import CleanChoices
 from paperless.models import ColorConvertChoices
 from paperless.models import ModeChoices
 from paperless.models import OutputTypeChoices
-from paperless.models import RemoteOCRMode
 
 
 @dataclasses.dataclass
@@ -186,45 +185,6 @@ class GeneralConfig(BaseConfig):
         self.app_logo = app_config.app_logo.url if app_config.app_logo else None
 
 
-@dataclasses.dataclass
-class RemoteOCRConfig(BaseConfig):
-    """
-    Settings for the remote (cloud) OCR parser
-    """
-
-    remote_ocr_engine: str | None = dataclasses.field(init=False)
-    remote_ocr_api_key: str | None = dataclasses.field(init=False)
-    remote_ocr_endpoint: str | None = dataclasses.field(init=False)
-    remote_ocr_mode: RemoteOCRMode = dataclasses.field(init=False)
-
-    def __post_init__(self) -> None:
-        app_config = self._get_config_instance()
-
-        self.remote_ocr_engine = (
-            app_config.remote_ocr_engine or settings.REMOTE_OCR_ENGINE
-        )
-        self.remote_ocr_api_key = (
-            app_config.remote_ocr_api_key or settings.REMOTE_OCR_API_KEY
-        )
-        self.remote_ocr_endpoint = (
-            app_config.remote_ocr_endpoint or settings.REMOTE_OCR_ENDPOINT
-        )
-        self.remote_ocr_mode = app_config.remote_ocr_mode or RemoteOCRMode(
-            settings.REMOTE_OCR_MODE,
-        )
-
-    @property
-    def remote_ocr_by_default(self) -> bool:
-        """
-        Whether every supported document goes to the remote engine.
-
-        When False the remote engine is used only for documents that
-        explicitly asked for it, i.e. a workflow matched during consumption or
-        the user ticked the box when reprocessing.
-        """
-        return self.remote_ocr_mode == RemoteOCRMode.ALWAYS
-
-
 @dataclasses.dataclass
 class AIConfig(BaseConfig):
     """

src/paperless/migrations/0014_applicationconfiguration_remote_ocr_api_key_and_more.py

@@ -1,44 +0,0 @@
-# Generated by Django 5.2.16 on 2026-08-10 14:37
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("paperless", "0013_applicationconfiguration_llm_request_timeout"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="applicationconfiguration",
-            name="remote_ocr_api_key",
-            field=models.CharField(
-                blank=True,
-                max_length=1024,
-                null=True,
-                verbose_name="Sets the remote OCR API key",
-            ),
-        ),
-        migrations.AddField(
-            model_name="applicationconfiguration",
-            name="remote_ocr_endpoint",
-            field=models.CharField(
-                blank=True,
-                max_length=256,
-                null=True,
-                verbose_name="Sets the remote OCR endpoint",
-            ),
-        ),
-        migrations.AddField(
-            model_name="applicationconfiguration",
-            name="remote_ocr_engine",
-            field=models.CharField(
-                blank=True,
-                choices=[("azureai", "Azure AI Document Intelligence")],
-                max_length=32,
-                null=True,
-                verbose_name="Sets the remote OCR engine",
-            ),
-        ),
-    ]

src/paperless/migrations/0015_applicationconfiguration_remote_ocr_mode.py

@@ -1,27 +0,0 @@
-# Generated by Django 5.2.16 on 2026-08-10 15:43
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("paperless", "0014_applicationconfiguration_remote_ocr_api_key_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="applicationconfiguration",
-            name="remote_ocr_mode",
-            field=models.CharField(
-                blank=True,
-                choices=[
-                    ("always", "All supported documents"),
-                    ("workflow_only", "Only when a workflow enables it"),
-                ],
-                max_length=32,
-                null=True,
-                verbose_name="Sets which documents are sent to the remote OCR engine",
-            ),
-        ),
-    ]

src/paperless/models.py

@@ -74,23 +74,6 @@ class ColorConvertChoices(models.TextChoices):
     CMYK = ("CMYK", _("CMYK"))
 
 
-class RemoteOCREngine(models.TextChoices):
-    """
-    Matches to PAPERLESS_REMOTE_OCR_ENGINE
-    """
-
-    AZURE_AI = ("azureai", _("Azure AI Document Intelligence"))
-
-
-class RemoteOCRMode(models.TextChoices):
-    """
-    Matches to PAPERLESS_REMOTE_OCR_MODE
-    """
-
-    ALWAYS = ("always", _("All supported documents"))
-    WORKFLOW_ONLY = ("workflow_only", _("Only when a workflow enables it"))
-
-
 class LLMEmbeddingBackend(models.TextChoices):
     OPENAI_LIKE = ("openai-like", _("OpenAI-compatible"))
     HUGGINGFACE = ("huggingface", _("Huggingface"))
@@ -303,44 +286,6 @@ class ApplicationConfiguration(AbstractSingletonModel):
         null=True,
     )
 
-    """
-    Settings for the remote OCR parser
-    """
-
-    # PAPERLESS_REMOTE_OCR_ENGINE
-    remote_ocr_engine = models.CharField(
-        verbose_name=_("Sets the remote OCR engine"),
-        blank=True,
-        null=True,
-        max_length=32,
-        choices=RemoteOCREngine.choices,
-    )
-
-    # PAPERLESS_REMOTE_OCR_API_KEY
-    remote_ocr_api_key = models.CharField(
-        verbose_name=_("Sets the remote OCR API key"),
-        blank=True,
-        null=True,
-        max_length=1024,
-    )
-
-    # PAPERLESS_REMOTE_OCR_ENDPOINT
-    remote_ocr_endpoint = models.CharField(
-        verbose_name=_("Sets the remote OCR endpoint"),
-        blank=True,
-        null=True,
-        max_length=256,
-    )
-
-    # PAPERLESS_REMOTE_OCR_MODE
-    remote_ocr_mode = models.CharField(
-        verbose_name=_("Sets which documents are sent to the remote OCR engine"),
-        blank=True,
-        null=True,
-        max_length=32,
-        choices=RemoteOCRMode.choices,
-    )
-
     """
     AI related settings
     """

src/paperless/parsers/__init__.py

@@ -134,11 +134,6 @@ class ParserProtocol(Protocol):
         Author or organisation name.
     url : str
         URL for documentation, source code, or issue tracker.
-
-    Parsers that send document content to a remote service should additionally
-    set ``uses_remote_service = True`` so the registry can exclude them when
-    remote processing has not been requested for a document. The attribute is
-    optional so a parser that omits it is treated as fully local.
     """
 
     # ------------------------------------------------------------------
@@ -150,10 +145,6 @@ class ParserProtocol(Protocol):
     author: str
     url: str
 
-    # NOTE: uses_remote_service is not declared here, the registry reads it
-    # with getattr(cls, ..., False) for backwards-compatibility with existing
-    # parsers
-
     # ------------------------------------------------------------------
     # Class methods
     # ------------------------------------------------------------------

src/paperless/parsers/registry.py

@@ -334,8 +334,6 @@ class ParserRegistry:
         mime_type: str,
         filename: str,
         path: Path | None = None,
-        *,
-        allow_remote: bool = True,
     ) -> type[ParserProtocol] | None:
         """Return the best parser class for the given file, or None.
 
@@ -361,11 +359,6 @@ class ParserRegistry:
         path:
             Optional filesystem path to the file. Forwarded to each
             parser's score method.
-        allow_remote:
-            When False, parsers that declare ``uses_remote_service = True``
-            are excluded from consideration, so a document is never sent to
-            a remote service. Parsers that do not declare the attribute
-            are treated as local and are always considered.
 
         Returns
         -------
@@ -381,13 +374,6 @@ class ParserRegistry:
             if mime_type not in parser_class.supported_mime_types():
                 continue
 
-            if not allow_remote and getattr(
-                parser_class,
-                "uses_remote_service",
-                False,
-            ):
-                continue
-
             score = parser_class.score(mime_type, filename, path)
             if score is None:
                 continue

src/paperless/parsers/remote.py

@@ -61,18 +61,6 @@ class RemoteEngineConfig:
         self.api_key = api_key
         self.endpoint = endpoint
 
-    @classmethod
-    def from_app_config(cls) -> Self:
-        """Build the config from the app config, falling back to the env."""
-        from paperless.config import RemoteOCRConfig
-
-        app_config = RemoteOCRConfig()
-        return cls(
-            engine=app_config.remote_ocr_engine,
-            api_key=app_config.remote_ocr_api_key,
-            endpoint=app_config.remote_ocr_endpoint,
-        )
-
     def engine_is_valid(self) -> bool:
         """Return True when the engine is known and fully configured."""
         return (
@@ -102,9 +90,6 @@ class RemoteDocumentParser:
         Maintainer name.
     url : str
         Issue tracker / source URL.
-    uses_remote_service : bool
-        Content is sent to a remote service, True so that the registry
-        can skip this parser if remote processing was not requested.
     """
 
     name: str = "Paperless-ngx Remote OCR Parser"
@@ -112,8 +97,6 @@ class RemoteDocumentParser:
     author: str = "Paperless-ngx Contributors"
     url: str = "https://github.com/paperless-ngx/paperless-ngx"
 
-    uses_remote_service: bool = True
-
     # ------------------------------------------------------------------
     # Class methods
     # ------------------------------------------------------------------
@@ -162,7 +145,11 @@ class RemoteDocumentParser:
             20 when the remote engine is configured and the MIME type is
             supported, otherwise None.
         """
-        config = RemoteEngineConfig.from_app_config()
+        config = RemoteEngineConfig(
+            engine=settings.REMOTE_OCR_ENGINE,
+            api_key=settings.REMOTE_OCR_API_KEY,
+            endpoint=settings.REMOTE_OCR_ENDPOINT,
+        )
         if not config.engine_is_valid():
             return None
         if mime_type not in _SUPPORTED_MIME_TYPES:
@@ -257,7 +244,11 @@ class RemoteDocumentParser:
             Whether an archive copy is wanted. For PDFs, False skips the
             remote engine and uses locally-extracted text instead.
         """
-        config = RemoteEngineConfig.from_app_config()
+        config = RemoteEngineConfig(
+            engine=settings.REMOTE_OCR_ENGINE,
+            api_key=settings.REMOTE_OCR_API_KEY,
+            endpoint=settings.REMOTE_OCR_ENDPOINT,
+        )
 
         if not config.engine_is_valid():
             logger.warning(

src/paperless/serialisers.py

@@ -219,13 +219,6 @@ class ApplicationConfigurationSerializer(
         allow_null=True,
         max_length=1024,
     )
-    remote_ocr_api_key = ObfuscatedPasswordField(
-        required=False,
-        allow_null=True,
-        max_length=1024,
-    )
-
-    OBFUSCATED_FIELDS = ("llm_api_key", "remote_ocr_api_key")
 
     def run_validation(self, data):
         # Empty strings treated as None to avoid unexpected behavior
@@ -237,13 +230,11 @@ class ApplicationConfigurationSerializer(
             data["language"] = None
         if "llm_output_language" in data and data["llm_output_language"] == "":
             data["llm_output_language"] = None
-        for field in self.OBFUSCATED_FIELDS:
-            if field in data and data[field] is not None:
-                if data[field] == "":
-                    data[field] = None
-                # Not a real value, don't overwrite the stored one
-                elif len(data[field].replace("*", "")) == 0:
-                    del data[field]
+        if "llm_api_key" in data and data["llm_api_key"] is not None:
+            if data["llm_api_key"] == "":
+                data["llm_api_key"] = None
+            elif len(data["llm_api_key"].replace("*", "")) == 0:
+                del data["llm_api_key"]
         return super().run_validation(data)
 
     def update(self, instance, validated_data):

src/paperless/settings/__init__.py

@@ -1203,11 +1203,6 @@ WEBHOOKS_ALLOW_INTERNAL_REQUESTS = get_bool_from_env(
 REMOTE_OCR_ENGINE = os.getenv("PAPERLESS_REMOTE_OCR_ENGINE")
 REMOTE_OCR_API_KEY = os.getenv("PAPERLESS_REMOTE_OCR_API_KEY")
 REMOTE_OCR_ENDPOINT = os.getenv("PAPERLESS_REMOTE_OCR_ENDPOINT")
-REMOTE_OCR_MODE = get_choice_from_env(
-    "PAPERLESS_REMOTE_OCR_MODE",
-    {"always", "workflow_only"},
-    default="always",
-)
 
 ################################################################################
 # AI Settings                                                                  #

src/paperless/tests/parsers/conftest.py

@@ -114,26 +114,7 @@ def remote_parser() -> Generator[RemoteDocumentParser, None, None]:
 
 
 @pytest.fixture()
-def empty_remote_ocr_app_config(mocker: MockerFixture) -> MagicMock:
-    # empty app config without accessing db
-    app_config = mocker.MagicMock(
-        remote_ocr_engine=None,
-        remote_ocr_api_key=None,
-        remote_ocr_endpoint=None,
-        remote_ocr_mode=None,
-    )
-    mocker.patch(
-        "paperless.config.BaseConfig._get_config_instance",
-        return_value=app_config,
-    )
-    return app_config
-
-
-@pytest.fixture()
-def azure_settings(
-    settings: SettingsWrapper,
-    empty_remote_ocr_app_config: MagicMock,
-) -> SettingsWrapper:
+def azure_settings(settings: SettingsWrapper) -> SettingsWrapper:
     """Configure Django settings for a valid Azure AI OCR engine.
 
     Sets ``REMOTE_OCR_ENGINE``, ``REMOTE_OCR_API_KEY``, and
@@ -152,10 +133,7 @@ def azure_settings(
 
 
 @pytest.fixture()
-def no_engine_settings(
-    settings: SettingsWrapper,
-    empty_remote_ocr_app_config: MagicMock,
-) -> SettingsWrapper:
+def no_engine_settings(settings: SettingsWrapper) -> SettingsWrapper:
     """Configure Django settings with no remote engine configured.
 
     Returns

src/paperless/tests/parsers/test_remote_parser.py

@@ -21,7 +21,6 @@ from unittest.mock import Mock
 import pytest
 
 from documents.parsers import ParseError
-from paperless.models import ApplicationConfiguration
 from paperless.parsers import ParserContext
 from paperless.parsers import ParserProtocol
 from paperless.parsers.remote import RemoteDocumentParser
@@ -199,21 +198,21 @@ class TestRemoteParserScore:
 
     def test_score_returns_none_when_api_key_missing(
         self,
-        no_engine_settings: SettingsWrapper,
+        settings: SettingsWrapper,
     ) -> None:
-        no_engine_settings.REMOTE_OCR_ENGINE = "azureai"
-        no_engine_settings.REMOTE_OCR_ENDPOINT = (
-            "https://test.cognitiveservices.azure.com"
-        )
+        settings.REMOTE_OCR_ENGINE = "azureai"
+        settings.REMOTE_OCR_API_KEY = None
+        settings.REMOTE_OCR_ENDPOINT = "https://test.cognitiveservices.azure.com"
         result = RemoteDocumentParser.score("application/pdf", "doc.pdf")
         assert result is None
 
     def test_score_returns_none_when_endpoint_missing(
         self,
-        no_engine_settings: SettingsWrapper,
+        settings: SettingsWrapper,
     ) -> None:
-        no_engine_settings.REMOTE_OCR_ENGINE = "azureai"
-        no_engine_settings.REMOTE_OCR_API_KEY = "key"
+        settings.REMOTE_OCR_ENGINE = "azureai"
+        settings.REMOTE_OCR_API_KEY = "key"
+        settings.REMOTE_OCR_ENDPOINT = None
         result = RemoteDocumentParser.score("application/pdf", "doc.pdf")
         assert result is None
 
@@ -228,24 +227,6 @@ class TestRemoteParserScore:
         score = RemoteDocumentParser.score("application/pdf", "doc.pdf")
         assert score is not None and score > 10
 
-    @pytest.mark.django_db
-    def test_score_uses_app_config_when_env_unset(
-        self,
-        settings: SettingsWrapper,
-    ) -> None:
-        """The app config alone is enough to activate the parser."""
-        settings.REMOTE_OCR_ENGINE = None
-        settings.REMOTE_OCR_API_KEY = None
-        settings.REMOTE_OCR_ENDPOINT = None
-        config = ApplicationConfiguration.objects.first()
-        assert config is not None
-        config.remote_ocr_engine = "azureai"
-        config.remote_ocr_api_key = "app-config-key"
-        config.remote_ocr_endpoint = "https://config.cognitiveservices.azure.com"
-        config.save()
-
-        assert RemoteDocumentParser.score("application/pdf", "doc.pdf") == 20
-
 
 # ---------------------------------------------------------------------------
 # Properties

src/paperless/tests/parsers/test_tesseract_parser.py

@@ -1277,8 +1277,6 @@ class TestParserFileTypes:
 # ---------------------------------------------------------------------------
 
 
-# Remote ocr config from ApplicationConfiguration needs DB access
-@pytest.mark.django_db
 class TestRasterisedDocumentParserRegistry:
     def test_registered_in_defaults(self) -> None:
         from paperless.parsers.registry import ParserRegistry

src/paperless/tests/test_checks.py

@@ -15,6 +15,7 @@ from paperless.checks import audit_log_check
 from paperless.checks import binaries_check
 from paperless.checks import check_default_language_available
 from paperless.checks import check_deprecated_db_settings
+from paperless.checks import check_remote_parser_configured
 from paperless.checks import check_v3_minimum_upgrade_version
 from paperless.checks import debug_mode_check
 from paperless.checks import paths_check
@@ -630,6 +631,31 @@ class TestV3MinimumUpgradeVersionCheck:
         assert check_v3_minimum_upgrade_version(None) == []
 
 
+class TestRemoteParserChecks:
+    def test_no_engine(self, settings: SettingsWrapper) -> None:
+        settings.REMOTE_OCR_ENGINE = None
+        msgs = check_remote_parser_configured(None)
+
+        assert len(msgs) == 0
+
+    def test_azure_no_endpoint(self, settings: SettingsWrapper) -> None:
+
+        settings.REMOTE_OCR_ENGINE = "azureai"
+        settings.REMOTE_OCR_API_KEY = "somekey"
+        settings.REMOTE_OCR_ENDPOINT = None
+
+        msgs = check_remote_parser_configured(None)
+
+        assert len(msgs) == 1
+
+        msg = msgs[0]
+
+        assert (
+            "Azure AI remote parser requires endpoint and API key to be configured."
+            in msg.msg
+        )
+
+
 class TestTesseractChecks:
     def test_default_language(self) -> None:
         check_default_language_available(None)

src/paperless/tests/test_registry.py

@@ -468,124 +468,6 @@ class TestParserRegistryGetParserForFile:
         assert result is AcceptingBuiltin
 
 
-class TestParserRegistryRemoteParsers:
-    """Verify the allow_remote filter in ParserRegistry.get_parser_for_file()."""
-
-    @staticmethod
-    def _remote_parser_cls() -> type:
-        class RemoteParser:
-            name = "remote"
-            version = "1.0"
-            author = "A"
-            url = "https://example.com/remote"
-            uses_remote_service = True
-
-            @classmethod
-            def supported_mime_types(cls):
-                return {"text/plain": ".txt"}
-
-            @classmethod
-            def score(cls, mime_type, filename, path=None):
-                return 20
-
-        return RemoteParser
-
-    def test_remote_parser_wins_when_remote_allowed(
-        self,
-        dummy_parser_cls: type,
-    ) -> None:
-        """
-        GIVEN: A remote parser scoring 20 and a local parser scoring 10.
-        WHEN:  get_parser_for_file() is called with allow_remote=True.
-        THEN:  The remote parser is returned.
-        """
-        remote_parser_cls = self._remote_parser_cls()
-        registry = ParserRegistry()
-        registry.register_builtin(dummy_parser_cls)
-        registry.register_builtin(remote_parser_cls)
-
-        result = registry.get_parser_for_file(
-            "text/plain",
-            "readme.txt",
-            allow_remote=True,
-        )
-        assert result is remote_parser_cls
-
-    def test_remote_parser_skipped_when_remote_not_allowed(
-        self,
-        dummy_parser_cls: type,
-    ) -> None:
-        """
-        GIVEN: A remote parser scoring 20 and a local parser scoring 10.
-        WHEN:  get_parser_for_file() is called with allow_remote=False.
-        THEN:  The local parser is returned despite its lower score.
-        """
-        registry = ParserRegistry()
-        registry.register_builtin(dummy_parser_cls)
-        registry.register_builtin(self._remote_parser_cls())
-
-        result = registry.get_parser_for_file(
-            "text/plain",
-            "readme.txt",
-            allow_remote=False,
-        )
-        assert result is dummy_parser_cls
-
-    def test_no_parser_when_only_remote_available_and_not_allowed(self) -> None:
-        """
-        GIVEN: A registry whose only candidate declares uses_remote_service.
-        WHEN:  get_parser_for_file() is called with allow_remote=False.
-        THEN:  None is returned — the remote parser is never used as a
-               fallback when remote processing was not requested.
-        """
-        registry = ParserRegistry()
-        registry.register_builtin(self._remote_parser_cls())
-
-        result = registry.get_parser_for_file(
-            "text/plain",
-            "readme.txt",
-            allow_remote=False,
-        )
-        assert result is None
-
-    def test_parser_without_attribute_treated_as_local(
-        self,
-        dummy_parser_cls: type,
-    ) -> None:
-        """
-        GIVEN: A third-party parser predating uses_remote_service, so it does
-               not declare the attribute at all.
-        WHEN:  get_parser_for_file() is called with allow_remote=False.
-        THEN:  It is still considered, i.e. treated as fully local, rather
-               than raising AttributeError.
-        """
-        assert not hasattr(dummy_parser_cls, "uses_remote_service")
-
-        registry = ParserRegistry()
-        registry.register_builtin(dummy_parser_cls)
-
-        result = registry.get_parser_for_file(
-            "text/plain",
-            "readme.txt",
-            allow_remote=False,
-        )
-        assert result is dummy_parser_cls
-
-    def test_remote_allowed_by_default(self) -> None:
-        """
-        GIVEN: A registry containing only a remote parser.
-        WHEN:  get_parser_for_file() is called without allow_remote.
-        THEN:  The remote parser is returned — callers that do not opt in to
-               the filter keep the previous behaviour.
-        """
-        remote_parser_cls = self._remote_parser_cls()
-        registry = ParserRegistry()
-        registry.register_builtin(remote_parser_cls)
-
-        result = registry.get_parser_for_file("text/plain", "readme.txt")
-        assert result is remote_parser_cls
-
-
 class TestDiscover:
     """Verify entrypoint discovery in ParserRegistry.discover()."""
 

src/paperless/tests/test_remote_ocr_config.py

@@ -1,113 +0,0 @@
-"""Tests for RemoteOCRConfig precedence between app config and Django settings."""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import pytest
-from django.test import override_settings
-
-from paperless.config import RemoteOCRConfig
-from paperless.models import RemoteOCRMode
-
-if TYPE_CHECKING:
-    from unittest.mock import MagicMock
-
-
-@pytest.fixture()
-def null_app_config(mocker) -> MagicMock:
-    """Mock ApplicationConfiguration with all fields None → falls back to Django settings."""
-    return mocker.MagicMock(
-        remote_ocr_engine=None,
-        remote_ocr_api_key=None,
-        remote_ocr_endpoint=None,
-        remote_ocr_mode=None,
-    )
-
-
-@pytest.fixture()
-def make_remote_ocr_config(mocker):
-    def _make(app_config, **django_settings_overrides):
-        mocker.patch(
-            "paperless.config.BaseConfig._get_config_instance",
-            return_value=app_config,
-        )
-        with override_settings(**django_settings_overrides):
-            return RemoteOCRConfig()
-
-    return _make
-
-
-class TestRemoteOCRConfig:
-    def test_falls_back_to_settings(
-        self,
-        make_remote_ocr_config,
-        null_app_config,
-    ) -> None:
-        cfg = make_remote_ocr_config(
-            null_app_config,
-            REMOTE_OCR_ENGINE="azureai",
-            REMOTE_OCR_API_KEY="env-key",
-            REMOTE_OCR_ENDPOINT="https://env.cognitiveservices.azure.com",
-            REMOTE_OCR_MODE=RemoteOCRMode.WORKFLOW_ONLY,
-        )
-        assert cfg.remote_ocr_engine == "azureai"
-        assert cfg.remote_ocr_api_key == "env-key"
-        assert cfg.remote_ocr_endpoint == "https://env.cognitiveservices.azure.com"
-        assert cfg.remote_ocr_mode == RemoteOCRMode.WORKFLOW_ONLY
-
-    def test_app_config_takes_precedence(
-        self,
-        make_remote_ocr_config,
-        mocker,
-    ) -> None:
-        app_config = mocker.MagicMock(
-            remote_ocr_engine="azureai",
-            remote_ocr_api_key="db-key",
-            remote_ocr_endpoint="https://db.cognitiveservices.azure.com",
-            remote_ocr_mode=RemoteOCRMode.WORKFLOW_ONLY,
-        )
-        cfg = make_remote_ocr_config(
-            app_config,
-            REMOTE_OCR_ENGINE=None,
-            REMOTE_OCR_API_KEY="env-key",
-            REMOTE_OCR_ENDPOINT="https://env.cognitiveservices.azure.com",
-            REMOTE_OCR_MODE=RemoteOCRMode.ALWAYS,
-        )
-        assert cfg.remote_ocr_engine == "azureai"
-        assert cfg.remote_ocr_api_key == "db-key"
-        assert cfg.remote_ocr_endpoint == "https://db.cognitiveservices.azure.com"
-        assert cfg.remote_ocr_mode == RemoteOCRMode.WORKFLOW_ONLY
-
-    def test_unset_everywhere(
-        self,
-        make_remote_ocr_config,
-        null_app_config,
-    ) -> None:
-        cfg = make_remote_ocr_config(
-            null_app_config,
-            REMOTE_OCR_ENGINE=None,
-            REMOTE_OCR_API_KEY=None,
-            REMOTE_OCR_ENDPOINT=None,
-        )
-        assert cfg.remote_ocr_engine is None
-        assert cfg.remote_ocr_api_key is None
-        assert cfg.remote_ocr_endpoint is None
-
-
-class TestRemoteOCRByDefault:
-    def test_always_mode(self, make_remote_ocr_config, null_app_config) -> None:
-        cfg = make_remote_ocr_config(
-            null_app_config,
-            REMOTE_OCR_MODE=RemoteOCRMode.ALWAYS,
-        )
-
-        assert cfg.remote_ocr_by_default is True
-
-    def test_workflow_only_mode(self, make_remote_ocr_config, null_app_config) -> None:
-        cfg = make_remote_ocr_config(
-            null_app_config,
-            REMOTE_OCR_MODE=RemoteOCRMode.WORKFLOW_ONLY,
-        )
-
-        assert cfg.remote_ocr_by_default is False

uv.lock

@@ -1175,6 +1175,14 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/9d/76/d08f5c79f7643dbff4512605c28b75481966ed6c8cc9b397c9dd2ee91cd1/drf_spectacular_sidecar-2026.7.1-py3-none-any.whl", hash = "sha256:bc6d50c9b64660e45e09296d39553b3e759eedd825fc41d631ee5b3f88e0c5de", size = 2617384, upload-time = "2026-07-01T13:39:03.787Z" },
 ]
 
+[[package]]
+name = "drf-writable-nested"
+version = "0.7.2"
+source = { registry = "https://pypi.org/simple" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/e8/57/df87d92fbfc3f0f2ef1a49c47f2a83389a4a13b7acf62b8bf7b223627d82/drf_writable_nested-0.7.2-py3-none-any.whl", hash = "sha256:4a3d2737c1cbfafa690e30236b169112e5b23cfe3d288f3992b0651a1b828c4d", size = 10570, upload-time = "2025-03-10T19:59:05.482Z" },
+]
+
 [[package]]
 name = "execnet"
 version = "2.1.2"
@@ -2887,6 +2895,7 @@ dependencies = [
     { name = "djangorestframework" },
     { name = "drf-spectacular" },
     { name = "drf-spectacular-sidecar" },
+    { name = "drf-writable-nested" },
     { name = "filelock" },
     { name = "flower" },
     { name = "gotenberg-client" },
@@ -2924,6 +2933,7 @@ dependencies = [
     { name = "torch", version = "2.13.0+cpu", source = { registry = "https://download.pytorch.org/whl/cpu" }, marker = "sys_platform == 'linux'" },
     { name = "watchfiles" },
     { name = "whitenoise" },
+    { name = "whoosh-compat", extra = ["tantivy"] },
     { name = "zxing-cpp" },
 ]
 
@@ -3036,6 +3046,7 @@ requires-dist = [
     { name = "djangorestframework", specifier = "~=3.16" },
     { name = "drf-spectacular", specifier = "~=0.30" },
     { name = "drf-spectacular-sidecar", specifier = "~=2026.7.1" },
+    { name = "drf-writable-nested", specifier = "~=0.7.1" },
     { name = "filelock", specifier = "~=3.32.0" },
     { name = "flower", specifier = "~=2.0.1" },
     { name = "gotenberg-client", specifier = "~=0.14.0" },
@@ -3081,6 +3092,7 @@ requires-dist = [
     { name = "torch", specifier = "~=2.13.0", index = "https://download.pytorch.org/whl/cpu" },
     { name = "watchfiles", specifier = ">=1.2" },
     { name = "whitenoise", specifier = "~=6.11" },
+    { name = "whoosh-compat", extras = ["tantivy"], specifier = "==0.1.0" },
     { name = "zxing-cpp", specifier = "~=3.1.0" },
 ]
 provides-extras = ["mariadb", "postgres", "webserver"]
@@ -5642,6 +5654,23 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/db/eb/d5583a11486211f3ebd4b385545ae787f32363d453c19fffd81106c9c138/whitenoise-6.12.0-py3-none-any.whl", hash = "sha256:fc5e8c572e33ebf24795b47b6a7da8da3c00cff2349f5b04c02f28d0cc5a3cc2", size = 20302, upload-time = "2026-02-27T00:05:40.086Z" },
 ]
 
+[[package]]
+name = "whoosh-compat"
+version = "0.1.0"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "python-dateutil" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/5d/f7/3e45f4a484afa174cd42e424ce2b8c514ae54f564830122656ad17b765e2/whoosh_compat-0.1.0.tar.gz", hash = "sha256:86935bdc159ed9b0a06a4661d17f1251d8280340b84e218cc73d915a2edaddf7", size = 577543, upload-time = "2026-08-25T15:22:42.316Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/3f/51/9a8399d0f472814e136a2884bf910c6c59843a5a2c66afc4b5133eb531ea/whoosh_compat-0.1.0-py3-none-any.whl", hash = "sha256:3e7c5f519b4d397dbf4f8d7bbe4ca1eb6004da24c8892bc701844ed393bc97e7", size = 153875, upload-time = "2026-08-25T15:22:40.787Z" },
+]
+
+[package.optional-dependencies]
+tantivy = [
+    { name = "tantivy" },
+]
+
 [[package]]
 name = "wrapt"
 version = "2.0.1"