Perf: batch CustomField/Document lookups in modify_custom_fields

modify_custom_fields looped documents x fields, re-.get()-ing the
CustomField queryset per iteration and Document.objects.get() per doc
for DOCUMENTLINK fields -- same shape as the earlier custom_fields
serializer N+1 (#13779), just nested one level deeper. Resolve both
into dicts once up front instead. Also pass the resolved objects
(not bare ids) to update_or_create so newly-created CustomFieldInstance
rows cache their field/document FK, avoiding a re-fetch when auditlog's
post_save receiver calls str(instance) (which touches .field.name).

docs_by_id defers `content` (the one field guaranteed both large and
unused by this function or its receivers) rather than using .only(),
since .only() would just turn the filename-generation signal's other
field access into a deferred-reload N+1.

Verified via CaptureQueriesContext: 6 docs x 4 fields dropped from 48
CustomField queries to 1; DOCUMENTLINK per-doc Document lookups dropped
from N to 0 (single batched query instead).

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:

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;
@@ -417,7 +403,7 @@ main {
 
 :host ::ng-deep .navbar-official-logo {
   .leaf {
-    fill: color-mix(in srgb, var(--pngx-primary-text-contrast) 85%, var(--bs-primary)) !important;
+    fill: color-mix(in srgb, var(--pngx-primary-text-contrast) 70%, var(--bs-primary)) !important;
   }
 
   .text {
@@ -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

@@ -305,33 +305,49 @@ def modify_custom_fields(
         else [(field, None) for field in add_custom_fields]
     )
 
-    custom_fields = CustomField.objects.filter(
-        id__in=[int(field) for field, _ in add_custom_fields],
-    ).distinct()
+    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")
+    }
     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 = {}
-            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
+            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.
             CustomFieldInstance.objects.update_or_create(
-                document_id=doc_id,
-                field_id=field_id,
+                document=docs_by_id[doc_id],
+                field=custom_field,
                 defaults=defaults,
             )
             if custom_field.data_type == CustomField.FieldDataType.DOCUMENTLINK:
-                doc = Document.objects.get(id=doc_id)
-                reflect_doclinks(doc, custom_field, value)
+                reflect_doclinks(docs_by_id[doc_id], custom_field, value)
 
     # For doc link fields that are being removed, remove symmetrical links
     for doclink_being_removed_instance in CustomFieldInstance.objects.filter(
@@ -339,12 +355,10 @@ 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=Document.objects.get(
-                    id=doclink_being_removed_instance.document.id,
-                ),
+                document=docs_by_id[doclink_being_removed_instance.document_id],
                 field=doclink_being_removed_instance.field,
                 target_doc_id=target_doc_id,
             )
@@ -399,16 +413,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},
         )
 

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
 

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/serialisers.py

@@ -1795,7 +1795,7 @@ class DeleteDocumentsSerializer(DocumentSelectionSerializer):
 
 
 class ReprocessDocumentsSerializer(DocumentSelectionSerializer):
-    remote_ocr = serializers.BooleanField(required=False, default=False)
+    pass
 
 
 class BulkEditSerializer(
@@ -2137,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")
@@ -2208,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
 
@@ -3312,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/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_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

@@ -6,7 +6,9 @@ from unittest import mock
 import pikepdf
 from django.contrib.auth.models import Group
 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
@@ -344,6 +346,100 @@ 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:
@@ -1782,56 +1878,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_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

@@ -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
@@ -1133,8 +1131,7 @@ class DocumentViewSet(
                     "custom_fields",
                     queryset=CustomFieldInstance.objects.select_related("field"),
                 ),
-                # NotesSerializer nests the author, this avoids query per note
-                Prefetch("notes", queryset=Note.objects.select_related("user")),
+                "notes",
             )
         )
 
@@ -4103,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: