Chore: bump brotli, djangorestframework, filelock, msgpack, setuptools for security fixes

allauth 65.20 is the first release allowing oauthlib 4, which carries the fixes for the open oauthlib advisories

docs/usage.md

@@ -109,7 +109,7 @@ Think of versions as **file history** for a document.
 Paperless-ngx includes management lists for tags, correspondents, document types
 and more. These areas allow you to view, add, edit, delete and manage permissions
 for these objects. You can also manage saved views, mail accounts, mail rules,
-workflows, [OCR templates](#ocr-templates) and more from the management sections.
+workflows and more from the management sections.
 
 ### Nested Tags
 
@@ -794,84 +794,6 @@ The following custom field types are supported:
 - `Document Link`: reference(s) to other document(s) displayed as links, automatically creates a symmetrical link in reverse
 - `Select`: a pre-defined list of strings from which the user can choose
 
-## OCR Templates {#ocr-templates}
-
-OCR templates read text from fixed areas ("zones") of a document and write it to a
-[custom field](#custom-fields), or to the document's title, archive serial number or created date. They are
-useful for documents that always share the same layout, such as bills from a particular utility. They allow you
-to draw a zone around the account number once, and every new bill gets its account number filled in.
-
-Like tags or document types, each template has a [matching algorithm](advanced_usage.md#matching) that
-decides which documents it automatically applies to (or not), based on their content.
-
-### Creating a template
-
-1. Open **OCR Templates** under "Manage" and choose **Add Template**.
-2. Give the template a name and set up its matching, for example **Any word** with the utility's name. Choose
-   **None** for a template that should only ever be run manually.
-3. Search for a sample document with the layout the template is for. Its pages are shown next to the template
-   settings.
-4. Draw zones on the document. Click a zone to select and edit it.
-5. Choose the field each zone fills.
-6. Use **Test** to run OCR on the selected zone of the sample document and see the text it finds and the value
-   that would be written.
-
-Zones are positioned relative to the sample document's page, so templates work best when the documents they
-match have an identical layout. Keep the matching specific enough that it only catches documents with that
-layout.
-
-### Zone settings
-
-- **Page**: the page the zone is on. Turn on **Last page** for zones that are always on the final page,
-  regardless of how many pages a document has.
-- **OCR language**: the Tesseract languages used to read the zone. Languages other than the defaults must be
-  installed, see [`PAPERLESS_OCR_LANGUAGES`](configuration.md#PAPERLESS_OCR_LANGUAGES).
-- **Transform**: post-processing applied to the text, such as stripping whitespace, keeping only numbers,
-  parsing a date or reading a QR code or barcode instead of text.
-- **Date format**: for the "Parse date" transform, the format of the date using
-  [Python date codes](https://docs.python.org/3/library/datetime.html#format-codes), e.g. `%d.%m.%Y`.
-  Leave it empty to detect the format automatically.
-- **Validation regex**: a regular expression the whole value must match. Values that do not match are not
-  written.
-
-Zones can fill custom fields of type text, long text, URL, date, integer, number, monetary or boolean.
-Document link and select fields are not supported.
-
-### Combining zones
-
-When several zones fill the same field, a **Combined value** setting appears for that field. Use it to arrange
-the zones' values with `{Zone name}` tokens and any text in between, for example `{Start} - {End}`. If it
-is left empty, the values are joined with spaces in zone order.
-
-### When templates run
-
-When a document is added, every enabled template that matches its content runs automatically. A template is
-only used for a document if the document's owner can view the template, so users' templates apply to their own
-documents, and unowned templates apply to everyone's. Templates run in name order, so if two templates fill the
-same field, the later one wins.
-
-Turn off **Enabled** to pause a template without deleting it. Disabled templates never run automatically, but
-can still be run manually.
-
-### Running templates manually
-
-To run templates on documents that are already in Paperless-ngx, open the **Actions** menu on the document
-details page:
-
-- **Run Zone OCR** runs every enabled template that matches the document.
-- The button next to it opens a dialog where you can choose one template to run
-  instead. A template you choose runs even if it does not match the document or is disabled.
-
-The bulk editor's **Run Zone OCR** action opens the same dialog for the selected documents. Bulk runs are
-processed in the background.
-
-!!! warning
-
-    Zone OCR overwrites the fields it fills. A zone that finds no value leaves its field unchanged.
-
-Managing OCR templates requires the OCR template permissions. Running zone OCR on documents requires
-permission to change them, and choosing a template requires permission to view it.
-
 ## PDF Actions
 
 Paperless-ngx supports basic editing operations for PDFs (these operations currently cannot be performed on non-PDF files). When viewing an individual document you can

pyproject.toml

@@ -27,7 +27,7 @@ dependencies = [
   # WARNING: django does not use semver.
   #          Only patch versions are guaranteed to not introduce breaking changes.
   "django~=5.2.13",
-  "django-allauth[mfa,socialaccount]~=65.16.0",
+  "django-allauth[mfa,socialaccount]~=65.20.0",
   "django-auditlog~=3.4.1",
   "django-cachalot~=2.9.0",
   "django-compression-middleware~=0.5.0",
@@ -43,7 +43,7 @@ dependencies = [
   "drf-spectacular~=0.30",
   "drf-spectacular-sidecar>=2026.7.1,<2026.10",
   "drf-writable-nested~=0.7.1",
-  "filelock>=3.32,<4.1",
+  "filelock>=3.32,<4.3",
   "flower>=2.0.1,<2.3",
   "gotenberg-client[httpx]~=1.0",
   "httpx-oauth~=0.17",

src-ui/src/app/app-routing.module.ts

@@ -13,7 +13,6 @@ import { DocumentDetailComponent } from './components/document-detail/document-d
 import { DocumentListComponent } from './components/document-list/document-list.component'
 import { DocumentAttributesComponent } from './components/manage/document-attributes/document-attributes.component'
 import { MailComponent } from './components/manage/mail/mail.component'
-import { OcrTemplatesComponent } from './components/manage/ocr-templates/ocr-templates.component'
 import { SavedViewsComponent } from './components/manage/saved-views/saved-views.component'
 import { ShareLinksComponent } from './components/manage/share-links/share-links.component'
 import { WorkflowsComponent } from './components/manage/workflows/workflows.component'
@@ -276,18 +275,6 @@ export const routes: Routes = [
           componentName: 'WorkflowsComponent',
         },
       },
-      {
-        path: 'ocr-templates',
-        component: OcrTemplatesComponent,
-        canActivate: [PermissionsGuard],
-        data: {
-          requiredPermission: {
-            action: PermissionAction.View,
-            type: PermissionType.OcrTemplate,
-          },
-          componentName: 'OcrTemplatesComponent',
-        },
-      },
       {
         path: 'mail',
         component: MailComponent,

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

@@ -113,7 +113,6 @@ const sidebarItemLabels: Record<HideableSidebarItemID, string> = {
   [HideableSidebarItemID.SavedViews]: $localize`Saved Views`,
   [HideableSidebarItemID.ShareLinks]: $localize`Share Links`,
   [HideableSidebarItemID.Workflows]: $localize`Workflows`,
-  [HideableSidebarItemID.OcrTemplates]: $localize`OCR Templates`,
   [HideableSidebarItemID.Mail]: $localize`Mail`,
   [HideableSidebarItemID.Documentation]: $localize`Documentation`,
 }

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

@@ -19,7 +19,6 @@ import {
   PaperlessTaskTriggerSource,
   PaperlessTaskType,
 } from 'src/app/data/paperless-task'
-import { Results } from 'src/app/data/results'
 import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
 import { PermissionsGuard } from 'src/app/guards/permissions.guard'
 import { CustomDatePipe } from 'src/app/pipes/custom-date.pipe'
@@ -153,11 +152,6 @@ const tasks: PaperlessTask[] = [
   },
 ]
 
-const paginatedTasks: Results<PaperlessTask> = {
-  count: tasks.length,
-  results: tasks,
-}
-
 const sectionCountResponse = {
   all: 7,
   needs_attention: 2,
@@ -204,7 +198,7 @@ describe('TasksComponent', () => {
     }).compileComponents()
 
     tasksService = TestBed.inject(TasksService)
-    reloadSpy = jest.spyOn(tasksService, 'reload')
+    reloadSpy = jest.spyOn(tasksService, 'reload').mockImplementation(() => {})
     httpTestingController = TestBed.inject(HttpTestingController)
     modalService = TestBed.inject(NgbModal)
     router = TestBed.inject(Router)
@@ -214,15 +208,6 @@ describe('TasksComponent', () => {
     jest.useFakeTimers()
     fixture.detectChanges()
 
-    httpTestingController
-      .expectOne(
-        (req) =>
-          req.url === `${environment.apiBaseUrl}tasks/` &&
-          req.params.get('acknowledged') === 'false' &&
-          req.params.get('page_size') === '1000'
-      )
-      .flush(paginatedTasks)
-
     httpTestingController
       .expectOne(
         (req) =>

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

@@ -289,17 +289,6 @@
                 <pngx-input-switch class="position-absolute top-50 end-0 translate-middle-y me-1" [class.d-none]="slimSidebarEnabled || slimSidebarAnimating()" [compact]="true" title="Workflows" i18n-title [ngModel]="!settingsService.sidebarItemIsHidden(HideableSidebarItemID.Workflows)" (ngModelChange)="toggleSidebarItem(HideableSidebarItemID.Workflows, $event)"></pngx-input-switch>
               }
             </li>
-            <li class="nav-item app-link position-relative" [class.d-none]="settingsService.sidebarItemIsHidden(HideableSidebarItemID.OcrTemplates) && !settingsService.organizingSidebarItems()"
-              *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.OcrTemplate }">
-              <a class="nav-link" [class.opacity-50]="settingsService.sidebarItemIsHidden(HideableSidebarItemID.OcrTemplates)" [class.pe-5]="settingsService.organizingSidebarItems() && !slimSidebarEnabled && !slimSidebarAnimating()" routerLink="ocr-templates" routerLinkActive="active" (click)="closeMenu()"
-                ngbPopover="OCR Templates" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
-                container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
-                <i-bs class="me-2" name="bounding-box-circles"></i-bs><span class="nav-link-label"><ng-container i18n>OCR Templates</ng-container></span>
-              </a>
-              @if (settingsService.organizingSidebarItems()) {
-                <pngx-input-switch class="position-absolute top-50 end-0 translate-middle-y me-1" [class.d-none]="slimSidebarEnabled || slimSidebarAnimating()" [compact]="true" title="OCR Templates" i18n-title [ngModel]="!settingsService.sidebarItemIsHidden(HideableSidebarItemID.OcrTemplates)" (ngModelChange)="toggleSidebarItem(HideableSidebarItemID.OcrTemplates, $event)"></pngx-input-switch>
-              }
-            </li>
             <li class="nav-item app-link position-relative" [class.d-none]="settingsService.sidebarItemIsHidden(HideableSidebarItemID.Mail) && !settingsService.organizingSidebarItems()" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.MailAccount }"
               tourAnchor="tour.mail">
               <a class="nav-link" [class.opacity-50]="settingsService.sidebarItemIsHidden(HideableSidebarItemID.Mail)" [class.pe-5]="settingsService.organizingSidebarItems() && !slimSidebarEnabled && !slimSidebarAnimating()" routerLink="mail" routerLinkActive="active" (click)="closeMenu()" ngbPopover="Mail"
@@ -355,11 +344,11 @@
                 ngbPopover="Tasks" i18n-ngbPopover [disablePopover]="!slimSidebarPopoversEnabled" placement="end"
                 container="body" triggers="mouseenter:mouseleave" popoverClass="popover-slim">
                 <i-bs class="me-2" name="list-task"></i-bs><span class="nav-link-label"><ng-container i18n>Tasks</ng-container></span>
-                @if (tasksService.needsAttentionTasks.length > 0 && !slimSidebarEnabled) {
-                  <span class="badge bg-danger ms-2 d-inline flex-shrink-0">{{tasksService.needsAttentionTasks.length}}</span>
+                @if (tasksService.needsAttentionTasksCount > 0 && !slimSidebarEnabled) {
+                  <span class="badge bg-danger ms-2 d-inline flex-shrink-0">{{tasksService.needsAttentionTasksCount}}</span>
                 }
-                @if (tasksService.needsAttentionTasks.length > 0 && slimSidebarEnabled) {
-                  <span class="badge bg-danger position-absolute top-0 end-0 d-none d-md-block">{{tasksService.needsAttentionTasks.length}}</span>
+                @if (tasksService.needsAttentionTasksCount > 0 && slimSidebarEnabled) {
+                  <span class="badge bg-danger position-absolute top-0 end-0 d-none d-md-block">{{tasksService.needsAttentionTasksCount}}</span>
                 }
               </a>
             </li>

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

@@ -295,7 +295,6 @@ describe('AppFrameComponent', () => {
       HideableSidebarItemID.Dashboard,
       HideableSidebarItemID.Workflows,
       HideableSidebarItemID.ShareLinks,
-      HideableSidebarItemID.OcrTemplates,
     ])
     fixture.detectChanges()
 
@@ -311,10 +310,6 @@ describe('AppFrameComponent', () => {
       fixture.nativeElement.querySelector('[routerLink="share-links"]')
         .parentElement.classList
     ).toContain('d-none')
-    expect(
-      fixture.nativeElement.querySelector('[routerLink="ocr-templates"]')
-        .parentElement.classList
-    ).toContain('d-none')
     expect(
       fixture.nativeElement.querySelector('[routerLink="mail"]').parentElement
         .classList
@@ -327,21 +322,12 @@ describe('AppFrameComponent', () => {
     ])
     settingsService.sidebarHiddenItemsEditing.set([
       HideableSidebarItemID.Dashboard,
-      HideableSidebarItemID.OcrTemplates,
     ])
     fixture.detectChanges()
 
     expect(
       fixture.nativeElement.querySelectorAll('pngx-input-switch').length
-    ).toBe(7)
-    const ocrTemplatesLink = fixture.nativeElement.querySelector(
-      '[routerLink="ocr-templates"]'
-    )
-    expect(ocrTemplatesLink.parentElement.classList).not.toContain('d-none')
-    expect(ocrTemplatesLink.classList).toContain('opacity-50')
-    expect(
-      ocrTemplatesLink.parentElement.querySelector('pngx-input-switch')
-    ).not.toBeNull()
+    ).toBe(6)
     expect(
       fixture.nativeElement.querySelector('[routerLink="dashboard"]')
         .parentElement.classList
@@ -602,8 +588,8 @@ describe('AppFrameComponent', () => {
 
   it('should show tasks badge for needs-attention tasks', () => {
     jest
-      .spyOn(tasksService, 'needsAttentionTasks', 'get')
-      .mockReturnValue([{} as any, {} as any])
+      .spyOn(tasksService, 'needsAttentionTasksCount', 'get')
+      .mockReturnValue(2)
 
     fixture.detectChanges()
 

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

@@ -1,30 +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="text-break" [innerHTML]="message"></p>
-  }
-  <pngx-input-select
-    [items]="templates()"
-    [(ngModel)]="template"
-    [allowNull]="true"
-    title="OCR template"
-    i18n-title
-    placeholder="All matching templates"
-    i18n-placeholder
-  ></pngx-input-select>
-</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/zone-ocr-confirm-dialog/zone-ocr-confirm-dialog.component.spec.ts

@@ -1,52 +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 { of } from 'rxjs'
-import { MATCH_NONE } from 'src/app/data/matching-model'
-import { OcrTemplate } from 'src/app/data/ocr-template'
-import { OcrTemplateService } from 'src/app/services/rest/ocr-template.service'
-import { ZoneOcrConfirmDialogComponent } from './zone-ocr-confirm-dialog.component'
-
-const templates: OcrTemplate[] = [
-  {
-    id: 1,
-    name: 'Invoices',
-    match: '',
-    matching_algorithm: MATCH_NONE,
-    sample_document: null,
-    source_width: 0,
-    source_height: 0,
-    enabled: true,
-    zones: [],
-  },
-]
-
-describe('ZoneOcrConfirmDialogComponent', () => {
-  let component: ZoneOcrConfirmDialogComponent
-  let fixture: ComponentFixture<ZoneOcrConfirmDialogComponent>
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [
-        NgbActiveModal,
-        provideHttpClient(withInterceptorsFromDi()),
-        provideHttpClientTesting(),
-      ],
-      imports: [ZoneOcrConfirmDialogComponent],
-    })
-    jest
-      .spyOn(TestBed.inject(OcrTemplateService), 'listAll')
-      .mockReturnValue(of({ count: 1, all: [1], results: templates }))
-
-    fixture = TestBed.createComponent(ZoneOcrConfirmDialogComponent)
-    component = fixture.componentInstance
-    fixture.detectChanges()
-  })
-
-  it('should offer templates and default to all matching templates', () => {
-    expect(component.templates()).toEqual(templates)
-    expect(component.template).toBeNull()
-    expect(fixture.nativeElement.textContent).toContain('OCR template')
-  })
-})

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

@@ -1,31 +0,0 @@
-import { Component, OnInit, inject, signal } from '@angular/core'
-import { FormsModule } from '@angular/forms'
-import { takeUntil } from 'rxjs'
-import { OcrTemplate } from 'src/app/data/ocr-template'
-import { OcrTemplateService } from 'src/app/services/rest/ocr-template.service'
-import { SelectComponent } from '../../input/select/select.component'
-import { ConfirmDialogComponent } from '../confirm-dialog.component'
-
-@Component({
-  selector: 'pngx-zone-ocr-confirm-dialog',
-  templateUrl: './zone-ocr-confirm-dialog.component.html',
-  imports: [FormsModule, SelectComponent],
-})
-export class ZoneOcrConfirmDialogComponent
-  extends ConfirmDialogComponent
-  implements OnInit
-{
-  private readonly ocrTemplateService = inject(OcrTemplateService)
-
-  public readonly templates = signal<OcrTemplate[]>([])
-
-  /** The template to run, or null for every template that matches. */
-  template: number | null = null
-
-  ngOnInit() {
-    this.ocrTemplateService
-      .listAll()
-      .pipe(takeUntil(this.unsubscribeNotifier))
-      .subscribe((r) => this.templates.set(r.results))
-  }
-}

src-ui/src/app/components/common/input/document-link/document-link.component.html

@@ -40,7 +40,7 @@
     (change)="onChange(selectedDocumentIDs)">
     <ng-template ng-label-tmp let-document="item">
       <div class="d-flex align-items-center">
-        @if (!disabled && multiple) {
+        @if (!disabled) {
           <button class="btn p-0 lh-1" (click)="unselect(document)" (mousedown)="$event.stopImmediatePropagation()" type="button" title="Remove link" i18n-title><i-bs name="x"></i-bs></button>
         }
         @if (document.title) {

src-ui/src/app/components/common/input/document-link/document-link.component.ts

@@ -81,9 +81,6 @@ export class DocumentLinkComponent
   @Input()
   placeholder: string = $localize`Search for documents`
 
-  @Input()
-  multiple: boolean = true
-
   /**
    * Parent for ng-select dropdown, needed to prevent close on click.
    */

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

@@ -61,22 +61,6 @@
         <i-bs name="pencil" class="me-2"></i-bs><ng-container i18n>PDF Editor</ng-container>
       </button>
 
-      <div class="d-flex" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.OcrTemplate }">
-        <button ngbDropdownItem (click)="runZoneOcr()" [disabled]="!userCanEdit || networkActive()">
-          <i-bs width="1em" height="1em" name="bounding-box-circles" class="me-2"></i-bs><span i18n>Run Zone OCR</span>
-        </button>
-        <button
-          ngbDropdownItem
-          class="w-auto flex-shrink-0 px-2"
-          (click)="runZoneOcrWithOptions()"
-          [disabled]="!userCanEdit || networkActive()"
-          title="Choose OCR template"
-          i18n-title
-        >
-          <i-bs width="1em" height="1em" name="sliders2"></i-bs>
-        </button>
-      </div>
-
       @if (userIsOwner && (requiresPassword || password)) {
         <button ngbDropdownItem (click)="removePassword()" [disabled]="!password">
           <i-bs name="unlock" class="me-2"></i-bs><ng-container i18n>Remove Password</ng-container>
@@ -106,7 +90,7 @@
 <div class="row">
   <div class="col-md-6 col-xl-5 mb-4">
 
-    <form [formGroup]='documentForm' (ngSubmit)="save()" [attr.inert]="zoneOcrRunning() ? '' : null" [attr.aria-busy]="zoneOcrRunning()">
+    <form [formGroup]='documentForm' (ngSubmit)="save()">
 
       <div class="btn-toolbar mb-1 pb-3 gap-2 row-gap-2 border-bottom">
         <div class="btn-group">

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

@@ -1900,196 +1900,6 @@ describe('DocumentDetailComponent', () => {
     expect(toastSpy).toHaveBeenCalledWith('Document reloaded.')
   })
 
-  it('should run zone OCR, report results and reload the document', () => {
-    component.documentId.set(doc.id)
-    component.document.set(doc)
-    jest.spyOn(documentService, 'runZoneOcr').mockReturnValue(
-      of({
-        results: [
-          { zone: 'Total', value: '102.10' },
-          { zone: 'Due', value: '' },
-        ],
-      } as any)
-    )
-    const loadSpy = jest
-      .spyOn(component as any, 'loadDocument')
-      .mockImplementation(() => {})
-    const notifySpy = jest.spyOn(component.docChangeNotifier, 'next')
-    const toastSpy = jest.spyOn(toastService, 'showInfo')
-    const modalSpy = jest.spyOn(modalService, 'open')
-
-    component.runZoneOcrWithOptions()
-    const dialog = modalSpy.mock.results[0].value.componentInstance
-    expect(dialog.message).toBe(
-      'Fields filled by the template will be overwritten.'
-    )
-    dialog.template = 3
-    dialog.confirmClicked.emit()
-
-    expect(documentService.runZoneOcr).toHaveBeenCalledWith(doc.id, 3)
-    expect(toastSpy).toHaveBeenCalledWith(
-      'Filled 1 of 2 fields. No value found for: Due'
-    )
-    expect(notifySpy).toHaveBeenCalledWith(doc.id)
-    expect(loadSpy).toHaveBeenCalledWith(doc.id, true, expect.any(Function))
-    expect(component.zoneOcrRunning()).toBe(true)
-    loadSpy.mock.calls[0][2]()
-    expect(component.zoneOcrRunning()).toBe(false)
-    expect(component.networkActive()).toBe(false)
-  })
-
-  it('should summarize zone OCR results', () => {
-    component.documentId.set(doc.id)
-    component.document.set(doc)
-    jest.spyOn(component as any, 'loadDocument').mockImplementation(() => {})
-    const runSpy = jest.spyOn(documentService, 'runZoneOcr')
-    const toastSpy = jest.spyOn(toastService, 'showInfo')
-    const modalSpy = jest.spyOn(modalService, 'open')
-
-    runSpy.mockReturnValueOnce(of({ status: 'completed', results: [] }))
-    component.runZoneOcr()
-    expect(modalSpy).not.toHaveBeenCalled()
-    expect(runSpy).toHaveBeenCalledWith(doc.id, null)
-    expect(toastSpy).toHaveBeenLastCalledWith(
-      'Zone OCR found no fields to fill.'
-    )
-
-    component.networkActive.set(false)
-    runSpy.mockReturnValueOnce(
-      of({
-        status: 'completed',
-        results: [
-          { template: 'T', zone: 'Total', custom_field: 'Amount', value: 0 },
-        ],
-      })
-    )
-    component.runZoneOcr()
-    expect(toastSpy).toHaveBeenLastCalledWith('Filled 1 of 1 fields.')
-  })
-
-  it('should confirm before running zone OCR over unsaved changes', () => {
-    component.documentId.set(doc.id)
-    component.document.set({ ...doc, __changedFields: ['title'] })
-    component.documentForm.patchValue({ title: 'Unsaved title' })
-    const runSpy = jest.spyOn(documentService, 'runZoneOcr')
-    const modalSpy = jest.spyOn(modalService, 'open')
-
-    component.runZoneOcr()
-
-    const modal = modalSpy.mock.results[0].value
-    expect(modal.componentInstance.message).toBe(
-      'Running Zone OCR will discard them.'
-    )
-    expect(runSpy).not.toHaveBeenCalled()
-    modal.componentInstance.cancel()
-    expect(runSpy).not.toHaveBeenCalled()
-    expect(component.documentForm.get('title').value).toBe('Unsaved title')
-    expect(component.zoneOcrRunning()).toBe(false)
-  })
-
-  it('should warn about unsaved changes in the zone OCR options dialog', () => {
-    component.documentId.set(doc.id)
-    component.document.set({ ...doc, __changedFields: ['title'] })
-    const runSpy = jest.spyOn(documentService, 'runZoneOcr')
-    const modalSpy = jest.spyOn(modalService, 'open')
-
-    component.runZoneOcrWithOptions()
-
-    const dialog = modalSpy.mock.results[0].value.componentInstance
-    expect(dialog.message).toBe('Running Zone OCR will discard them.')
-    expect(dialog.btnClass).toBe('btn-warning')
-    dialog.cancel()
-    expect(runSpy).not.toHaveBeenCalled()
-    component.networkActive.set(true)
-    component.runZoneOcrWithOptions()
-    expect(modalSpy).toHaveBeenCalledTimes(1)
-  })
-
-  it('should not allow saving or a second zone OCR run while one is running', () => {
-    component.documentId.set(doc.id)
-    component.document.set({ ...doc, __changedFields: ['title'] })
-    const pending = new Subject<any>()
-    const runSpy = jest
-      .spyOn(documentService, 'runZoneOcr')
-      .mockReturnValue(pending)
-    const modalSpy = jest.spyOn(modalService, 'open')
-
-    component.runZoneOcr()
-    modalSpy.mock.results[0].value.componentInstance.confirmClicked.emit()
-
-    expect(runSpy).toHaveBeenCalledWith(doc.id, null)
-    expect(component.zoneOcrRunning()).toBe(true)
-    expect(component.networkActive()).toBe(true)
-    const saveSpy = jest.spyOn(documentService, 'patch')
-    component.save()
-    expect(saveSpy).not.toHaveBeenCalled()
-    component.runZoneOcr()
-    expect(modalSpy).toHaveBeenCalledTimes(1)
-    expect(runSpy).toHaveBeenCalledTimes(1)
-    pending.error(new Error('failed'))
-    expect(component.zoneOcrRunning()).toBe(false)
-    expect(component.networkActive()).toBe(false)
-    expect(component.document().__changedFields).toEqual(['title'])
-  })
-
-  it('should not reload after zone OCR if another document is open', () => {
-    component.documentId.set(doc.id)
-    component.document.set({ ...doc, __changedFields: [] })
-    const pending = new Subject<any>()
-    jest.spyOn(documentService, 'runZoneOcr').mockReturnValue(pending)
-    const loadSpy = jest.spyOn(component as any, 'loadDocument')
-
-    component.runZoneOcr()
-    component.documentId.set(99)
-    pending.next({ results: [] })
-
-    expect(loadSpy).not.toHaveBeenCalled()
-    expect(component.zoneOcrRunning()).toBe(false)
-    pending.complete()
-  })
-
-  it('should keep unsaved changes when zone OCR is skipped', () => {
-    component.documentId.set(doc.id)
-    component.document.set({ ...doc, __changedFields: ['title'] })
-    component.documentForm.patchValue({ title: 'Unsaved title' })
-    const modalSpy = jest.spyOn(modalService, 'open')
-    jest
-      .spyOn(documentService, 'runZoneOcr')
-      .mockReturnValue(of({ status: 'skipped', results: [] }))
-    const loadSpy = jest.spyOn(component as any, 'loadDocument')
-    const infoSpy = jest.spyOn(toastService, 'showInfo')
-
-    component.runZoneOcr()
-    modalSpy.mock.results[0].value.componentInstance.confirm()
-
-    expect(loadSpy).not.toHaveBeenCalled()
-    expect(component.documentForm.get('title').value).toBe('Unsaved title')
-    expect(component.zoneOcrRunning()).toBe(false)
-    expect(component.networkActive()).toBe(false)
-    expect(infoSpy).toHaveBeenCalledWith(
-      'No OCR template applies to this document.'
-    )
-  })
-
-  it('should show an error when zone OCR fails', () => {
-    component.document.set(doc)
-    jest
-      .spyOn(documentService, 'runZoneOcr')
-      .mockReturnValue(throwError(() => new Error('nope')))
-    const loadSpy = jest.spyOn(component as any, 'loadDocument')
-    const errorSpy = jest.spyOn(toastService, 'showError')
-
-    component.runZoneOcr()
-
-    expect(errorSpy).toHaveBeenCalledWith(
-      'Error running zone OCR.',
-      expect.any(Error)
-    )
-    expect(loadSpy).not.toHaveBeenCalled()
-    expect(component.zoneOcrRunning()).toBe(false)
-    expect(component.networkActive()).toBe(false)
-  })
-
   it('should change preview element by render type', () => {
     initNormally()
     component.document.update((document) => ({

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

@@ -64,7 +64,6 @@ import {
   FILTER_STORAGE_PATH,
 } from 'src/app/data/filter-rule-type'
 import { ObjectWithId } from 'src/app/data/object-with-id'
-import { OcrZoneRunResult } from 'src/app/data/ocr-template'
 import { StoragePath } from 'src/app/data/storage-path'
 import { Tag } from 'src/app/data/tag'
 import { SETTINGS_KEYS, SuggestionSource } from 'src/app/data/ui-settings'
@@ -105,7 +104,6 @@ import { DocumentDetailFieldID } from '../admin/settings/settings.component'
 import { ConfirmDialogComponent } from '../common/confirm-dialog/confirm-dialog.component'
 import { PasswordRemovalConfirmDialogComponent } from '../common/confirm-dialog/password-removal-confirm-dialog/password-removal-confirm-dialog.component'
 import { ReprocessConfirmDialogComponent } from '../common/confirm-dialog/reprocess-confirm-dialog/reprocess-confirm-dialog.component'
-import { ZoneOcrConfirmDialogComponent } from '../common/confirm-dialog/zone-ocr-confirm-dialog/zone-ocr-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'
 import { DocumentTypeEditDialogComponent } from '../common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component'
@@ -268,7 +266,6 @@ export class DocumentDetailComponent
   readonly error = signal<any>(undefined)
 
   readonly networkActive = signal(false)
-  readonly zoneOcrRunning = signal(false)
 
   readonly documentId = signal<number>(undefined)
   readonly document = signal<Document>(undefined)
@@ -546,11 +543,7 @@ export class DocumentDetailComponent
       )
   }
 
-  private loadDocument(
-    documentId: number,
-    forceRemote: boolean = false,
-    onComplete?: () => void
-  ): void {
+  private loadDocument(documentId: number, forceRemote: boolean = false): void {
     let redirectedToRoot = false
     this.closeIncomingUpdateModal()
     this.pendingIncomingUpdate = null
@@ -607,8 +600,7 @@ export class DocumentDetailComponent
         }),
         first(),
         takeUntil(this.unsubscribeNotifier),
-        takeUntil(this.docChangeNotifier),
-        finalize(() => onComplete?.())
+        takeUntil(this.docChangeNotifier)
       )
       .subscribe({
         next: (doc) => {
@@ -1342,7 +1334,6 @@ export class DocumentDetailComponent
   }
 
   save(close: boolean = false, savedCallback: () => void = null) {
-    if (this.zoneOcrRunning()) return
     this.networkActive.set(true)
     ;(document.activeElement as HTMLElement)?.dispatchEvent(new Event('change'))
     this.documentsService
@@ -1563,107 +1554,6 @@ export class DocumentDetailComponent
     })
   }
 
-  /** Runs every template that matches, confirming only over unsaved changes. */
-  runZoneOcr() {
-    if (this.networkActive()) return
-    const documentId = this.documentId()
-    if (!this.hasLocalEdits(this.document())) {
-      this.executeZoneOcr(documentId, null)
-      return
-    }
-    const modal = this.modalService.open(ConfirmDialogComponent, {
-      backdrop: 'static',
-    })
-    modal.componentInstance.title = $localize`Run Zone OCR`
-    modal.componentInstance.messageBold = $localize`You have unsaved changes.`
-    modal.componentInstance.message = $localize`Running Zone OCR will discard them.`
-    modal.componentInstance.btnClass = 'btn-warning'
-    modal.componentInstance.btnCaption = $localize`Run Zone OCR`
-    modal.componentInstance.confirmClicked
-      .pipe(first(), takeUntil(this.unsubscribeNotifier))
-      .subscribe(() => {
-        modal.close()
-        if (this.documentId() === documentId && !this.networkActive()) {
-          this.executeZoneOcr(documentId, null)
-        }
-      })
-  }
-
-  /** Opens the dialog to pick which template to run. */
-  runZoneOcrWithOptions() {
-    if (this.networkActive()) return
-    const documentId = this.documentId()
-    const modal = this.modalService.open(ZoneOcrConfirmDialogComponent, {
-      backdrop: 'static',
-    })
-    const dialog = modal.componentInstance as ZoneOcrConfirmDialogComponent
-    dialog.title = $localize`Run Zone OCR`
-    dialog.btnCaption = $localize`Run Zone OCR`
-    if (this.hasLocalEdits(this.document())) {
-      dialog.messageBold = $localize`You have unsaved changes.`
-      dialog.message = $localize`Running Zone OCR will discard them.`
-      dialog.btnClass = 'btn-warning'
-    } else {
-      dialog.message = $localize`Fields filled by the template will be overwritten.`
-    }
-    dialog.confirmClicked
-      .pipe(first(), takeUntil(this.unsubscribeNotifier))
-      .subscribe(() => {
-        modal.close()
-        if (this.documentId() === documentId && !this.networkActive()) {
-          this.executeZoneOcr(documentId, dialog.template)
-        }
-      })
-  }
-
-  private executeZoneOcr(documentId: number, templateId: number | null) {
-    this.zoneOcrRunning.set(true)
-    this.networkActive.set(true)
-    this.documentsService
-      .runZoneOcr(documentId, templateId)
-      .pipe(takeUntil(this.unsubscribeNotifier))
-      .subscribe({
-        next: (response) => {
-          if (
-            this.documentId() !== documentId ||
-            response.status === 'skipped'
-          ) {
-            this.finishZoneOcr()
-            if (response.status === 'skipped') {
-              this.toastService.showInfo(
-                $localize`No OCR template applies to this document.`
-              )
-            }
-            return
-          }
-          this.toastService.showInfo(this.zoneOcrSummary(response.results))
-          this.docChangeNotifier.next(documentId)
-          this.loadDocument(documentId, true, () => this.finishZoneOcr())
-        },
-        error: (error) => {
-          this.finishZoneOcr()
-          this.toastService.showError($localize`Error running zone OCR.`, error)
-        },
-      })
-  }
-
-  private zoneOcrSummary(results: OcrZoneRunResult[]): string {
-    if (!results.length) return $localize`Zone OCR found no fields to fill.`
-    const missed = results
-      .filter((result) => !`${result.value ?? ''}`.trim())
-      .map((result) => result.zone)
-    const filled = results.length - missed.length
-    return missed.length
-      ? $localize`Filled ${filled} of ${results.length} fields. No value found for: ${missed.join(', ')}`
-      : $localize`Filled ${filled} of ${results.length} fields.`
-  }
-
-  private finishZoneOcr() {
-    this.zoneOcrRunning.set(false)
-    this.networkActive.set(false)
-    this.flushPendingIncomingUpdate()
-  }
-
   private getSelectedNonLatestVersionId(): number | null {
     const versions = this.document()?.versions ?? []
     if (!versions.length || !this.selectedVersionId()) {

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

@@ -98,11 +98,6 @@
           <button ngbDropdownItem (click)="mergeSelectedAsVersions()" [disabled]="!userOwnsAll || !userCanEditAll || !userCanDelete || list.allSelected || list.selectedCount < 2">
             <i-bs name="journal-bookmark-fill" class="me-2"></i-bs><ng-container i18n>Merge as versions</ng-container>
           </button>
-          @if (permissionService.currentUserCan(PermissionAction.View, PermissionType.OcrTemplate)) {
-            <button ngbDropdownItem (click)="runZoneOcrSelected()" [disabled]="!userCanEditAll">
-              <i-bs name="bounding-box-circles" class="me-2"></i-bs><ng-container i18n>Run Zone OCR</ng-container>
-            </button>
-          }
         </div>
       </div>
     </div>

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

@@ -1286,53 +1286,6 @@ describe('BulkEditorComponent', () => {
     ) // listAllFilteredIds
   })
 
-  it('should support run zone ocr', () => {
-    let modal: NgbModalRef
-    modalService.activeInstances.subscribe((m) => (modal = m[0]))
-    jest.spyOn(permissionsService, 'currentUserCan').mockReturnValue(true)
-    jest
-      .spyOn(documentListViewService, 'documents', 'get')
-      .mockReturnValue([{ id: 3 }, { id: 4 }])
-    jest
-      .spyOn(documentListViewService, 'selected', 'get')
-      .mockReturnValue(new Set([3, 4]))
-    jest
-      .spyOn(permissionsService, 'currentUserHasObjectPermissions')
-      .mockReturnValue(true)
-    fixture.detectChanges()
-    component.runZoneOcrSelected()
-    expect(modal).not.toBeUndefined()
-    modal.componentInstance.confirm()
-    let req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/run_zone_ocr/`
-    )
-    req.flush(true)
-    expect(req.request.body).toEqual({
-      documents: [3, 4],
-    })
-
-    component.runZoneOcrSelected()
-    modal.componentInstance.template = 3
-    modal.componentInstance.confirm()
-    req = httpTestingController.expectOne(
-      `${environment.apiBaseUrl}documents/run_zone_ocr/`
-    )
-    req.flush(true)
-    expect(req.request.body).toEqual({
-      documents: [3, 4],
-      template: 3,
-    })
-    httpTestingController.match(
-      `${environment.apiBaseUrl}ocr_templates/?page=1&page_size=100000`
-    ) // template list
-    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=50&ordering=-created&truncate_content=true&include_selection_data=true`
-    ) // list reload
-    httpTestingController.match(
-      `${environment.apiBaseUrl}documents/?page=1&page_size=100000&fields=id`
-    ) // listAllFilteredIds
-  })
-
   it('should support rotate', () => {
     let modal: NgbModalRef
     modalService.activeInstances.subscribe((m) => (modal = m[0]))

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

@@ -64,7 +64,6 @@ import { MergeAsVersionsConfirmDialogComponent } from '../../common/confirm-dial
 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 { ZoneOcrConfirmDialogComponent } from '../../common/confirm-dialog/zone-ocr-confirm-dialog/zone-ocr-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'
 import { DocumentTypeEditDialogComponent } from '../../common/edit-dialog/document-type-edit-dialog/document-type-edit-dialog.component'
@@ -967,30 +966,6 @@ export class BulkEditorComponent
       })
   }
 
-  runZoneOcrSelected() {
-    const modal = this.modalService.open(ZoneOcrConfirmDialogComponent, {
-      backdrop: 'static',
-    })
-    const dialog = modal.componentInstance as ZoneOcrConfirmDialogComponent
-    dialog.title = $localize`Run zone OCR confirm`
-    dialog.messageBold = $localize`This operation will run zone OCR on ${this.getSelectionSize()} selected document(s).`
-    dialog.message = $localize`Fields filled by the template will be overwritten.`
-    dialog.btnClass = 'btn-warning'
-    dialog.btnCaption = $localize`Proceed`
-    dialog.confirmClicked
-      .pipe(takeUntil(this.unsubscribeNotifier))
-      .subscribe(() => {
-        dialog.buttonsEnabled.set(false)
-        this.executeDocumentAction(
-          modal,
-          this.documentService.runZoneOcrDocuments(
-            this.getSelectionQuery(),
-            dialog.template
-          )
-        )
-      })
-  }
-
   setPermissions() {
     let modal = this.modalService.open(PermissionsDialogComponent, {
       backdrop: 'static',

src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor-zone-list/ocr-template-editor-zone-list.component.html

@@ -1,36 +0,0 @@
-@if (zones.length === 0) {
-  <p class="text-muted" i18n>No zones yet. Drag anywhere on the sample document to create one.</p>
-} @else {
-  <div class="list-group">
-    @for (zone of zones; track $index; let i = $index) {
-      <div class="list-group-item list-group-item-action d-flex align-items-center gap-3 position-relative">
-        <span class="p-2 rounded flex-shrink-0" [style.background-color]="zoneColor(i)" aria-hidden="true"></span>
-        <div class="flex-grow-1 text-truncate">
-          <button type="button" class="btn btn-link p-0 fw-semibold text-reset text-decoration-none text-truncate mw-100 stretched-link" (click)="zoneSelected.emit(i)">{{ zone.name }}</button>
-          @if (!hasField(zone)) {
-            <div class="small text-warning text-truncate">
-              <i-bs name="exclamation-triangle" class="me-1" aria-hidden="true"></i-bs><span i18n>No field selected</span>
-            </div>
-          } @else {
-            <div class="small text-muted text-truncate">
-              {{ getZoneTargetName(zone) }}
-              @if (isCombined(zone)) {
-                <i-bs name="braces" class="ms-1" title="Combined with other zones" i18n-title></i-bs>
-              }
-            </div>
-          }
-        </div>
-        <small class="text-muted text-nowrap">
-          @if (zone.page === -1) {
-            <ng-container i18n>Last page</ng-container>
-          } @else {
-            <ng-container i18n>Page {{ zone.page ?? 1 }}</ng-container>
-          }
-        </small>
-        <button type="button" class="btn btn-sm btn-link text-danger position-relative z-2" (click)="zoneRemoved.emit(i)" title="Delete zone" i18n-title aria-label="Delete zone" i18n-aria-label>
-          <i-bs name="trash"></i-bs>
-        </button>
-      </div>
-    }
-  </div>
-}

src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor-zone-list/ocr-template-editor-zone-list.component.spec.ts

@@ -1,118 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
-import { CustomField } from 'src/app/data/custom-field'
-import {
-  OcrTemplateZone,
-  OcrZoneTarget,
-  OcrZoneTransform,
-} from 'src/app/data/ocr-template'
-import { OcrTemplateEditorZoneListComponent } from './ocr-template-editor-zone-list.component'
-
-function zone(overrides: Partial<OcrTemplateZone> = {}): OcrTemplateZone {
-  return {
-    name: 'Zone 1',
-    target: OcrZoneTarget.CustomField,
-    custom_field: 7,
-    x: 10,
-    y: 20,
-    width: 30,
-    height: 40,
-    page: 1,
-    ocr_language: 'eng',
-    transform: OcrZoneTransform.Strip,
-    validation_regex: '',
-    order: 0,
-    ...overrides,
-  }
-}
-
-describe('OcrTemplateEditorZoneListComponent', () => {
-  let fixture: ComponentFixture<OcrTemplateEditorZoneListComponent>
-  let component: OcrTemplateEditorZoneListComponent
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [
-        OcrTemplateEditorZoneListComponent,
-        NgxBootstrapIconsModule.pick(allIcons),
-      ],
-    }).compileComponents()
-
-    fixture = TestBed.createComponent(OcrTemplateEditorZoneListComponent)
-    component = fixture.componentInstance
-  })
-
-  it('shows empty state when no zones are defined', () => {
-    fixture.detectChanges()
-
-    expect(fixture.nativeElement.textContent).toContain('No zones yet')
-  })
-
-  it('renders zone name, target, and page', () => {
-    component.zones = [zone(), zone({ name: 'Zone 2', page: -1 })]
-    component.customFields = [{ id: 7, name: 'Invoice Number' } as CustomField]
-    fixture.detectChanges()
-
-    const text = fixture.nativeElement.textContent
-    expect(text).toContain('Zone 1')
-    expect(text).toContain('Invoice Number')
-    expect(text).toContain('Page 1')
-    expect(text).toContain('Last page')
-  })
-
-  it('marks zones that share a field', () => {
-    component.zones = [
-      zone(),
-      zone({ name: 'Zone 2' }),
-      zone({ name: 'Zone 3', custom_field: 8 }),
-    ]
-    fixture.detectChanges()
-
-    expect(component.isCombined(component.zones[0])).toBe(true)
-    expect(component.isCombined(component.zones[2])).toBe(false)
-    expect(
-      fixture.nativeElement.querySelectorAll(
-        '[title="Combined with other zones"]'
-      )
-    ).toHaveLength(2)
-  })
-
-  it('warns only for zones without a field and clears the warning when assigned', () => {
-    component.zones = [
-      zone({ custom_field: null }),
-      zone({ target: OcrZoneTarget.Title, custom_field: null }),
-      zone(),
-    ]
-    fixture.detectChanges()
-
-    const warnings = () =>
-      fixture.nativeElement.querySelectorAll('.text-warning')
-    expect(warnings()).toHaveLength(1)
-    expect(warnings()[0].textContent).toContain('No field selected')
-
-    component.zones[0].custom_field = 7
-    fixture.componentRef.setInput('zones', [...component.zones])
-    fixture.detectChanges()
-    expect(warnings()).toHaveLength(0)
-  })
-
-  it('emits select and remove events', () => {
-    component.zones = [zone()]
-    const selectSpy = jest.spyOn(component.zoneSelected, 'emit')
-    const removeSpy = jest.spyOn(component.zoneRemoved, 'emit')
-    fixture.detectChanges()
-
-    const buttons = fixture.nativeElement.querySelectorAll('button')
-    buttons[0].click()
-    buttons[1].click()
-
-    expect(selectSpy).toHaveBeenCalledWith(0)
-    expect(removeSpy).toHaveBeenCalledWith(0)
-  })
-
-  it('does not label an unknown built-in target', () => {
-    expect(
-      component.getZoneTargetName(zone({ target: 'unknown' as OcrZoneTarget }))
-    ).toBe('')
-  })
-})

src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor-zone-list/ocr-template-editor-zone-list.component.ts

@@ -1,50 +0,0 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { CustomField } from 'src/app/data/custom-field'
-import {
-  getZoneFieldKey,
-  OCR_BUILTIN_TARGETS,
-  OcrTemplateZone,
-  OcrZoneTarget,
-} from 'src/app/data/ocr-template'
-import { getZoneColor } from '../zone-geometry'
-
-@Component({
-  selector: 'pngx-ocr-template-zone-list',
-  imports: [NgxBootstrapIconsModule],
-  templateUrl: './ocr-template-editor-zone-list.component.html',
-})
-export class OcrTemplateEditorZoneListComponent {
-  @Input() zones: OcrTemplateZone[] = []
-  @Input() customFields: CustomField[] = []
-
-  @Output() public readonly zoneSelected = new EventEmitter<number>()
-  @Output() public readonly zoneRemoved = new EventEmitter<number>()
-
-  public readonly zoneColor = getZoneColor
-
-  hasField(zone: OcrTemplateZone): boolean {
-    return getZoneFieldKey(zone) !== null
-  }
-
-  isCombined(zone: OcrTemplateZone): boolean {
-    const key = getZoneFieldKey(zone)
-    return (
-      key !== null &&
-      this.zones.filter((z) => getZoneFieldKey(z) === key).length > 1
-    )
-  }
-
-  getZoneTargetName(zone: OcrTemplateZone): string {
-    if (zone.target === OcrZoneTarget.CustomField) {
-      return (
-        this.customFields.find((field) => field.id === zone.custom_field)
-          ?.name ?? ''
-      )
-    }
-    return (
-      OCR_BUILTIN_TARGETS.find((target) => target.id === zone.target)?.name ??
-      ''
-    )
-  }
-}

src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.html

@@ -1,313 +0,0 @@
-<div class="modal-header">
-  <h4 class="modal-title" id="ocr-template-editor-title">{{ dialogTitle }}</h4>
-  @if (template.id) {
-    <span class="badge bg-primary text-primary-text-contrast ms-2">ID: {{ template.id }}</span>
-  }
-  <button type="button" class="btn-close" (click)="activeModal.dismiss()" [disabled]="saving()" aria-label="Close" i18n-aria-label></button>
-</div>
-
-<div class="modal-body d-flex flex-column">
-  <div class="row gx-3 editor-layout flex-grow-1 flex-lg-nowrap" [attr.inert]="saving() ? '' : null" [attr.aria-busy]="saving()">
-    <div class="col-lg-4 mb-3 mb-lg-0 overflow-auto">
-      <ul ngbNav #nav="ngbNav" [(activeId)]="activeTab" class="nav-underline flex-nowrap flex-md-wrap overflow-auto">
-        <li ngbNavItem="template">
-          <a ngbNavLink i18n>Template</a>
-          <ng-template ngbNavContent>
-            <div class="row mb-3">
-              <div class="col-9">
-                <pngx-input-text [(ngModel)]="template.name" title="Template name" i18n-title></pngx-input-text>
-              </div>
-              <div class="col-3">
-                <pngx-input-switch [(ngModel)]="template.enabled" title="Enabled" i18n-title></pngx-input-switch>
-              </div>
-            </div>
-
-            <pngx-input-select [(ngModel)]="template.matching_algorithm" [items]="matchingAlgorithms" title="Matching algorithm" i18n-title></pngx-input-select>
-            @if (patternRequired) {
-              <pngx-input-text [(ngModel)]="template.match" title="Matching pattern" i18n-title></pngx-input-text>
-              <pngx-input-check [(ngModel)]="template.is_insensitive" title="Case insensitive" i18n-title></pngx-input-check>
-            }
-
-            <div *pngxIfOwner="object">
-              <hr />
-              <pngx-permissions-form [users]="users()" [accordion]="true" [(ngModel)]="permissionsForm"></pngx-permissions-form>
-            </div>
-
-          </ng-template>
-        </li>
-
-        <li ngbNavItem="zones">
-          <a ngbNavLink><ng-container i18n>Zones</ng-container> <span class="badge bg-primary ms-2">{{ template.zones.length }}</span></a>
-          <ng-template ngbNavContent>
-            @if (selectedZone; as zone) {
-              <div class="d-flex align-items-center gap-2 mb-3">
-                <button type="button" class="btn btn-sm btn-link px-0 me-auto" (click)="deselectZone()">
-                  <i-bs name="arrow-left" class="me-1"></i-bs><ng-container i18n>All zones</ng-container>
-                </button>
-                <button type="button" class="btn btn-sm btn-outline-primary" (click)="testZone()" [disabled]="!previewDocId || zoneTesting">
-                  @if (zoneTesting) {
-                    <span class="spinner-border spinner-border-sm me-1" aria-hidden="true"></span>
-                  } @else {
-                    <i-bs name="play-fill" class="me-1"></i-bs>
-                  }
-                  <ng-container i18n>Test</ng-container>
-                </button>
-                <button type="button" class="btn btn-sm btn-outline-danger" (click)="removeZone(selectedZoneIndex)" title="Delete zone" i18n-title aria-label="Delete zone" i18n-aria-label>
-                  <i-bs name="trash"></i-bs>
-                </button>
-              </div>
-
-              @if (zoneTestResult; as result) {
-                @if (result.error) {
-                  <div class="alert alert-warning py-2 mb-3 small" role="alert">{{ result.error }}</div>
-                } @else {
-                  <dl class="row small border rounded mx-0 py-2 mb-3">
-                    <dt class="col-4" i18n>OCR text</dt>
-                    <dd class="col-8">
-                      @if (result.raw_text) {
-                        <code>{{ result.raw_text }}</code>
-                      } @else {
-                        <span class="text-muted" i18n>Nothing detected</span>
-                      }
-                    </dd>
-                    <dt class="col-4" i18n>Value</dt>
-                    <dd class="col-8" [class.mb-0]="!result.regex">
-                      @if (result.value) {
-                        <code>{{ result.value }}</code>
-                      } @else {
-                        <span class="text-muted" i18n>Empty</span>
-                      }
-                    </dd>
-                    @if (result.regex) {
-                      <dt class="col-4" i18n>Validation</dt>
-                      <dd class="col-8 mb-0">
-                        @if (result.regex_match) {
-                          <span class="badge bg-success" i18n>Regex matches</span>
-                        } @else {
-                          <span class="badge bg-danger" i18n>Regex does not match</span>
-                        }
-                      </dd>
-                    }
-                  </dl>
-                }
-              }
-
-              <pngx-input-text [ngModel]="zone.name" (ngModelChange)="renameZone(zone, $event)" title="Name" i18n-title></pngx-input-text>
-
-              <pngx-input-select
-                [items]="fieldItems()"
-                [ngModel]="zoneFieldValue(zone)"
-                (ngModelChange)="setZoneField(zone, $event)"
-                (createNew)="createField($event)"
-                title="Field"
-                i18n-title
-                placeholder="Choose a field"
-                i18n-placeholder
-                hint="Where the extracted value is written."
-                i18n-hint
-              ></pngx-input-select>
-
-              @if (isFieldShared(zone)) {
-                <pngx-input-text
-                  [ngModel]="getCombineFormat(zone)"
-                  (ngModelChange)="setCombineFormat(zone, $event)"
-                  [placeholder]="defaultCombineFormat(zone)"
-                  title="Combined value"
-                  i18n-title
-                  hint="Several zones write to this field. Set the format or leave empty to join them with spaces."
-                  i18n-hint
-                ></pngx-input-text>
-                <div class="d-flex flex-wrap gap-1 mt-n2 mb-3">
-                  @for (z of zonesForField(zone); track z) {
-                    <button type="button" class="btn btn-sm btn-outline-secondary font-monospace" (click)="insertCombineToken(zone, z)">{{ '{' + z.name + '}' }}</button>
-                  }
-                </div>
-              }
-
-              <div class="row align-items-end">
-                <div class="col">
-                  @if (!isLastPageZone(zone)) {
-                    <pngx-input-number [(ngModel)]="zone.page" [showAdd]="false" title="Page" i18n-title></pngx-input-number>
-                  }
-                </div>
-                <div class="col-auto">
-                  <pngx-input-switch [ngModel]="isLastPageZone(zone)" (ngModelChange)="setLastPageZone(zone, $event)" [horizontal]="true" title="Last page" i18n-title></pngx-input-switch>
-                </div>
-              </div>
-
-              <h6 class="border-top pt-3 mt-1 mb-3" i18n>Processing</h6>
-
-              <pngx-input-select
-                [items]="languageOptions"
-                [multiple]="true"
-                [ngModel]="ocrLanguageArray(zone)"
-                (ngModelChange)="setOcrLanguages(zone, $event)"
-                title="OCR language"
-                i18n-title
-                placeholder="Select languages"
-                i18n-placeholder
-              ></pngx-input-select>
-
-              <pngx-input-select [items]="transformOptions" [(ngModel)]="zone.transform" title="Transform" i18n-title></pngx-input-select>
-
-              @if (zone.transform === OcrZoneTransform.Date) {
-                <pngx-input-text
-                  [(ngModel)]="zone.date_format"
-                  title="Date format"
-                  i18n-title
-                  placeholder="Auto-detect"
-                  i18n-placeholder
-                  hint="Python date codes, e.g. %d.%m.%Y. Leave empty to detect the format automatically."
-                  i18n-hint
-                ></pngx-input-text>
-              }
-
-              <pngx-input-text [(ngModel)]="zone.validation_regex" title="Validation regex" i18n-title placeholder="\d{2}\.\d{2}\.\d{4}" hint="The value must match this pattern to be applied." i18n-hint></pngx-input-text>
-            } @else {
-              <pngx-ocr-template-zone-list
-                [zones]="template.zones"
-                [customFields]="customFields()"
-                (zoneSelected)="selectZone($event)"
-                (zoneRemoved)="removeZone($event)"
-              ></pngx-ocr-template-zone-list>
-            }
-          </ng-template>
-        </li>
-      </ul>
-
-      <div [ngbNavOutlet]="nav" class="mt-3"></div>
-    </div>
-
-    <div class="col-lg-8 d-flex flex-column">
-      <div class="d-flex flex-wrap gap-2 mb-2 flex-shrink-0">
-        <pngx-input-document-link
-          class="flex-grow-1"
-          [ngModel]="sampleDocumentIds"
-          (ngModelChange)="setSampleDocument($event)"
-          [minimal]="true"
-          [multiple]="false"
-          placeholder="Search for a sample document"
-          i18n-placeholder
-        ></pngx-input-document-link>
-        @if (previewDocId) {
-          <div class="input-group w-auto flex-nowrap">
-            <input class="form-control flex-grow-0 preview-page-input" type="number" min="1" [max]="previewPageCount()" [(ngModel)]="previewPageDisplay" [disabled]="!pageLoaded()" aria-label="Page" i18n-aria-label />
-            <span class="input-group-text" i18n>of {{ previewPageCount() ?? '?' }}</span>
-          </div>
-          <fieldset class="input-group w-auto flex-nowrap" aria-label="Zoom" i18n-aria-label>
-            <button type="button" class="btn btn-outline-secondary" aria-label="Zoom out" i18n-aria-label [disabled]="!pageLoaded() || zoom <= 0.5" (click)="zoomOut()"><i-bs name="dash"></i-bs></button>
-            <button type="button" class="btn btn-outline-secondary preview-zoom" title="Reset zoom" i18n-title [disabled]="!pageLoaded()" (click)="resetZoom()">{{ zoom | percent: '1.0-0' }}</button>
-            <button type="button" class="btn btn-outline-secondary" aria-label="Zoom in" i18n-aria-label [disabled]="!pageLoaded() || zoom >= 4" (click)="zoomIn()"><i-bs name="plus"></i-bs></button>
-          </fieldset>
-        }
-      </div>
-      <div class="flex-grow-1 overflow-hidden">
-        <div class="h-100 overflow-auto border" [attr.aria-busy]="previewDocId && !pageLoaded()">
-          @if (pageFailed()) {
-            <div class="py-5 px-3 text-center" role="alert">
-              <i-bs name="exclamation-triangle" width="32" height="32" class="text-warning"></i-bs>
-              <p class="my-3" i18n>Could not load this page.</p>
-              <button type="button" class="btn btn-sm btn-outline-secondary" (click)="setSampleDocument(sampleDocumentIds)"><i-bs name="arrow-clockwise" class="me-1"></i-bs><span i18n>Retry</span></button>
-            </div>
-          } @else if (previewDocId) {
-            <div class="position-relative" [class.d-none]="!pageLoaded()" [style.width.%]="zoom * 100">
-              <img
-                #pageImage
-                [src]="pageImageUrl"
-                (load)="onImageLoad()"
-                (error)="onImageError()"
-                alt="Sample document page"
-                i18n-alt
-                class="d-block w-100"
-                crossorigin="use-credentials"
-              />
-              @if (pageLoaded()) {
-                <svg
-                  #zoneOverlay
-                  class="zone-overlay position-absolute top-0 start-0 w-100 h-100"
-                  [attr.viewBox]="overlayViewBox()"
-                  preserveAspectRatio="none"
-                  [style.cursor]="overlayCursor"
-                  (pointerdown)="onOverlayPointerDown($event)"
-                  (pointermove)="onOverlayPointerMove($event)"
-                  (pointerup)="onOverlayPointerUp($event)"
-                  (pointercancel)="onOverlayPointerCancel($event)"
-                  (lostpointercapture)="onOverlayPointerCancel($event)"
-                  aria-label="Zone overlay" i18n-aria-label
-                >
-                  @for (zone of template.zones; track $index; let i = $index) {
-                    @if (zoneDisplayRect(i); as rect) {
-                      <g>
-                        <rect
-                          class="zone-rect"
-                          [class.zone-rect-selected]="selectedZoneIndex === i"
-                          [attr.x]="rect.x"
-                          [attr.y]="rect.y"
-                          [attr.width]="rect.w"
-                          [attr.height]="rect.h"
-                          [attr.stroke]="zoneColor(i)"
-                          [attr.fill]="zoneColor(i)"
-                        ></rect>
-                        <text
-                          class="zone-label fw-semibold pe-none"
-                          [attr.x]="rect.x + overlayUnitSize(6)"
-                          [attr.y]="zoneLabelY(rect)"
-                          [attr.font-size]="overlayFontSize()"
-                          [attr.fill]="zoneColor(i)"
-                        >{{ zoneLabel(zone, i) }}</text>
-
-                        @if (selectedZoneIndex === i) {
-                          @for (handle of resizeHandles(rect); track handle.handle) {
-                            <rect
-                              class="zone-resize-handle"
-                              [attr.x]="handle.x - overlayHandleSize() / 2"
-                              [attr.y]="handle.y - overlayHandleSize() / 2"
-                              [attr.width]="overlayHandleSize()"
-                              [attr.height]="overlayHandleSize()"
-                              [attr.fill]="zoneColor(i)"
-                            ></rect>
-                          }
-                        }
-                      </g>
-                    }
-                  }
-
-                  @if (drawingRect(); as rect) {
-                    <rect
-                      class="zone-drawing-rect"
-                      [attr.x]="rect.x"
-                      [attr.y]="rect.y"
-                      [attr.width]="rect.w"
-                      [attr.height]="rect.h"
-                    ></rect>
-                  }
-                </svg>
-              }
-            </div>
-            @if (!pageLoaded()) {
-              <div class="p-5 d-flex justify-content-center align-items-center">
-                <output class="spinner-border">
-                  <span class="visually-hidden" i18n>Loading page...</span>
-                </output>
-              </div>
-            }
-          } @else {
-            <div class="py-5 px-3 text-center text-muted">
-              <i-bs name="file-text" width="32" height="32"></i-bs>
-              <p class="mt-3 mb-0" i18n>No sample document selected.</p>
-            </div>
-          }
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-<div class="modal-footer">
-  <button type="button" class="btn btn-outline-secondary" (click)="activeModal.dismiss()" [disabled]="saving()" i18n>Cancel</button>
-  <button type="button" class="btn btn-primary" (click)="save()" [disabled]="saving() || !isDirty">
-    @if (saving()) {
-      <span class="spinner-border spinner-border-sm me-1" aria-hidden="true"></span>
-    }
-    <span i18n>Save</span>
-  </button>
-</div>

src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.scss

@@ -1,64 +0,0 @@
-:host {
-  display: flex;
-  flex-direction: column;
-  min-height: 0;
-}
-
-@media (min-width: 992px) {
-  .modal-body {
-    overflow: hidden;
-  }
-
-  .editor-layout {
-    min-height: 0;
-  }
-}
-
-.preview-page-input {
-  width: 3.5rem;
-}
-
-.preview-zoom {
-  min-width: 4rem;
-}
-
-.zone-overlay {
-  touch-action: none;
-}
-
-.zone-rect,
-.zone-drawing-rect {
-  vector-effect: non-scaling-stroke;
-}
-
-.zone-rect {
-  fill-opacity: 0.2;
-  stroke-width: 2;
-}
-
-.zone-rect-selected {
-  stroke-width: 3;
-}
-
-.zone-label {
-  font-family: var(--bs-font-sans-serif);
-  paint-order: stroke;
-  stroke: #fff;
-  stroke-linejoin: round;
-  stroke-width: 4px;
-  vector-effect: non-scaling-stroke;
-}
-
-.zone-resize-handle {
-  stroke: #fff;
-  stroke-width: 1;
-  vector-effect: non-scaling-stroke;
-}
-
-.zone-drawing-rect {
-  fill: var(--bs-primary);
-  fill-opacity: 0.2;
-  stroke: var(--bs-primary);
-  stroke-dasharray: 5 5;
-  stroke-width: 2;
-}

src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.spec.ts

@@ -1,878 +0,0 @@
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
-import { provideHttpClientTesting } from '@angular/common/http/testing'
-import { ElementRef } from '@angular/core'
-import { ComponentFixture, TestBed } from '@angular/core/testing'
-import { By } from '@angular/platform-browser'
-import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap'
-import { allIcons, NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { of, Subject, throwError } from 'rxjs'
-import { PermissionsFormComponent } from 'src/app/components/common/input/permissions/permissions-form/permissions-form.component'
-import { CustomField, CustomFieldDataType } from 'src/app/data/custom-field'
-import { Document } from 'src/app/data/document'
-import {
-  MATCH_ANY,
-  MATCH_AUTO,
-  MATCH_LITERAL,
-  MATCH_NONE,
-} from 'src/app/data/matching-model'
-import {
-  OcrTemplate,
-  OcrTemplateZone,
-  OcrZoneTarget,
-  OcrZoneTestResult,
-  OcrZoneTransform,
-} from 'src/app/data/ocr-template'
-import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
-import { User } from 'src/app/data/user'
-import { PermissionsService } from 'src/app/services/permissions.service'
-import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
-import { DocumentService } from 'src/app/services/rest/document.service'
-import { OcrTemplateService } from 'src/app/services/rest/ocr-template.service'
-import { UserService } from 'src/app/services/rest/user.service'
-import { SettingsService } from 'src/app/services/settings.service'
-import { ToastService } from 'src/app/services/toast.service'
-import { OcrTemplateEditorComponent } from './ocr-template-editor.component'
-
-const customFields: CustomField[] = [
-  { id: 1, name: 'Invoice number', data_type: CustomFieldDataType.String },
-  { id: 2, name: 'Status', data_type: CustomFieldDataType.Select },
-]
-
-function zone(overrides: Partial<OcrTemplateZone> = {}): OcrTemplateZone {
-  return {
-    name: 'Invoice number',
-    target: OcrZoneTarget.CustomField,
-    custom_field: 1,
-    x: 100,
-    y: 100,
-    width: 200,
-    height: 100,
-    page: 1,
-    ocr_language: 'eng',
-    transform: OcrZoneTransform.Strip,
-    validation_regex: '',
-    order: 0,
-    ...overrides,
-  }
-}
-
-function pointer(x: number, y: number, pointerId = 1): PointerEvent {
-  return Object.assign(
-    new MouseEvent('pointermove', { clientX: x, clientY: y, button: 0 }),
-    { pointerId }
-  ) as PointerEvent
-}
-
-describe('OcrTemplateEditorComponent', () => {
-  let component: OcrTemplateEditorComponent
-  let fixture: ComponentFixture<OcrTemplateEditorComponent>
-  let documentService: DocumentService
-  let templateService: OcrTemplateService
-  let modalService: NgbModal
-  const activeModal = { close: jest.fn(), dismiss: jest.fn() }
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        NgxBootstrapIconsModule.pick(allIcons),
-        OcrTemplateEditorComponent,
-      ],
-      providers: [
-        { provide: NgbActiveModal, useValue: activeModal },
-        provideHttpClient(withInterceptorsFromDi()),
-        provideHttpClientTesting(),
-      ],
-    })
-    jest
-      .spyOn(TestBed.inject(CustomFieldsService), 'listAll')
-      .mockReturnValue(of({ count: 2, all: [1, 2], results: customFields }))
-    jest
-      .spyOn(TestBed.inject(UserService), 'listAll')
-      .mockReturnValue(of({ count: 0, all: [], results: [] }))
-    TestBed.inject(PermissionsService).initialize([], { id: 1 } as User)
-    documentService = TestBed.inject(DocumentService)
-    jest
-      .spyOn(documentService, 'get')
-      .mockReturnValue(of({ id: 5, page_count: 3 }))
-    templateService = TestBed.inject(OcrTemplateService)
-    modalService = TestBed.inject(NgbModal)
-    activeModal.close.mockReset()
-    fixture = TestBed.createComponent(OcrTemplateEditorComponent)
-    component = fixture.componentInstance
-  })
-
-  function prepareOverlay() {
-    const image = document.createElement('img')
-    Object.defineProperties(image, {
-      naturalWidth: { value: 1000 },
-      naturalHeight: { value: 1000 },
-      clientWidth: { value: 1000 },
-    })
-    const overlay = document.createElementNS(
-      'http://www.w3.org/2000/svg',
-      'svg'
-    )
-    Object.assign(overlay, {
-      getScreenCTM: () => ({ inverse: () => ({}) }),
-      createSVGPoint: () => ({
-        x: 0,
-        y: 0,
-        matrixTransform() {
-          return { x: this.x, y: this.y }
-        },
-      }),
-      setPointerCapture: jest.fn(),
-      hasPointerCapture: () => true,
-      releasePointerCapture: jest.fn(),
-    })
-    component.imageRef = new ElementRef(image)
-    component.overlayRef = new ElementRef(overlay)
-    component.pageLoaded.set(true)
-  }
-
-  function fieldDialog() {
-    const dialog = {
-      dialogMode: { set: jest.fn() },
-      object: null,
-      succeeded: new Subject<CustomField>(),
-      failed: new Subject(),
-    }
-    jest
-      .spyOn(modalService, 'open')
-      .mockReturnValue({ componentInstance: dialog } as any)
-    return dialog
-  }
-
-  it('updates screen-sized overlay units when the preview image resizes', () => {
-    let resize: ResizeObserverCallback
-    const observer = {
-      observe: jest.fn(),
-      unobserve: jest.fn(),
-      disconnect: jest.fn(),
-    }
-    const resizeObserver = jest
-      .spyOn(globalThis, 'ResizeObserver')
-      .mockImplementation((callback) => {
-        resize = callback
-        return observer
-      })
-    const image = document.createElement('img')
-    const ref = new ElementRef(image)
-    component.pageImage = ref
-    expect(observer.observe).toHaveBeenCalledWith(image)
-    resize([], observer)
-    expect(component.overlayUnitSize(8)).toBe(8)
-
-    Object.defineProperties(image, {
-      naturalWidth: { value: 1000 },
-      clientWidth: { value: 500 },
-    })
-    resize([], observer)
-    expect(component.overlayUnitSize(8)).toBe(16)
-    expect(component.overlayFontSize()).toBe(24)
-
-    component.pageImage = undefined
-    expect(observer.disconnect).toHaveBeenCalledTimes(1)
-    fixture.destroy()
-    expect(observer.disconnect).toHaveBeenCalledTimes(2)
-    resizeObserver.mockRestore()
-  })
-
-  it('renders loaded image dimensions, zone labels, and selection handles', () => {
-    component.object = {
-      ...component.template,
-      id: 3,
-      sample_document: 5,
-      zones: [zone()],
-    }
-    component.selectedZoneIndex = 0
-    fixture.detectChanges()
-    const image = fixture.nativeElement.querySelector('img')
-    Object.defineProperties(image, {
-      naturalWidth: { value: 1000 },
-      naturalHeight: { value: 1500 },
-    })
-    image.dispatchEvent(new Event('load'))
-    fixture.detectChanges()
-
-    expect(component.template).toMatchObject({
-      source_width: 1000,
-      source_height: 1500,
-    })
-    expect(
-      fixture.nativeElement
-        .querySelector('.zone-overlay')
-        .getAttribute('viewBox')
-    ).toBe('0 0 1000 1500')
-    expect(
-      fixture.nativeElement.querySelector('.zone-label').textContent
-    ).toContain('Invoice number')
-    expect(
-      fixture.nativeElement.querySelectorAll('.zone-resize-handle')
-    ).toHaveLength(8)
-    expect(component.zoneLabel(zone({ name: '' }), 2)).toBe('Zone 3')
-    expect(component.zoneLabelY({ x: 0, y: 0, w: 100, h: 100 })).toBe(14)
-  })
-
-  it('offers the supported language and transform choices', () => {
-    expect(component.languageOptions.map((option) => option.id)).toContain(
-      'eng'
-    )
-    expect(component.transformOptions.map((option) => option.id)).toEqual(
-      Object.values(OcrZoneTransform)
-    )
-  })
-
-  it('clamps page navigation and supports one-based page input', () => {
-    component.setSampleDocument([5])
-    component.previewPageDisplay = 2
-    expect(component.previewPage).toBe(1)
-    expect(component.previewPageDisplay).toBe(2)
-    expect(component.pageImageUrl).toContain('/5/1/')
-    component.pageLoaded.set(true)
-    component.goToPage(1)
-    expect(component.pageLoaded()).toBe(true)
-    component.goToPage(Infinity)
-    component.goToPage(NaN)
-    expect(component.previewPage).toBe(1)
-    component.goToPage(99)
-    expect(component.previewPage).toBe(2)
-    expect(component.pageLoaded()).toBe(false)
-    component.goToPage(-5)
-    expect(component.previewPage).toBe(0)
-    component.previewPageCount.set(null)
-    component.goToPage(4.7)
-    expect(component.previewPage).toBe(4)
-  })
-
-  it('limits zoom and resets it to the original size', () => {
-    for (let i = 0; i < 20; i++) component.zoomIn()
-    expect(component.zoom).toBe(4)
-    for (let i = 0; i < 20; i++) component.zoomOut()
-    expect(component.zoom).toBe(0.5)
-    component.resetZoom()
-    expect(component.zoom).toBe(1)
-  })
-
-  it('moves last-page zones to the last page and can pin them to a page', () => {
-    component.setSampleDocument([5])
-    const selected = zone()
-    component.template.zones = [selected]
-    expect(component.isLastPageZone(selected)).toBe(false)
-    component.setLastPageZone(selected, true)
-    expect(selected.page).toBe(-1)
-    expect(component.isLastPageZone(selected)).toBe(true)
-    component.selectZone(0)
-    expect(component.previewPage).toBe(2)
-    component.setLastPageZone(selected, false)
-    expect(selected.page).toBe(3)
-  })
-
-  it('ignores page-count errors from a previous sample document', () => {
-    const pending = new Subject<Document>()
-    jest
-      .spyOn(documentService, 'get')
-      .mockReturnValueOnce(pending)
-      .mockReturnValueOnce(of({ id: 6 }))
-    component.setSampleDocument([5])
-    component.setSampleDocument([6])
-    pending.error(new Error('Old document failed'))
-    expect(component.pageFailed()).toBe(false)
-    expect(component.previewPageCount()).toBeNull()
-  })
-
-  it('ignores non-primary, unloaded, and saving pointer gestures', () => {
-    prepareOverlay()
-    component.onOverlayPointerDown(
-      new MouseEvent('pointerdown', { button: 2 }) as PointerEvent
-    )
-    expect(component.drawingRect()).toBeNull()
-    component.pageLoaded.set(false)
-    component.onOverlayPointerDown(pointer(100, 100))
-    expect(component.drawingRect()).toBeNull()
-    component.pageLoaded.set(true)
-    component.saving.set(true)
-    component.onOverlayPointerDown(pointer(100, 100))
-    expect(component.drawingRect()).toBeNull()
-  })
-
-  it('ignores pointer events when the SVG coordinate transform is unavailable', () => {
-    component.onOverlayPointerDown(pointer(100, 100))
-    expect(component.drawingRect()).toBeNull()
-    prepareOverlay()
-    jest
-      .spyOn(component.overlayRef.nativeElement, 'getScreenCTM')
-      .mockReturnValue(null)
-    component.onOverlayPointerDown(pointer(100, 100))
-    component.onOverlayPointerMove(pointer(200, 200))
-    expect(component.drawingRect()).toBeNull()
-  })
-
-  it('updates a drawing only for its captured pointer', () => {
-    prepareOverlay()
-    component.onOverlayPointerDown(pointer(100, 100))
-    component.onOverlayPointerDown(pointer(500, 500, 2))
-    component.onOverlayPointerMove(pointer(900, 900, 2))
-    expect(component.drawingRect()).toEqual({ x: 100, y: 100, w: 0, h: 0 })
-    component.onOverlayPointerMove(pointer(250, 200))
-    expect(component.drawingRect()).toEqual({ x: 100, y: 100, w: 150, h: 100 })
-    component.onOverlayPointerUp(pointer(250, 200))
-    expect(component.template.zones[0]).toMatchObject({
-      x: 100,
-      y: 100,
-      width: 150,
-      height: 100,
-    })
-  })
-
-  it('resizes a selected zone using its corner handle', () => {
-    prepareOverlay()
-    const selected = zone()
-    component.template.zones = [selected]
-    component.selectZone(0)
-    component.onOverlayPointerDown(pointer(100, 100))
-    component.onOverlayPointerMove(pointer(50, 75))
-    component.onOverlayPointerUp(pointer(60, 80))
-    expect(selected).toMatchObject({ x: 60, y: 80, width: 240, height: 120 })
-    expect(component.template.zones).toHaveLength(1)
-  })
-
-  it('shows the appropriate cursor over handles, zones, and empty space', () => {
-    prepareOverlay()
-    component.template.zones = [zone()]
-    component.onOverlayPointerMove(pointer(150, 150))
-    expect(component.overlayCursor).toBe('move')
-    component.selectZone(0)
-    component.onOverlayPointerMove(pointer(100, 100))
-    expect(component.overlayCursor).toBe('nw-resize')
-    component.onOverlayPointerMove(pointer(500, 500))
-    expect(component.overlayCursor).toBe('crosshair')
-    component.template.zones[0].page = 2
-    component.onOverlayPointerMove(pointer(100, 100))
-    expect(component.zoneDisplayRect(0)).toBeNull()
-    expect(component.overlayCursor).toBe('crosshair')
-  })
-
-  it('cancels only the captured pointer and tolerates an already-lost capture', () => {
-    prepareOverlay()
-    component.onOverlayPointerCancel(pointer(100, 100))
-    component.onOverlayPointerDown(pointer(100, 100))
-    component.onOverlayPointerCancel(pointer(150, 150, 2))
-    expect(component.drawingRect()).not.toBeNull()
-    jest
-      .spyOn(component.overlayRef.nativeElement, 'hasPointerCapture')
-      .mockReturnValue(false)
-    component.onOverlayPointerCancel(pointer(150, 150))
-    expect(component.drawingRect()).toBeNull()
-    expect(
-      component.overlayRef.nativeElement.releasePointerCapture
-    ).not.toHaveBeenCalled()
-    expect(component.template.zones).toEqual([])
-  })
-
-  it('preserves the selected zone when an earlier or later zone is removed', () => {
-    component.template.zones = [zone(), zone(), zone(), zone()]
-    component.selectZone(1)
-    const selected = component.selectedZone
-    component.removeZone(3)
-    expect(component.selectedZone).toBe(selected)
-    component.removeZone(0)
-    expect(component.selectedZoneIndex).toBe(0)
-    expect(component.selectedZone).toBe(selected)
-    component.selectZone(99)
-    expect(component.selectedZone).toBeNull()
-  })
-
-  it('does not test zones without a selection or a sample document', () => {
-    const test = jest.spyOn(templateService, 'testZone')
-    component.testZone()
-    component.template.zones = [zone()]
-    component.selectZone(0)
-    component.testZone()
-    expect(test).not.toHaveBeenCalled()
-  })
-
-  it.each([
-    {
-      response: { error: { error: 'OCR unavailable' } },
-      message: 'OCR unavailable',
-    },
-    { response: new Error('Network failure'), message: 'Test failed' },
-  ])('shows zone-test errors: $message', ({ response, message }) => {
-    component.template.zones = [zone({ page: undefined })]
-    component.selectZone(0)
-    component.setSampleDocument([5])
-    jest
-      .spyOn(templateService, 'testZone')
-      .mockReturnValue(throwError(() => response))
-    component.testZone()
-    expect(component.zoneTestResult).toEqual({ error: message })
-    expect(component.zoneTesting).toBe(false)
-    expect(templateService.testZone).toHaveBeenCalledWith(
-      5,
-      expect.objectContaining({ page: 1 })
-    )
-  })
-
-  it('switches between built-in targets, custom fields, and an unassigned field', () => {
-    const selected = zone()
-    expect(component.zoneFieldValue(selected)).toBe(1)
-    component.setZoneField(selected, OcrZoneTarget.Title)
-    expect(component.zoneFieldValue(selected)).toBe(OcrZoneTarget.Title)
-    expect(selected.custom_field).toBeNull()
-    component.setZoneField(selected, 7)
-    expect(selected).toMatchObject({
-      target: OcrZoneTarget.CustomField,
-      custom_field: 7,
-    })
-    component.setZoneField(selected, null)
-    expect(component.zoneFieldValue(selected)).toBeNull()
-    expect(component.zonesForField(selected)).toEqual([])
-    component.setCombineFormat(selected, 'Ignored')
-    expect(component.template.combine_formats).toEqual({})
-  })
-
-  it('creates combine formats when absent and leaves implicit formats alone on rename', () => {
-    const selected = zone({ target: OcrZoneTarget.Title, custom_field: null })
-    component.template.combine_formats = undefined
-    component.renameZone(selected, 'Renamed')
-    expect(selected.name).toBe('Renamed')
-    expect(component.getCombineFormat(selected)).toBe('')
-    component.setCombineFormat(selected, '{Renamed} ')
-    component.insertCombineToken(selected, selected)
-    expect(component.template.combine_formats).toEqual({
-      title: '{Renamed} {Renamed}',
-    })
-  })
-
-  it('saves templates without combine formats', () => {
-    component.template.combine_formats = undefined
-    fixture.detectChanges()
-    expect(component.isDirty).toBe(false)
-    jest
-      .spyOn(templateService, 'create')
-      .mockReturnValue(of(component.template))
-    component.save()
-    expect(component.template.combine_formats).toBeUndefined()
-  })
-
-  it('does not assign unsupported custom field types and surfaces creation failures', () => {
-    component.template.zones = [zone({ custom_field: null })]
-    component.selectZone(0)
-    const dialog = fieldDialog()
-    const error = jest.spyOn(TestBed.inject(ToastService), 'showError')
-    component.createField('Status')
-    expect(dialog.object).toEqual({ name: 'Status' })
-    dialog.succeeded.next(customFields[1])
-    expect(component.selectedZone.custom_field).toBeNull()
-    const failure = new Error('Could not save')
-    dialog.failed.next(failure)
-    expect(error).toHaveBeenCalledWith('Error saving field.', failure)
-  })
-
-  it('refreshes field choices when a field is created without a selected zone', () => {
-    const dialog = fieldDialog()
-    component.createField('Total')
-    dialog.succeeded.next(customFields[0])
-    expect(component.customFields()).toEqual(customFields)
-    expect(component.selectedZone).toBeNull()
-  })
-
-  it('should edit a copy of the template and load its sample document', () => {
-    const original: OcrTemplate = {
-      ...component.template,
-      id: 3,
-      name: 'Invoices',
-      match: 'Northwind',
-      matching_algorithm: MATCH_LITERAL,
-      sample_document: 5,
-      zones: [zone()],
-      combine_formats: { '1': '{Invoice number}' },
-    }
-    component.object = original
-    fixture.detectChanges()
-
-    expect(component.dialogTitle).toEqual('Edit OCR Template')
-    expect(component.previewDocId).toEqual(5)
-    expect(component.previewPageCount()).toEqual(3)
-    expect(component.pageImageUrl).toContain('document-page-image/5/0/')
-    expect(component.template.match).toEqual('Northwind')
-    expect(component.isDirty).toBeFalsy()
-
-    component.template.zones[0].x = 500
-    component.template.combine_formats['1'] = 'Edited'
-    expect(original.zones[0].x).toEqual(100)
-    expect(original.combine_formats['1']).toEqual('{Invoice number}')
-  })
-
-  it('should offer every matching algorithm except automatic', () => {
-    expect(component.matchingAlgorithms.map((a) => a.id)).not.toContain(
-      MATCH_AUTO
-    )
-    expect(component.template.matching_algorithm).toEqual(MATCH_ANY)
-    expect(component.patternRequired).toBeTruthy()
-
-    component.template.matching_algorithm = MATCH_NONE
-    expect(component.patternRequired).toBeFalsy()
-  })
-
-  it('should initialize new template permissions from saved defaults', () => {
-    const defaults = {
-      [SETTINGS_KEYS.DEFAULT_PERMS_OWNER]: 1,
-      [SETTINGS_KEYS.DEFAULT_PERMS_VIEW_USERS]: [2],
-      [SETTINGS_KEYS.DEFAULT_PERMS_VIEW_GROUPS]: [3],
-      [SETTINGS_KEYS.DEFAULT_PERMS_EDIT_USERS]: [],
-      [SETTINGS_KEYS.DEFAULT_PERMS_EDIT_GROUPS]: [4],
-    }
-    jest
-      .spyOn(TestBed.inject(SettingsService), 'get')
-      .mockImplementation((key) => defaults[key])
-    fixture.detectChanges()
-    expect(component.permissionsForm).toEqual({
-      owner: 1,
-      set_permissions: {
-        view: { users: [2], groups: [3] },
-        change: { users: [], groups: [4] },
-      },
-    })
-    expect(
-      fixture.debugElement.query(By.directive(PermissionsFormComponent))
-    ).toBeTruthy()
-    expect(component.isDirty).toBe(false)
-    const create = jest
-      .spyOn(templateService, 'create')
-      .mockReturnValue(of({ ...component.template, id: 3 }))
-    component.save()
-    expect(create).toHaveBeenCalledWith(
-      expect.objectContaining(component.permissionsForm)
-    )
-  })
-
-  it('should copy existing permissions and track changes without mutating the list item', () => {
-    component.object = {
-      ...component.template,
-      id: 3,
-      owner: 1,
-      permissions: {
-        view: { users: [2], groups: [] },
-        change: { users: [], groups: [3] },
-      },
-    }
-    fixture.detectChanges()
-    expect(component.permissionsForm.owner).toBe(1)
-    expect(component.isDirty).toBe(false)
-    component.permissionsForm.set_permissions.view.users.push(4)
-    expect(component.isDirty).toBe(true)
-    expect(component.object.permissions.view.users).toEqual([2])
-    const update = jest
-      .spyOn(templateService, 'update')
-      .mockReturnValue(of(component.template))
-    component.save()
-    expect(update).toHaveBeenCalledWith(
-      expect.objectContaining({
-        owner: 1,
-        set_permissions: {
-          view: { users: [2, 4], groups: [] },
-          change: { users: [], groups: [3] },
-        },
-      })
-    )
-  })
-
-  it('should hide sharing controls and omit permission changes for a shared editor', () => {
-    component.object = {
-      ...component.template,
-      id: 3,
-      owner: 2,
-      user_can_change: true,
-    }
-    fixture.detectChanges()
-    expect(
-      fixture.debugElement.query(By.directive(PermissionsFormComponent))
-    ).toBeNull()
-    component.permissionsForm = {
-      owner: 1,
-      set_permissions: { view: { users: [1] } },
-    }
-    const update = jest
-      .spyOn(templateService, 'update')
-      .mockReturnValue(of(component.template))
-    component.save()
-    expect(update.mock.calls[0][0].owner).toBe(2)
-    expect(update.mock.calls[0][0]).not.toHaveProperty('set_permissions')
-  })
-
-  it('should keep only the last picked sample document', () => {
-    component.setSampleDocument([5, 6])
-    expect(component.sampleDocumentIds).toEqual([6])
-
-    component.setSampleDocument([])
-    expect(component.previewDocId).toBeNull()
-    expect(component.pageImageUrl).toBeNull()
-  })
-
-  it('should ignore a stale sample document response', () => {
-    const pending = new Subject<Document>()
-    jest.spyOn(documentService, 'get').mockReturnValueOnce(pending)
-    component.setSampleDocument([5])
-    component.setSampleDocument([6])
-    pending.next({ id: 5, page_count: 99 })
-
-    expect(component.previewPageCount()).toEqual(3)
-  })
-
-  it('should show a failed page and retry it', () => {
-    jest
-      .spyOn(documentService, 'get')
-      .mockReturnValueOnce(throwError(() => new Error('offline')))
-    component.setSampleDocument([5])
-    expect(component.pageFailed()).toBeTruthy()
-
-    component.setSampleDocument(component.sampleDocumentIds)
-    expect(component.pageFailed()).toBeFalsy()
-
-    component.onImageError()
-    expect(component.pageFailed()).toBeTruthy()
-  })
-
-  it('should support create and update', () => {
-    const createSpy = jest
-      .spyOn(templateService, 'create')
-      .mockReturnValue(of({ ...component.template, id: 3 }))
-    const updateSpy = jest
-      .spyOn(templateService, 'update')
-      .mockReturnValue(of(component.template))
-    const succeededSpy = jest.spyOn(component.succeeded, 'emit')
-
-    component.save()
-    expect(createSpy).toHaveBeenCalled()
-    expect(succeededSpy).toHaveBeenCalledWith({ ...component.template, id: 3 })
-    expect(activeModal.close).toHaveBeenCalled()
-
-    component.saving.set(false)
-    component.template.id = 3
-    component.save()
-    expect(updateSpy).toHaveBeenCalledWith(component.template)
-  })
-
-  it('should emit failed and allow editing again after a failed save', () => {
-    prepareOverlay()
-    component.template.zones = [zone()]
-    const pending = new Subject<OcrTemplate>()
-    jest.spyOn(templateService, 'create').mockReturnValue(pending)
-    const failedSpy = jest.spyOn(component.failed, 'emit')
-    component.onOverlayPointerDown(pointer(150, 150))
-
-    component.save()
-    component.save()
-    expect(templateService.create).toHaveBeenCalledTimes(1)
-    component.onOverlayPointerMove(pointer(250, 250))
-    component.onOverlayPointerUp(pointer(250, 250))
-    expect(component.template.zones[0].x).toEqual(100)
-
-    pending.error(new Error('Save failed'))
-    expect(failedSpy).toHaveBeenCalled()
-    expect(component.saving()).toBeFalsy()
-    component.onOverlayPointerDown(pointer(150, 150))
-    component.onOverlayPointerUp(pointer(250, 250))
-    expect(component.template.zones[0].x).toEqual(200)
-  })
-
-  it('should track unsaved changes', () => {
-    fixture.detectChanges()
-    expect(component.isDirty).toBeFalsy()
-
-    component.template.combine_formats = { '1': '' }
-    expect(component.isDirty).toBeFalsy()
-
-    component.template.name = 'Invoices'
-    expect(component.isDirty).toBeTruthy()
-    component.template.name = ''
-    expect(component.isDirty).toBeFalsy()
-
-    component.setSampleDocument([5])
-    expect(component.isDirty).toBeTruthy()
-  })
-
-  it('should draw a zone with no field in empty space', () => {
-    prepareOverlay()
-    component.onOverlayPointerDown(pointer(100, 100))
-    component.onOverlayPointerUp(pointer(1200, 250))
-
-    expect(component.template.zones[0]).toMatchObject({
-      x: 100,
-      y: 100,
-      width: 900,
-      height: 150,
-      custom_field: null,
-    })
-    expect(component.selectedZoneIndex).toEqual(0)
-  })
-
-  it('should clear the selection on a click in empty space', () => {
-    prepareOverlay()
-    component.template.zones = [zone()]
-    component.selectZone(0)
-    component.onOverlayPointerDown(pointer(600, 600))
-    component.onOverlayPointerUp(pointer(602, 601))
-
-    expect(component.template.zones).toHaveLength(1)
-    expect(component.selectedZoneIndex).toBeNull()
-  })
-
-  it('should move a zone when dragging on it', () => {
-    prepareOverlay()
-    component.template.zones = [zone()]
-    component.onOverlayPointerDown(pointer(150, 150))
-    component.onOverlayPointerUp(pointer(250, 200))
-
-    expect(component.template.zones).toHaveLength(1)
-    expect(component.template.zones[0]).toMatchObject({ x: 200, y: 150 })
-  })
-
-  it('should cancel a drawing on escape and ignore other pointers', () => {
-    prepareOverlay()
-    component.onOverlayPointerDown(pointer(100, 100))
-    component.onOverlayPointerUp(pointer(300, 200, 2))
-    expect(component.drawingRect()).not.toBeNull()
-
-    component.cancelDrawing()
-    component.onOverlayPointerUp(pointer(300, 200))
-    expect(component.template.zones).toEqual([])
-  })
-
-  it('should open a zone in the zones tab and go back to the list', () => {
-    component.template.zones = [zone(), zone()]
-    component.selectZone(1)
-    expect(component.activeTab).toEqual('zones')
-    expect(component.selectedZone).toBe(component.template.zones[1])
-
-    component.deselectZone()
-    expect(component.selectedZone).toBeNull()
-
-    component.selectZone(0)
-    component.removeZone(0)
-    expect(component.template.zones).toHaveLength(1)
-    expect(component.selectedZone).toBeNull()
-  })
-
-  it('should only offer custom fields OCR can write to', () => {
-    fixture.detectChanges()
-    expect(component.fieldItems().map((item) => item.id)).toEqual([
-      OcrZoneTarget.Title,
-      OcrZoneTarget.Asn,
-      OcrZoneTarget.Created,
-      1,
-    ])
-  })
-
-  it('should create a custom field and assign it to the zone', () => {
-    const succeeded = new Subject<CustomField>()
-    const dialog = {
-      dialogMode: { set: jest.fn() },
-      object: null,
-      succeeded,
-      failed: new Subject(),
-    }
-    jest
-      .spyOn(modalService, 'open')
-      .mockReturnValue({ componentInstance: dialog } as any)
-    component.template.zones = [zone({ custom_field: null })]
-    component.selectZone(0)
-
-    component.createField()
-    expect(dialog.object).toEqual({ name: 'Invoice number' })
-    succeeded.next(customFields[0])
-
-    expect(component.template.zones[0].custom_field).toEqual(1)
-  })
-
-  it('should build and prune combine formats', () => {
-    const first = zone({ name: 'First' })
-    const second = zone({ name: 'Second' })
-    const other = zone({ name: 'Other', custom_field: 2 })
-    component.template.zones = [first, second, other]
-    component.template.combine_formats = { '2': '{Other}' }
-
-    expect(component.isFieldShared(first)).toBeTruthy()
-    expect(component.isFieldShared(other)).toBeFalsy()
-    expect(component.defaultCombineFormat(first)).toEqual('{First} {Second}')
-
-    component.insertCombineToken(first, second)
-    component.insertCombineToken(first, first)
-    expect(component.getCombineFormat(second)).toEqual('{Second} {First}')
-
-    jest.spyOn(templateService, 'create').mockReturnValue(of(null))
-    component.save()
-    expect(component.template.combine_formats).toEqual({
-      '1': '{Second} {First}',
-    })
-  })
-
-  it('should update exact tokens when a zone is renamed', () => {
-    const first = zone({ name: 'First [value]' })
-    component.template.zones = [first, zone({ name: 'Second' })]
-    component.template.combine_formats = {
-      '1': 'First [value]: {First [value]} / { First [value] } / {Second} / {First [value] extra}',
-      '2': '{First [value]}',
-    }
-
-    component.renameZone(first, '')
-    component.renameZone(first, 'Invoice number')
-
-    expect(first.name).toEqual('Invoice number')
-    expect(component.template.combine_formats).toEqual({
-      '1': 'First [value]: {Invoice number} / {Invoice number} / {Second} / {First [value] extra}',
-      '2': '{First [value]}',
-    })
-  })
-
-  it('should keep the language array stable until the value changes', () => {
-    const selected = zone({ ocr_language: 'deu+eng' })
-    const languages = component.ocrLanguageArray(selected)
-    expect(languages).toEqual(['deu', 'eng'])
-    expect(component.ocrLanguageArray(selected)).toBe(languages)
-
-    component.setOcrLanguages(selected, ['fra'])
-    expect(selected.ocr_language).toEqual('fra')
-    expect(component.ocrLanguageArray(selected)).toEqual(['fra'])
-
-    component.setOcrLanguages(selected, null)
-    expect(component.ocrLanguageArray(selected)).toEqual([])
-  })
-
-  it('should hide a test result once the zone changes', () => {
-    const selected = zone()
-    component.template.zones = [selected]
-    component.selectZone(0)
-    component.setSampleDocument([5])
-    jest
-      .spyOn(templateService, 'testZone')
-      .mockReturnValue(of({ value: '123' }))
-
-    component.testZone()
-    expect(component.zoneTestResult.value).toEqual('123')
-
-    selected.transform = OcrZoneTransform.Numeric
-    expect(component.zoneTestResult).toBeNull()
-  })
-
-  it('should drop a pending test when the zone or sample document changes', () => {
-    const pending = new Subject<OcrZoneTestResult>()
-    component.template.zones = [zone(), zone()]
-    component.selectZone(0)
-    component.setSampleDocument([5])
-    jest.spyOn(templateService, 'testZone').mockReturnValue(pending)
-
-    component.testZone()
-    expect(component.zoneTesting).toBeTruthy()
-    component.selectZone(1)
-    pending.next({ value: 'Old zone' })
-    expect(component.zoneTestResult).toBeNull()
-
-    component.testZone()
-    component.setSampleDocument([])
-    pending.next({ value: 'Old document' })
-    expect(component.zoneTestResult).toBeNull()
-  })
-})

src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/ocr-template-editor.component.ts

@@ -1,963 +0,0 @@
-import { CommonModule } from '@angular/common'
-import {
-  Component,
-  computed,
-  ElementRef,
-  EventEmitter,
-  HostListener,
-  inject,
-  Input,
-  OnDestroy,
-  OnInit,
-  Output,
-  signal,
-  ViewChild,
-} from '@angular/core'
-import { FormsModule } from '@angular/forms'
-import {
-  NgbActiveModal,
-  NgbModal,
-  NgbNavModule,
-} from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { Subject, takeUntil } from 'rxjs'
-import { CustomFieldEditDialogComponent } from 'src/app/components/common/edit-dialog/custom-field-edit-dialog/custom-field-edit-dialog.component'
-import { EditDialogMode } from 'src/app/components/common/edit-dialog/edit-dialog.component'
-import { DocumentLinkComponent } from 'src/app/components/common/input/document-link/document-link.component'
-import { CheckComponent } from 'src/app/components/common/input/check/check.component'
-import { NumberComponent } from 'src/app/components/common/input/number/number.component'
-import {
-  PermissionsFormComponent,
-  PermissionsFormObject,
-} from 'src/app/components/common/input/permissions/permissions-form/permissions-form.component'
-import { SelectComponent } from 'src/app/components/common/input/select/select.component'
-import { SwitchComponent } from 'src/app/components/common/input/switch/switch.component'
-import { TextComponent } from 'src/app/components/common/input/text/text.component'
-import { CustomField } from 'src/app/data/custom-field'
-import {
-  MATCH_ANY,
-  MATCH_AUTO,
-  MATCH_NONE,
-  MATCHING_ALGORITHMS,
-} from 'src/app/data/matching-model'
-import {
-  DEFAULT_OCR_ZONE_LANGUAGE,
-  getZoneFieldKey,
-  OCR_BUILTIN_TARGETS,
-  OCR_SUPPORTED_FIELD_TYPES,
-  OcrTemplate,
-  OcrTemplateZone,
-  OcrZoneTarget,
-  OcrZoneTestResult,
-  OcrZoneTransform,
-  ZoneTestRequest,
-} from 'src/app/data/ocr-template'
-import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
-import { User } from 'src/app/data/user'
-import { IfOwnerDirective } from 'src/app/directives/if-owner.directive'
-import { PermissionsService } from 'src/app/services/permissions.service'
-import { CustomFieldsService } from 'src/app/services/rest/custom-fields.service'
-import { DocumentService } from 'src/app/services/rest/document.service'
-import { OcrTemplateService } from 'src/app/services/rest/ocr-template.service'
-import { UserService } from 'src/app/services/rest/user.service'
-import { SettingsService } from 'src/app/services/settings.service'
-import { ToastService } from 'src/app/services/toast.service'
-import { OcrTemplateEditorZoneListComponent } from './ocr-template-editor-zone-list/ocr-template-editor-zone-list.component'
-import {
-  DisplayRect,
-  DrawingRect,
-  findHandleAt,
-  findZoneAt,
-  getResizeHandles,
-  getZoneColor,
-  getZoneDisplayRect,
-  getZonePage,
-  HANDLE_SIZE,
-  isZoneOnPage,
-  MIN_ZONE_SIZE,
-  MoveStart,
-  moveZone,
-  Point,
-  ResizeHandle,
-  resizeZone,
-} from './zone-geometry'
-
-type ActiveTab = 'template' | 'zones'
-type ZoneFieldSelection = OcrZoneTarget | number | null
-type OverlayInteraction =
-  | { kind: 'idle' }
-  | { kind: 'drawing'; pointerId: number; rect: DrawingRect }
-  | { kind: 'moving'; pointerId: number; zoneIndex: number; start: MoveStart }
-  | {
-      kind: 'resizing'
-      pointerId: number
-      zoneIndex: number
-      handle: ResizeHandle
-    }
-interface ZoneTest {
-  zone: OcrTemplateZone
-  /** The sample document and zone settings the result was produced from. */
-  key: string
-  result: OcrZoneTestResult | null
-}
-
-export const ZONE_TRANSFORM_OPTIONS = [
-  { id: OcrZoneTransform.None, name: $localize`None` },
-  { id: OcrZoneTransform.Strip, name: $localize`Strip whitespace` },
-  { id: OcrZoneTransform.Uppercase, name: $localize`Uppercase` },
-  { id: OcrZoneTransform.Lowercase, name: $localize`Lowercase` },
-  { id: OcrZoneTransform.Numeric, name: $localize`Numeric only` },
-  {
-    id: OcrZoneTransform.StripPunctuation,
-    name: $localize`Remove leading/trailing punctuation`,
-  },
-  { id: OcrZoneTransform.Date, name: $localize`Parse date` },
-  { id: OcrZoneTransform.QrCode, name: $localize`Read QR/barcode` },
-]
-
-export const ZONE_LANGUAGE_OPTIONS = [
-  { id: 'eng', name: $localize`English` },
-  { id: 'deu', name: $localize`German` },
-  { id: 'fra', name: $localize`French` },
-  { id: 'ita', name: $localize`Italian` },
-  { id: 'spa', name: $localize`Spanish` },
-  { id: 'por', name: $localize`Portuguese` },
-  { id: 'nld', name: $localize`Dutch` },
-]
-
-const TEMPLATE_MATCHING_ALGORITHMS = MATCHING_ALGORITHMS.filter(
-  (algorithm) => algorithm.id !== MATCH_AUTO
-)
-
-const NO_OVERLAY_INTERACTION: OverlayInteraction = { kind: 'idle' }
-const RESIZE_CURSOR: Record<ResizeHandle, string> = {
-  nw: 'nw-resize',
-  ne: 'ne-resize',
-  sw: 'sw-resize',
-  se: 'se-resize',
-  n: 'n-resize',
-  s: 's-resize',
-  w: 'w-resize',
-  e: 'e-resize',
-}
-
-@Component({
-  selector: 'pngx-ocr-template-editor',
-  imports: [
-    DocumentLinkComponent,
-    NumberComponent,
-    TextComponent,
-    CheckComponent,
-    SelectComponent,
-    SwitchComponent,
-    CommonModule,
-    FormsModule,
-    NgbNavModule,
-    NgxBootstrapIconsModule,
-    OcrTemplateEditorZoneListComponent,
-    PermissionsFormComponent,
-    IfOwnerDirective,
-  ],
-  templateUrl: './ocr-template-editor.component.html',
-  styleUrls: ['./ocr-template-editor.component.scss'],
-})
-export class OcrTemplateEditorComponent implements OnInit, OnDestroy {
-  public readonly activeModal = inject(NgbActiveModal)
-  private readonly templateService = inject(OcrTemplateService)
-  private readonly customFieldsService = inject(CustomFieldsService)
-  private readonly documentService = inject(DocumentService)
-  private readonly toastService = inject(ToastService)
-  private readonly modalService = inject(NgbModal)
-  private readonly userService = inject(UserService)
-  private readonly settingsService = inject(SettingsService)
-  private readonly permissionsService = inject(PermissionsService)
-  private readonly destroy$ = new Subject<void>()
-  private readonly cancelZoneTest$ = new Subject<void>()
-
-  @Input() object: OcrTemplate
-  @Output() public readonly succeeded = new EventEmitter<OcrTemplate>()
-  @Output() public readonly failed = new EventEmitter()
-
-  @ViewChild('zoneOverlay') overlayRef: ElementRef<SVGSVGElement>
-  imageRef: ElementRef<HTMLImageElement>
-  private previewResizeObserver: ResizeObserver | null = null
-  private readonly overlayScale = signal(1)
-
-  @ViewChild('pageImage')
-  set pageImage(ref: ElementRef<HTMLImageElement> | undefined) {
-    this.previewResizeObserver?.disconnect()
-    this.imageRef = ref
-    if (!ref) return
-    this.previewResizeObserver = new ResizeObserver(() => {
-      const image = ref.nativeElement
-      if (image.naturalWidth && image.clientWidth) {
-        this.overlayScale.set(image.naturalWidth / image.clientWidth)
-      }
-    })
-    this.previewResizeObserver.observe(ref.nativeElement)
-  }
-
-  template: OcrTemplate = {
-    id: null,
-    name: '',
-    match: '',
-    matching_algorithm: MATCH_ANY,
-    is_insensitive: true,
-    sample_document: null,
-    source_width: 0,
-    source_height: 0,
-    enabled: true,
-    combine_formats: {},
-    zones: [],
-  }
-
-  public readonly customFields = signal<CustomField[]>([])
-  public readonly fieldItems = computed<
-    { id: ZoneFieldSelection; name: string }[]
-  >(() => [
-    ...OCR_BUILTIN_TARGETS,
-    ...this.customFields()
-      .filter((field) => OCR_SUPPORTED_FIELD_TYPES.includes(field.data_type))
-      .map((field) => ({ id: field.id, name: field.name })),
-  ])
-  public readonly users = signal<User[]>([])
-  permissionsForm: PermissionsFormObject = {}
-  public readonly OcrZoneTransform = OcrZoneTransform
-  public readonly saving = signal(false)
-
-  /** Bound to the document picker, which works with id arrays. */
-  sampleDocumentIds: number[] = []
-  previewPage = 0
-  public readonly previewPageCount = signal<number | null>(null)
-  public readonly pageLoaded = signal(false)
-  public readonly pageFailed = signal(false)
-  zoom = 1
-
-  get previewDocId(): number | null {
-    return this.sampleDocumentIds[0] ?? null
-  }
-
-  get pageImageUrl(): string | null {
-    return this.previewDocId
-      ? this.templateService.getPageImageUrl(
-          this.previewDocId,
-          this.previewPage
-        )
-      : null
-  }
-
-  get transformOptions() {
-    return ZONE_TRANSFORM_OPTIONS
-  }
-
-  get languageOptions() {
-    return ZONE_LANGUAGE_OPTIONS
-  }
-
-  get matchingAlgorithms() {
-    return TEMPLATE_MATCHING_ALGORITHMS
-  }
-
-  get patternRequired(): boolean {
-    return (
-      this.template.matching_algorithm !== MATCH_AUTO &&
-      this.template.matching_algorithm !== MATCH_NONE
-    )
-  }
-
-  public get previewPageDisplay(): number {
-    return this.previewPage + 1
-  }
-
-  public set previewPageDisplay(value: number) {
-    this.goToPage(value - 1)
-  }
-
-  activeTab: ActiveTab = 'template'
-
-  selectedZoneIndex: number | null = null
-  private overlayInteraction: OverlayInteraction = NO_OVERLAY_INTERACTION
-  overlayCursor = 'crosshair'
-
-  private readonly zoneTest = signal<ZoneTest | null>(null)
-
-  get zoneTestResult(): OcrZoneTestResult | null {
-    return this.isCurrentZoneTest() ? this.zoneTest().result : null
-  }
-
-  get zoneTesting(): boolean {
-    return this.isCurrentZoneTest() && this.zoneTest().result === null
-  }
-
-  get selectedZone(): OcrTemplateZone | null {
-    return this.selectedZoneIndex !== null
-      ? (this.template.zones[this.selectedZoneIndex] ?? null)
-      : null
-  }
-
-  private initialState = ''
-
-  get isDirty(): boolean {
-    return this.editorState() !== this.initialState
-  }
-
-  private editorState(): string {
-    const formats = Object.entries(this.template.combine_formats ?? {}).filter(
-      ([, format]) => format
-    )
-    return JSON.stringify({
-      ...this.template,
-      combine_formats: Object.fromEntries(formats),
-      sample_document: this.previewDocId ?? null,
-      permissions_form: this.permissionsForm,
-    })
-  }
-
-  get dialogTitle(): string {
-    return this.template.id
-      ? $localize`Edit OCR Template`
-      : $localize`New OCR Template`
-  }
-
-  ngOnInit() {
-    this.userService
-      .listAll()
-      .pipe(takeUntil(this.destroy$))
-      .subscribe((r) => this.users.set(r.results))
-    this.customFieldsService
-      .listAll()
-      .pipe(takeUntil(this.destroy$))
-      .subscribe((r) => {
-        this.customFields.set(r.results)
-      })
-
-    if (this.object) {
-      this.template = {
-        ...this.object,
-        zones: this.object.zones.map((zone) => ({ ...zone })),
-        combine_formats: { ...this.object.combine_formats },
-      }
-      if (this.template.sample_document) {
-        this.setSampleDocument([this.template.sample_document])
-      }
-    }
-    const permissions = this.object?.permissions
-    this.permissionsForm = this.object
-      ? {
-          owner: this.object.owner,
-          set_permissions: {
-            view: {
-              users: [...(permissions?.view.users ?? [])],
-              groups: [...(permissions?.view.groups ?? [])],
-            },
-            change: {
-              users: [...(permissions?.change.users ?? [])],
-              groups: [...(permissions?.change.groups ?? [])],
-            },
-          },
-        }
-      : {
-          owner: this.settingsService.get(SETTINGS_KEYS.DEFAULT_PERMS_OWNER),
-          set_permissions: {
-            view: {
-              users: this.settingsService.get(
-                SETTINGS_KEYS.DEFAULT_PERMS_VIEW_USERS
-              ),
-              groups: this.settingsService.get(
-                SETTINGS_KEYS.DEFAULT_PERMS_VIEW_GROUPS
-              ),
-            },
-            change: {
-              users: this.settingsService.get(
-                SETTINGS_KEYS.DEFAULT_PERMS_EDIT_USERS
-              ),
-              groups: this.settingsService.get(
-                SETTINGS_KEYS.DEFAULT_PERMS_EDIT_GROUPS
-              ),
-            },
-          },
-        }
-    this.initialState = this.editorState()
-  }
-
-  setSampleDocument(ids: number[]) {
-    const id = ids.at(-1)
-    this.sampleDocumentIds = id ? [id] : []
-    this.previewPage = 0
-    this.previewPageCount.set(null)
-    this.resetPage()
-    if (!id) return
-    this.documentService
-      .get(id)
-      .pipe(takeUntil(this.destroy$))
-      .subscribe({
-        next: (doc) => {
-          if (this.previewDocId !== id) return
-          this.previewPageCount.set(doc.page_count ?? null)
-        },
-        error: () => {
-          if (this.previewDocId === id) this.pageFailed.set(true)
-        },
-      })
-  }
-
-  private resetPage() {
-    this.stopOverlayInteraction()
-    this.clearZoneTest()
-    this.pageLoaded.set(false)
-    this.pageFailed.set(false)
-  }
-
-  goToPage(page: number) {
-    if (!Number.isFinite(page)) return
-    const pageCount = this.previewPageCount()
-    const max = pageCount ? pageCount - 1 : page
-    const clamped = Math.max(0, Math.min(Math.trunc(page), max))
-    if (clamped === this.previewPage) return
-    this.previewPage = clamped
-    this.resetPage()
-  }
-
-  zoomIn() {
-    this.zoom = Math.min(4, Math.round((this.zoom + 0.25) * 100) / 100)
-  }
-
-  zoomOut() {
-    this.zoom = Math.max(0.5, Math.round((this.zoom - 0.25) * 100) / 100)
-  }
-
-  resetZoom() {
-    this.zoom = 1
-  }
-
-  zonePage(zone: OcrTemplateZone): number {
-    return getZonePage(zone, this.previewPage, this.previewPageCount())
-  }
-
-  isLastPageZone(zone: OcrTemplateZone): boolean {
-    return zone.page === -1
-  }
-
-  setLastPageZone(zone: OcrTemplateZone, lastPage: boolean) {
-    zone.page = lastPage ? -1 : this.previewPage + 1
-  }
-
-  private isOnCurrentPage(zone: OcrTemplateZone): boolean {
-    return isZoneOnPage(zone, this.previewPage, this.previewPageCount())
-  }
-
-  onImageLoad() {
-    this.pageLoaded.set(true)
-    const img = this.imageRef.nativeElement
-    this.template.source_width = img.naturalWidth
-    this.template.source_height = img.naturalHeight
-  }
-
-  onImageError() {
-    this.stopOverlayInteraction()
-    this.pageFailed.set(true)
-  }
-
-  @HostListener('document:keydown.escape')
-  cancelDrawing() {
-    this.stopOverlayInteraction()
-  }
-
-  onOverlayPointerDown(event: PointerEvent) {
-    if (this.saving()) return
-    if (event.button !== 0 || this.overlayInteraction.kind !== 'idle') return
-    const point = this.svgPointFromEvent(event)
-    if (!this.pageLoaded() || !point) return
-    event.preventDefault()
-
-    if (this.selectedZoneIndex !== null) {
-      const handle = this.handleAt(point, this.selectedZoneIndex)
-      if (handle) {
-        this.overlayInteraction = {
-          kind: 'resizing',
-          pointerId: event.pointerId,
-          zoneIndex: this.selectedZoneIndex,
-          handle,
-        }
-        this.overlayRef.nativeElement.setPointerCapture(event.pointerId)
-        return
-      }
-    }
-
-    const clickedIdx = this.zoneIndexAt(point)
-    if (clickedIdx !== null) {
-      this.selectZone(clickedIdx)
-      const zone = this.template.zones[clickedIdx]
-      this.overlayInteraction = {
-        kind: 'moving',
-        pointerId: event.pointerId,
-        zoneIndex: clickedIdx,
-        start: {
-          mouseX: point.x,
-          mouseY: point.y,
-          zoneX: zone.x,
-          zoneY: zone.y,
-        },
-      }
-      this.overlayRef.nativeElement.setPointerCapture(event.pointerId)
-      return
-    }
-
-    // Empty space: start drawing a new zone. A click without a drag just clears
-    // the selection (see onOverlayPointerUp).
-    this.clearZoneTest()
-    this.selectedZoneIndex = null
-    this.overlayInteraction = {
-      kind: 'drawing',
-      pointerId: event.pointerId,
-      rect: {
-        startX: point.x,
-        startY: point.y,
-        endX: point.x,
-        endY: point.y,
-      },
-    }
-    this.overlayRef.nativeElement.setPointerCapture(event.pointerId)
-  }
-
-  onOverlayPointerMove(event: PointerEvent) {
-    if (
-      this.overlayInteraction.kind !== 'idle' &&
-      this.overlayInteraction.pointerId !== event.pointerId
-    )
-      return
-    const point = this.svgPointFromEvent(event)
-    if (!point) return
-
-    if (this.overlayInteraction.kind === 'resizing') {
-      resizeZone(
-        this.template.zones[this.overlayInteraction.zoneIndex],
-        this.overlayInteraction.handle,
-        point,
-        this.imageNaturalSize()
-      )
-      return
-    }
-
-    if (this.overlayInteraction.kind === 'moving') {
-      moveZone(
-        this.template.zones[this.overlayInteraction.zoneIndex],
-        point,
-        this.overlayInteraction.start,
-        this.imageNaturalSize()
-      )
-      return
-    }
-
-    if (this.overlayInteraction.kind === 'drawing') {
-      this.overlayInteraction.rect.endX = point.x
-      this.overlayInteraction.rect.endY = point.y
-      return
-    }
-
-    this.updateOverlayCursor(point)
-  }
-
-  private updateOverlayCursor(point: Point) {
-    if (this.selectedZoneIndex !== null) {
-      const handle = this.handleAt(point, this.selectedZoneIndex)
-      if (handle) {
-        this.overlayCursor = RESIZE_CURSOR[handle]
-        return
-      }
-    }
-    this.overlayCursor = this.zoneIndexAt(point) !== null ? 'move' : 'crosshair'
-  }
-
-  onOverlayPointerUp(event: PointerEvent) {
-    if (this.overlayInteraction.kind === 'idle') return
-    if (this.overlayInteraction.pointerId !== event.pointerId) return
-    this.onOverlayPointerMove(event)
-    const interaction = this.overlayInteraction
-    this.stopOverlayInteraction()
-    if (interaction.kind !== 'drawing') return
-
-    const rect = this.sourceRectFromDrawing(interaction.rect)
-
-    // Ignore tiny accidental clicks.
-    if (rect.w < MIN_ZONE_SIZE || rect.h < MIN_ZONE_SIZE) {
-      return
-    }
-
-    this.template.zones.push(this.createZoneFromRect(rect))
-    this.selectZone(this.template.zones.length - 1)
-  }
-
-  private createZoneFromRect(rect: DisplayRect): OcrTemplateZone {
-    const imageSize = this.imageNaturalSize()
-    return {
-      name: `Zone ${this.template.zones.length + 1}`,
-      target: OcrZoneTarget.CustomField,
-      custom_field: null,
-      x: rect.x,
-      y: rect.y,
-      width: rect.w,
-      height: rect.h,
-      page: this.previewPageDisplay,
-      ocr_language: DEFAULT_OCR_ZONE_LANGUAGE,
-      transform: OcrZoneTransform.Strip,
-      date_format: '',
-      validation_regex: '',
-      order: this.template.zones.length,
-      zone_source_width: imageSize.width,
-      zone_source_height: imageSize.height,
-    }
-  }
-
-  onOverlayPointerCancel(event: PointerEvent) {
-    if (this.overlayInteraction.kind === 'idle') return
-    if (this.overlayInteraction.pointerId !== event.pointerId) return
-    this.stopOverlayInteraction()
-  }
-
-  private stopOverlayInteraction() {
-    const interaction = this.overlayInteraction
-    this.overlayInteraction = NO_OVERLAY_INTERACTION
-    this.overlayCursor = 'crosshair'
-    const overlay = this.overlayRef?.nativeElement
-    if (
-      interaction.kind !== 'idle' &&
-      overlay?.hasPointerCapture(interaction.pointerId)
-    ) {
-      overlay.releasePointerCapture(interaction.pointerId)
-    }
-  }
-
-  drawingRect(): DisplayRect | null {
-    return this.overlayInteraction.kind === 'drawing'
-      ? this.displayRectFromDrawing(this.overlayInteraction.rect)
-      : null
-  }
-
-  /** The zone's rectangle on the overlay, or null if it's on another page. */
-  zoneDisplayRect(zoneIndex: number): DisplayRect | null {
-    const zone = this.template.zones[zoneIndex]
-    if (!this.isOnCurrentPage(zone)) return null
-    return getZoneDisplayRect(zone, this.imageNaturalSize())
-  }
-
-  private handleAt(point: Point, zoneIndex: number): ResizeHandle | null {
-    const rect = this.zoneDisplayRect(zoneIndex)
-    return rect ? findHandleAt(point, rect, this.overlayHandleSize()) : null
-  }
-
-  private zoneIndexAt(point: Point): number | null {
-    return findZoneAt(
-      point,
-      this.template.zones,
-      this.previewPage,
-      this.previewPageCount(),
-      this.imageNaturalSize()
-    )
-  }
-
-  overlayViewBox(): string {
-    const imageSize = this.imageNaturalSize()
-    return `0 0 ${imageSize.width} ${imageSize.height}`
-  }
-
-  public readonly zoneColor = getZoneColor
-
-  zoneLabel(zone: OcrTemplateZone, index: number): string {
-    return zone.name || `Zone ${index + 1}`
-  }
-
-  zoneLabelY(rect: DisplayRect): number {
-    return Math.max(this.overlayUnitSize(14), rect.y - this.overlayUnitSize(4))
-  }
-
-  public readonly resizeHandles = getResizeHandles
-
-  overlayHandleSize(): number {
-    return this.overlayUnitSize(HANDLE_SIZE)
-  }
-
-  overlayFontSize(): number {
-    return this.overlayUnitSize(12)
-  }
-
-  overlayUnitSize(screenPixels: number): number {
-    return screenPixels * this.overlayScale()
-  }
-
-  private svgPointFromEvent(event: MouseEvent): Point | null {
-    const svg = this.overlayRef?.nativeElement
-    const matrix = svg?.getScreenCTM()
-    if (!svg || !matrix) return null
-
-    const point = svg.createSVGPoint()
-    point.x = event.clientX
-    point.y = event.clientY
-
-    const svgPoint = point.matrixTransform(matrix.inverse())
-    const size = this.imageNaturalSize()
-    return {
-      x: Math.max(0, Math.min(svgPoint.x, size.width)),
-      y: Math.max(0, Math.min(svgPoint.y, size.height)),
-    }
-  }
-
-  private displayRectFromDrawing(rect: DrawingRect): DisplayRect {
-    return {
-      x: Math.min(rect.startX, rect.endX),
-      y: Math.min(rect.startY, rect.endY),
-      w: Math.abs(rect.endX - rect.startX),
-      h: Math.abs(rect.endY - rect.startY),
-    }
-  }
-
-  private sourceRectFromDrawing(rect: DrawingRect): DisplayRect {
-    const displayRect = this.displayRectFromDrawing(rect)
-    return {
-      x: Math.round(displayRect.x),
-      y: Math.round(displayRect.y),
-      w: Math.round(displayRect.w),
-      h: Math.round(displayRect.h),
-    }
-  }
-
-  private imageNaturalSize() {
-    const img = this.imageRef.nativeElement
-    return { width: img.naturalWidth, height: img.naturalHeight }
-  }
-
-  removeZone(index: number) {
-    this.stopOverlayInteraction()
-    this.clearZoneTest()
-    this.template.zones.splice(index, 1)
-    if (this.selectedZoneIndex === index) {
-      this.selectedZoneIndex = null
-    } else if (this.selectedZoneIndex > index) {
-      this.selectedZoneIndex--
-    }
-  }
-
-  selectZone(index: number) {
-    this.selectedZoneIndex = index
-    this.activeTab = 'zones'
-    this.clearZoneTest()
-    const zone = this.template.zones[index]
-    if (zone) {
-      this.goToPage(this.zonePage(zone) - 1)
-    }
-  }
-
-  deselectZone() {
-    this.selectedZoneIndex = null
-    this.clearZoneTest()
-  }
-
-  testZone() {
-    const zone = this.selectedZone
-    if (!zone || !this.previewDocId) return
-    this.clearZoneTest()
-    const test: ZoneTest = { zone, key: this.zoneTestKey(zone), result: null }
-    this.zoneTest.set(test)
-    this.templateService
-      .testZone(this.previewDocId, this.zoneTestRequest(zone))
-      .pipe(takeUntil(this.destroy$), takeUntil(this.cancelZoneTest$))
-      .subscribe({
-        next: (res) => this.zoneTest.set({ ...test, result: res }),
-        error: (err) =>
-          this.zoneTest.set({
-            ...test,
-            result: { error: err.error?.error || $localize`Test failed` },
-          }),
-      })
-  }
-
-  private clearZoneTest() {
-    this.cancelZoneTest$.next()
-    this.zoneTest.set(null)
-  }
-
-  /** A result is stale once its zone, settings or sample document change. */
-  private isCurrentZoneTest(): boolean {
-    const test = this.zoneTest()
-    return (
-      test?.zone === this.selectedZone &&
-      test.key === this.zoneTestKey(test.zone)
-    )
-  }
-
-  private zoneTestKey(zone: OcrTemplateZone): string {
-    return JSON.stringify([this.previewDocId, this.zoneTestRequest(zone)])
-  }
-
-  private zoneTestRequest(zone: OcrTemplateZone): ZoneTestRequest {
-    return {
-      name: zone.name,
-      x: zone.x,
-      y: zone.y,
-      width: zone.width,
-      height: zone.height,
-      page: zone.page ?? 1,
-      ocr_language: zone.ocr_language,
-      transform: zone.transform,
-      date_format: zone.date_format,
-      validation_regex: zone.validation_regex,
-      zone_source_width: zone.zone_source_width,
-      zone_source_height: zone.zone_source_height,
-    }
-  }
-
-  save() {
-    if (this.saving()) return
-    this.stopOverlayInteraction()
-    this.saving.set(true)
-    this.pruneCombineFormats()
-    this.template.sample_document = this.previewDocId
-    const payload = this.permissionsService.currentUserOwnsObject(this.object)
-      ? { ...this.template, ...this.permissionsForm }
-      : this.template
-    const obs = this.template.id
-      ? this.templateService.update(payload)
-      : this.templateService.create(payload)
-
-    obs.pipe(takeUntil(this.destroy$)).subscribe({
-      next: (saved) => {
-        this.activeModal.close()
-        this.succeeded.emit(saved)
-      },
-      error: (e) => {
-        this.saving.set(false)
-        this.failed.emit(e)
-      },
-    })
-  }
-
-  // ng-select needs a stable array between change detection runs, so the
-  // split language list is cached per zone until ocr_language changes.
-  private readonly ocrLanguageCache = new WeakMap<
-    OcrTemplateZone,
-    { language: string; languages: string[] }
-  >()
-
-  ocrLanguageArray(zone: OcrTemplateZone): string[] {
-    const language = zone.ocr_language || ''
-    const cached = this.ocrLanguageCache.get(zone)
-    if (cached?.language === language) return cached.languages
-    const languages = language.split('+').filter(Boolean)
-    this.ocrLanguageCache.set(zone, { language, languages })
-    return languages
-  }
-
-  setOcrLanguages(zone: OcrTemplateZone, langs: string[]) {
-    zone.ocr_language = (langs ?? []).join('+')
-  }
-
-  /** The field select's value: a built-in target, or a custom field id. */
-  zoneFieldValue(zone: OcrTemplateZone): ZoneFieldSelection {
-    return zone.target === OcrZoneTarget.CustomField
-      ? zone.custom_field
-      : zone.target
-  }
-
-  setZoneField(zone: OcrTemplateZone, value: ZoneFieldSelection) {
-    if (typeof value === 'string') {
-      zone.target = value
-      zone.custom_field = null
-    } else {
-      zone.target = OcrZoneTarget.CustomField
-      zone.custom_field = value
-    }
-  }
-
-  zonesForField(zone: OcrTemplateZone): OcrTemplateZone[] {
-    const key = getZoneFieldKey(zone)
-    if (!key) return []
-    return this.template.zones.filter((z) => getZoneFieldKey(z) === key)
-  }
-
-  isFieldShared(zone: OcrTemplateZone): boolean {
-    return this.zonesForField(zone).length > 1
-  }
-
-  renameZone(zone: OcrTemplateZone, name: string) {
-    const oldName = zone.name.trim()
-    const format = this.getCombineFormat(zone)
-    if (format) {
-      this.setCombineFormat(
-        zone,
-        format.replace(/\{([^{}]*)\}/g, (token, tokenName: string) =>
-          tokenName.trim() === oldName ? `{${name}}` : token
-        )
-      )
-    }
-    zone.name = name
-  }
-
-  getCombineFormat(zone: OcrTemplateZone): string {
-    return this.template.combine_formats?.[getZoneFieldKey(zone)] ?? ''
-  }
-
-  setCombineFormat(zone: OcrTemplateZone, value: string) {
-    const key = getZoneFieldKey(zone)
-    if (!key) return
-    this.template.combine_formats ??= {}
-    this.template.combine_formats[key] = value
-  }
-
-  defaultCombineFormat(zone: OcrTemplateZone): string {
-    return this.zonesForField(zone)
-      .map((z) => `{${z.name}}`)
-      .join(' ')
-  }
-
-  insertCombineToken(zone: OcrTemplateZone, tokenZone: OcrTemplateZone) {
-    const current = this.getCombineFormat(zone)
-    const sep = current && !current.endsWith(' ') ? ' ' : ''
-    this.setCombineFormat(zone, `${current}${sep}{${tokenZone.name}}`)
-  }
-
-  /** Drop formats that are empty or whose field no longer has several zones. */
-  private pruneCombineFormats() {
-    const formats = this.template.combine_formats
-    if (!formats) return
-    const keys = this.template.zones.map(getZoneFieldKey)
-    for (const [key, format] of Object.entries(formats)) {
-      if (!format || keys.filter((k) => k === key).length < 2) {
-        delete formats[key]
-      }
-    }
-  }
-
-  createField(name?: string) {
-    const zone = this.selectedZone
-    const modal = this.modalService.open(CustomFieldEditDialogComponent)
-    modal.componentInstance.dialogMode.set(EditDialogMode.CREATE)
-    modal.componentInstance.object = { name: name || zone?.name }
-    modal.componentInstance.succeeded
-      .pipe(takeUntil(this.destroy$))
-      .subscribe((field: CustomField) => {
-        this.toastService.showSuccess($localize`Saved field "${field.name}".`)
-        this.customFieldsService.clearCache()
-        this.customFieldsService
-          .listAll()
-          .pipe(takeUntil(this.destroy$))
-          .subscribe((r) => {
-            if (zone && OCR_SUPPORTED_FIELD_TYPES.includes(field.data_type)) {
-              this.setZoneField(zone, field.id)
-            }
-            this.customFields.set(r.results)
-          })
-      })
-    modal.componentInstance.failed
-      .pipe(takeUntil(this.destroy$))
-      .subscribe((e) => {
-        this.toastService.showError($localize`Error saving field.`, e)
-      })
-  }
-
-  ngOnDestroy() {
-    this.previewResizeObserver?.disconnect()
-    this.cancelZoneTest$.complete()
-    this.destroy$.next()
-    this.destroy$.complete()
-  }
-}

src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/zone-geometry.spec.ts

@@ -1,197 +0,0 @@
-import {
-  OcrTemplateZone,
-  OcrZoneTarget,
-  OcrZoneTransform,
-} from 'src/app/data/ocr-template'
-import {
-  findHandleAt,
-  findZoneAt,
-  getResizeHandles,
-  getZoneDisplayRect,
-  getZonePage,
-  isZoneOnPage,
-  moveZone,
-  resizeZone,
-} from './zone-geometry'
-
-function zone(overrides: Partial<OcrTemplateZone> = {}): OcrTemplateZone {
-  return {
-    name: 'Zone',
-    target: OcrZoneTarget.CustomField,
-    custom_field: 1,
-    x: 100,
-    y: 200,
-    width: 300,
-    height: 400,
-    page: 1,
-    ocr_language: 'eng',
-    transform: OcrZoneTransform.Strip,
-    validation_regex: '',
-    order: 0,
-    ...overrides,
-  }
-}
-
-describe('OCR template editor geometry', () => {
-  it('normalizes zone pages', () => {
-    expect(getZonePage(zone({ page: 2 }), 0, 5)).toBe(2)
-    expect(getZonePage(zone({ page: -1 }), 0, 5)).toBe(5)
-    expect(getZonePage(zone({ page: -1 }), 2, null)).toBe(3)
-    expect(getZonePage(zone({ page: 0 }), 0, 5)).toBe(1)
-    expect(getZonePage(zone({ page: undefined }), 0, 5)).toBe(1)
-  })
-
-  it('checks whether a zone is on the current preview page', () => {
-    expect(isZoneOnPage(zone({ page: 2 }), 1, 5)).toBe(true)
-    expect(isZoneOnPage(zone({ page: 2 }), 0, 5)).toBe(false)
-    expect(isZoneOnPage(zone({ page: -1 }), 4, 5)).toBe(true)
-  })
-
-  it('uses natural image coordinates when source dimensions are unset', () => {
-    expect(
-      getZoneDisplayRect(zone({ x: 100, y: 200, width: 300, height: 400 }), {
-        width: 1000,
-        height: 2000,
-      })
-    ).toEqual({ x: 100, y: 200, w: 300, h: 400 })
-  })
-
-  it('uses per-zone source dimensions when present', () => {
-    expect(
-      getZoneDisplayRect(
-        zone({
-          x: 100,
-          y: 100,
-          width: 100,
-          height: 100,
-          zone_source_width: 1000,
-          zone_source_height: 1000,
-        }),
-        { width: 500, height: 750 }
-      )
-    ).toEqual({ x: 50, y: 75, w: 50, h: 75 })
-  })
-
-  it('finds zones from topmost to bottommost on the current page', () => {
-    const zones = [
-      zone({ name: 'first', x: 0, y: 0, width: 100, height: 100, page: 1 }),
-      zone({ name: 'second', x: 0, y: 0, width: 50, height: 50, page: 1 }),
-      zone({ name: 'third', x: 0, y: 0, width: 50, height: 50, page: 2 }),
-    ]
-
-    expect(
-      findZoneAt({ x: 25, y: 25 }, zones, 0, 2, { width: 100, height: 100 })
-    ).toBe(1)
-  })
-
-  it('finds resize handles around a display rect', () => {
-    const rect = { x: 10, y: 20, w: 100, h: 200 }
-
-    expect(findHandleAt({ x: 10, y: 20 }, rect)).toBe('nw')
-    expect(findHandleAt({ x: 110, y: 220 }, rect)).toBe('se')
-    expect(findHandleAt({ x: 60, y: 20 }, rect)).toBe('n')
-    expect(findHandleAt({ x: 90, y: 160 }, rect)).toBeNull()
-    expect(findHandleAt({ x: 19, y: 20 }, rect, 8)).toBeNull()
-    expect(findHandleAt({ x: 19, y: 20 }, rect, 10)).toBe('nw')
-  })
-
-  it('returns no zone when the point is outside every rectangle', () => {
-    expect(
-      findZoneAt({ x: 900, y: 900 }, [zone()], 0, 1, {
-        width: 1000,
-        height: 1000,
-      })
-    ).toBeNull()
-  })
-
-  it('resizes north-west edges while keeping the opposite corner fixed', () => {
-    const z = zone({ x: 100, y: 200, width: 300, height: 400 })
-    resizeZone(z, 'nw', { x: 50, y: 100 }, { width: 1000, height: 1000 })
-    expect(z).toMatchObject({ x: 50, y: 100, width: 350, height: 500 })
-    resizeZone(z, 'nw', { x: 900, y: 900 }, { width: 1000, height: 1000 })
-    expect(z).toMatchObject({ x: 390, y: 590, width: 10, height: 10 })
-  })
-
-  it('clamps resized north-west edges to the source image bounds', () => {
-    const z = zone({
-      x: 50,
-      y: 50,
-      width: 100,
-      height: 100,
-      zone_source_width: 200,
-      zone_source_height: 300,
-    })
-    resizeZone(z, 'nw', { x: -50, y: -50 }, { width: 400, height: 600 })
-    expect(z).toMatchObject({ x: 0, y: 0, width: 150, height: 150 })
-  })
-
-  it('uses the rendered handle positions for hit testing', () => {
-    const rect = { x: 10, y: 20, w: 100, h: 200 }
-    const handles = getResizeHandles(rect)
-
-    expect(handles).toEqual([
-      { handle: 'nw', x: 10, y: 20 },
-      { handle: 'n', x: 60, y: 20 },
-      { handle: 'ne', x: 110, y: 20 },
-      { handle: 'w', x: 10, y: 120 },
-      { handle: 'e', x: 110, y: 120 },
-      { handle: 'sw', x: 10, y: 220 },
-      { handle: 's', x: 60, y: 220 },
-      { handle: 'se', x: 110, y: 220 },
-    ])
-    for (const marker of handles) {
-      expect(findHandleAt(marker, rect)).toBe(marker.handle)
-    }
-  })
-
-  it('moves zones without leaving source image bounds', () => {
-    const z = zone({ x: 50, y: 50, width: 100, height: 100 })
-
-    moveZone(
-      z,
-      { x: 500, y: 500 },
-      { mouseX: 50, mouseY: 50, zoneX: 50, zoneY: 50 },
-      { width: 500, height: 500 }
-    )
-
-    expect(z.x).toBe(400)
-    expect(z.y).toBe(400)
-  })
-
-  it('resizes zones without leaving source image bounds', () => {
-    const z = zone({
-      x: 50,
-      y: 50,
-      width: 100,
-      height: 100,
-      zone_source_width: 200,
-      zone_source_height: 200,
-    })
-
-    resizeZone(z, 'se', { x: 500, y: 500 }, { width: 500, height: 500 })
-
-    expect(z.width).toBe(150)
-    expect(z.height).toBe(150)
-  })
-
-  it('moves zones in their original source coordinates on a different-size preview', () => {
-    const z = zone({
-      x: 50,
-      y: 50,
-      width: 100,
-      height: 100,
-      zone_source_width: 1000,
-      zone_source_height: 2000,
-    })
-
-    moveZone(
-      z,
-      { x: 75, y: 75 },
-      { mouseX: 25, mouseY: 25, zoneX: 50, zoneY: 50 },
-      { width: 500, height: 500 }
-    )
-
-    expect(z.x).toBe(150)
-    expect(z.y).toBe(250)
-  })
-})

src-ui/src/app/components/manage/ocr-templates/ocr-template-editor/zone-geometry.ts

@@ -1,204 +0,0 @@
-import { OcrTemplateZone } from 'src/app/data/ocr-template'
-
-export interface DrawingRect {
-  startX: number
-  startY: number
-  endX: number
-  endY: number
-}
-
-export interface Dimensions {
-  width: number
-  height: number
-}
-
-export interface Point {
-  x: number
-  y: number
-}
-
-export interface DisplayRect {
-  x: number
-  y: number
-  w: number
-  h: number
-}
-
-export interface MoveStart {
-  mouseX: number
-  mouseY: number
-  zoneX: number
-  zoneY: number
-}
-
-export type ResizeHandle = 'n' | 's' | 'e' | 'w' | 'ne' | 'nw' | 'se' | 'sw'
-
-export interface ResizeHandleMarker extends Point {
-  handle: ResizeHandle
-}
-
-export const HANDLE_SIZE = 8
-export const MIN_ZONE_SIZE = 10
-
-const ZONE_COLORS = [
-  '#4f8ff7',
-  '#ff6b6b',
-  '#51cf66',
-  '#ffd43b',
-  '#cc5de8',
-  '#ff922b',
-  '#20c997',
-  '#e599f7',
-]
-
-/** Outline color for a zone, shared by the preview overlay and the zone list. */
-export function getZoneColor(index: number): string {
-  return ZONE_COLORS[index % ZONE_COLORS.length]
-}
-
-export function getZonePage(
-  zone: OcrTemplateZone,
-  previewPage: number,
-  previewPageCount: number | null
-): number {
-  const page = zone.page ?? 1
-  if (page === -1) return previewPageCount ?? previewPage + 1
-  return Math.max(page, 1)
-}
-
-export function isZoneOnPage(
-  zone: OcrTemplateZone,
-  previewPage: number,
-  previewPageCount: number | null
-): boolean {
-  return getZonePage(zone, previewPage, previewPageCount) === previewPage + 1
-}
-
-function getZoneSourceSize(
-  zone: OcrTemplateZone,
-  imageSize: Dimensions
-): Dimensions {
-  return {
-    width: zone.zone_source_width || imageSize.width,
-    height: zone.zone_source_height || imageSize.height,
-  }
-}
-
-export function getZoneDisplayRect(
-  zone: OcrTemplateZone,
-  imageSize: Dimensions
-): DisplayRect {
-  const sourceSize = getZoneSourceSize(zone, imageSize)
-  // The SVG viewBox uses the preview image's natural dimensions.
-  const scaleX = imageSize.width / sourceSize.width
-  const scaleY = imageSize.height / sourceSize.height
-
-  return {
-    x: zone.x * scaleX,
-    y: zone.y * scaleY,
-    w: zone.width * scaleX,
-    h: zone.height * scaleY,
-  }
-}
-
-export function getResizeHandles(rect: DisplayRect): ResizeHandleMarker[] {
-  return [
-    { handle: 'nw', x: rect.x, y: rect.y },
-    { handle: 'n', x: rect.x + rect.w / 2, y: rect.y },
-    { handle: 'ne', x: rect.x + rect.w, y: rect.y },
-    { handle: 'w', x: rect.x, y: rect.y + rect.h / 2 },
-    { handle: 'e', x: rect.x + rect.w, y: rect.y + rect.h / 2 },
-    { handle: 'sw', x: rect.x, y: rect.y + rect.h },
-    { handle: 's', x: rect.x + rect.w / 2, y: rect.y + rect.h },
-    { handle: 'se', x: rect.x + rect.w, y: rect.y + rect.h },
-  ]
-}
-
-export function findHandleAt(
-  point: Point,
-  rect: DisplayRect,
-  handleSize = HANDLE_SIZE
-): ResizeHandle | null {
-  return (
-    getResizeHandles(rect).find(
-      ({ x, y }) =>
-        Math.abs(point.x - x) <= handleSize &&
-        Math.abs(point.y - y) <= handleSize
-    )?.handle ?? null
-  )
-}
-
-export function findZoneAt(
-  point: Point,
-  zones: OcrTemplateZone[],
-  previewPage: number,
-  previewPageCount: number | null,
-  imageSize: Dimensions
-): number | null {
-  for (let i = zones.length - 1; i >= 0; i--) {
-    const zone = zones[i]
-    if (!isZoneOnPage(zone, previewPage, previewPageCount)) continue
-    const rect = getZoneDisplayRect(zone, imageSize)
-
-    if (
-      point.x >= rect.x &&
-      point.x <= rect.x + rect.w &&
-      point.y >= rect.y &&
-      point.y <= rect.y + rect.h
-    ) {
-      return i
-    }
-  }
-
-  return null
-}
-
-export function moveZone(
-  zone: OcrTemplateZone,
-  point: Point,
-  moveStart: MoveStart,
-  imageSize: Dimensions
-) {
-  const sourceSize = getZoneSourceSize(zone, imageSize)
-  const scaleX = sourceSize.width / imageSize.width
-  const scaleY = sourceSize.height / imageSize.height
-  const dx = Math.round((point.x - moveStart.mouseX) * scaleX)
-  const dy = Math.round((point.y - moveStart.mouseY) * scaleY)
-
-  zone.x = clamp(moveStart.zoneX + dx, 0, sourceSize.width - zone.width)
-  zone.y = clamp(moveStart.zoneY + dy, 0, sourceSize.height - zone.height)
-}
-
-export function resizeZone(
-  zone: OcrTemplateZone,
-  handle: ResizeHandle,
-  point: Point,
-  imageSize: Dimensions
-) {
-  const sourceSize = getZoneSourceSize(zone, imageSize)
-  const scaleX = sourceSize.width / imageSize.width
-  const scaleY = sourceSize.height / imageSize.height
-  const imageX = clamp(Math.round(point.x * scaleX), 0, sourceSize.width)
-  const imageY = clamp(Math.round(point.y * scaleY), 0, sourceSize.height)
-
-  if (handle.includes('w')) {
-    const right = Math.min(zone.x + zone.width, sourceSize.width)
-    zone.x = clamp(imageX, 0, right - MIN_ZONE_SIZE)
-    zone.width = right - zone.x
-  }
-  if (handle.includes('e')) {
-    zone.width = Math.max(MIN_ZONE_SIZE, imageX - zone.x)
-  }
-  if (handle.includes('n')) {
-    const bottom = Math.min(zone.y + zone.height, sourceSize.height)
-    zone.y = clamp(imageY, 0, bottom - MIN_ZONE_SIZE)
-    zone.height = bottom - zone.y
-  }
-  if (handle.includes('s')) {
-    zone.height = Math.max(MIN_ZONE_SIZE, imageY - zone.y)
-  }
-}
-
-function clamp(value: number, min: number, max: number): number {
-  return Math.max(min, Math.min(value, max))
-}

src-ui/src/app/components/manage/ocr-templates/ocr-templates.component.html

@@ -1,75 +0,0 @@
-<pngx-page-header
-  title="OCR Templates"
-  i18n-title
-  info="Define extraction zones on document types to automatically populate custom fields via OCR."
-  i18n-info
-  >
-  <button type="button" class="btn btn-sm btn-outline-primary" (click)="editTemplate()" *pngxIfPermissions="{ action: PermissionAction.Add, type: PermissionType.OcrTemplate }">
-    <i-bs name="plus-circle" class="me-1"></i-bs><ng-container i18n>Add Template</ng-container>
-  </button>
-</pngx-page-header>
-
-<ul class="list-group">
-
-  <li class="list-group-item">
-    <div class="row">
-      <div class="col" i18n>Name</div>
-      <div class="col d-none d-sm-flex" i18n>Matching</div>
-      <div class="col d-none d-sm-flex" i18n>Zones</div>
-      <div class="col" i18n>Status</div>
-      <div class="col" i18n>Actions</div>
-    </div>
-  </li>
-
-  @if (loading() && templates().length === 0) {
-    <li class="list-group-item">
-      <output class="spinner-border spinner-border-sm me-2"></output>
-      <ng-container i18n>Loading...</ng-container>
-    </li>
-  }
-
-  @for (template of templates(); track template.id) {
-    <li class="list-group-item">
-      <div class="row fade" [class.show]="show()">
-        <div class="col d-flex align-items-center"><button class="btn btn-link p-0 text-start" type="button" (click)="editTemplate(template)" [disabled]="!userCanEdit(template)">{{template.name}}</button></div>
-        <div class="col d-flex align-items-center d-none d-sm-flex">{{getMatching(template)}}</div>
-        <div class="col d-flex align-items-center d-none d-sm-flex"><code>{{template.zones.length}}</code></div>
-        <div class="col d-flex align-items-center">
-          <div class="form-check form-switch mb-0">
-            <input type="checkbox" class="form-check-input cursor-pointer" [id]="template.id+'_enable'" [(ngModel)]="template.enabled" (change)="toggleTemplateEnabled(template)" [disabled]="!userCanEdit(template)" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.OcrTemplate }">
-            <label class="form-check-label cursor-pointer" [for]="template.id+'_enable'">
-              <code> @if(template.enabled) { <ng-container i18n>Enabled</ng-container> } @else { <span i18n class="text-muted">Disabled</span> }</code>
-            </label>
-          </div>
-        </div>
-        <div class="col">
-
-          <div class="btn-group d-block d-sm-none">
-            <div ngbDropdown container="body" class="d-inline-block">
-              <button type="button" class="btn btn-link" id="actionsMenuMobile{{template.id}}" (click)="$event.stopPropagation()" ngbDropdownToggle>
-                <i-bs name="three-dots-vertical"></i-bs>
-              </button>
-              <div ngbDropdownMenu aria-labelledby="actionsMenuMobile{{template.id}}">
-                <button (click)="editTemplate(template)" [disabled]="!userCanEdit(template)" *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.OcrTemplate }" ngbDropdownItem i18n>Edit</button>
-                <button (click)="deleteTemplate(template)" [disabled]="!permissionsService.currentUserOwnsObject(template)" *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.OcrTemplate }" ngbDropdownItem i18n>Delete</button>
-              </div>
-            </div>
-          </div>
-          <div class="btn-toolbar d-none d-sm-flex gap-2" role="toolbar">
-            <div class="btn-group">
-              <button *pngxIfPermissions="{ action: PermissionAction.Change, type: PermissionType.OcrTemplate }" [disabled]="!userCanEdit(template)" class="btn btn-sm btn-outline-secondary" type="button" (click)="editTemplate(template)">
-                <i-bs width="1em" height="1em" name="pencil" class="me-1"></i-bs><ng-container i18n>Edit</ng-container>
-              </button>
-              <button *pngxIfPermissions="{ action: PermissionAction.Delete, type: PermissionType.OcrTemplate }" [disabled]="!permissionsService.currentUserOwnsObject(template)" class="btn btn-sm btn-outline-danger" type="button" (click)="deleteTemplate(template)">
-                <i-bs width="1em" height="1em" name="trash" class="me-1"></i-bs><ng-container i18n>Delete</ng-container>
-              </button>
-            </div>
-          </div>
-        </div>
-      </div>
-    </li>
-  }
-  @if (!loading() && templates().length === 0) {
-    <li class="list-group-item" [class.show]="show()" i18n>No OCR templates defined.</li>
-  }
-</ul>

src-ui/src/app/components/manage/ocr-templates/ocr-templates.component.spec.ts

@@ -1,300 +0,0 @@
-import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
-import { provideHttpClientTesting } from '@angular/common/http/testing'
-import { ComponentFixture, TestBed } from '@angular/core/testing'
-import { By } from '@angular/platform-browser'
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule, allIcons } from 'ngx-bootstrap-icons'
-import { of, throwError } from 'rxjs'
-import { MATCH_LITERAL, MATCH_NONE } from 'src/app/data/matching-model'
-import { OcrTemplate } from 'src/app/data/ocr-template'
-import { User } from 'src/app/data/user'
-import { DirtyFormGuard } from 'src/app/guards/dirty-form.guard'
-import { PermissionsService } from 'src/app/services/permissions.service'
-import { OcrTemplateService } from 'src/app/services/rest/ocr-template.service'
-import { UserService } from 'src/app/services/rest/user.service'
-import { ToastService } from 'src/app/services/toast.service'
-import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
-import { OcrTemplateEditorComponent } from './ocr-template-editor/ocr-template-editor.component'
-import { OcrTemplatesComponent } from './ocr-templates.component'
-
-const templates: OcrTemplate[] = [
-  {
-    id: 1,
-    name: 'Invoices',
-    match: 'Northwind',
-    matching_algorithm: MATCH_LITERAL,
-    sample_document: null,
-    source_width: 0,
-    source_height: 0,
-    enabled: true,
-    zones: [],
-  },
-]
-
-describe('OcrTemplatesComponent', () => {
-  let component: OcrTemplatesComponent
-  let fixture: ComponentFixture<OcrTemplatesComponent>
-  let ocrTemplateService: OcrTemplateService
-  let modalService: NgbModal
-  let toastService: ToastService
-  let modal: NgbModalRef
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      imports: [NgxBootstrapIconsModule.pick(allIcons), OcrTemplatesComponent],
-      providers: [
-        provideHttpClient(withInterceptorsFromDi()),
-        provideHttpClientTesting(),
-      ],
-    })
-
-    TestBed.inject(PermissionsService).initialize(
-      [
-        'view_ocrtemplate',
-        'add_ocrtemplate',
-        'change_ocrtemplate',
-        'delete_ocrtemplate',
-      ],
-      { id: 1, groups: [], is_superuser: false } as User
-    )
-    jest
-      .spyOn(TestBed.inject(UserService), 'listAll')
-      .mockReturnValue(of({ count: 0, all: [], results: [] }))
-
-    ocrTemplateService = TestBed.inject(OcrTemplateService)
-    jest
-      .spyOn(ocrTemplateService, 'listAll')
-      .mockReturnValue(of({ count: 1, all: [1], results: templates }))
-    modalService = TestBed.inject(NgbModal)
-    modalService.activeInstances.subscribe((m) => (modal = m[m.length - 1]))
-    toastService = TestBed.inject(ToastService)
-    fixture = TestBed.createComponent(OcrTemplatesComponent)
-    component = fixture.componentInstance
-    fixture.detectChanges()
-  })
-
-  afterEach(() => modalService.dismissAll())
-
-  it('should show templates with their matching', () => {
-    const text = fixture.nativeElement.textContent
-    expect(text).toContain('Invoices')
-    expect(text).toContain('Exact match: Northwind')
-
-    expect(
-      component.getMatching({ ...templates[0], matching_algorithm: MATCH_NONE })
-    ).toEqual('None')
-    expect(component.getMatching({ ...templates[0], match: '' })).toEqual('-')
-  })
-
-  it.each([
-    {
-      name: 'owned',
-      owner: 1,
-      user_can_change: true,
-      editable: true,
-      deletable: true,
-    },
-    {
-      name: 'unowned',
-      owner: null,
-      user_can_change: true,
-      editable: true,
-      deletable: true,
-    },
-    {
-      name: 'view-only shared',
-      owner: 2,
-      user_can_change: false,
-      editable: false,
-      deletable: false,
-    },
-    {
-      name: 'editable shared',
-      owner: 2,
-      user_can_change: true,
-      editable: true,
-      deletable: false,
-    },
-  ])(
-    'should respect permissions for $name templates',
-    async ({ owner, user_can_change, editable, deletable }) => {
-      const template = { ...templates[0], owner, user_can_change }
-      component.templates.set([template])
-      fixture.detectChanges()
-      await fixture.whenStable()
-
-      expect(fixture.nativeElement.querySelector('.text-start').disabled).toBe(
-        !editable
-      )
-      expect(
-        fixture.nativeElement.querySelector('.form-switch input').disabled
-      ).toBe(!editable)
-      const buttons = Array.from<HTMLButtonElement>(
-        fixture.nativeElement.querySelectorAll('button')
-      )
-      for (const button of buttons.filter(
-        (button) => button.textContent.trim() === 'Edit'
-      )) {
-        expect(button.disabled).toBe(!editable)
-      }
-      for (const button of buttons.filter(
-        (button) => button.textContent.trim() === 'Delete'
-      )) {
-        expect(button.disabled).toBe(!deletable)
-      }
-    }
-  )
-
-  it('should allow a superuser to manage another users template', () => {
-    TestBed.inject(PermissionsService).initialize([], {
-      id: 1,
-      is_superuser: true,
-    } as User)
-    component.templates.set([
-      { ...templates[0], owner: 2, user_can_change: false },
-    ])
-    fixture.detectChanges()
-    expect(fixture.nativeElement.querySelector('.text-start').disabled).toBe(
-      false
-    )
-    expect(
-      fixture.nativeElement.querySelector('.btn-outline-danger').disabled
-    ).toBe(false)
-  })
-
-  it('should not open mutation dialogs or patch a view-only template', () => {
-    const template = { ...templates[0], owner: 2, user_can_change: false }
-    const open = jest.spyOn(modalService, 'open')
-    const patch = jest.spyOn(ocrTemplateService, 'patch')
-    component.editTemplate(template)
-    component.toggleTemplateEnabled(template)
-    component.deleteTemplate(template)
-    expect(open).not.toHaveBeenCalled()
-    expect(patch).not.toHaveBeenCalled()
-  })
-
-  it('should require global edit permission even for an owned template', () => {
-    TestBed.inject(PermissionsService).initialize(['view_ocrtemplate'], {
-      id: 1,
-    } as User)
-    fixture.destroy()
-    fixture = TestBed.createComponent(OcrTemplatesComponent)
-    component = fixture.componentInstance
-    fixture.detectChanges()
-    expect(fixture.nativeElement.querySelector('.text-start').disabled).toBe(
-      true
-    )
-    expect(fixture.nativeElement.querySelector('.form-switch input')).toBeNull()
-  })
-
-  it('should support create, show notification on error / success', () => {
-    const toastErrorSpy = jest.spyOn(toastService, 'showError')
-    const toastSuccessSpy = jest.spyOn(toastService, 'showSuccess')
-    const reloadSpy = jest.spyOn(component, 'reload')
-
-    fixture.debugElement
-      .queryAll(By.css('pngx-page-header button'))
-      .find((button) => button.nativeElement.textContent.includes('Add'))
-      .triggerEventHandler('click')
-
-    const editor = modal.componentInstance as OcrTemplateEditorComponent
-    expect(editor).toBeInstanceOf(OcrTemplateEditorComponent)
-    expect(editor.object).toBeUndefined()
-
-    editor.failed.emit({ error: 'error creating template' })
-    expect(toastErrorSpy).toHaveBeenCalled()
-    expect(reloadSpy).not.toHaveBeenCalled()
-
-    editor.succeeded.emit(templates[0])
-    expect(toastSuccessSpy).toHaveBeenCalled()
-    expect(reloadSpy).toHaveBeenCalled()
-  })
-
-  it('should pass the template to the editor', () => {
-    component.editTemplate(templates[0])
-    expect(modal.componentInstance.object).toBe(templates[0])
-  })
-
-  it('should confirm closing the editor with unsaved changes', async () => {
-    const confirmSpy = jest
-      .spyOn(TestBed.inject(DirtyFormGuard), 'confirmChanges')
-      .mockReturnValue(of(false))
-    component.editTemplate()
-    const editor = modal.componentInstance as OcrTemplateEditorComponent
-    editor.ngOnInit()
-
-    modal.dismiss()
-    await fixture.whenStable()
-    expect(confirmSpy).not.toHaveBeenCalled()
-
-    component.editTemplate()
-    const dirtyEditor = modal.componentInstance as OcrTemplateEditorComponent
-    dirtyEditor.ngOnInit()
-    dirtyEditor.template.name = 'Changed'
-    modal.dismiss()
-    await fixture.whenStable()
-    expect(confirmSpy).toHaveBeenCalled()
-    expect(modalService.hasOpenModals()).toBe(true)
-
-    dirtyEditor.saving.set(true)
-    confirmSpy.mockClear()
-    modal.dismiss()
-    await fixture.whenStable()
-    expect(confirmSpy).not.toHaveBeenCalled()
-    expect(modalService.hasOpenModals()).toBe(true)
-  })
-
-  it('should only send the enabled flag when toggling', () => {
-    const patchSpy = jest
-      .spyOn(ocrTemplateService, 'patch')
-      .mockReturnValueOnce(throwError(() => new Error('error toggling')))
-      .mockReturnValueOnce(of(templates[0]))
-    const toastErrorSpy = jest.spyOn(toastService, 'showError')
-    const toastSuccessSpy = jest.spyOn(toastService, 'showSuccess')
-    const reloadSpy = jest.spyOn(component, 'reload')
-
-    const toggle = fixture.debugElement.query(By.css('.form-switch input'))
-    toggle.nativeElement.click()
-    expect(patchSpy).toHaveBeenCalledWith({ id: 1, enabled: false })
-    expect(toastErrorSpy).toHaveBeenCalled()
-    expect(reloadSpy).toHaveBeenCalledTimes(1)
-
-    component.toggleTemplateEnabled(templates[0])
-    expect(toastSuccessSpy).toHaveBeenCalled()
-    expect(reloadSpy).toHaveBeenCalledTimes(2)
-  })
-
-  it('should support delete, show notification on error / success', () => {
-    const toastErrorSpy = jest.spyOn(toastService, 'showError')
-    const toastSuccessSpy = jest.spyOn(toastService, 'showSuccess')
-    const deleteSpy = jest.spyOn(ocrTemplateService, 'delete')
-    const reloadSpy = jest.spyOn(component, 'reload')
-
-    component.deleteTemplate(templates[0])
-    const dialog = modal.componentInstance as ConfirmDialogComponent
-
-    deleteSpy.mockReturnValueOnce(throwError(() => new Error('error deleting')))
-    dialog.confirmClicked.emit()
-    expect(toastErrorSpy).toHaveBeenCalled()
-    expect(dialog.buttonsEnabled()).toBe(true)
-    expect(reloadSpy).not.toHaveBeenCalled()
-
-    deleteSpy.mockReturnValueOnce(of(true))
-    dialog.confirmClicked.emit()
-    expect(toastSuccessSpy).toHaveBeenCalled()
-    expect(reloadSpy).toHaveBeenCalled()
-  })
-
-  it.each([true, false])(
-    'reports the enabled state %s after the update succeeds',
-    (enabled) => {
-      const template = { ...templates[0], enabled }
-      jest.spyOn(ocrTemplateService, 'patch').mockReturnValue(of(template))
-      const toast = jest.spyOn(toastService, 'showSuccess')
-      component.toggleTemplateEnabled(template)
-      expect(toast).toHaveBeenCalledWith(
-        `${enabled ? 'Enabled' : 'Disabled'} OCR template "${template.name}"`
-      )
-    }
-  )
-})

src-ui/src/app/components/manage/ocr-templates/ocr-templates.component.ts

@@ -1,185 +0,0 @@
-import { Component, OnInit, inject, signal } from '@angular/core'
-import { FormsModule } from '@angular/forms'
-import { NgbDropdownModule, NgbModal } from '@ng-bootstrap/ng-bootstrap'
-import { NgxBootstrapIconsModule } from 'ngx-bootstrap-icons'
-import { firstValueFrom, takeUntil, tap } from 'rxjs'
-import { MATCH_NONE, MATCHING_ALGORITHMS } from 'src/app/data/matching-model'
-import { OcrTemplate } from 'src/app/data/ocr-template'
-import { IfPermissionsDirective } from 'src/app/directives/if-permissions.directive'
-import { DirtyFormGuard } from 'src/app/guards/dirty-form.guard'
-import {
-  PermissionAction,
-  PermissionType,
-  PermissionsService,
-} from 'src/app/services/permissions.service'
-import { OcrTemplateService } from 'src/app/services/rest/ocr-template.service'
-import { ToastService } from 'src/app/services/toast.service'
-import { ConfirmDialogComponent } from '../../common/confirm-dialog/confirm-dialog.component'
-import { PageHeaderComponent } from '../../common/page-header/page-header.component'
-import { LoadingComponentWithPermissions } from '../../loading-component/loading.component'
-import { OcrTemplateEditorComponent } from './ocr-template-editor/ocr-template-editor.component'
-
-@Component({
-  selector: 'pngx-ocr-templates',
-  templateUrl: './ocr-templates.component.html',
-  imports: [
-    PageHeaderComponent,
-    IfPermissionsDirective,
-    FormsModule,
-    NgbDropdownModule,
-    NgxBootstrapIconsModule,
-  ],
-})
-export class OcrTemplatesComponent
-  extends LoadingComponentWithPermissions
-  implements OnInit
-{
-  private readonly ocrTemplateService = inject(OcrTemplateService)
-  public readonly permissionsService = inject(PermissionsService)
-  private readonly modalService = inject(NgbModal)
-  private readonly dirtyFormGuard = inject(DirtyFormGuard)
-  private readonly toastService = inject(ToastService)
-
-  public readonly templates = signal<OcrTemplate[]>([])
-
-  ngOnInit() {
-    this.reload()
-  }
-
-  reload() {
-    this.loading.set(true)
-    this.ocrTemplateService
-      .listAll()
-      .pipe(
-        takeUntil(this.unsubscribeNotifier),
-        tap((r) => this.templates.set(r.results))
-      )
-      .subscribe(() => {
-        this.show.set(true)
-        this.loading.set(false)
-      })
-  }
-
-  getMatching(template: OcrTemplate): string {
-    if (template.matching_algorithm === MATCH_NONE) {
-      return $localize`None`
-    }
-    if (!template.match) {
-      return '-'
-    }
-    const algorithm = MATCHING_ALGORITHMS.find(
-      (a) => a.id === template.matching_algorithm
-    )
-    return `${algorithm?.shortName}: ${template.match}`
-  }
-
-  editTemplate(template?: OcrTemplate) {
-    if (template && !this.userCanEdit(template)) return
-    const modal = this.modalService.open(OcrTemplateEditorComponent, {
-      backdrop: 'static',
-      keyboard: false,
-      size: 'xxl',
-      fullscreen: 'lg',
-      scrollable: true,
-      ariaLabelledBy: 'ocr-template-editor-title',
-      beforeDismiss: () => {
-        const editor: OcrTemplateEditorComponent = modal.componentInstance
-        if (editor.saving()) return false
-        if (!editor.isDirty) return true
-        return firstValueFrom(
-          this.dirtyFormGuard.confirmChanges(undefined, $localize`Close`)
-        )
-      },
-    })
-    modal.componentInstance.object = template
-    modal.componentInstance.succeeded
-      .pipe(takeUntil(this.unsubscribeNotifier))
-      .subscribe((saved: OcrTemplate) => {
-        this.toastService.showSuccess(
-          $localize`Saved OCR template "${saved.name}".`
-        )
-        this.ocrTemplateService.clearCache()
-        this.reload()
-      })
-    modal.componentInstance.failed
-      .pipe(takeUntil(this.unsubscribeNotifier))
-      .subscribe((e) => {
-        this.toastService.showError($localize`Error saving OCR template.`, e)
-      })
-  }
-
-  toggleTemplateEnabled(template: OcrTemplate) {
-    if (!this.userCanEdit(template)) return
-    this.ocrTemplateService
-      .patch({ id: template.id, enabled: template.enabled } as OcrTemplate)
-      .subscribe({
-        next: () => {
-          this.toastService.showSuccess(
-            template.enabled
-              ? $localize`Enabled OCR template "${template.name}"`
-              : $localize`Disabled OCR template "${template.name}"`
-          )
-          this.reload()
-        },
-        error: (e) => {
-          this.toastService.showError(
-            $localize`Error toggling OCR template "${template.name}".`,
-            e
-          )
-          this.reload()
-        },
-      })
-  }
-
-  deleteTemplate(template: OcrTemplate) {
-    if (
-      !this.permissionsService.currentUserCan(
-        PermissionAction.Delete,
-        PermissionType.OcrTemplate
-      ) ||
-      !this.permissionsService.currentUserOwnsObject(template)
-    )
-      return
-    const modal = this.modalService.open(ConfirmDialogComponent, {
-      backdrop: 'static',
-    })
-    modal.componentInstance.title = $localize`Confirm delete OCR template`
-    modal.componentInstance.messageBold = $localize`This operation will permanently delete this OCR template.`
-    modal.componentInstance.message = $localize`This operation cannot be undone.`
-    modal.componentInstance.btnClass = 'btn-danger'
-    modal.componentInstance.btnCaption = $localize`Proceed`
-    modal.componentInstance.confirmClicked.subscribe(() => {
-      modal.componentInstance.buttonsEnabled.set(false)
-      this.ocrTemplateService.delete(template).subscribe({
-        next: () => {
-          modal.close()
-          this.toastService.showSuccess(
-            $localize`Deleted OCR template "${template.name}".`
-          )
-          this.ocrTemplateService.clearCache()
-          this.reload()
-        },
-        error: (e) => {
-          modal.componentInstance.buttonsEnabled.set(true)
-          this.toastService.showError(
-            $localize`Error deleting OCR template "${template.name}".`,
-            e
-          )
-        },
-      })
-    })
-  }
-
-  userCanEdit(template: OcrTemplate): boolean {
-    return (
-      this.permissionsService.currentUserCan(
-        PermissionAction.Change,
-        PermissionType.OcrTemplate
-      ) &&
-      this.permissionsService.currentUserHasObjectPermissions(
-        PermissionAction.Change,
-        template
-      )
-    )
-  }
-}

src-ui/src/app/data/ocr-template.ts

@@ -1,115 +0,0 @@
-import { CustomFieldDataType } from './custom-field'
-import { MatchingModel } from './matching-model'
-import { ObjectWithPermissions } from './object-with-permissions'
-
-export enum OcrZoneTarget {
-  CustomField = 'custom_field',
-  Title = 'title',
-  Asn = 'asn',
-  Created = 'created',
-}
-
-export enum OcrZoneTransform {
-  None = 'none',
-  Strip = 'strip',
-  Uppercase = 'uppercase',
-  Lowercase = 'lowercase',
-  Numeric = 'numeric',
-  StripPunctuation = 'strip_punctuation',
-  Date = 'date',
-  QrCode = 'qr_code',
-}
-
-export const DEFAULT_OCR_ZONE_LANGUAGE = 'eng'
-
-/** The field a zone writes to, keyed by OcrTemplate.combine_formats. */
-export function getZoneFieldKey(zone: OcrTemplateZone): string | null {
-  if (zone.target !== OcrZoneTarget.CustomField) return zone.target
-  return zone.custom_field === null ? null : String(zone.custom_field)
-}
-
-/** Custom field types zone OCR can write to. See models.py OCR_SUPPORTED_FIELD_TYPES. */
-export const OCR_SUPPORTED_FIELD_TYPES: CustomFieldDataType[] = [
-  CustomFieldDataType.String,
-  CustomFieldDataType.Url,
-  CustomFieldDataType.Date,
-  CustomFieldDataType.Integer,
-  CustomFieldDataType.Float,
-  CustomFieldDataType.Monetary,
-  CustomFieldDataType.LongText,
-  CustomFieldDataType.Boolean,
-]
-
-export const OCR_BUILTIN_TARGETS = [
-  { id: OcrZoneTarget.Title, name: $localize`Title` },
-  { id: OcrZoneTarget.Asn, name: $localize`Archive serial number` },
-  { id: OcrZoneTarget.Created, name: $localize`Date created` },
-]
-
-export interface OcrTemplateZone {
-  id?: number
-  name: string
-  target: OcrZoneTarget
-  custom_field: number | null
-  page?: number
-  x: number
-  y: number
-  width: number
-  height: number
-  ocr_language: string
-  transform: OcrZoneTransform
-  date_format?: string
-  validation_regex: string
-  order: number
-  zone_source_width?: number
-  zone_source_height?: number
-}
-
-export interface OcrTemplate extends MatchingModel, ObjectWithPermissions {
-  name: string
-  sample_document: number | null
-  source_width: number
-  source_height: number
-  enabled: boolean
-  combine_formats?: Record<string, string>
-  created?: string
-  updated?: string
-  zones: OcrTemplateZone[]
-}
-
-export interface ZoneTestRequest {
-  name: string
-  x: number
-  y: number
-  width: number
-  height: number
-  page: number
-  ocr_language: string
-  transform: OcrZoneTransform
-  date_format?: string
-  validation_regex: string
-  zone_source_width?: number
-  zone_source_height?: number
-}
-
-export interface OcrZoneTestResult {
-  raw_text?: string | null
-  value?: string | null
-  regex?: string
-  regex_match?: boolean | null
-  error?: string
-}
-
-export interface OcrZoneRunResult {
-  template: string
-  zone: string
-  custom_field: string
-  value: string | number | boolean | null
-  reason?: string | null
-}
-
-export interface OcrZoneRunResponse {
-  status: 'completed' | 'skipped'
-  reason?: 'no_template'
-  results: OcrZoneRunResult[]
-}

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

@@ -35,7 +35,6 @@ export enum HideableSidebarItemID {
   SavedViews = 'saved_views',
   ShareLinks = 'share_links',
   Workflows = 'workflows',
-  OcrTemplates = 'ocr_templates',
   Mail = 'mail',
   Documentation = 'documentation',
 }

src-ui/src/app/guards/dirty-form.guard.ts

@@ -3,16 +3,12 @@ import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { DirtyCheckGuard } from '@ngneat/dirty-check-forms'
 import { Observable, Subject } from 'rxjs'
 import { ConfirmDialogComponent } from 'src/app/components/common/confirm-dialog/confirm-dialog.component'
-import { ActivatedRouteSnapshot } from '@angular/router'
 
 @Injectable({ providedIn: 'root' })
 export class DirtyFormGuard extends DirtyCheckGuard {
   private modalService = inject(NgbModal)
 
-  confirmChanges(
-    _currentRoute?: ActivatedRouteSnapshot,
-    leaveLabel: string = $localize`Leave page`
-  ): Observable<boolean> {
+  confirmChanges(): Observable<boolean> {
     let modal = this.modalService.open(ConfirmDialogComponent, {
       backdrop: 'static',
     })
@@ -20,7 +16,7 @@ export class DirtyFormGuard extends DirtyCheckGuard {
     modal.componentInstance.messageBold = $localize`You have unsaved changes.`
     modal.componentInstance.message = $localize`Are you sure you want to leave?`
     modal.componentInstance.btnClass = 'btn-warning'
-    modal.componentInstance.btnCaption = leaveLabel
+    modal.componentInstance.btnCaption = $localize`Leave page`
     modal.componentInstance.confirmClicked.subscribe(() => {
       modal.componentInstance.buttonsEnabled.set(false)
       modal.close()

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

@@ -283,10 +283,6 @@ describe('PermissionsService', () => {
         'view_workflow',
         'change_workflow',
         'delete_workflow',
-        'add_ocrtemplate',
-        'view_ocrtemplate',
-        'change_ocrtemplate',
-        'delete_ocrtemplate',
         'add_customfield',
         'view_customfield',
         'change_customfield',

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

@@ -29,7 +29,6 @@ export enum PermissionType {
   ShareLinkBundle = '%s_sharelinkbundle',
   CustomField = '%s_customfield',
   Workflow = '%s_workflow',
-  OcrTemplate = '%s_ocrtemplate',
   ProcessedMail = '%s_processedmail',
   GlobalStatistics = '%s_global_statistics',
   SystemMonitoring = '%s_system_monitoring',

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

@@ -563,20 +563,6 @@ describe(`DocumentService`, () => {
 
     req.flush('task-id')
   })
-
-  it('should call appropriate api endpoint for running zone OCR', () => {
-    const url = `${environment.apiBaseUrl}${endpoint}/${documents[0].id}/run-zone-ocr/`
-    subscription = service.runZoneOcr(documents[0].id).subscribe()
-    let req = httpTestingController.expectOne(url)
-    expect(req.request.method).toEqual('POST')
-    expect(req.request.body).toEqual({})
-    req.flush({ status: 'completed', results: [] })
-
-    subscription = service.runZoneOcr(documents[0].id, 3).subscribe()
-    req = httpTestingController.expectOne(url)
-    expect(req.request.body).toEqual({ template: 3 })
-    req.flush({ status: 'completed', results: [] })
-  })
 })
 
 it('should construct sort fields respecting permissions', () => {

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

@@ -12,7 +12,6 @@ import {
 import { DocumentMetadata } from 'src/app/data/document-metadata'
 import { DocumentSuggestions } from 'src/app/data/document-suggestions'
 import { FilterRule } from 'src/app/data/filter-rule'
-import { OcrZoneRunResponse } from 'src/app/data/ocr-template'
 import { Results, SelectionData } from 'src/app/data/results'
 import { SETTINGS_KEYS } from 'src/app/data/ui-settings'
 import { queryParamsFromFilterRules } from '../../utils/query-params'
@@ -361,26 +360,6 @@ export class DocumentService extends AbstractPaperlessService<Document> {
     })
   }
 
-  runZoneOcrDocuments(
-    selection: DocumentSelectionQuery,
-    templateId: number | null = null
-  ) {
-    return this.http.post(this.getResourceUrl(null, 'run_zone_ocr'), {
-      ...selection,
-      ...(templateId ? { template: templateId } : {}),
-    })
-  }
-
-  runZoneOcr(
-    id: number,
-    templateId: number | null = null
-  ): Observable<OcrZoneRunResponse> {
-    return this.http.post<OcrZoneRunResponse>(
-      this.getResourceUrl(id, 'run-zone-ocr'),
-      templateId ? { template: templateId } : {}
-    )
-  }
-
   rotateDocuments(
     selection: DocumentSelectionQuery,
     degrees: number,

src-ui/src/app/services/rest/ocr-template.service.spec.ts

@@ -1,78 +0,0 @@
-import { provideHttpClient } from '@angular/common/http'
-import {
-  HttpTestingController,
-  provideHttpClientTesting,
-} from '@angular/common/http/testing'
-import { TestBed } from '@angular/core/testing'
-import { OcrZoneTransform, ZoneTestRequest } from 'src/app/data/ocr-template'
-import { environment } from 'src/environments/environment'
-import { OcrTemplateService } from './ocr-template.service'
-
-describe('OcrTemplateService', () => {
-  let service: OcrTemplateService
-  let http: HttpTestingController
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [provideHttpClient(), provideHttpClientTesting()],
-    })
-    service = TestBed.inject(OcrTemplateService)
-    http = TestBed.inject(HttpTestingController)
-  })
-
-  afterEach(() => http.verify())
-
-  it('builds page image URLs with zero-based page numbers', () => {
-    expect(service.getPageImageUrl(12, 0)).toBe(
-      `${environment.apiBaseUrl}ocr_templates/document-page-image/12/0/`
-    )
-    expect(service.getPageImageUrl(12, 2)).toBe(
-      `${environment.apiBaseUrl}ocr_templates/document-page-image/12/2/`
-    )
-  })
-
-  it('posts a zone test and returns the extraction result', () => {
-    const zone: ZoneTestRequest = {
-      name: 'Total',
-      x: 10,
-      y: 20,
-      width: 100,
-      height: 50,
-      page: -1,
-      ocr_language: 'eng',
-      transform: OcrZoneTransform.Numeric,
-      validation_regex: '\\d+',
-      zone_source_width: 1000,
-      zone_source_height: 1500,
-    }
-    const result = {
-      raw_text: 'Total: 123',
-      value: '123',
-      regex: '\\d+',
-      regex_match: true,
-    }
-    const next = jest.fn()
-    service.testZone(12, zone).subscribe(next)
-    const request = http.expectOne(
-      `${environment.apiBaseUrl}ocr_templates/test-zone/`
-    )
-    expect(request.request.method).toBe('POST')
-    expect(request.request.body).toEqual({ document: 12, zone })
-    request.flush(result)
-    expect(next).toHaveBeenCalledWith(result)
-  })
-
-  it('passes zone-test failures to the caller', () => {
-    const error = jest.fn()
-    service.testZone(12, {} as ZoneTestRequest).subscribe({ error })
-    http
-      .expectOne(`${environment.apiBaseUrl}ocr_templates/test-zone/`)
-      .flush(
-        { error: 'Invalid zone' },
-        { status: 400, statusText: 'Bad Request' }
-      )
-    expect(error).toHaveBeenCalledWith(
-      expect.objectContaining({ status: 400, error: { error: 'Invalid zone' } })
-    )
-  })
-})

src-ui/src/app/services/rest/ocr-template.service.ts

@@ -1,30 +0,0 @@
-import { Injectable } from '@angular/core'
-import { Observable } from 'rxjs'
-import {
-  OcrTemplate,
-  OcrZoneTestResult,
-  ZoneTestRequest,
-} from '../../data/ocr-template'
-import { AbstractPaperlessService } from './abstract-paperless-service'
-
-@Injectable({ providedIn: 'root' })
-export class OcrTemplateService extends AbstractPaperlessService<OcrTemplate> {
-  constructor() {
-    super()
-    this.resourceName = 'ocr_templates'
-  }
-
-  getPageImageUrl(docId: number, page: number): string {
-    return `${this.baseUrl}${this.resourceName}/document-page-image/${docId}/${page}/`
-  }
-
-  testZone(
-    docId: number,
-    zone: ZoneTestRequest
-  ): Observable<OcrZoneTestResult> {
-    return this.http.post<OcrZoneTestResult>(
-      `${this.baseUrl}${this.resourceName}/test-zone/`,
-      { document: docId, zone }
-    )
-  }
-}

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

@@ -9,11 +9,7 @@ import {
 } from '@angular/common/http/testing'
 import { TestBed } from '@angular/core/testing'
 import { environment } from 'src/environments/environment'
-import {
-  PaperlessTaskStatus,
-  PaperlessTaskTriggerSource,
-  PaperlessTaskType,
-} from '../data/paperless-task'
+import { PaperlessTaskType } from '../data/paperless-task'
 import { TasksService } from './tasks.service'
 
 describe('TasksService', () => {
@@ -38,23 +34,23 @@ describe('TasksService', () => {
     httpTestingController.verify()
   })
 
-  it('calls tasks api endpoint on reload', () => {
+  it('calls tasks status counts api endpoint on reload', () => {
     tasksService.reload()
     const req = httpTestingController.expectOne(
       (req: HttpRequest<unknown>) =>
-        req.url === `${environment.apiBaseUrl}tasks/` &&
-        req.params.get('acknowledged') === 'false' &&
-        req.params.get('page_size') === '1000'
+        req.url === `${environment.apiBaseUrl}tasks/status_counts/` &&
+        req.params.get('acknowledged') === 'false'
     )
     expect(req.request.method).toEqual('GET')
-    req.flush({ count: 0, results: [] })
+    req.flush({ all: 5, needs_attention: 3, in_progress: 1, completed: 1 })
+    expect(tasksService.needsAttentionTasksCount).toEqual(3)
   })
 
   it('cancels an in-progress reload when reloading again', () => {
     tasksService.reload()
     const staleReload = httpTestingController.expectOne(
       (req: HttpRequest<unknown>) =>
-        req.url === `${environment.apiBaseUrl}tasks/`
+        req.url === `${environment.apiBaseUrl}tasks/status_counts/`
     )
     tasksService.reload()
 
@@ -62,9 +58,9 @@ describe('TasksService', () => {
     httpTestingController
       .expectOne(
         (req: HttpRequest<unknown>) =>
-          req.url === `${environment.apiBaseUrl}tasks/`
+          req.url === `${environment.apiBaseUrl}tasks/status_counts/`
       )
-      .flush({ count: 0, results: [] })
+      .flush({ all: 0, needs_attention: 0, in_progress: 0, completed: 0 })
   })
 
   it('continues reloading after a reload request fails', () => {
@@ -72,7 +68,7 @@ describe('TasksService', () => {
     httpTestingController
       .expectOne(
         (req: HttpRequest<unknown>) =>
-          req.url === `${environment.apiBaseUrl}tasks/`
+          req.url === `${environment.apiBaseUrl}tasks/status_counts/`
       )
       .flush('error', { status: 500, statusText: 'error' })
 
@@ -82,16 +78,16 @@ describe('TasksService', () => {
     httpTestingController
       .expectOne(
         (req: HttpRequest<unknown>) =>
-          req.url === `${environment.apiBaseUrl}tasks/`
+          req.url === `${environment.apiBaseUrl}tasks/status_counts/`
       )
-      .flush({ count: 0, results: [] })
+      .flush({ all: 0, needs_attention: 0, in_progress: 0, completed: 0 })
   })
 
   it('reloads after dismissing a task while a reload is already in progress', () => {
     tasksService.reload()
     const staleReload = httpTestingController.expectOne(
       (req: HttpRequest<unknown>) =>
-        req.url === `${environment.apiBaseUrl}tasks/` &&
+        req.url === `${environment.apiBaseUrl}tasks/status_counts/` &&
         req.params.get('acknowledged') === 'false'
     )
 
@@ -104,12 +100,12 @@ describe('TasksService', () => {
     httpTestingController
       .expectOne(
         (req: HttpRequest<unknown>) =>
-          req.url === `${environment.apiBaseUrl}tasks/` &&
+          req.url === `${environment.apiBaseUrl}tasks/status_counts/` &&
           req.params.get('acknowledged') === 'false'
       )
-      .flush({ count: 0, results: [] })
+      .flush({ all: 50, needs_attention: 42, in_progress: 3, completed: 5 })
 
-    expect(tasksService.needsAttentionTasks).toHaveLength(0)
+    expect(tasksService.needsAttentionTasksCount).toEqual(42)
   })
 
   it('calls acknowledge_tasks api endpoint on dismiss and reloads', () => {
@@ -126,11 +122,10 @@ describe('TasksService', () => {
     httpTestingController
       .expectOne(
         (req: HttpRequest<unknown>) =>
-          req.url === `${environment.apiBaseUrl}tasks/` &&
-          req.params.get('acknowledged') === 'false' &&
-          req.params.get('page_size') === '1000'
+          req.url === `${environment.apiBaseUrl}tasks/status_counts/` &&
+          req.params.get('acknowledged') === 'false'
       )
-      .flush({ count: 0, results: [] })
+      .flush({ all: 0, needs_attention: 0, in_progress: 0, completed: 0 })
   })
 
   it('calls acknowledge_tasks api endpoint on dismiss all and reloads', () => {
@@ -147,65 +142,10 @@ describe('TasksService', () => {
     httpTestingController
       .expectOne(
         (req: HttpRequest<unknown>) =>
-          req.url === `${environment.apiBaseUrl}tasks/` &&
-          req.params.get('acknowledged') === 'false' &&
-          req.params.get('page_size') === '1000'
+          req.url === `${environment.apiBaseUrl}tasks/status_counts/` &&
+          req.params.get('acknowledged') === 'false'
       )
-      .flush({ count: 0, results: [] })
-  })
-
-  it('includes revoked tasks in needs attention', () => {
-    const mockTasks = [
-      {
-        task_type: PaperlessTaskType.SanityCheck,
-        trigger_source: PaperlessTaskTriggerSource.System,
-        status: PaperlessTaskStatus.Failure,
-        acknowledged: false,
-        task_id: '1235',
-        input_data: {},
-        date_created: new Date(),
-        related_document_ids: [],
-      },
-      {
-        task_type: PaperlessTaskType.MailFetch,
-        trigger_source: PaperlessTaskTriggerSource.Scheduled,
-        status: PaperlessTaskStatus.Revoked,
-        acknowledged: false,
-        task_id: '1236',
-        input_data: {},
-        date_created: new Date(),
-        related_document_ids: [],
-      },
-      {
-        task_type: PaperlessTaskType.EmptyTrash,
-        trigger_source: PaperlessTaskTriggerSource.Manual,
-        status: PaperlessTaskStatus.Success,
-        acknowledged: false,
-        task_id: '1238',
-        input_data: {},
-        date_created: new Date(),
-        related_document_ids: [],
-      },
-    ]
-
-    tasksService.reload()
-
-    const req = httpTestingController.expectOne(
-      (req: HttpRequest<unknown>) =>
-        req.url === `${environment.apiBaseUrl}tasks/` &&
-        req.params.get('acknowledged') === 'false' &&
-        req.params.get('page_size') === '1000'
-    )
-
-    req.flush({ count: mockTasks.length, results: mockTasks })
-
-    expect(tasksService.needsAttentionTasks).toHaveLength(2)
-    expect(tasksService.needsAttentionTasks.map((task) => task.status)).toEqual(
-      expect.arrayContaining([
-        PaperlessTaskStatus.Failure,
-        PaperlessTaskStatus.Revoked,
-      ])
-    )
+      .flush({ all: 0, needs_attention: 0, in_progress: 0, completed: 0 })
   })
 
   it('supports running tasks', () => {

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

@@ -5,14 +5,12 @@ import {
   catchError,
   finalize,
   first,
-  map,
   switchMap,
   takeUntil,
   tap,
 } from 'rxjs/operators'
 import {
   PaperlessTask,
-  PaperlessTaskStatus,
   PaperlessTaskStatusCounts,
   PaperlessTaskType,
 } from 'src/app/data/paperless-task'
@@ -27,50 +25,42 @@ export class TasksService {
 
   private baseUrl: string = environment.apiBaseUrl
   private endpoint: string = 'tasks'
-  private readonly defaultReloadPageSize = 1000
 
   public loading: boolean = false
 
-  private readonly tasks = signal<PaperlessTask[]>([])
+  private readonly tasksStatusCounts = signal<PaperlessTaskStatusCounts>({
+    all: 0,
+    needs_attention: 0,
+    in_progress: 0,
+    completed: 0,
+  })
   private readonly reloadNotifier = new Subject<void>()
 
   private unsubscribeNotifer: Subject<any> = new Subject()
 
   constructor() {
     this.reloadNotifier
-      .pipe(
-        switchMap(() => {
-          this.loading = true
-          return this.http
-            .get<Results<PaperlessTask>>(`${this.baseUrl}${this.endpoint}/`, {
-              params: {
-                acknowledged: 'false',
-                page_size: this.defaultReloadPageSize,
-              },
-            })
-            .pipe(
-              map((response) => response.results),
-              takeUntil(this.unsubscribeNotifer),
-              catchError(() => EMPTY),
-              finalize(() => {
-                this.loading = false
-              })
-            )
-        })
-      )
-      .subscribe((tasks) => {
-        this.tasks.set(tasks)
+      .pipe(switchMap(() => this.fetchUnacknowledgedTasksCounts()))
+      .subscribe((taskStatusCounts) => {
+        this.tasksStatusCounts.set(taskStatusCounts)
       })
   }
 
-  public get needsAttentionTasks(): PaperlessTask[] {
-    return this.tasks().filter((t) =>
-      [PaperlessTaskStatus.Failure, PaperlessTaskStatus.Revoked].includes(
-        t.status
-      )
+  private fetchUnacknowledgedTasksCounts(): Observable<PaperlessTaskStatusCounts> {
+    this.loading = true
+    return this.statusCounts({ acknowledged: false }).pipe(
+      takeUntil(this.unsubscribeNotifer),
+      catchError(() => EMPTY),
+      finalize(() => {
+        this.loading = false
+      })
     )
   }
 
+  public get needsAttentionTasksCount(): number {
+    return this.tasksStatusCounts().needs_attention
+  }
+
   public reload() {
     this.reloadNotifier.next()
   }
@@ -105,7 +95,7 @@ export class TasksService {
 
   public dismissTasks(task_ids: Set<number>): Observable<any> {
     return this.http
-      .post(`${this.baseUrl}tasks/acknowledge/`, {
+      .post(`${this.baseUrl}${this.endpoint}/acknowledge/`, {
         tasks: [...task_ids],
       })
       .pipe(
@@ -119,7 +109,7 @@ export class TasksService {
 
   public dismissAllTasks(): Observable<any> {
     return this.http
-      .post(`${this.baseUrl}tasks/acknowledge/`, {
+      .post(`${this.baseUrl}${this.endpoint}/acknowledge/`, {
         all: true,
       })
       .pipe(

src-ui/src/main.ts

@@ -42,7 +42,6 @@ import {
   bell,
   bodyText,
   bookmark,
-  boundingBoxCircles,
   boxArrowInRight,
   boxArrowUp,
   boxArrowUpRight,
@@ -106,7 +105,6 @@ import {
   fileEarmarkPlus,
   fileEarmarkRichtext,
   fileEarmarkSpreadsheet,
-  fileEarmarkRuled,
   fileText,
   files,
   filter,
@@ -157,7 +155,6 @@ import {
   send,
   shop,
   slashCircle,
-  sliders2,
   sliders2Vertical,
   sortAlphaDown,
   sortAlphaUpAlt,
@@ -302,7 +299,6 @@ const icons = {
   braces,
   bodyText,
   bookmark,
-  boundingBoxCircles,
   boxArrowInRight,
   boxArrowUp,
   boxArrowUpRight,
@@ -365,7 +361,6 @@ const icons = {
   fileEarmarkPlus,
   fileEarmarkRichtext,
   fileEarmarkSpreadsheet,
-  fileEarmarkRuled,
   files,
   fileText,
   filter,
@@ -416,7 +411,6 @@ const icons = {
   send,
   slashCircle,
   shop,
-  sliders2,
   sliders2Vertical,
   sortAlphaDown,
   sortAlphaUpAlt,

src-ui/src/styles.scss

@@ -691,12 +691,6 @@ table.table {
   }
 }
 
-@media (min-width: 992px) {
-  .modal-xxl {
-    --bs-modal-width: min(1440px, calc(100vw - 2 * var(--bs-modal-margin)));
-  }
-}
-
 .toast {
   --bs-toast-max-width: var(--pngx-toast-max-width);
 }

src/documents/apps.py

@@ -15,7 +15,6 @@ class DocumentsConfig(AppConfig):
         from documents.signals.handlers import add_to_index
         from documents.signals.handlers import run_workflows_added
         from documents.signals.handlers import run_workflows_updated
-        from documents.signals.handlers import run_zone_ocr_extraction
         from documents.signals.handlers import send_websocket_document_updated
         from documents.signals.handlers import set_correspondent
         from documents.signals.handlers import set_document_type
@@ -30,8 +29,6 @@ class DocumentsConfig(AppConfig):
         document_consumption_finished.connect(run_workflows_added)
         document_consumption_finished.connect(add_to_index)
         document_consumption_finished.connect(add_or_update_document_in_llm_index)
-        document_consumption_finished.connect(run_zone_ocr_extraction)
-
         document_updated.connect(run_workflows_updated)
         document_updated.connect(send_websocket_document_updated)
         document_updated.connect(add_or_update_document_in_llm_index)

src/documents/bulk_edit.py

@@ -33,7 +33,6 @@ from documents.models import CustomField
 from documents.models import CustomFieldInstance
 from documents.models import Document
 from documents.models import DocumentType
-from documents.models import OcrTemplate
 from documents.models import PaperlessTask
 from documents.models import StoragePath
 from documents.models import Tag
@@ -42,7 +41,6 @@ from documents.permissions import set_permissions_for_objects
 from documents.plugins.helpers import DocumentsStatusManager
 from documents.tasks import bulk_update_documents
 from documents.tasks import consume_file
-from documents.tasks import extract_zones
 from documents.tasks import remove_document_from_index
 from documents.tasks import update_document_content_maybe_archive_file
 from documents.versioning import get_latest_version_for_root
@@ -1199,22 +1197,3 @@ def remove_doclink(
         target_doc_field_instance.value.remove(document.id)
         target_doc_field_instance.save()
     Document.objects.filter(id=target_doc_id).update(modified=timezone.now())
-
-
-def run_zone_ocr(
-    doc_ids: list[int],
-    *,
-    template: OcrTemplate | None = None,
-) -> Literal["OK"]:
-    """
-    Queue zone OCR for the given documents, with the given template or with the
-    templates that match each document's content when its task runs.
-    """
-    template_id = template.pk if template is not None else None
-    for document_id in doc_ids:
-        extract_zones.apply_async(
-            kwargs={"document_id": document_id, "template_id": template_id},
-            headers={"trigger_source": PaperlessTask.TriggerSource.MANUAL},
-        )
-
-    return "OK"

src/documents/migrations/0028_ocrtemplate_ocrtemplatezone.py

@@ -1,311 +0,0 @@
-# Generated by Django 5.2.17 on 2026-10-20 20:29
-
-import django.core.validators
-import django.db.models.deletion
-import django.utils.timezone
-from django.conf import settings
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("documents", "0027_documentbarcode"),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="OcrTemplate",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                ("name", models.CharField(max_length=128, verbose_name="name")),
-                (
-                    "match",
-                    models.CharField(blank=True, max_length=256, verbose_name="match"),
-                ),
-                (
-                    "matching_algorithm",
-                    models.PositiveSmallIntegerField(
-                        choices=[
-                            (0, "None"),
-                            (1, "Any word"),
-                            (2, "All words"),
-                            (3, "Exact match"),
-                            (4, "Regular expression"),
-                            (5, "Fuzzy word"),
-                            (6, "Automatic"),
-                        ],
-                        default=1,
-                        verbose_name="matching algorithm",
-                    ),
-                ),
-                (
-                    "is_insensitive",
-                    models.BooleanField(default=True, verbose_name="is insensitive"),
-                ),
-                (
-                    "source_width",
-                    models.PositiveIntegerField(
-                        help_text="Width of the image the zones were drawn on (px)",
-                        validators=[django.core.validators.MinValueValidator(1)],
-                        verbose_name="source width",
-                    ),
-                ),
-                (
-                    "source_height",
-                    models.PositiveIntegerField(
-                        help_text="Height of the image the zones were drawn on (px)",
-                        validators=[django.core.validators.MinValueValidator(1)],
-                        verbose_name="source height",
-                    ),
-                ),
-                ("enabled", models.BooleanField(default=True, verbose_name="enabled")),
-                (
-                    "combine_formats",
-                    models.JSONField(
-                        blank=True,
-                        default=dict,
-                        help_text="Per-target format strings for combining several zones into one field, keyed by target (custom field id, or 'title'/'asn'/'created'). Tokens like {Zone Name} are replaced with that zone's value.",
-                        verbose_name="combine formats",
-                    ),
-                ),
-                (
-                    "created",
-                    models.DateTimeField(
-                        db_index=True,
-                        default=django.utils.timezone.now,
-                        editable=False,
-                        verbose_name="created",
-                    ),
-                ),
-                (
-                    "updated",
-                    models.DateTimeField(auto_now=True, verbose_name="updated"),
-                ),
-                (
-                    "owner",
-                    models.ForeignKey(
-                        blank=True,
-                        default=None,
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        to=settings.AUTH_USER_MODEL,
-                        verbose_name="owner",
-                    ),
-                ),
-                (
-                    "sample_document",
-                    models.ForeignKey(
-                        blank=True,
-                        help_text="Document used for previewing zones in the editor",
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="+",
-                        to="documents.document",
-                        verbose_name="sample document",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "OCR template",
-                "verbose_name_plural": "OCR templates",
-                "ordering": ("name",),
-                "abstract": False,
-            },
-        ),
-        migrations.CreateModel(
-            name="OcrTemplateZone",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "name",
-                    models.CharField(
-                        help_text="Descriptive name for this zone (e.g. 'Invoice Number')",
-                        max_length=128,
-                        verbose_name="zone name",
-                    ),
-                ),
-                (
-                    "target",
-                    models.CharField(
-                        choices=[
-                            ("custom_field", "Custom field"),
-                            ("title", "Title"),
-                            ("asn", "Archive serial number"),
-                            ("created", "Date created"),
-                        ],
-                        default="custom_field",
-                        help_text="Where the extracted value is written: a custom field, or a built-in document field (title, ASN, created date)",
-                        max_length=20,
-                        verbose_name="target",
-                    ),
-                ),
-                (
-                    "page",
-                    models.IntegerField(
-                        blank=True,
-                        help_text="Page (1 = first, -1 = last; blank uses the template default)",
-                        null=True,
-                        verbose_name="page",
-                    ),
-                ),
-                (
-                    "x",
-                    models.PositiveIntegerField(
-                        help_text="Left edge (px)",
-                        verbose_name="x",
-                    ),
-                ),
-                (
-                    "y",
-                    models.PositiveIntegerField(
-                        help_text="Top edge (px)",
-                        verbose_name="y",
-                    ),
-                ),
-                (
-                    "width",
-                    models.PositiveIntegerField(
-                        help_text="Zone width (px)",
-                        validators=[django.core.validators.MinValueValidator(1)],
-                        verbose_name="width",
-                    ),
-                ),
-                (
-                    "height",
-                    models.PositiveIntegerField(
-                        help_text="Zone height (px)",
-                        validators=[django.core.validators.MinValueValidator(1)],
-                        verbose_name="height",
-                    ),
-                ),
-                (
-                    "zone_source_width",
-                    models.PositiveIntegerField(
-                        blank=True,
-                        help_text="Width of the page image this zone was drawn on (px). Falls back to template source_width if unset.",
-                        null=True,
-                        verbose_name="zone source width",
-                    ),
-                ),
-                (
-                    "zone_source_height",
-                    models.PositiveIntegerField(
-                        blank=True,
-                        help_text="Height of the page image this zone was drawn on (px). Falls back to template source_height if unset.",
-                        null=True,
-                        verbose_name="zone source height",
-                    ),
-                ),
-                (
-                    "ocr_language",
-                    models.CharField(
-                        default="eng",
-                        help_text="Tesseract language code(s), e.g. 'deu+eng'",
-                        max_length=20,
-                        verbose_name="OCR language",
-                    ),
-                ),
-                (
-                    "transform",
-                    models.CharField(
-                        choices=[
-                            ("none", "None"),
-                            ("strip", "Strip whitespace"),
-                            ("uppercase", "Uppercase"),
-                            ("lowercase", "Lowercase"),
-                            ("numeric", "Numeric only"),
-                            (
-                                "strip_punctuation",
-                                "Remove leading/trailing punctuation",
-                            ),
-                            ("date", "Parse date"),
-                            ("qr_code", "Read QR/barcode"),
-                        ],
-                        default="strip",
-                        max_length=20,
-                        verbose_name="transform",
-                    ),
-                ),
-                (
-                    "date_format",
-                    models.CharField(
-                        blank=True,
-                        default="",
-                        help_text="Python strptime format for the 'Parse date' transform (e.g. %d.%m.%Y). Blank = auto-detect.",
-                        max_length=64,
-                        verbose_name="date format",
-                    ),
-                ),
-                (
-                    "validation_regex",
-                    models.CharField(
-                        blank=True,
-                        default="",
-                        help_text="Optional regex pattern — extracted text is only accepted if it matches",
-                        max_length=256,
-                        verbose_name="validation regex",
-                    ),
-                ),
-                ("order", models.PositiveIntegerField(default=0, verbose_name="order")),
-                (
-                    "custom_field",
-                    models.ForeignKey(
-                        blank=True,
-                        help_text="Target custom field (only used when target is 'custom_field')",
-                        null=True,
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="ocr_zones",
-                        to="documents.customfield",
-                        verbose_name="custom field",
-                    ),
-                ),
-                (
-                    "template",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="zones",
-                        to="documents.ocrtemplate",
-                        verbose_name="template",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "OCR template zone",
-                "verbose_name_plural": "OCR template zones",
-                "ordering": ("template", "order"),
-            },
-        ),
-        migrations.AddConstraint(
-            model_name="ocrtemplate",
-            constraint=models.UniqueConstraint(
-                fields=("name", "owner"),
-                name="documents_ocrtemplate_unique_name_owner",
-            ),
-        ),
-        migrations.AddConstraint(
-            model_name="ocrtemplate",
-            constraint=models.UniqueConstraint(
-                condition=models.Q(("owner__isnull", True)),
-                fields=("name",),
-                name="documents_ocrtemplate_name_uniq",
-            ),
-        ),
-    ]

src/documents/models.py

@@ -2149,215 +2149,3 @@ class WorkflowRun(SoftDeleteModel):
 
     def __str__(self) -> str:
         return f"WorkflowRun of {self.workflow} at {self.run_at} on {self.document}"
-
-
-class OcrTemplate(MatchingModel):
-    """Matching rules and extraction zones for documents with a common layout."""
-
-    source_width = models.PositiveIntegerField(
-        _("source width"),
-        validators=[MinValueValidator(1)],
-        help_text=_("Width of the image the zones were drawn on (px)"),
-    )
-
-    source_height = models.PositiveIntegerField(
-        _("source height"),
-        validators=[MinValueValidator(1)],
-        help_text=_("Height of the image the zones were drawn on (px)"),
-    )
-
-    sample_document = models.ForeignKey(
-        "documents.Document",
-        on_delete=models.SET_NULL,
-        null=True,
-        blank=True,
-        related_name="+",
-        verbose_name=_("sample document"),
-        help_text=_("Document used for previewing zones in the editor"),
-    )
-
-    enabled = models.BooleanField(_("enabled"), default=True)
-
-    combine_formats = models.JSONField(
-        _("combine formats"),
-        default=dict,
-        blank=True,
-        help_text=_(
-            "Per-target format strings for combining several zones into one "
-            "field, keyed by target (custom field id, or 'title'/'asn'/'created'). "
-            "Tokens like {Zone Name} are replaced with that zone's value.",
-        ),
-    )
-
-    created = models.DateTimeField(
-        _("created"),
-        default=timezone.now,
-        db_index=True,
-        editable=False,
-    )
-
-    updated = models.DateTimeField(
-        _("updated"),
-        auto_now=True,
-    )
-
-    class Meta(MatchingModel.Meta):
-        verbose_name = _("OCR template")
-        verbose_name_plural = _("OCR templates")
-
-
-class OcrTemplateZone(models.Model):
-    """A page region and the field its extracted value is written to."""
-
-    template = models.ForeignKey(
-        OcrTemplate,
-        on_delete=models.CASCADE,
-        related_name="zones",
-        verbose_name=_("template"),
-    )
-
-    name = models.CharField(
-        _("zone name"),
-        max_length=128,
-        help_text=_("Descriptive name for this zone (e.g. 'Invoice Number')"),
-    )
-
-    class TargetType(models.TextChoices):
-        CUSTOM_FIELD = ("custom_field", _("Custom field"))
-        TITLE = ("title", _("Title"))
-        ASN = ("asn", _("Archive serial number"))
-        CREATED = ("created", _("Date created"))
-
-    target = models.CharField(
-        _("target"),
-        max_length=20,
-        choices=TargetType.choices,
-        default=TargetType.CUSTOM_FIELD,
-        help_text=_(
-            "Where the extracted value is written: a custom field, or a "
-            "built-in document field (title, ASN, created date)",
-        ),
-    )
-
-    custom_field = models.ForeignKey(
-        "documents.CustomField",
-        on_delete=models.CASCADE,
-        related_name="ocr_zones",
-        verbose_name=_("custom field"),
-        null=True,
-        blank=True,
-        help_text=_("Target custom field (only used when target is 'custom_field')"),
-    )
-
-    page = models.IntegerField(
-        _("page"),
-        null=True,
-        blank=True,
-        help_text=_("Page (1 = first, -1 = last; blank uses the template default)"),
-    )
-
-    x = models.PositiveIntegerField(_("x"), help_text=_("Left edge (px)"))
-    y = models.PositiveIntegerField(_("y"), help_text=_("Top edge (px)"))
-    width = models.PositiveIntegerField(
-        _("width"),
-        validators=[MinValueValidator(1)],
-        help_text=_("Zone width (px)"),
-    )
-    height = models.PositiveIntegerField(
-        _("height"),
-        validators=[MinValueValidator(1)],
-        help_text=_("Zone height (px)"),
-    )
-
-    # Mixed-size PDFs need each zone's original page dimensions for scaling.
-    zone_source_width = models.PositiveIntegerField(
-        _("zone source width"),
-        null=True,
-        blank=True,
-        help_text=_(
-            "Width of the page image this zone was drawn on (px). "
-            "Falls back to template source_width if unset.",
-        ),
-    )
-    zone_source_height = models.PositiveIntegerField(
-        _("zone source height"),
-        null=True,
-        blank=True,
-        help_text=_(
-            "Height of the page image this zone was drawn on (px). "
-            "Falls back to template source_height if unset.",
-        ),
-    )
-
-    ocr_language = models.CharField(
-        _("OCR language"),
-        max_length=20,
-        default="eng",
-        help_text=_("Tesseract language code(s), e.g. 'deu+eng'"),
-    )
-
-    class TransformType(models.TextChoices):
-        NONE = ("none", _("None"))
-        STRIP = ("strip", _("Strip whitespace"))
-        UPPERCASE = ("uppercase", _("Uppercase"))
-        LOWERCASE = ("lowercase", _("Lowercase"))
-        NUMERIC = ("numeric", _("Numeric only"))
-        STRIP_PUNCTUATION = (
-            "strip_punctuation",
-            _("Remove leading/trailing punctuation"),
-        )
-        DATE = ("date", _("Parse date"))
-        QR_CODE = ("qr_code", _("Read QR/barcode"))
-
-    transform = models.CharField(
-        _("transform"),
-        max_length=20,
-        choices=TransformType.choices,
-        default=TransformType.STRIP,
-    )
-
-    date_format = models.CharField(
-        _("date format"),
-        max_length=64,
-        blank=True,
-        default="",
-        help_text=_(
-            "Python strptime format for the 'Parse date' transform "
-            "(e.g. %d.%m.%Y). Blank = auto-detect.",
-        ),
-    )
-
-    validation_regex = models.CharField(
-        _("validation regex"),
-        max_length=256,
-        blank=True,
-        default="",
-        help_text=_(
-            "Optional regex pattern — extracted text is only accepted if it matches",
-        ),
-    )
-
-    order = models.PositiveIntegerField(_("order"), default=0)
-
-    class Meta:
-        ordering = ("template", "order")
-        verbose_name = _("OCR template zone")
-        verbose_name_plural = _("OCR template zones")
-
-    def __str__(self) -> str:
-        return f"{self.template.name} -> {self.name}"
-
-
-# Document links and select fields require object references, not OCR text.
-OCR_SUPPORTED_FIELD_TYPES = frozenset(
-    {
-        CustomField.FieldDataType.STRING,
-        CustomField.FieldDataType.URL,
-        CustomField.FieldDataType.DATE,
-        CustomField.FieldDataType.INT,
-        CustomField.FieldDataType.FLOAT,
-        CustomField.FieldDataType.MONETARY,
-        CustomField.FieldDataType.LONG_TEXT,
-        CustomField.FieldDataType.BOOL,
-    },
-)

src/documents/regex.py

@@ -77,33 +77,6 @@ def safe_regex_match(pattern: str, text: str, *, flags: int = 0):
         return None
 
 
-def safe_regex_fullmatch(pattern: str, text: str, *, flags: int = 0):
-    """
-    Run a regex full match with a timeout. Returns a match object or None.
-    Validation errors and timeouts are logged and treated as no match.
-    """
-
-    try:
-        validate_regex_pattern(pattern)
-        compiled = regex.compile(pattern, flags=flags)
-    except (regex.error, ValueError) as exc:
-        logger.exception(
-            "Error while processing regular expression %s: %s",
-            textwrap.shorten(pattern, width=80, placeholder="…"),
-            exc,
-        )
-        return None
-
-    try:
-        return compiled.fullmatch(text, timeout=REGEX_TIMEOUT_SECONDS)
-    except TimeoutError:
-        logger.warning(
-            "Regular expression matching timed out for pattern %s",
-            textwrap.shorten(pattern, width=80, placeholder="…"),
-        )
-        return None
-
-
 def safe_regex_sub(pattern: str, repl: str, text: str, *, flags: int = 0) -> str | None:
     """
     Run a regex substitution with a timeout. Returns the substituted string,

src/documents/serialisers.py

@@ -23,7 +23,6 @@ from django.core.validators import MaxValueValidator
 from django.core.validators import MinValueValidator
 from django.core.validators import RegexValidator
 from django.core.validators import integer_validator
-from django.db import transaction
 from django.db.models import Count
 from django.db.models import Q
 from django.db.models.functions import Lower
@@ -55,7 +54,6 @@ if settings.AUDIT_LOG_ENABLED:
 from documents import bulk_edit
 from documents.data_models import DocumentSource
 from documents.filters import CustomFieldQueryParser
-from documents.models import OCR_SUPPORTED_FIELD_TYPES
 from documents.models import Correspondent
 from documents.models import CustomField
 from documents.models import CustomFieldInstance
@@ -64,8 +62,6 @@ from documents.models import DocumentBarcode
 from documents.models import DocumentType
 from documents.models import MatchingModel
 from documents.models import Note
-from documents.models import OcrTemplate
-from documents.models import OcrTemplateZone
 from documents.models import PaperlessTask
 from documents.models import SavedView
 from documents.models import SavedViewFilterRule
@@ -1825,18 +1821,6 @@ class ReprocessDocumentsSerializer(DocumentSelectionSerializer):
     remote_ocr = serializers.BooleanField(required=False, default=False)
 
 
-class RunZoneOcrSerializer(serializers.Serializer):
-    template = serializers.PrimaryKeyRelatedField(
-        queryset=OcrTemplate.objects.prefetch_related("zones", "zones__custom_field"),
-        required=False,
-        allow_null=True,
-    )
-
-
-class RunZoneOcrDocumentsSerializer(DocumentSelectionSerializer, RunZoneOcrSerializer):
-    pass
-
-
 class BulkEditSerializer(
     SerializerWithPerms,
     DocumentSelectionSerializer,
@@ -3714,181 +3698,3 @@ class StoragePathTestSerializer(SerializerWithPerms):
             document_field.queryset = Document.objects.filter(
                 id__in=permitted_document_ids(user),
             )
-
-
-class OcrTemplateZoneSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = OcrTemplateZone
-        fields = [
-            "id",
-            "name",
-            "target",
-            "custom_field",
-            "page",
-            "x",
-            "y",
-            "width",
-            "height",
-            "ocr_language",
-            "transform",
-            "date_format",
-            "order",
-            "zone_source_width",
-            "zone_source_height",
-            "validation_regex",
-        ]
-
-    def validate_custom_field(self, value):
-        if value is None:
-            return value
-        if value.data_type not in OCR_SUPPORTED_FIELD_TYPES:
-            raise serializers.ValidationError(
-                f"Custom field type '{value.data_type}' is not supported for OCR extraction. "
-                f"Use string, integer, float, date, monetary, boolean, URL, or long text.",
-            )
-        return value
-
-    def validate_page(self, value):
-        if value is not None and value != -1 and value < 1:
-            raise serializers.ValidationError(
-                "Page must be positive or -1 for the last page.",
-            )
-        return value
-
-    def validate(self, data):
-        # A template PATCH still replaces each zone in full.
-        if self.root.partial:
-            for name, field in self.fields.items():
-                if field.required and name not in data:
-                    raise serializers.ValidationError(
-                        {name: field.error_messages["required"]},
-                    )
-        return data
-
-
-class OcrTemplateZoneTestSerializer(OcrTemplateZoneSerializer):
-    name = serializers.CharField(default="test")
-    x = serializers.IntegerField(min_value=0, default=0)
-    y = serializers.IntegerField(min_value=0, default=0)
-    width = serializers.IntegerField(min_value=2)
-    height = serializers.IntegerField(min_value=2)
-
-    class Meta(OcrTemplateZoneSerializer.Meta):
-        fields = [
-            "name",
-            "x",
-            "y",
-            "width",
-            "height",
-            "page",
-            "ocr_language",
-            "transform",
-            "date_format",
-            "validation_regex",
-            "zone_source_width",
-            "zone_source_height",
-        ]
-        extra_kwargs = {
-            "zone_source_width": {"min_value": 1},
-            "zone_source_height": {"min_value": 1},
-        }
-
-
-class OcrTemplateTestSerializer(serializers.Serializer):
-    document = serializers.PrimaryKeyRelatedField(
-        queryset=Document.objects.select_related("root_document__owner"),
-    )
-    zone = OcrTemplateZoneTestSerializer()
-
-
-class OcrTemplateSerializer(MatchingModelSerializer, OwnedObjectSerializer):
-    zones = OcrTemplateZoneSerializer(many=True, required=False)
-    combine_formats = serializers.DictField(
-        child=serializers.CharField(allow_blank=True, trim_whitespace=False),
-        required=False,
-    )
-
-    # Templates are never assigned to documents
-    slug = None
-    document_count = None
-
-    class Meta:
-        model = OcrTemplate
-        fields = [
-            "id",
-            "name",
-            "match",
-            "matching_algorithm",
-            "is_insensitive",
-            "source_width",
-            "source_height",
-            "sample_document",
-            "enabled",
-            "combine_formats",
-            "created",
-            "updated",
-            "zones",
-            "owner",
-            "permissions",
-            "user_can_change",
-            "set_permissions",
-        ]
-        read_only_fields = ["created", "updated"]
-
-    def validate_matching_algorithm(self, value):
-        if value == MatchingModel.MATCH_AUTO:
-            raise serializers.ValidationError(
-                "Automatic matching is not supported for OCR templates.",
-            )
-        return value
-
-    def validate(self, data):
-        data = super().validate(data)
-        zones = data.get("zones", [])
-        if (
-            self.instance
-            and "zones" not in data
-            and ("source_width" in data or "source_height" in data)
-        ):
-            zones = self.instance.zones.values()
-        source_width = data.get(
-            "source_width",
-            getattr(self.instance, "source_width", None),
-        )
-        source_height = data.get(
-            "source_height",
-            getattr(self.instance, "source_height", None),
-        )
-        for zone in zones:
-            width = zone.get("zone_source_width") or source_width
-            height = zone.get("zone_source_height") or source_height
-            if (
-                zone.get("x", 0) + zone.get("width", 0) > width
-                or zone.get("y", 0) + zone.get("height", 0) > height
-            ):
-                raise serializers.ValidationError(
-                    {
-                        "zones": f"Zone '{zone.get('name', '?')}' extends beyond its source dimensions.",
-                    },
-                )
-        return data
-
-    @transaction.atomic
-    def create(self, validated_data):
-        zones_data = validated_data.pop("zones", [])
-        template = super().create(validated_data)
-        for zone_data in zones_data:
-            OcrTemplateZone.objects.create(template=template, **zone_data)
-        return template
-
-    @transaction.atomic
-    def update(self, instance, validated_data):
-        zones_data = validated_data.pop("zones", None)
-        instance = super().update(instance, validated_data)
-
-        if zones_data is not None:
-            instance.zones.all().delete()
-            for zone_data in zones_data:
-                OcrTemplateZone.objects.create(template=instance, **zone_data)
-
-        return instance

src/documents/signals/handlers.py

@@ -1381,9 +1381,17 @@ def task_revoked_handler(
         return
     try:
         close_old_connections()
+        reason = "Task revoked before completion."
+        if expired:
+            reason = "Task expired before execution."
+        elif terminated:
+            reason = "Task terminated during execution."
         PaperlessTask.objects.filter(task_id=task_id).update(
             status=PaperlessTask.Status.REVOKED,
             date_done=timezone.now(),
+            result_data={
+                "reason": (reason + " Check worker logs for details."),
+            },
         )
     except Exception:  # pragma: no cover
         logger.exception("Updating PaperlessTask on revocation failed")
@@ -1404,19 +1412,6 @@ def close_connection_pool_on_worker_init(**kwargs) -> None:
             conn.close_pool()
 
 
-def run_zone_ocr_extraction(sender, document, original_file=None, **kwargs):
-    """Apply matching templates without failing consumption if extraction fails."""
-    try:
-        from documents.zone_ocr import run_zone_extraction
-
-        run_zone_extraction(document, Path(original_file) if original_file else None)
-    except Exception:
-        logger.exception(
-            "Zone OCR extraction failed for document %s",
-            document.pk,
-        )
-
-
 @worker_process_shutdown.connect
 def close_connection_pool_on_worker_shutdown(**kwargs) -> None:  # pragma: no cover
     """

src/documents/tasks.py

@@ -47,7 +47,6 @@ from documents.models import CustomFieldInstance
 from documents.models import Document
 from documents.models import DocumentBarcode
 from documents.models import DocumentType
-from documents.models import OcrTemplate
 from documents.models import PaperlessTask
 from documents.models import ShareLink
 from documents.models import ShareLinkBundle
@@ -70,7 +69,6 @@ from documents.utils import compute_checksum
 from documents.utils import identity
 from documents.versioning import annotate_effective_content
 from documents.workflows.utils import get_workflows_for_trigger
-from documents.zone_ocr import run_zone_extraction
 from paperless.config import AIConfig
 from paperless.config import BarcodeConfig
 from paperless.config import RemoteOCRConfig
@@ -370,31 +368,6 @@ def _read_barcodes_for_reprocess(document: Document) -> list[StoredBarcode] | No
         return None
 
 
-@shared_task
-def extract_zones(document_id: int, template_id: int | None = None) -> None:
-    """
-    Run an OCR template against a stored document, or every template that
-    matches it when no template is given.
-    """
-    document = Document.objects.get(id=document_id)
-    if template_id is None:
-        run_zone_extraction(document, None)
-        return
-
-    try:
-        template = OcrTemplate.objects.prefetch_related(
-            "zones",
-            "zones__custom_field",
-        ).get(id=template_id)
-    except OcrTemplate.DoesNotExist:
-        logger.warning(
-            "OCR template %s no longer exists, not running zone OCR",
-            template_id,
-        )
-        return
-    run_zone_extraction(document, None, templates=[template])
-
-
 @shared_task
 def update_document_content_maybe_archive_file(
     document_id,

src/documents/tests/test_api_bulk_edit.py

@@ -12,7 +12,6 @@ from documents.models import CustomField
 from documents.models import CustomFieldInstance
 from documents.models import Document
 from documents.models import DocumentType
-from documents.models import OcrTemplate
 from documents.models import StoragePath
 from documents.models import Tag
 from paperless_testing.dirs import DirectoriesMixin
@@ -584,87 +583,6 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase):
         self.assertEqual(args[0], [self.doc1.id])
         self.assertEqual(kwargs, {"remote_ocr": True})
 
-    @mock.patch("documents.views.bulk_edit.run_zone_ocr")
-    def test_run_zone_ocr_documents_endpoint(self, m) -> None:
-        """
-        GIVEN:
-            - API data to run zone OCR on a document
-        WHEN:
-            - API is called
-        THEN:
-            - run_zone_ocr is called with the document
-        """
-        self.setup_mock(m, "run_zone_ocr")
-        response = self.client.post(
-            "/api/documents/run_zone_ocr/",
-            json.dumps({"documents": [self.doc1.id]}),
-            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, {})
-
-    @mock.patch("documents.views.bulk_edit.run_zone_ocr")
-    def test_run_zone_ocr_documents_endpoint_with_template(self, m) -> None:
-        """
-        GIVEN:
-            - API data to run a chosen OCR template on a document
-        WHEN:
-            - API is called
-        THEN:
-            - run_zone_ocr is called with the template
-        """
-        self.setup_mock(m, "run_zone_ocr")
-        template = OcrTemplate.objects.create(
-            name="Bills",
-            source_width=100,
-            source_height=100,
-        )
-        response = self.client.post(
-            "/api/documents/run_zone_ocr/",
-            json.dumps({"documents": [self.doc1.id], "template": template.pk}),
-            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, {"template": template})
-
-    @mock.patch("documents.views.bulk_edit.run_zone_ocr")
-    def test_run_zone_ocr_documents_endpoint_rejects_private_template(
-        self,
-        m,
-    ) -> None:
-        """
-        GIVEN:
-            - A user who can change the documents but not view the template
-        WHEN:
-            - API is called with that template
-        THEN:
-            - The whole request is refused
-        """
-        user = UserFactory(username="editor")
-        grant_global(user, "view_document", "change_document")
-        template = OcrTemplate.objects.create(
-            name="Private",
-            owner=UserFactory(username="other"),
-            source_width=100,
-            source_height=100,
-        )
-        self.client.force_authenticate(user=user)
-
-        response = self.client.post(
-            "/api/documents/run_zone_ocr/",
-            json.dumps({"documents": [self.doc1.id], "template": template.pk}),
-            content_type="application/json",
-        )
-
-        self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN)
-        m.assert_not_called()
-
     @mock.patch("documents.serialisers.bulk_edit.set_storage_path")
     def test_api_set_storage_path(self, m) -> None:
         """

src/documents/tests/test_api_documents.py

@@ -46,6 +46,7 @@ from documents.models import UiSettings
 from documents.models import Workflow
 from documents.models import WorkflowAction
 from documents.models import WorkflowTrigger
+from documents.search import get_backend
 from documents.signals.handlers import run_workflows
 from documents.tests.utils import ConsumeTaskMixin
 from paperless_testing.dirs import DirectoriesMixin
@@ -66,6 +67,70 @@ class TestDocumentApi(DirectoriesMixin, ConsumeTaskMixin, APITestCase):
         self.client.force_authenticate(user=self.user)
         cache.clear()
 
+    def test_detail_save_indexes_final_workflow_state(self) -> None:
+        viewer = UserFactory()
+        grant_global(viewer, "view_document")
+        inbox = TagFactory(is_inbox_tag=True)
+        doc = DocumentFactory(owner=self.user, content="distinctiveword")
+        doc.tags.add(inbox)
+        trigger = WorkflowTrigger.objects.create(
+            type=WorkflowTrigger.WorkflowTriggerType.DOCUMENT_UPDATED,
+        )
+        action = WorkflowAction.objects.create(assign_title="Workflow title")
+        action.assign_view_users.add(viewer)
+        action.remove_view_users.add(viewer)
+        workflow = Workflow.objects.create(name="Update document")
+        workflow.triggers.add(trigger)
+        workflow.actions.add(action)
+        backend = get_backend()
+        backend.add_or_update(doc)
+
+        for action_type in (
+            WorkflowAction.WorkflowActionType.ASSIGNMENT,
+            WorkflowAction.WorkflowActionType.REMOVAL,
+            WorkflowAction.WorkflowActionType.MOVE_TO_TRASH,
+        ):
+            with self.subTest(action_type=action_type):
+                grant = action_type == WorkflowAction.WorkflowActionType.ASSIGNMENT
+                action.type = action_type
+                action.save()
+                trigger.filter_has_not_tags.set([inbox] if grant else [])
+                trigger.filter_has_tags.set([] if grant else [inbox])
+                self.client.force_authenticate(self.user)
+                response = self.client.patch(
+                    f"/api/documents/{doc.pk}/",
+                    {"tags": [] if grant else [inbox.pk]},
+                    format="json",
+                )
+                self.assertEqual(response.status_code, status.HTTP_200_OK)
+                self.client.force_authenticate(viewer)
+                self.assertEqual(
+                    self.client.get(f"/api/documents/{doc.pk}/").status_code,
+                    status.HTTP_200_OK if grant else status.HTTP_404_NOT_FOUND,
+                )
+                # Check the index directly: the API's DB permission filtering
+                # would otherwise hide stale grants and trashed index entries.
+                self.assertEqual(
+                    list(backend.search_ids("distinctiveword", user=viewer)),
+                    [doc.pk] if grant else [],
+                )
+                if grant:
+                    response = self.client.get(
+                        "/api/documents/",
+                        {"query": "distinctiveword AND title:workflow"},
+                    )
+                    self.assertEqual(response.status_code, status.HTTP_200_OK)
+                    self.assertEqual(
+                        [result["id"] for result in response.data["results"]],
+                        [doc.pk],
+                    )
+                elif action_type == WorkflowAction.WorkflowActionType.MOVE_TO_TRASH:
+                    self.assertFalse(Document.objects.filter(pk=doc.pk).exists())
+                    self.assertEqual(
+                        list(backend.search_ids("distinctiveword", user=None)),
+                        [],
+                    )
+
     def testDocuments(self) -> None:
         response = self.client.get("/api/documents/").data
 

src/documents/tests/test_bulk_edit.py

@@ -21,13 +21,11 @@ from documents.models import CustomField
 from documents.models import CustomFieldInstance
 from documents.models import Document
 from documents.models import DocumentType
-from documents.models import OcrTemplate
 from documents.models import StoragePath
 from documents.models import Tag
 from documents.pdf_ops import PageSpec
 from documents.permissions import PermissionsSpec
 from documents.permissions import set_permissions_for_objects
-from documents.tasks import extract_zones
 from paperless_testing.dirs import DirectoriesMixin
 from paperless_testing.factories import DocumentFactory
 from paperless_testing.permissions import grant_object
@@ -1897,111 +1895,6 @@ class TestPDFActions(DirectoriesMixin, TestCase):
         self.assertIn("Error removing password from document", cm.output[0])
 
 
-@pytest.mark.django_db
-class TestBulkEditRunZoneOcr:
-    @pytest.fixture
-    def mock_task(self, mocker: MockerFixture) -> mock.MagicMock:
-        return mocker.patch("documents.bulk_edit.extract_zones")
-
-    def test_queues_every_selected_document(
-        self,
-        mock_task: mock.MagicMock,
-    ) -> None:
-        """
-        GIVEN:
-            - Selected documents
-        WHEN:
-            - run_zone_ocr is called with them
-        THEN:
-            - Each document is queued once, templates are matched when its
-              task runs
-        """
-        docs = DocumentFactory.create_batch(2)
-
-        result = bulk_edit.run_zone_ocr([doc.id for doc in docs])
-
-        assert result == "OK"
-        assert [
-            call.kwargs["kwargs"] for call in mock_task.apply_async.call_args_list
-        ] == [{"document_id": doc.id, "template_id": None} for doc in docs]
-
-    def test_queues_the_chosen_template(self, mock_task: mock.MagicMock) -> None:
-        """
-        GIVEN:
-            - A chosen OCR template
-        WHEN:
-            - run_zone_ocr is called with it
-        THEN:
-            - The template is queued with the document
-        """
-        doc = DocumentFactory()
-        template = OcrTemplate.objects.create(
-            name="Bills",
-            source_width=100,
-            source_height=100,
-        )
-
-        bulk_edit.run_zone_ocr([doc.id], template=template)
-
-        assert mock_task.apply_async.call_args.kwargs["kwargs"] == {
-            "document_id": doc.id,
-            "template_id": template.pk,
-        }
-
-    def test_task_runs_extraction(self, mocker: MockerFixture) -> None:
-        """
-        GIVEN:
-            - A queued zone OCR task
-        WHEN:
-            - The task runs
-        THEN:
-            - Zone extraction runs on the stored document
-        """
-        extract = mocker.patch("documents.tasks.run_zone_extraction")
-        doc = DocumentFactory()
-
-        extract_zones(doc.id)
-
-        extract.assert_called_once_with(doc, None)
-
-    def test_task_runs_the_chosen_template(self, mocker: MockerFixture) -> None:
-        """
-        GIVEN:
-            - A queued zone OCR task with a chosen template
-        WHEN:
-            - The task runs
-        THEN:
-            - Zone extraction runs with only that template
-        """
-        extract = mocker.patch("documents.tasks.run_zone_extraction")
-        doc = DocumentFactory()
-        template = OcrTemplate.objects.create(
-            name="Bills",
-            source_width=100,
-            source_height=100,
-        )
-
-        extract_zones(doc.id, template.pk)
-
-        extract.assert_called_once_with(doc, None, templates=[template])
-
-    def test_task_skips_a_deleted_template(self, mocker: MockerFixture) -> None:
-        """
-        GIVEN:
-            - A template deleted between queueing and running
-        WHEN:
-            - The task runs
-        THEN:
-            - Nothing is extracted
-        """
-        extract = mocker.patch("documents.tasks.run_zone_extraction")
-        doc = DocumentFactory()
-
-        extract_zones(doc.id, 999)
-
-        extract.assert_not_called()
-
-
 @pytest.mark.django_db
 class TestBulkEditReprocess:
     @pytest.fixture

src/documents/tests/test_regex.py

@@ -4,7 +4,6 @@ from django.conf import settings
 from pytest_mock import MockerFixture
 
 from documents.regex import safe_regex_finditer
-from documents.regex import safe_regex_fullmatch
 from documents.regex import safe_regex_match
 from documents.regex import safe_regex_search
 from documents.regex import safe_regex_sub
@@ -27,7 +26,7 @@ class TestValidateRegexPattern:
 
 
 class TestSafeRegexSearchAndMatch:
-    """Tests for safe_regex_search, _match and _fullmatch (same contract)."""
+    """Tests for safe_regex_search and safe_regex_match (same contract)."""
 
     @pytest.mark.parametrize(
         ("func", "pattern", "text", "expected_group"),
@@ -46,13 +45,6 @@ class TestSafeRegexSearchAndMatch:
                 "123",
                 id="match-match-found",
             ),
-            pytest.param(
-                safe_regex_fullmatch,
-                r"\d+",
-                "123",
-                "123",
-                id="fullmatch-match-found",
-            ),
         ],
     )
     def test_match_found(self, func, pattern, text, expected_group) -> None:
@@ -65,12 +57,6 @@ class TestSafeRegexSearchAndMatch:
         [
             pytest.param(safe_regex_search, r"\d+", "abcdef", id="search-no-match"),
             pytest.param(safe_regex_match, r"\d+", "abc123", id="match-no-match"),
-            pytest.param(
-                safe_regex_fullmatch,
-                r"\d+",
-                "123abc",
-                id="fullmatch-no-match",
-            ),
         ],
     )
     def test_no_match(self, func, pattern, text) -> None:
@@ -81,7 +67,6 @@ class TestSafeRegexSearchAndMatch:
         [
             pytest.param(safe_regex_search, id="search"),
             pytest.param(safe_regex_match, id="match"),
-            pytest.param(safe_regex_fullmatch, id="fullmatch"),
         ],
     )
     def test_invalid_pattern_returns_none(self, func) -> None:
@@ -92,7 +77,6 @@ class TestSafeRegexSearchAndMatch:
         [
             pytest.param(safe_regex_search, id="search"),
             pytest.param(safe_regex_match, id="match"),
-            pytest.param(safe_regex_fullmatch, id="fullmatch"),
         ],
     )
     def test_flags_respected(self, func) -> None:
@@ -103,7 +87,6 @@ class TestSafeRegexSearchAndMatch:
         [
             pytest.param(safe_regex_search, "search", id="search"),
             pytest.param(safe_regex_match, "match", id="match"),
-            pytest.param(safe_regex_fullmatch, "fullmatch", id="fullmatch"),
         ],
     )
     def test_timeout_returns_none(

src/documents/tests/test_task_signals.py

@@ -13,52 +13,14 @@ from documents.data_models import DocumentMetadataOverrides
 from documents.data_models import DocumentSource
 from documents.models import PaperlessTask
 from documents.signals.handlers import before_task_publish_handler
-from documents.signals.handlers import run_zone_ocr_extraction
 from documents.signals.handlers import task_failure_handler
 from documents.signals.handlers import task_postrun_handler
 from documents.signals.handlers import task_prerun_handler
 from documents.signals.handlers import task_revoked_handler
-from paperless_testing.factories import DocumentFactory
 from paperless_testing.factories import PaperlessTaskFactory
 from paperless_testing.factories import UserFactory
 
 
-@pytest.mark.django_db
-@pytest.mark.parametrize(
-    "original_file",
-    [None, "/tmp/original.pdf", Path("/tmp/original.pdf")],
-)
-def test_consumption_runs_zone_extraction(
-    original_file,
-    mocker: pytest_mock.MockerFixture,
-):
-    extract = mocker.patch("documents.zone_ocr.run_zone_extraction")
-    document = DocumentFactory()
-
-    run_zone_ocr_extraction(sender=None, document=document, original_file=original_file)
-
-    extract.assert_called_once_with(
-        document,
-        Path(original_file) if original_file else None,
-    )
-
-
-@pytest.mark.django_db
-def test_zone_extraction_failure_does_not_fail_consumption(
-    mocker: pytest_mock.MockerFixture,
-    caplog,
-):
-    mocker.patch(
-        "documents.zone_ocr.run_zone_extraction",
-        side_effect=RuntimeError("OCR failed"),
-    )
-    document = DocumentFactory()
-
-    run_zone_ocr_extraction(sender=None, document=document)
-
-    assert f"Zone OCR extraction failed for document {document.pk}" in caplog.text
-
-
 @pytest.fixture
 def consume_input_doc():
     doc = mock.MagicMock(spec=ConsumableDocument)
@@ -467,6 +429,36 @@ class TestTaskRevokedHandler:
         assert task.status == PaperlessTask.Status.REVOKED
         assert task.date_done is not None
 
+    @pytest.mark.parametrize(
+        ("expired", "terminated", "reason"),
+        [
+            (True, False, "Task expired before execution."),
+            (False, True, "Task terminated during execution."),
+            (False, False, "Task revoked before completion."),
+        ],
+    )
+    def test_records_revocation_details(
+        self,
+        mocker,
+        expired,
+        terminated,
+        reason,
+    ) -> None:
+        task = PaperlessTaskFactory(status=PaperlessTask.Status.PENDING)
+        request = mocker.MagicMock()
+        request.id = task.task_id
+
+        task_revoked_handler(
+            request=request,
+            expired=expired,
+            terminated=terminated,
+        )
+        task.refresh_from_db()
+
+        assert task.result_data == {
+            "reason": f"{reason} Check worker logs for details.",
+        }
+
     def test_ignores_none_request(self) -> None:
         """task_revoked_handler must not raise when request is None."""
 

src/documents/views.py

@@ -3,12 +3,10 @@ import logging
 import os
 import platform
 import re
-import subprocess
 import tempfile
 import zipfile
 from collections import deque
 from collections.abc import Callable
-from dataclasses import asdict
 from datetime import datetime
 from datetime import timedelta
 from http import HTTPStatus
@@ -154,8 +152,6 @@ from documents.models import CustomFieldInstance
 from documents.models import Document
 from documents.models import DocumentType
 from documents.models import Note
-from documents.models import OcrTemplate
-from documents.models import OcrTemplateZone
 from documents.models import PaperlessTask
 from documents.models import SavedView
 from documents.models import ShareLink
@@ -185,7 +181,6 @@ from documents.permissions import restrict_queryset_to_visible
 from documents.permissions import set_permissions_for_objects
 from documents.permissions import user_is_unrestricted
 from documents.plugins.date_parsing import get_date_parser
-from documents.regex import safe_regex_fullmatch
 from documents.schema import generate_object_with_permissions_schema
 from documents.search import SearchHit
 from documents.serialisers import AcknowledgeTasksViewSerializer
@@ -206,15 +201,11 @@ from documents.serialisers import EmailSerializer
 from documents.serialisers import MergeDocumentsAsVersionsSerializer
 from documents.serialisers import MergeDocumentsSerializer
 from documents.serialisers import NotesSerializer
-from documents.serialisers import OcrTemplateSerializer
-from documents.serialisers import OcrTemplateTestSerializer
 from documents.serialisers import PostDocumentSerializer
 from documents.serialisers import RemovePasswordDocumentsSerializer
 from documents.serialisers import ReprocessDocumentsSerializer
 from documents.serialisers import RotateDocumentsSerializer
 from documents.serialisers import RunTaskSerializer
-from documents.serialisers import RunZoneOcrDocumentsSerializer
-from documents.serialisers import RunZoneOcrSerializer
 from documents.serialisers import SavedViewSerializer
 from documents.serialisers import SearchResultSerializer
 from documents.serialisers import SerializerWithPerms
@@ -1313,13 +1304,19 @@ class DocumentViewSet(
 
         from documents.search import get_backend
 
-        get_backend().add_or_update(refreshed_doc)
-
         document_updated.send(
             sender=self.__class__,
             document=refreshed_doc,
         )
 
+        # Index the final workflow state, including deletion.
+        backend = get_backend()
+        final_doc = Document.objects.filter(pk=root_doc.pk).first()
+        if final_doc is None:
+            backend.remove(root_doc.pk)
+        else:
+            backend.add_or_update(final_doc)
+
         return response
 
     def list(self, request, *args, **kwargs):
@@ -2239,76 +2236,6 @@ class DocumentViewSet(
             raise Http404
         return version_doc
 
-    @extend_schema(
-        operation_id="documents_run_zone_ocr",
-        request=RunZoneOcrSerializer,
-        responses=inline_serializer(
-            name="RunZoneOcrResult",
-            fields={
-                "status": serializers.ChoiceField(choices=["completed", "skipped"]),
-                "reason": serializers.ChoiceField(
-                    choices=["no_template"],
-                    required=False,
-                ),
-                "results": serializers.ListField(child=serializers.DictField()),
-            },
-        ),
-    )
-    @action(
-        methods=["post"],
-        detail=True,
-        url_path="run-zone-ocr",
-        permission_classes=[IsAuthenticated],
-    )
-    def run_zone_ocr(self, request, pk=None):
-        """
-        Run zone-based OCR extraction on this document, with the given template
-        or with every template that matches it.
-        """
-        serializer = RunZoneOcrSerializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
-        template = serializer.validated_data.get("template")
-
-        document = get_object_or_404(
-            Document.objects.select_related("root_document__owner"),
-            pk=pk,
-        )
-        if not request.user.has_perm(
-            "documents.change_document",
-        ) or not has_perms_owner_aware(request.user, "change_document", document):
-            return HttpResponseForbidden("Insufficient permissions")
-
-        if template is not None and not has_perms_owner_aware(
-            request.user,
-            "view_ocrtemplate",
-            template,
-        ):
-            return HttpResponseForbidden("Insufficient permissions")
-
-        from documents.zone_ocr import get_templates_for_document
-
-        templates = (
-            [template] if template is not None else get_templates_for_document(document)
-        )
-        if not templates:
-            return Response(
-                {"status": "skipped", "reason": "no_template", "results": []},
-            )
-
-        doc_path = document.archive_path or document.source_path
-        if not doc_path or not Path(doc_path).is_file():
-            return Response(
-                {"error": "Document file not found"},
-                status=status.HTTP_404_NOT_FOUND,
-            )
-
-        from documents.zone_ocr import run_zone_extraction
-
-        results = run_zone_extraction(document, None, templates=templates)
-        return Response(
-            {"status": "completed", "results": [asdict(result) for result in results]},
-        )
-
     @extend_schema(
         operation_id="documents_delete_version",
         parameters=[
@@ -3461,40 +3388,6 @@ class ReprocessDocumentsView(DocumentOperationPermissionMixin):
         )
 
 
-@extend_schema_view(
-    post=extend_schema(
-        operation_id="documents_run_zone_ocr_bulk",
-        description="Run OCR template zone extraction on selected documents",
-        responses={
-            200: inline_serializer(
-                name="RunZoneOcrDocumentsResult",
-                fields={
-                    "result": serializers.CharField(),
-                },
-            ),
-        },
-    ),
-)
-class RunZoneOcrDocumentsView(DocumentOperationPermissionMixin):
-    serializer_class = RunZoneOcrDocumentsSerializer
-
-    def post(self, request, *args, **kwargs):
-        serializer = self.get_serializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
-        template = serializer.validated_data.get("template")
-        if template is not None and not has_perms_owner_aware(
-            request.user,
-            "view_ocrtemplate",
-            template,
-        ):
-            return HttpResponseForbidden("Insufficient permissions")
-        return self._execute_document_action(
-            method=bulk_edit.run_zone_ocr,
-            validated_data=serializer.validated_data,
-            operation_label="document zone OCR",
-        )
-
-
 @extend_schema_view(
     post=extend_schema(
         operation_id="documents_edit_pdf",
@@ -5787,141 +5680,3 @@ def serve_logo(request: HttpRequest, filename: str | None = None) -> FileRespons
         filename=logo_name,
         as_attachment=True,
     )
-
-
-class OcrTemplateViewSet(BulkPermissionMixin, PassUserMixin, ModelViewSet[OcrTemplate]):
-    """CRUD for OCR templates with zone definitions."""
-
-    model = OcrTemplate
-
-    queryset = (
-        OcrTemplate.objects.select_related("owner")
-        .prefetch_related(
-            "zones",
-            "zones__custom_field",
-        )
-        .order_by("name")
-    )
-    serializer_class = OcrTemplateSerializer
-    pagination_class = StandardPagination
-    permission_classes = (IsAuthenticated, PaperlessObjectPermissions)
-    filter_backends = (
-        OrderingFilter,
-        PermittedObjectsFilter,
-    )
-    ordering_fields = ("name",)
-
-    @action(
-        detail=False,
-        methods=["get"],
-        url_path=r"document-page-image/(?P<doc_id>[0-9]+)/(?P<page>[0-9]+)",
-    )
-    def document_page_image(self, request, doc_id=None, page=None):
-        """Render a page for the template editor's zone overlay."""
-        document = get_object_or_404(
-            Document.objects.select_related("root_document__owner"),
-            pk=doc_id,
-        )
-
-        if not has_perms_owner_aware(request.user, "view_document", document):
-            return HttpResponseForbidden("Insufficient permissions")
-
-        page_num = int(page)
-
-        if document.page_count and page_num >= document.page_count:
-            raise Http404(
-                f"Page {page_num} out of range (document has {document.page_count} pages)",
-            )
-
-        doc_path = document.archive_path or document.source_path
-        if not doc_path or not Path(doc_path).is_file():
-            raise Http404("Document file not found")
-
-        if document.mime_type and document.mime_type.startswith("image/"):
-            content = Path(doc_path).read_bytes()
-            return HttpResponse(content, content_type=document.mime_type)
-
-        with tempfile.TemporaryDirectory(dir=settings.SCRATCH_DIR) as tmp_dir:
-            output_prefix = Path(tmp_dir) / "page"
-            try:
-                subprocess.run(
-                    [
-                        "pdftoppm",
-                        "-png",
-                        "-r",
-                        "150",
-                        "-f",
-                        str(page_num + 1),
-                        "-l",
-                        str(page_num + 1),
-                        str(doc_path),
-                        str(output_prefix),
-                    ],
-                    check=True,
-                    capture_output=True,
-                    timeout=30,
-                )
-            except (subprocess.CalledProcessError, subprocess.TimeoutExpired) as error:
-                logger.warning(
-                    "Failed to render page %s of document %s: %s",
-                    page_num,
-                    document.pk,
-                    error,
-                )
-                raise Http404("Failed to render page") from error
-            except FileNotFoundError as error:
-                logger.warning("pdftoppm is not available")
-                raise Http404("Failed to render page") from error
-
-            rendered = sorted(Path(tmp_dir).glob("page-*.png"))
-            if not rendered:
-                raise Http404("No rendered page found")
-
-            content = rendered[0].read_bytes()
-
-        return HttpResponse(content, content_type="image/png")
-
-    @extend_schema(request=OcrTemplateTestSerializer)
-    @action(detail=False, methods=["post"], url_path="test-zone")
-    def test_zone(self, request):
-        """Extract an ad-hoc zone without changing the document."""
-        from documents.zone_ocr import extract_zone_preview
-
-        serializer = OcrTemplateTestSerializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
-        document = serializer.validated_data["document"]
-
-        if not has_perms_owner_aware(request.user, "view_document", document):
-            return HttpResponseForbidden("Insufficient permissions")
-
-        doc_path = document.archive_path or document.source_path
-        if not doc_path or not Path(doc_path).is_file():
-            return Response(
-                {"error": "Document file not found"},
-                status=status.HTTP_404_NOT_FOUND,
-            )
-
-        zone = OcrTemplateZone(**serializer.validated_data["zone"])
-
-        result = extract_zone_preview(
-            Path(doc_path),
-            zone,
-            zone.zone_source_width or 0,
-            zone.zone_source_height or 0,
-            document.page_count,
-        )
-
-        regex_match = None
-        if zone.validation_regex and result.get("value") is not None:
-            regex_match = (
-                safe_regex_fullmatch(zone.validation_regex, result["value"]) is not None
-            )
-
-        return Response(
-            {
-                "raw_text": result.get("raw_text"),
-                "value": result.get("value"),
-                "regex": zone.validation_regex,
-                "regex_match": regex_match,
-            },
-        )

src/documents/zone_ocr.py

@@ -1,672 +0,0 @@
-from __future__ import annotations
-
-import logging
-import math
-import re
-import string
-import subprocess
-import tempfile
-from dataclasses import dataclass
-from datetime import date
-from datetime import datetime
-from decimal import Decimal
-from decimal import InvalidOperation
-from pathlib import Path
-
-import dateparser
-import magic
-import zxingcpp
-from django.conf import settings
-from django.core.exceptions import ValidationError
-from django.db import transaction
-from PIL import Image
-
-from documents.matching import matches
-from documents.models import CustomField
-from documents.models import CustomFieldInstance
-from documents.models import Document
-from documents.models import OcrTemplate
-from documents.models import OcrTemplateZone
-from documents.permissions import permitted_object_ids
-from documents.regex import safe_regex_fullmatch
-from documents.versioning import get_root_document
-
-logger = logging.getLogger("paperless.zone_ocr")
-
-
-@dataclass(frozen=True)
-class ZoneExtraction:
-    raw_text: str | None = None
-    value: str | None = None
-
-
-@dataclass(frozen=True)
-class FieldUpdate:
-    field_name: str
-    value: object
-    custom_field: CustomField | None = None
-
-
-@dataclass
-class ZoneOcrResult:
-    template: str
-    zone: str
-    custom_field: str
-    value: object = None
-    reason: str | None = None
-
-
-def _zone_result(
-    template: OcrTemplate,
-    zone: OcrTemplateZone,
-    *,
-    value: object = None,
-    reason: str | None = None,
-) -> ZoneOcrResult:
-    if zone.target == OcrTemplateZone.TargetType.CUSTOM_FIELD:
-        label = zone.custom_field.name if zone.custom_field_id else "(no field)"
-    else:
-        label = {"title": "Title", "asn": "ASN", "created": "Created"}[zone.target]
-    return ZoneOcrResult(template.name, zone.name, label, value, reason)
-
-
-def get_templates_for_document(document: Document) -> list[OcrTemplate]:
-    """
-    The enabled templates that match the document's content and that its owner
-    can view, the same rule as matching. A version is owned through its root
-    document.
-    """
-    owner = get_root_document(document).owner
-    templates = (
-        OcrTemplate.objects.filter(
-            enabled=True,
-            id__in=permitted_object_ids(owner, OcrTemplate, "view_ocrtemplate"),
-        )
-        .order_by("name", "pk")
-        .prefetch_related("zones", "zones__custom_field")
-    )
-    return [template for template in templates if matches(template, document)]
-
-
-def run_zone_extraction(
-    document: Document,
-    original_file: Path | None,
-    templates: list[OcrTemplate] | None = None,
-) -> list[ZoneOcrResult]:
-    """
-    Run zone-based OCR extraction for the given templates, or for every
-    template that matches the document when none are given.
-    """
-    if templates is None:
-        templates = get_templates_for_document(document)
-    if not templates:
-        return []
-
-    doc_path = _resolve_doc_path(document, original_file)
-    if doc_path is None:
-        logger.warning(
-            "Zone OCR: no accessible file for document %d",
-            document.pk,
-        )
-        return [
-            _zone_result(template, zone, reason="missing_file")
-            for template in templates
-            for zone in template.zones.all()
-        ]
-
-    template_zones = [(template, list(template.zones.all())) for template in templates]
-    pages = {
-        _resolve_page_idx(zone.page, document.page_count)
-        for _, zones in template_zones
-        for zone in zones
-    }
-    if not pages:
-        return []
-    results = []
-    with tempfile.TemporaryDirectory(dir=settings.SCRATCH_DIR) as tmp_dir:
-        tmp_path = Path(tmp_dir)
-        page_images = _render_pages(doc_path, pages, tmp_path, document.page_count)
-        for template, zones in template_zones:
-            try:
-                results.extend(
-                    _process_template(document, page_images, template, zones, tmp_path),
-                )
-            except Exception:
-                # One failed template must not prevent the remaining templates from running.
-                logger.exception(
-                    "Zone OCR: error processing template '%s' for document %d",
-                    template.name,
-                    document.pk,
-                )
-                results.extend(
-                    _zone_result(template, zone, reason="template_failed")
-                    for zone in zones
-                )
-    return results
-
-
-def _resolve_doc_path(
-    document: Document,
-    original_file: Path | None,
-) -> Path | None:
-    """Prefer the archive, then the source, then the ingestion signal's file."""
-    candidates = []
-    if document.has_archive_version:
-        candidates.append(document.archive_path)
-    candidates.append(document.source_path)
-    if original_file is not None:
-        candidates.append(original_file)
-
-    for path in candidates:
-        if path is not None and Path(path).is_file():
-            return Path(path)
-    return None
-
-
-def _resolve_page_idx(page_value: int | None, page_count: int | None) -> int:
-    """Resolve a 1-based page or -1 (last page), defaulting to the first page."""
-    if page_value == -1:
-        return max((page_count or 1) - 1, 0)
-    return max((page_value or 1) - 1, 0)
-
-
-def _process_template(
-    document: Document,
-    page_images: dict[int, Path],
-    template: OcrTemplate,
-    zones: list[OcrTemplateZone],
-    tmp_path: Path,
-) -> list[ZoneOcrResult]:
-    """Extract and combine zone values before applying a template's updates."""
-    grouped: dict[str, list[tuple[OcrTemplateZone, ZoneOcrResult]]] = {}
-    results = []
-    for zone in zones:
-        page_idx = _resolve_page_idx(zone.page, document.page_count)
-        extracted = None
-        reason = "missing_page"
-        if page_idx in page_images:
-            extraction = _extract_zone(
-                page_images[page_idx],
-                zone,
-                zone.zone_source_width or template.source_width,
-                zone.zone_source_height or template.source_height,
-                tmp_path,
-            )
-            extracted = extraction.value
-            reason = None if extracted else "no_value"
-        if (
-            extracted is not None
-            and zone.validation_regex
-            and not safe_regex_fullmatch(zone.validation_regex, extracted)
-        ):
-            reason = "regex_mismatch"
-        result = _zone_result(
-            template,
-            zone,
-            value=extracted if reason is None else None,
-            reason=reason,
-        )
-        results.append(result)
-        grouped.setdefault(_field_key(zone), []).append((zone, result))
-
-    updates = []
-    combine_formats = template.combine_formats or {}
-    for key, field_zones in grouped.items():
-        accepted = [result for _, result in field_zones if result.reason is None]
-        if not accepted:
-            continue
-        value = _combine_field_value(
-            combine_formats.get(key, ""),
-            [(zone.name, result.value) for zone, result in field_zones],
-        )
-        target_zone = field_zones[0][0]
-        update = _prepare_field_update(target_zone, value) if value else None
-        if update is not None:
-            updates.append(update)
-        for result in accepted:
-            result.value = update.value if update else None
-            if update is None:
-                result.reason = (
-                    "unassigned" if key == "custom_field" else "invalid_value"
-                )
-    _apply_field_updates(document, updates)
-    return results
-
-
-def _field_key(zone: OcrTemplateZone) -> str:
-    """Use the same target keys as the editor's combination formats."""
-    target = zone.target
-    if target == OcrTemplateZone.TargetType.CUSTOM_FIELD and zone.custom_field_id:
-        return str(zone.custom_field_id)
-    return target
-
-
-def _combine_field_value(
-    fmt: str,
-    field_zones: list[tuple[str, str | None]],
-) -> str:
-    """Combine the OCR values of all zones targeting one field.
-
-    With a format string, `{Zone Name}` tokens are replaced by that zone's value
-    and literal text is kept; separators left dangling by an empty token are
-    cleaned up. Without a format, the zone values are joined in order by a space.
-    """
-    values = {name: value or "" for name, value in field_zones}
-
-    if not fmt:
-        return " ".join(value for _, value in field_zones if value).strip()
-
-    def _replace(match: re.Match) -> str:
-        return values.get(match.group(1).strip(), "")
-
-    combined = re.sub(r"\{([^{}]+)\}", _replace, fmt)
-    # Tidy up separators an empty token may have left behind.
-    combined = re.sub(r"\s{2,}", " ", combined)
-    combined = re.sub(r"([^\w\s])\s*\1+", r"\1", combined)
-    return combined.strip().strip("-/.,;:| \t")
-
-
-def _render_pages(
-    doc_path: Path,
-    pages: set[int],
-    tmp_dir: Path,
-    page_count: int | None,
-) -> dict[int, Path]:
-    """Render specific PDF pages as PNG images using pdftoppm (poppler-utils)."""
-    result: dict[int, Path] = {}
-    mime = _detect_mime(doc_path)
-
-    if mime and mime.startswith("image/"):
-        if 0 in pages:
-            result[0] = doc_path
-        return result
-
-    for actual_page in sorted(pages):
-        if actual_page < 0 or (page_count and actual_page >= page_count):
-            continue
-
-        output_prefix = tmp_dir / f"page_{actual_page}"
-        try:
-            subprocess.run(
-                [
-                    "pdftoppm",
-                    "-png",
-                    "-singlefile",
-                    "-r",
-                    "300",
-                    "-f",
-                    str(actual_page + 1),  # pdftoppm is 1-indexed
-                    "-l",
-                    str(actual_page + 1),
-                    str(doc_path),
-                    str(output_prefix),
-                ],
-                check=True,
-                capture_output=True,
-                timeout=60,
-            )
-        except subprocess.TimeoutExpired:
-            logger.error("Zone OCR: pdftoppm timed out for page %d", actual_page)
-            continue
-        except subprocess.CalledProcessError as e:
-            logger.error(
-                "Zone OCR: pdftoppm failed for page %d: %s",
-                actual_page,
-                e.stderr.decode(errors="replace") if e.stderr else str(e),
-            )
-            continue
-        except FileNotFoundError:
-            logger.error("Zone OCR: pdftoppm not found")
-            return result
-
-        rendered = output_prefix.with_suffix(".png")
-        if rendered.is_file():
-            result[actual_page] = rendered
-
-    return result
-
-
-def _crop_zone(
-    page_img: Path,
-    zone: OcrTemplateZone,
-    source_width: int,
-    source_height: int,
-) -> Image.Image | None:
-    """Crop a zone from the page image and return the PIL Image."""
-    try:
-        with Image.open(page_img) as img:
-            img_width, img_height = img.size
-            if not source_width or not source_height:
-                source_width, source_height = img.size
-
-            scale_x = img_width / source_width
-            scale_y = img_height / source_height
-
-            crop_left = int(zone.x * scale_x)
-            crop_top = int(zone.y * scale_y)
-            crop_right = int((zone.x + zone.width) * scale_x)
-            crop_bottom = int((zone.y + zone.height) * scale_y)
-
-            # Clamp to the image so an oversized zone can't crop out of bounds.
-            crop_left = max(0, min(crop_left, img_width))
-            crop_top = max(0, min(crop_top, img_height))
-            crop_right = min(crop_right, img_width)
-            crop_bottom = min(crop_bottom, img_height)
-
-            if crop_right - crop_left < 2 or crop_bottom - crop_top < 2:
-                logger.warning("Zone OCR: crop too small for zone '%s'", zone.name)
-                return None
-
-            return img.crop((crop_left, crop_top, crop_right, crop_bottom))
-    except (OSError, ValueError, Image.DecompressionBombError):
-        logger.exception("Zone OCR: crop failed for zone '%s'", zone.name)
-        return None
-
-
-def _read_barcode(cropped: Image.Image, zone_name: str) -> str | None:
-    """Read QR/barcode from a cropped image using zxingcpp."""
-    try:
-        results = zxingcpp.read_barcodes(cropped)
-        return results[0].text if results else None
-    except (RuntimeError, ValueError, TypeError):
-        logger.exception("Zone OCR: barcode read failed for zone '%s'", zone_name)
-        return None
-
-
-def _ocr_text(cropped: Image.Image, zone: OcrTemplateZone, tmp_dir: Path) -> str | None:
-    """OCR a cropped image with Tesseract."""
-    crop_path = tmp_dir / f"zone_{zone.pk}.png"
-    cropped.save(crop_path)
-
-    try:
-        proc = subprocess.run(
-            [
-                "tesseract",
-                str(crop_path),
-                "stdout",
-                "-l",
-                zone.ocr_language,
-                "--psm",
-                "6",  # Assume uniform block of text
-            ],
-            capture_output=True,
-            text=True,
-            timeout=30,
-            check=True,
-        )
-        return proc.stdout.strip() or None
-    except subprocess.TimeoutExpired:
-        logger.error("Zone OCR: Tesseract timed out for zone '%s'", zone.name)
-        return None
-    except subprocess.CalledProcessError as e:
-        logger.error(
-            "Zone OCR: Tesseract failed for zone '%s': %s",
-            zone.name,
-            e.stderr[:200] if e.stderr else str(e),
-        )
-        return None
-    except FileNotFoundError:
-        logger.error("Zone OCR: Tesseract not found")
-        return None
-
-
-def _extract_zone(
-    page_img: Path,
-    zone: OcrTemplateZone,
-    source_width: int,
-    source_height: int,
-    tmp_dir: Path,
-) -> ZoneExtraction:
-    """Read and transform a zone, retaining the text for the editor's preview."""
-    cropped = _crop_zone(page_img, zone, source_width, source_height)
-    if cropped is None:
-        return ZoneExtraction()
-
-    try:
-        raw_text = (
-            _read_barcode(cropped, zone.name)
-            if zone.transform == OcrTemplateZone.TransformType.QR_CODE
-            else _ocr_text(cropped, zone, tmp_dir)
-        )
-    finally:
-        cropped.close()
-    return ZoneExtraction(
-        raw_text=raw_text,
-        value=_apply_transform(raw_text, zone.transform, zone.date_format)
-        if raw_text
-        else None,
-    )
-
-
-def extract_zone_preview(
-    doc_path: Path,
-    zone: OcrTemplateZone,
-    source_width: int,
-    source_height: int,
-    page_count: int | None,
-) -> dict:
-    """Extract a zone without writing its value to the document."""
-    page_idx = _resolve_page_idx(zone.page, page_count)
-    with tempfile.TemporaryDirectory(dir=settings.SCRATCH_DIR) as tmp_dir:
-        tmp_path = Path(tmp_dir)
-        page_images = _render_pages(doc_path, {page_idx}, tmp_path, page_count)
-        if page_idx not in page_images:
-            return {"raw_text": None, "value": None}
-
-        result = _extract_zone(
-            page_images[page_idx],
-            zone,
-            source_width,
-            source_height,
-            tmp_path,
-        )
-        return {"raw_text": result.raw_text, "value": result.value}
-
-
-def _parse_iso_date(text: str) -> date | None:
-    match = re.search(r"\d{4}-\d{2}-\d{2}", text)
-    return date.fromisoformat(match[0]) if match else None
-
-
-def _parse_date(text: str, fmt: str = "") -> date | None:
-    """Try the zone's date format, ISO dates, then automatic date detection."""
-    if fmt:
-        try:
-            return datetime.strptime(text, fmt).date()
-        except ValueError:
-            pass
-    try:
-        iso_date = _parse_iso_date(text)
-    except ValueError:
-        iso_date = None
-    if iso_date is not None:
-        return iso_date
-    try:
-        parsed = dateparser.parse(
-            text,
-            settings={
-                "PREFER_DAY_OF_MONTH": "first",
-                "RETURN_AS_TIMEZONE_AWARE": False,
-            },
-        )
-        if parsed:
-            return parsed.date()
-    except (ValueError, OverflowError):
-        logger.debug("Zone OCR: date parsing failed")
-    return None
-
-
-def _apply_transform(text: str, transform: str, date_format: str = "") -> str:
-    """Apply post-processing transform to extracted text."""
-    text = text.strip()
-    if not text:
-        return text
-
-    if transform in ("strip", "none"):
-        return text
-    elif transform == "date":
-        parsed = _parse_date(text, date_format)
-        return parsed.isoformat() if parsed else text
-    elif transform == "uppercase":
-        return text.upper()
-    elif transform == "lowercase":
-        return text.lower()
-    elif transform == "numeric":
-        result = re.sub(r"[^\d.,\-]", "", text)
-        return result if result else text
-    elif transform == "strip_punctuation":
-        return text.strip(string.punctuation + " \t\r\n")
-    return text
-
-
-def _prepare_field_update(
-    zone: OcrTemplateZone,
-    value: str,
-) -> FieldUpdate | None:
-    """Convert extracted text and enforce the destination field's constraints."""
-    custom_field = None
-    if zone.target == OcrTemplateZone.TargetType.CUSTOM_FIELD:
-        if not zone.custom_field_id:
-            return None
-        custom_field = zone.custom_field
-        field_name = CustomFieldInstance.get_value_field_name(custom_field.data_type)
-        typed_value = _convert_value(value, custom_field.data_type)
-        model = CustomFieldInstance
-    elif zone.target == OcrTemplateZone.TargetType.TITLE:
-        field_name, typed_value = "title", value[:128]
-        model = Document
-    elif zone.target == OcrTemplateZone.TargetType.ASN:
-        digits = re.sub(r"[^\d]", "", value)
-        field_name = "archive_serial_number"
-        typed_value = int(digits) if digits else None
-        model = Document
-    elif zone.target == OcrTemplateZone.TargetType.CREATED:
-        field_name, typed_value = "created", _parse_date(value)
-        model = Document
-    else:
-        return None
-    if typed_value is None:
-        return None
-    try:
-        typed_value = model._meta.get_field(field_name).clean(typed_value, None)
-    except ValidationError:
-        logger.info("Zone OCR: invalid value for zone '%s'", zone.name)
-        return None
-    return FieldUpdate(field_name, typed_value, custom_field)
-
-
-def _apply_field_updates(document: Document, updates: list[FieldUpdate]) -> None:
-    builtin_values = {
-        update.field_name: update.value
-        for update in updates
-        if update.custom_field is None
-    }
-    original_values = {name: getattr(document, name) for name in builtin_values}
-    try:
-        with transaction.atomic():
-            for update in updates:
-                if update.custom_field is not None:
-                    CustomFieldInstance.objects.update_or_create(
-                        document=document,
-                        field=update.custom_field,
-                        defaults={update.field_name: update.value},
-                    )
-            if builtin_values:
-                for name, value in builtin_values.items():
-                    setattr(document, name, value)
-                document.save(update_fields=list(builtin_values))
-    except Exception:
-        # Database rollback does not restore attributes on the model instance.
-        for name, value in original_values.items():
-            setattr(document, name, value)
-        raise
-
-
-def _normalize_number(value: str) -> str:
-    cleaned = re.sub(r"[^\d.,\-]", "", value)
-    # When both separators occur, the rightmost one is the decimal separator.
-    if "," in cleaned and "." in cleaned:
-        if cleaned.rindex(",") > cleaned.rindex("."):
-            cleaned = cleaned.replace(".", "").replace(",", ".")
-        else:
-            cleaned = cleaned.replace(",", "")
-    else:
-        cleaned = cleaned.replace(",", ".")
-    Decimal(cleaned)
-    return cleaned
-
-
-def _convert_value(value: str, data_type: str) -> object | None:
-    """Convert an extracted OCR string to the appropriate type for the custom field."""
-    if not value:
-        return None
-
-    try:
-        if data_type in (
-            CustomField.FieldDataType.STRING,
-            CustomField.FieldDataType.URL,
-        ):
-            return value[:128]
-
-        elif data_type == CustomField.FieldDataType.LONG_TEXT:
-            return value
-
-        elif data_type == CustomField.FieldDataType.INT:
-            digits = re.sub(r"[^\d\-]", "", value)
-            digits = digits.lstrip("-")
-            if not digits:
-                return None
-            if value.strip().startswith("-"):
-                digits = "-" + digits
-            return int(digits)
-
-        elif data_type == CustomField.FieldDataType.FLOAT:
-            number = float(_normalize_number(value))
-            return number if math.isfinite(number) else None
-
-        elif data_type == CustomField.FieldDataType.DATE:
-            parsed = _parse_iso_date(value)
-            return parsed.isoformat() if parsed else None
-
-        elif data_type == CustomField.FieldDataType.MONETARY:
-            return _normalize_number(value)
-
-        elif data_type == CustomField.FieldDataType.BOOL:
-            lower = value.lower().strip()
-            if lower in ("true", "yes", "1", "ja", "oui", "si", "x"):
-                return True
-            elif lower in ("false", "no", "0", "nein", "non"):
-                return False
-            return None
-
-        else:
-            logger.debug(
-                "Zone OCR: unsupported custom field type %s for OCR extraction",
-                data_type,
-            )
-            return None
-
-    except (ValueError, InvalidOperation):
-        logger.info("Zone OCR: could not convert value to %s", data_type)
-        return None
-
-
-def _detect_mime(path: Path) -> str | None:
-    """Detect MIME type of a file."""
-    try:
-        return magic.from_file(str(path), mime=True)
-    except (OSError, magic.MagicException):
-        logger.debug("Zone OCR: magic failed for %s, falling back to extension", path)
-
-    suffix = path.suffix.lower()
-    return {
-        ".pdf": "application/pdf",
-        ".png": "image/png",
-        ".jpg": "image/jpeg",
-        ".jpeg": "image/jpeg",
-        ".tiff": "image/tiff",
-        ".tif": "image/tiff",
-        ".webp": "image/webp",
-        ".bmp": "image/bmp",
-        ".gif": "image/gif",
-    }.get(suffix)

src/locale/en_US/LC_MESSAGES/django.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: paperless-ngx\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2026-10-24 21:11+0000\n"
+"POT-Creation-Date: 2026-10-28 02:55+0000\n"
 "PO-Revision-Date: 2022-02-17 04:17\n"
 "Last-Translator: \n"
 "Language-Team: English\n"
@@ -1653,7 +1653,7 @@ msgid "workflow runs"
 msgstr ""
 
 #: documents/serialisers.py:483 documents/serialisers.py:840
-#: documents/serialisers.py:2872 documents/views.py:360 documents/views.py:2724
+#: documents/serialisers.py:2872 documents/views.py:360 documents/views.py:2730
 #: paperless_mail/serialisers.py:156
 msgid "Insufficient permissions."
 msgstr ""
@@ -1694,7 +1694,7 @@ msgstr ""
 msgid "Duplicate document identifiers are not allowed."
 msgstr ""
 
-#: documents/serialisers.py:2958 documents/views.py:4774
+#: documents/serialisers.py:2958 documents/views.py:4780
 #, python-format
 msgid "Documents not found: %(ids)s"
 msgstr ""
@@ -1949,36 +1949,36 @@ msgstr ""
 msgid "Specify only one of text, title_search, query, or more_like_id."
 msgstr ""
 
-#: documents/views.py:353 documents/views.py:2721
+#: documents/views.py:353 documents/views.py:2727
 msgid "Invalid more_like_id"
 msgstr ""
 
-#: documents/views.py:1659
+#: documents/views.py:1665
 msgid "Invalid AI configuration."
 msgstr ""
 
-#: documents/views.py:1670
+#: documents/views.py:1676
 msgid "AI backend request timed out."
 msgstr ""
 
-#: documents/views.py:1682
+#: documents/views.py:1688
 msgid "AI backend rejected the request. Check logs for details."
 msgstr ""
 
-#: documents/views.py:4790
+#: documents/views.py:4796
 #, python-format
 msgid "Insufficient permissions to share document %(id)s."
 msgstr ""
 
-#: documents/views.py:4837
+#: documents/views.py:4843
 msgid "Bundle is already being processed."
 msgstr ""
 
-#: documents/views.py:4903
+#: documents/views.py:4909
 msgid "The share link bundle is still being prepared. Please try again later."
 msgstr ""
 
-#: documents/views.py:4917
+#: documents/views.py:4923
 msgid "The share link bundle is unavailable."
 msgstr ""
 

src/paperless/urls.py

@@ -30,13 +30,11 @@ from documents.views import IndexView
 from documents.views import LogViewSet
 from documents.views import MergeDocumentsAsVersionsView
 from documents.views import MergeDocumentsView
-from documents.views import OcrTemplateViewSet
 from documents.views import PostDocumentView
 from documents.views import RemoteVersionView
 from documents.views import RemovePasswordDocumentsView
 from documents.views import ReprocessDocumentsView
 from documents.views import RotateDocumentsView
-from documents.views import RunZoneOcrDocumentsView
 from documents.views import SavedViewViewSet
 from documents.views import SearchAutoCompleteView
 from documents.views import SelectionDataView
@@ -92,7 +90,6 @@ api_router.register(r"workflow_triggers", WorkflowTriggerViewSet)
 api_router.register(r"workflow_actions", WorkflowActionViewSet)
 api_router.register(r"workflows", WorkflowViewSet)
 api_router.register(r"custom_fields", CustomFieldViewSet)
-api_router.register(r"ocr_templates", OcrTemplateViewSet)
 api_router.register(r"config", ApplicationConfigurationViewSet)
 api_router.register(r"processed_mail", ProcessedMailViewSet)
 
@@ -169,11 +166,6 @@ urlpatterns = [
                                 ReprocessDocumentsView.as_view(),
                                 name="reprocess_documents",
                             ),
-                            re_path(
-                                "^run_zone_ocr/",
-                                RunZoneOcrDocumentsView.as_view(),
-                                name="run_zone_ocr_documents",
-                            ),
                             re_path(
                                 "^rotate/",
                                 RotateDocumentsView.as_view(),

uv.lock

@@ -424,42 +424,68 @@ wheels = [
 
 [[package]]
 name = "brotli"
-version = "1.2.0"
+version = "1.2.1"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/f7/16/c92ca344d646e71a43b8bb353f0a6490d7f6e06210f8554c8f874e454285/brotli-1.2.0.tar.gz", hash = "sha256:e310f77e41941c13340a95976fe66a8a95b01e783d430eeaf7a2f87e0a57dd0a", size = 7388632, upload-time = "2025-11-05T18:39:42.86Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/cf/81/1546c983678a9b4e77cb4718eaedd1b2caf24a6cdbf1eb8775938d22aff7/brotli-1.2.1.tar.gz", hash = "sha256:02b2f7b5a83485efe448a44ddf7983def05c3bb1dcf917d4f7154070260e13de", size = 7389447, upload-time = "2026-10-22T14:00:12.66Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/7a/ef/f285668811a9e1ddb47a18cb0b437d5fc2760d537a2fe8a57875ad6f8448/brotli-1.2.0-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:15b33fe93cedc4caaff8a0bd1eb7e3dab1c61bb22a0bf5bdfdfd97cd7da79744", size = 863110, upload-time = "2025-11-05T18:38:12.978Z" },
-    { url = "https://files.pythonhosted.org/packages/50/62/a3b77593587010c789a9d6eaa527c79e0848b7b860402cc64bc0bc28a86c/brotli-1.2.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:898be2be399c221d2671d29eed26b6b2713a02c2119168ed914e7d00ceadb56f", size = 445438, upload-time = "2025-11-05T18:38:14.208Z" },
-    { url = "https://files.pythonhosted.org/packages/cd/e1/7fadd47f40ce5549dc44493877db40292277db373da5053aff181656e16e/brotli-1.2.0-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:350c8348f0e76fff0a0fd6c26755d2653863279d086d3aa2c290a6a7251135dd", size = 1534420, upload-time = "2025-11-05T18:38:15.111Z" },
-    { url = "https://files.pythonhosted.org/packages/12/8b/1ed2f64054a5a008a4ccd2f271dbba7a5fb1a3067a99f5ceadedd4c1d5a7/brotli-1.2.0-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:2e1ad3fda65ae0d93fec742a128d72e145c9c7a99ee2fcd667785d99eb25a7fe", size = 1632619, upload-time = "2025-11-05T18:38:16.094Z" },
-    { url = "https://files.pythonhosted.org/packages/89/5a/7071a621eb2d052d64efd5da2ef55ecdac7c3b0c6e4f9d519e9c66d987ef/brotli-1.2.0-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:40d918bce2b427a0c4ba189df7a006ac0c7277c180aee4617d99e9ccaaf59e6a", size = 1426014, upload-time = "2025-11-05T18:38:17.177Z" },
-    { url = "https://files.pythonhosted.org/packages/26/6d/0971a8ea435af5156acaaccec1a505f981c9c80227633851f2810abd252a/brotli-1.2.0-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2a7f1d03727130fc875448b65b127a9ec5d06d19d0148e7554384229706f9d1b", size = 1489661, upload-time = "2025-11-05T18:38:18.41Z" },
-    { url = "https://files.pythonhosted.org/packages/f3/75/c1baca8b4ec6c96a03ef8230fab2a785e35297632f402ebb1e78a1e39116/brotli-1.2.0-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:9c79f57faa25d97900bfb119480806d783fba83cd09ee0b33c17623935b05fa3", size = 1599150, upload-time = "2025-11-05T18:38:19.792Z" },
-    { url = "https://files.pythonhosted.org/packages/0d/1a/23fcfee1c324fd48a63d7ebf4bac3a4115bdb1b00e600f80f727d850b1ae/brotli-1.2.0-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:844a8ceb8483fefafc412f85c14f2aae2fb69567bf2a0de53cdb88b73e7c43ae", size = 1493505, upload-time = "2025-11-05T18:38:20.913Z" },
-    { url = "https://files.pythonhosted.org/packages/11/ee/b0a11ab2315c69bb9b45a2aaed022499c9c24a205c3a49c3513b541a7967/brotli-1.2.0-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:35d382625778834a7f3061b15423919aa03e4f5da34ac8e02c074e4b75ab4f84", size = 861543, upload-time = "2025-11-05T18:38:24.183Z" },
-    { url = "https://files.pythonhosted.org/packages/e1/2f/29c1459513cd35828e25531ebfcbf3e92a5e49f560b1777a9af7203eb46e/brotli-1.2.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:7a61c06b334bd99bc5ae84f1eeb36bfe01400264b3c352f968c6e30a10f9d08b", size = 444288, upload-time = "2025-11-05T18:38:25.139Z" },
-    { url = "https://files.pythonhosted.org/packages/3d/6f/feba03130d5fceadfa3a1bb102cb14650798c848b1df2a808356f939bb16/brotli-1.2.0-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:acec55bb7c90f1dfc476126f9711a8e81c9af7fb617409a9ee2953115343f08d", size = 1528071, upload-time = "2025-11-05T18:38:26.081Z" },
-    { url = "https://files.pythonhosted.org/packages/2b/38/f3abb554eee089bd15471057ba85f47e53a44a462cfce265d9bf7088eb09/brotli-1.2.0-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:260d3692396e1895c5034f204f0db022c056f9e2ac841593a4cf9426e2a3faca", size = 1626913, upload-time = "2025-11-05T18:38:27.284Z" },
-    { url = "https://files.pythonhosted.org/packages/03/a7/03aa61fbc3c5cbf99b44d158665f9b0dd3d8059be16c460208d9e385c837/brotli-1.2.0-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:072e7624b1fc4d601036ab3f4f27942ef772887e876beff0301d261210bca97f", size = 1419762, upload-time = "2025-11-05T18:38:28.295Z" },
-    { url = "https://files.pythonhosted.org/packages/21/1b/0374a89ee27d152a5069c356c96b93afd1b94eae83f1e004b57eb6ce2f10/brotli-1.2.0-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:adedc4a67e15327dfdd04884873c6d5a01d3e3b6f61406f99b1ed4865a2f6d28", size = 1484494, upload-time = "2025-11-05T18:38:29.29Z" },
-    { url = "https://files.pythonhosted.org/packages/cf/57/69d4fe84a67aef4f524dcd075c6eee868d7850e85bf01d778a857d8dbe0a/brotli-1.2.0-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:7a47ce5c2288702e09dc22a44d0ee6152f2c7eda97b3c8482d826a1f3cfc7da7", size = 1593302, upload-time = "2025-11-05T18:38:30.639Z" },
-    { url = "https://files.pythonhosted.org/packages/d5/3b/39e13ce78a8e9a621c5df3aeb5fd181fcc8caba8c48a194cd629771f6828/brotli-1.2.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:af43b8711a8264bb4e7d6d9a6d004c3a2019c04c01127a868709ec29962b6036", size = 1487913, upload-time = "2025-11-05T18:38:31.618Z" },
-    { url = "https://files.pythonhosted.org/packages/6c/d4/4ad5432ac98c73096159d9ce7ffeb82d151c2ac84adcc6168e476bb54674/brotli-1.2.0-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:9e5825ba2c9998375530504578fd4d5d1059d09621a02065d1b6bfc41a8e05ab", size = 861523, upload-time = "2025-11-05T18:38:34.67Z" },
-    { url = "https://files.pythonhosted.org/packages/91/9f/9cc5bd03ee68a85dc4bc89114f7067c056a3c14b3d95f171918c088bf88d/brotli-1.2.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:0cf8c3b8ba93d496b2fae778039e2f5ecc7cff99df84df337ca31d8f2252896c", size = 444289, upload-time = "2025-11-05T18:38:35.6Z" },
-    { url = "https://files.pythonhosted.org/packages/2e/b6/fe84227c56a865d16a6614e2c4722864b380cb14b13f3e6bef441e73a85a/brotli-1.2.0-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c8565e3cdc1808b1a34714b553b262c5de5fbda202285782173ec137fd13709f", size = 1528076, upload-time = "2025-11-05T18:38:36.639Z" },
-    { url = "https://files.pythonhosted.org/packages/55/de/de4ae0aaca06c790371cf6e7ee93a024f6b4bb0568727da8c3de112e726c/brotli-1.2.0-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:26e8d3ecb0ee458a9804f47f21b74845cc823fd1bb19f02272be70774f56e2a6", size = 1626880, upload-time = "2025-11-05T18:38:37.623Z" },
-    { url = "https://files.pythonhosted.org/packages/5f/16/a1b22cbea436642e071adcaf8d4b350a2ad02f5e0ad0da879a1be16188a0/brotli-1.2.0-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:67a91c5187e1eec76a61625c77a6c8c785650f5b576ca732bd33ef58b0dff49c", size = 1419737, upload-time = "2025-11-05T18:38:38.729Z" },
-    { url = "https://files.pythonhosted.org/packages/46/63/c968a97cbb3bdbf7f974ef5a6ab467a2879b82afbc5ffb65b8acbb744f95/brotli-1.2.0-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:4ecdb3b6dc36e6d6e14d3a1bdc6c1057c8cbf80db04031d566eb6080ce283a48", size = 1484440, upload-time = "2025-11-05T18:38:39.916Z" },
-    { url = "https://files.pythonhosted.org/packages/06/9d/102c67ea5c9fc171f423e8399e585dabea29b5bc79b05572891e70013cdd/brotli-1.2.0-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:3e1b35d56856f3ed326b140d3c6d9db91740f22e14b06e840fe4bb1923439a18", size = 1593313, upload-time = "2025-11-05T18:38:41.24Z" },
-    { url = "https://files.pythonhosted.org/packages/9e/4a/9526d14fa6b87bc827ba1755a8440e214ff90de03095cacd78a64abe2b7d/brotli-1.2.0-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:54a50a9dad16b32136b2241ddea9e4df159b41247b2ce6aac0b3276a66a8f1e5", size = 1487945, upload-time = "2025-11-05T18:38:42.277Z" },
-    { url = "https://files.pythonhosted.org/packages/17/e1/298c2ddf786bb7347a1cd71d63a347a79e5712a7c0cba9e3c3458ebd976f/brotli-1.2.0-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:6c12dad5cd04530323e723787ff762bac749a7b256a5bece32b2243dd5c27b21", size = 863080, upload-time = "2025-11-05T18:38:45.503Z" },
-    { url = "https://files.pythonhosted.org/packages/84/0c/aac98e286ba66868b2b3b50338ffbd85a35c7122e9531a73a37a29763d38/brotli-1.2.0-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:3219bd9e69868e57183316ee19c84e03e8f8b5a1d1f2667e1aa8c2f91cb061ac", size = 445453, upload-time = "2025-11-05T18:38:46.433Z" },
-    { url = "https://files.pythonhosted.org/packages/ec/f1/0ca1f3f99ae300372635ab3fe2f7a79fa335fee3d874fa7f9e68575e0e62/brotli-1.2.0-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:963a08f3bebd8b75ac57661045402da15991468a621f014be54e50f53a58d19e", size = 1528168, upload-time = "2025-11-05T18:38:47.371Z" },
-    { url = "https://files.pythonhosted.org/packages/d6/a6/2ebfc8f766d46df8d3e65b880a2e220732395e6d7dc312c1e1244b0f074a/brotli-1.2.0-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.manylinux_2_28_ppc64le.whl", hash = "sha256:9322b9f8656782414b37e6af884146869d46ab85158201d82bab9abbcb971dc7", size = 1627098, upload-time = "2025-11-05T18:38:48.385Z" },
-    { url = "https://files.pythonhosted.org/packages/f3/2f/0976d5b097ff8a22163b10617f76b2557f15f0f39d6a0fe1f02b1a53e92b/brotli-1.2.0-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:cf9cba6f5b78a2071ec6fb1e7bd39acf35071d90a81231d67e92d637776a6a63", size = 1419861, upload-time = "2025-11-05T18:38:49.372Z" },
-    { url = "https://files.pythonhosted.org/packages/9c/97/d76df7176a2ce7616ff94c1fb72d307c9a30d2189fe877f3dd99af00ea5a/brotli-1.2.0-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:7547369c4392b47d30a3467fe8c3330b4f2e0f7730e45e3103d7d636678a808b", size = 1484594, upload-time = "2025-11-05T18:38:50.655Z" },
-    { url = "https://files.pythonhosted.org/packages/d3/93/14cf0b1216f43df5609f5b272050b0abd219e0b54ea80b47cef9867b45e7/brotli-1.2.0-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:fc1530af5c3c275b8524f2e24841cbe2599d74462455e9bae5109e9ff42e9361", size = 1593455, upload-time = "2025-11-05T18:38:51.624Z" },
-    { url = "https://files.pythonhosted.org/packages/b3/73/3183c9e41ca755713bdf2cc1d0810df742c09484e2e1ddd693bee53877c1/brotli-1.2.0-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:d2d085ded05278d1c7f65560aae97b3160aeb2ea2c0b3e26204856beccb60888", size = 1488164, upload-time = "2025-11-05T18:38:53.079Z" },
+    { url = "https://files.pythonhosted.org/packages/63/f5/213512faee9562f069cc0d228a8dce8097d5517e15fdf48b8f05d53e6b55/brotli-1.2.1-cp311-cp311-macosx_10_9_universal2.whl", hash = "sha256:970a3dbce807a3f5c2b8232036052bade01e4bc92ade37d73ea3750418307fa1", size = 863168, upload-time = "2026-10-22T13:57:38.57Z" },
+    { url = "https://files.pythonhosted.org/packages/3e/5a/7b31d12915cbd1b7bdf5a0ba290159290d7af5904bda55a17770cae89f00/brotli-1.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:59ec359a56f44277ad424fb4b7cf1a0ae2fd855b35ba8f15dcfbcabb3fb51aeb", size = 443278, upload-time = "2026-10-22T13:57:40.157Z" },
+    { url = "https://files.pythonhosted.org/packages/66/f3/49499c9b368dcd65d6bb64c799ff790ae8ecca28011b40a884c3473be3d9/brotli-1.2.1-cp311-cp311-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:f51bca8fcac4266519533698c316f3d23340768a8e57c4796c9f6e0a4f353807", size = 1248964, upload-time = "2026-10-22T13:57:41.327Z" },
+    { url = "https://files.pythonhosted.org/packages/3b/f7/d98bcbc94b10c17bfc109157612b58481a383003e7df90925ff4d7534aaa/brotli-1.2.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:b0faa0b9af9367748388345d5b12f6add2a9cf896481e72910e88fbfe14ecd54", size = 1409293, upload-time = "2026-10-22T13:57:42.5Z" },
+    { url = "https://files.pythonhosted.org/packages/95/d6/910649b3ea76e50885a2f67f238d0aedc5d435627b24150cef2792c3c81b/brotli-1.2.1-cp311-cp311-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:eaa5178a4c1fe619eff9cbe93b57919d426332e219870301d4ef5fc09a522ae9", size = 1430285, upload-time = "2026-10-22T13:57:43.725Z" },
+    { url = "https://files.pythonhosted.org/packages/71/7e/c1d314406ce47a39180fc66114681d9ac10c2c667e14e4dc1a5e5089f4fb/brotli-1.2.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:6b3c3d5794212a54434b4856f808f7bdf7ad48eacadaadb5b2346fc9a639365a", size = 1426895, upload-time = "2026-10-22T13:57:44.984Z" },
+    { url = "https://files.pythonhosted.org/packages/81/20/cee575e524f9908b406fec81a2505127f65efaa8447655d3061be941e4a0/brotli-1.2.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:2df1678c2c25db2f669c613fe8b4e587d0dd24c6acf7746bad13d6e87e4b051d", size = 1491281, upload-time = "2026-10-22T13:57:46.218Z" },
+    { url = "https://files.pythonhosted.org/packages/58/16/6b86ed3e2e475b9d8418d1e88bc1719197934df74f7b5142f9db5a86b4dd/brotli-1.2.1-cp311-cp311-musllinux_1_2_i686.whl", hash = "sha256:c4b68ce579b05c66bb18a16356a4f713bebac2446ee498dd8bb1ecab3da77b89", size = 1283748, upload-time = "2026-10-22T13:57:47.398Z" },
+    { url = "https://files.pythonhosted.org/packages/1e/ba/ca87fec021a63ad4f7f5e01d456c8b0d63defb11862feff6f22fd6238507/brotli-1.2.1-cp311-cp311-musllinux_1_2_ppc64le.whl", hash = "sha256:f34405292fca45cd77419005c1ea35ba1c03eaff9042afe76d6fe189fe474669", size = 1599415, upload-time = "2026-10-22T13:57:48.577Z" },
+    { url = "https://files.pythonhosted.org/packages/ca/fe/6cdf401cc44a2c32d280cb58f032c071f15afd939c2f8579b0a28449065c/brotli-1.2.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4d47a9f0ba5ee608f3f3a9c942dcd244443068ae5b0d90183dd396dea02236e4", size = 1494419, upload-time = "2026-10-22T13:57:49.783Z" },
+    { url = "https://files.pythonhosted.org/packages/34/5d/dcf82117cbb506cfe0b75a00c34f2f7e850e5d933d80c0e50e2a191f1fee/brotli-1.2.1-cp312-cp312-macosx_10_13_universal2.whl", hash = "sha256:3975fb11f63e212b87a087e4a910187b522c6969a4989ca362d6f85f9dc36acd", size = 861663, upload-time = "2026-10-22T13:57:54.196Z" },
+    { url = "https://files.pythonhosted.org/packages/98/c3/59d6445882214a47eab34e763aacc8dce18c4e7f9c5e2d9c95df9a7f7a3d/brotli-1.2.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:de499e2492c8106a5e163d3cf5b6726e2797f9234cfbc6055fbb5f9d8f198f39", size = 442271, upload-time = "2026-10-22T13:57:55.284Z" },
+    { url = "https://files.pythonhosted.org/packages/87/7b/55b0c895c17dbe747b63e442d2c3a163cc838d116bf5560414a13cc284c9/brotli-1.2.1-cp312-cp312-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:1f65a91f3576949793b8720b12a47e7ea06debc970a2da6d54ff8458053e2109", size = 1242808, upload-time = "2026-10-22T13:57:56.675Z" },
+    { url = "https://files.pythonhosted.org/packages/7a/75/d8f2a81748b60733e8b03afd4bc1b70d3fb74a235b3b13dff0b2978e7f87/brotli-1.2.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:875975f91870682cca4371260522ad3f22d636e845b5c5355c52bc045c0f75c8", size = 1402417, upload-time = "2026-10-22T13:57:57.827Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/b2/7addcc2c4965d0946e38a416b60af89700d54141845447f03fe4bff0293c/brotli-1.2.1-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:c3f667dc60a875b12a5ecd7828062ccd97c0fb79c4adc6c8699d23d5ff2af7e1", size = 1424422, upload-time = "2026-10-22T13:57:59.285Z" },
+    { url = "https://files.pythonhosted.org/packages/b6/cc/b0b5b6b1ff4544bec3a702d5ad2e0badf22db296d16277a6ee59dabaffdc/brotli-1.2.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:4b9dd0173ca5e01d1eb307d3c184fe8c09bdc168ede560889b1018d216d38c61", size = 1420478, upload-time = "2026-10-22T13:58:00.484Z" },
+    { url = "https://files.pythonhosted.org/packages/42/dd/1d9bdb8aa35c14ba45ce208768eb977810446b7537d9d418c2bcaae2ed20/brotli-1.2.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:9307679936e86d7773eadfa444a4a4ee80f6f45230e93379875f4a6897a09a2b", size = 1485966, upload-time = "2026-10-22T13:58:01.715Z" },
+    { url = "https://files.pythonhosted.org/packages/4d/8e/86e64fc403888244e090a7a3d9fb35f6d6bb2219e789fc88064065464a3c/brotli-1.2.1-cp312-cp312-musllinux_1_2_i686.whl", hash = "sha256:fb5df75d1b1c42d997adbb39eac61f2cdb48efa26304a0cb9c0b757c9bc20732", size = 1279161, upload-time = "2026-10-22T13:58:02.933Z" },
+    { url = "https://files.pythonhosted.org/packages/ef/ba/cbfa7d264d4cec16d5951071f1d04028e7024119c65a7bd909e77cafc9e6/brotli-1.2.1-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:d6ef0035b6ae338a46951c144081c61fb044f4c1eb6d20acc5ba6277f666a4c0", size = 1594070, upload-time = "2026-10-22T13:58:04.421Z" },
+    { url = "https://files.pythonhosted.org/packages/4d/4d/7abc13404dde1665d2fe3cde3385e06d5f81aed0242c23979acc3f552afd/brotli-1.2.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:338856ae9ff63af4fc3dbbd6184a7276a6ae83df2243562e86e5ee5cf980cce7", size = 1489507, upload-time = "2026-10-22T13:58:05.591Z" },
+    { url = "https://files.pythonhosted.org/packages/f0/85/d74a573b92ba449960eb088ce87dcb61a9dc6a0c5a7ba8d104ae180e64c3/brotli-1.2.1-cp313-cp313-macosx_10_13_universal2.whl", hash = "sha256:a84e0ae14d1efe782a9f143021c4e01d5ed986a140fe5070505cc5978eaf0592", size = 861657, upload-time = "2026-10-22T13:58:10.392Z" },
+    { url = "https://files.pythonhosted.org/packages/ca/bd/848b55fbd96fa1ce9f534aa39c930f864dbf224282f4a3808c0d35ea2819/brotli-1.2.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:c5302747f969d5ec925810176f7697712a3fa2ea0fae0c7a85aa4ad9325247fd", size = 442252, upload-time = "2026-10-22T13:58:11.647Z" },
+    { url = "https://files.pythonhosted.org/packages/40/41/95d5e6774cb037851001038484bcf98b3af203664fe78d29dd03ece317e7/brotli-1.2.1-cp313-cp313-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:7ec678c52c3ef5e37482a094d109c04cf9e4a0e2923dd1e0fbddb4bf133a976e", size = 1242773, upload-time = "2026-10-22T13:58:13.182Z" },
+    { url = "https://files.pythonhosted.org/packages/8b/ad/0942abad71d8b2aabd21472efa5be31ab0be31f98271d58767b9797eec82/brotli-1.2.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:b5b458950312830913f837e179ce9221000ab7a20b4e42d7b48c1fcd79140de1", size = 1402440, upload-time = "2026-10-22T13:58:14.513Z" },
+    { url = "https://files.pythonhosted.org/packages/a3/53/2f7e666e61a1419d527904b6018a711f10650a851e7767358abf2919625e/brotli-1.2.1-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:f37ccd159dae35d4914651d57142c8077aa67ab7e3ffef690b00bcb7a7dbd8e6", size = 1424432, upload-time = "2026-10-22T13:58:15.789Z" },
+    { url = "https://files.pythonhosted.org/packages/65/85/4c57c3cd2eee42878677b4943086e6b36cefc50214a5447028268045ce63/brotli-1.2.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:264fd5b200f6f6170cb551a4b9fcaabf8aa846ddaefe72db4d5f49f9d3743df9", size = 1420480, upload-time = "2026-10-22T13:58:17.007Z" },
+    { url = "https://files.pythonhosted.org/packages/8f/f7/65e75560e20d522db1f0c75a1b2612c6ebd542ff9df17b8920cdbe4cde68/brotli-1.2.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:1329c80daa60752f1d94f507479504921e358e71746c5fce9b55b3d51ac038bc", size = 1485998, upload-time = "2026-10-22T13:58:18.422Z" },
+    { url = "https://files.pythonhosted.org/packages/5d/2a/6cc0cfc4170bd72f6fc0aef11984e7c583ecf0a7fec563bb4292c0d50e15/brotli-1.2.1-cp313-cp313-musllinux_1_2_i686.whl", hash = "sha256:77ef5882c5318ffc3dd94c6abc6a8f1ec2af75d66522319f1a250a07d53d0546", size = 1279199, upload-time = "2026-10-22T13:58:19.709Z" },
+    { url = "https://files.pythonhosted.org/packages/66/36/97f3eefc9295ce8d87b568433d38e0ca3345b82571341196817c96b2ca50/brotli-1.2.1-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:6bd29ab84bb8972370cacd310e8a91651f54476d01de1cd1a4cf0bece5eb25e1", size = 1594118, upload-time = "2026-10-22T13:58:20.857Z" },
+    { url = "https://files.pythonhosted.org/packages/03/61/687b36bd6b714270ff3d7ff96df6199336abc26c1fa98da276d9776d75b7/brotli-1.2.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:ed8e452f5cb34f59f4861d50d029c6203b5f8f11c13d4186264392a64b4def8d", size = 1489530, upload-time = "2026-10-22T13:58:22Z" },
+    { url = "https://files.pythonhosted.org/packages/af/dd/641dd6072ea8c5e0ef7d1f8dc02149b4b0b77ef68fe12fc08b08320980d5/brotli-1.2.1-cp314-cp314-macosx_10_15_universal2.whl", hash = "sha256:b8b2fc7901b31d5885f26521cf2d74feccdc126a272ba1d879b7545bb25468bc", size = 863184, upload-time = "2026-10-22T13:58:27.201Z" },
+    { url = "https://files.pythonhosted.org/packages/b2/b8/3c4a50dc10f098a022519042eab84f11ef8c29abb9270fca76086ac392c3/brotli-1.2.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:de1bf30d819809a964060356032e6670c9923644666afaaf3d1719d05ddb844e", size = 443276, upload-time = "2026-10-22T13:58:28.47Z" },
+    { url = "https://files.pythonhosted.org/packages/b1/a1/5ef931a404de2c61b2cd775e70b1652ff3f4d434f0589da22efbee590f4a/brotli-1.2.1-cp314-cp314-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:ed62c15ce5e8b975b2710a0f7c8bb953cbffb472fccb05055be6afcba9520c19", size = 1243026, upload-time = "2026-10-22T13:58:29.934Z" },
+    { url = "https://files.pythonhosted.org/packages/11/95/54e7278ee3fc589a6ac3a9bc191b5412542949411f0b38c56614d0f51282/brotli-1.2.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:a3942e2d365f009e5e7839114fa315e1a2bcfea12b52064a28f1a7281862a2a7", size = 1402517, upload-time = "2026-10-22T13:58:31.231Z" },
+    { url = "https://files.pythonhosted.org/packages/4d/db/e065253a23a09d97dc7bd8cb47194a85479d71be35a51b5c575ae5095ebe/brotli-1.2.1-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:6532d2c58018121a9eb5882656cf862cdbbd853600cb5fbccac59bcff14f66b0", size = 1424572, upload-time = "2026-10-22T13:58:32.468Z" },
+    { url = "https://files.pythonhosted.org/packages/c4/07/8948582ce173e8e43cea9fadb8c3c3ea94800fb9814119c9239c1ae6c797/brotli-1.2.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:a998857af4fcd19920bdf5f30f0f1a23f38472a703d33e49168cd4fd32438377", size = 1420557, upload-time = "2026-10-22T13:58:34.1Z" },
+    { url = "https://files.pythonhosted.org/packages/c0/d4/65073a06d6356a8f60b4c6ce0c3ade206d1118b8b8705b548f7b72ed549a/brotli-1.2.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:f352f797b1477c46a20e45f4cbc3a0e258e61963c8ae8f79f84a7bfb4195b37e", size = 1486209, upload-time = "2026-10-22T13:58:35.331Z" },
+    { url = "https://files.pythonhosted.org/packages/5a/19/8663beee29665f6fdf520b9c7ea333e0e930952176092be24c4c8bd8f791/brotli-1.2.1-cp314-cp314-musllinux_1_2_i686.whl", hash = "sha256:be371af72af54b6e508b68a7a87768e05b7e13023f6c82a3e3f5e4d0e829e186", size = 1279217, upload-time = "2026-10-22T13:58:36.719Z" },
+    { url = "https://files.pythonhosted.org/packages/bb/a6/3851ec19707a1610412ecf4f057d7c1b5acbb8f8b211494a70e1f451ccf6/brotli-1.2.1-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:dca1bf90b3a6a7440904f128464eb95bf46ac9da7ad3c85912483dd83128fd95", size = 1594292, upload-time = "2026-10-22T13:58:38.115Z" },
+    { url = "https://files.pythonhosted.org/packages/8d/13/6bc9d4cb30fb0a475cd149c2075b9f63b93257a84ff70d0783a403f4b015/brotli-1.2.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:e4a7be59d374c445766fa4ac066a04d19a757365ae00a950053d0ab7388d1039", size = 1489719, upload-time = "2026-10-22T13:58:39.365Z" },
+    { url = "https://files.pythonhosted.org/packages/a2/72/85ea89c1088673a297e8b652cf0080668812144d5525db6512eadddf9d19/brotli-1.2.1-cp315-cp315-macosx_10_15_universal2.whl", hash = "sha256:eea17e3cdc6f9aecffe15fe9a9eeba8e8c049a5d347de1561eed2240cdf35a79", size = 863002, upload-time = "2026-10-22T13:58:44.325Z" },
+    { url = "https://files.pythonhosted.org/packages/81/6a/bd4db4ef0c4d083d8a2e5a1d0b20239b186f261e72b14a9a0ec91c078e92/brotli-1.2.1-cp315-cp315-macosx_10_15_x86_64.whl", hash = "sha256:761db18dc32b24d00fbedca1013089eb3470053cefa8492bd9c07b11102d72bf", size = 443263, upload-time = "2026-10-22T13:58:45.474Z" },
+    { url = "https://files.pythonhosted.org/packages/79/1a/08635be453d523474fdfce81f588583a4e8049c75c04df849b5a278bf027/brotli-1.2.1-cp315-cp315-manylinux1_i686.manylinux2014_i686.manylinux_2_17_i686.manylinux_2_5_i686.whl", hash = "sha256:035f3bf861328d8b7fcb61f4a976f9913027158e5666116733d59ffc65f2745e", size = 1244379, upload-time = "2026-10-22T13:58:46.615Z" },
+    { url = "https://files.pythonhosted.org/packages/3b/94/52f2facc5ae118a68c4f0e715e03c9f854507a359608804d7de2dfe8d603/brotli-1.2.1-cp315-cp315-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:aa32b51702a0b6e9fddc0d1dc66cb6ed6af112f1bba0cac2be9039546a862b5c", size = 1404133, upload-time = "2026-10-22T13:58:47.756Z" },
+    { url = "https://files.pythonhosted.org/packages/1e/9b/768635c710b684574da55e12bcdbe36419fd8bf6cb97e01c72a4593f9747/brotli-1.2.1-cp315-cp315-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:810aea5958d6a2d92593fd27218df528644aeb72cc7f6d401e650752d6c98949", size = 1424875, upload-time = "2026-10-22T13:58:48.912Z" },
+    { url = "https://files.pythonhosted.org/packages/46/39/7b7d53d7cea61f35f6b52ea149804523d01e532bf26017eed4351d82a7ad/brotli-1.2.1-cp315-cp315-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:f00ff4b56caf151365c77988eb85a4a71eb26fe63047d4084d5614e06d65e3cf", size = 1425345, upload-time = "2026-10-22T13:58:50.253Z" },
+    { url = "https://files.pythonhosted.org/packages/cb/5e/652c788a4da5c6415c7ae31382626ba870020c9280e0f9be1a6dfec80261/brotli-1.2.1-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:dafaeb38712f99e5c31ad7f02c366f1ddd3792921b94066015f8c49f197163b0", size = 1487925, upload-time = "2026-10-22T13:58:51.593Z" },
+    { url = "https://files.pythonhosted.org/packages/85/c9/1b7753d02c106ff70b3d88056586ed7c2fe329d2aa5707cdaebe90372942/brotli-1.2.1-cp315-cp315-musllinux_1_2_i686.whl", hash = "sha256:972e34c5cbbfe6c90358bfae38edae1a29d3456e920da5a4664c98f221ee4df8", size = 1276526, upload-time = "2026-10-22T13:58:53.142Z" },
+    { url = "https://files.pythonhosted.org/packages/a5/5f/6ae3e85bfb7a3f4711cea5a1b92d4377fddf1319a666cda213cc83b6c040/brotli-1.2.1-cp315-cp315-musllinux_1_2_ppc64le.whl", hash = "sha256:59ca34c7a83d7a3b842247183c426f891a95a8f57db41b7aac92195c51e8a83a", size = 1594681, upload-time = "2026-10-22T13:58:54.571Z" },
+    { url = "https://files.pythonhosted.org/packages/8a/52/2808406d83e5462c086d69dbebb892f4ed78d2eb4b6755ea4b9e58357e3b/brotli-1.2.1-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:90bd49511341dd7c40bb3acaa97cd8b9e5df4821a5714b842117e7069c7cc03e", size = 1486968, upload-time = "2026-10-22T13:58:56.008Z" },
+    { url = "https://files.pythonhosted.org/packages/7f/eb/803fb4003fc74fb7202eade0832057729837c0929b690e7f691c1778f230/brotli-1.2.1-pp311-pypy311_pp80-macosx_10_15_x86_64.whl", hash = "sha256:93269f11303fc9a3e3990b57e0533f41949546156d9f0e535571f313032563cc", size = 416747, upload-time = "2026-10-22T13:59:59.612Z" },
+    { url = "https://files.pythonhosted.org/packages/60/fc/48f827dda08844d6313a97c6c34b7f0cffc8310bf4f2cd4d98fae6c198fb/brotli-1.2.1-pp311-pypy311_pp80-macosx_11_0_arm64.whl", hash = "sha256:87492842770cd772fce25e9cd279913eaea6c55a91a960b6302aedfa2ec7b152", size = 399671, upload-time = "2026-10-22T14:00:01.176Z" },
+    { url = "https://files.pythonhosted.org/packages/c3/2b/21aa1de7b7b5739f8d9b55c12100de794c42b10abd1a83da1a99072e2b46/brotli-1.2.1-pp311-pypy311_pp80-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f06dd6a30438692d48c0d54de4b659cd55a57c2c2f6591c969c98d0a5523ab07", size = 404664, upload-time = "2026-10-22T14:00:02.357Z" },
+    { url = "https://files.pythonhosted.org/packages/f1/22/bce8a2f6af49807728b4d3394a67190032b37170be0a9f870c98b0e1e4a6/brotli-1.2.1-pp311-pypy311_pp80-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:fb6a4d400aa531c73a718b337116fad77ba8dc6df34fa615c808bfc55ffb19ca", size = 398822, upload-time = "2026-10-22T14:00:03.441Z" },
+    { url = "https://files.pythonhosted.org/packages/f5/29/62f7de3d08c53b09fe67b24b024b13ce3ec088fe0dd6940064719e61eba5/brotli-1.2.1-pp312-pypy312_pp80-macosx_10_15_x86_64.whl", hash = "sha256:5f3da70516b1bd1b2aa183ec4ab5c02dfc6ad5c1184d47bb65ade25e710439b6", size = 416714, upload-time = "2026-10-22T14:00:06.054Z" },
+    { url = "https://files.pythonhosted.org/packages/e2/66/3da6c4e928c55fc85f4cdaf0cbd41ebb1639ae70c71f9f26183818460d54/brotli-1.2.1-pp312-pypy312_pp80-macosx_11_0_arm64.whl", hash = "sha256:11aec6ea5c20cad61a33302e06baa48b0243bfa4d173bc2985dabd047e367d08", size = 399657, upload-time = "2026-10-22T14:00:07.095Z" },
+    { url = "https://files.pythonhosted.org/packages/85/9d/626bb730a70507151667d950c9214003427b962a3876142c07ba52d96391/brotli-1.2.1-pp312-pypy312_pp80-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:00a50d063aae2e69c2eb28818ccf6dc3e51f2ea5b74e3c2082a47943ee23f399", size = 404727, upload-time = "2026-10-22T14:00:08.438Z" },
+    { url = "https://files.pythonhosted.org/packages/bb/34/fb0bbe56d822ee4c75b2383e518bdd579327f18f1cfedf1d779a585df01b/brotli-1.2.1-pp312-pypy312_pp80-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:37de1818ce469b3c37324c89d4d4dbb5e64461d9dc01c16f8abb2a17c465b132", size = 398927, upload-time = "2026-10-22T14:00:09.739Z" },
 ]
 
 [[package]]
@@ -988,15 +1014,15 @@ wheels = [
 
 [[package]]
 name = "django-allauth"
-version = "65.16.1"
+version = "65.20.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "asgiref" },
     { name = "django" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/3d/df/357187dfff18c7783e4911827a6c69437e290d7259a32a99c23fcd85997f/django_allauth-65.16.1.tar.gz", hash = "sha256:4425ac3088541c4c54983e16e08f6e3eb9f438dc1b1009534fa51c8bb739ed31", size = 2232835, upload-time = "2026-04-17T18:53:59.475Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/8a/98/a343df4b6230e483cd0437a9265f9acd365e4639d8750c17021455f94a2c/django_allauth-65.20.1.tar.gz", hash = "sha256:954cf5cb39e7793e25420f0352b77c74c9a68ab36ae2c8b9d783c2d710650f19", size = 2304239, upload-time = "2026-10-20T19:59:25.752Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/ad/58/d95b6c3088d83697bfd93782ee57bc6a6462e41eb19121a947b8a015396a/django_allauth-65.16.1-py3-none-any.whl", hash = "sha256:e49df24056bf37c44e56aaad1e51f78994b7d175bc3476d65e8f8f58390a8ce8", size = 2051868, upload-time = "2026-04-17T18:54:12.032Z" },
+    { url = "https://files.pythonhosted.org/packages/d8/9f/0ea3886dd6310ddfb44d20a20152c04b7dbf6380c911171662d4d766119a/django_allauth-65.20.1-py3-none-any.whl", hash = "sha256:39f4b66d113b6f6df6805d22d577b8f06aa54e251425de1699fb6a3d7f8d1e45", size = 2077848, upload-time = "2026-10-20T19:57:49.207Z" },
 ]
 
 [package.optional-dependencies]
@@ -1195,14 +1221,14 @@ wheels = [
 
 [[package]]
 name = "djangorestframework"
-version = "3.18.1"
+version = "3.18.3"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "django" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/8a/2e/b3ce9d449b1ed9f9dd74fb7dfbc5f20860d5f40c2b4b10a2c3eabd8ff579/djangorestframework-3.18.1.tar.gz", hash = "sha256:605d79fa2ec2f02905492e5ea13d903c2d842d0b4c915a57f7bf02ab9f3c91dd", size = 915653, upload-time = "2026-09-07T18:04:08.288Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/8d/b2/1cee76b188301f7d03169ca77fab2b3d3ec5d01b3469189f944af2d7f11a/djangorestframework-3.18.3.tar.gz", hash = "sha256:446a9b352e7eff630421ab3f2328bd2401b109a9470afa4a31189994911ed030", size = 923563, upload-time = "2026-10-06T21:33:51.521Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e8/83/5ed615e47339d8e65f62eb1a8133f8f046492eb3a25ad40d90acb9a208b3/djangorestframework-3.18.1-py3-none-any.whl", hash = "sha256:f1409d698967aaf82d5d98d76b549c8fba8bd92ebd0d83d24454508f72168dc2", size = 901373, upload-time = "2026-09-07T18:04:06.237Z" },
+    { url = "https://files.pythonhosted.org/packages/c4/dd/de5f4543765bec94e036a5e9593a42f8fa7efec8de78eb56b9ca834385f3/djangorestframework-3.18.3-py3-none-any.whl", hash = "sha256:8544bb674846731b1e3c9b309236ee1dc412905a0aa725be2ec193ca950a7d12", size = 903986, upload-time = "2026-10-06T21:33:49.917Z" },
 ]
 
 [[package]]
@@ -1306,11 +1332,11 @@ wheels = [
 
 [[package]]
 name = "filelock"
-version = "4.0.12"
+version = "4.2.4"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/53/e4/34efcb869715cf299e47d1ac7b2624d2bcb6f2d3dffc2f0abe8417f65ab2/filelock-4.0.12.tar.gz", hash = "sha256:cf42711a7ac791818b299fab0332a088c65aeeefa36290de98db92c434303b0c", size = 253880, upload-time = "2026-10-05T13:17:43.677Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/d8/28/3893324bcadf8f89b1616637468d766af3f625008c0735bf704fdfa86617/filelock-4.2.4.tar.gz", hash = "sha256:c6d8663535e1650ee430507b4ffbac7b464dd64b7647ea0112a9f406499d163d", size = 652444, upload-time = "2026-10-19T01:57:51.001Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/da/a1/b047e1c486a2c66283633b7dbb73872ca16ca1ce6a426f70d4d037fc8e1c/filelock-4.0.12-py3-none-any.whl", hash = "sha256:5f17ee83ecee8a6f3e389c75822fb70a1c2f0506b99438a6dffa1d56793588c8", size = 111732, upload-time = "2026-10-05T13:17:42.361Z" },
+    { url = "https://files.pythonhosted.org/packages/e0/1b/5e74289a1878e666bb4b65fe5805a04cafcac2aa5f519ef1ead67ef91c56/filelock-4.2.4-py3-none-any.whl", hash = "sha256:301241438c57936ef93f4243a94f2559022268bfcf9b375a9a72eb0f8db8358e", size = 162475, upload-time = "2026-10-19T01:57:49.419Z" },
 ]
 
 [[package]]
@@ -2607,50 +2633,69 @@ wheels = [
 
 [[package]]
 name = "msgpack"
-version = "1.2.1"
+version = "1.2.4"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/31/f9/c0a1c127f9049db9155afc316952ea571720dd01833ff5e4d7e8e6352dbb/msgpack-1.2.1.tar.gz", hash = "sha256:04c721c2c7448767e9e3f2520a475663d8ee0f09c31890f6d2bd70fd636a9647", size = 183960, upload-time = "2026-06-18T16:13:52.594Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/cc/52/1ec7ead2c7528bf3d1db73e886fa4df10f9e6f0eb7854a448b7090cfcef7/msgpack-1.2.4.tar.gz", hash = "sha256:475c44e12f2a5de766a8448783f149c9b33f3f49b88953c6cd739a77d93c732c", size = 197764, upload-time = "2026-10-26T17:55:48.593Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/f4/6b/e9b1cdc042c4458801d2545ed782a95f3d6ba8e270cce8745b8603c7f748/msgpack-1.2.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:29a3f6e9667868429d8240dfd063ea5ffdc1321c13d783aa23827a38de0dcb22", size = 82812, upload-time = "2026-06-18T16:12:45.022Z" },
-    { url = "https://files.pythonhosted.org/packages/0c/3a/dd518a1bf78ed1e9ad8afe57307c079a00eafe4b3068932a27ca1ea56b4f/msgpack-1.2.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:aded5bdf32609dc7987a49bbbd15a8ef096193f96dd8bbeb791de729e650acf5", size = 82739, upload-time = "2026-06-18T16:12:46.025Z" },
-    { url = "https://files.pythonhosted.org/packages/70/e0/7ba9e1542bf0771a27b8b37c1316e3f95ae9d748fd765284655c476ad4ef/msgpack-1.2.1-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:146ee4e9ce80b365c6d4c47073da9da7bcec473e58194ceee5dd7620ace77e06", size = 414233, upload-time = "2026-06-18T16:12:47.029Z" },
-    { url = "https://files.pythonhosted.org/packages/03/8d/671d81534ea0e2b0e8a121be100020da09eb78861fe3aa8f3ef7dcd3bed1/msgpack-1.2.1-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a28d076ca7c82b9c8728ad90b7147489449557038bed50e4241eb832395169b4", size = 423843, upload-time = "2026-06-18T16:12:48.19Z" },
-    { url = "https://files.pythonhosted.org/packages/d2/b6/e5c737515ed1f166664b87601b532f58cbb73d8aa6a90b99f7c2c5037e8e/msgpack-1.2.1-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:7d31c0ac0c640f877804c67cb2bc9f4e23dc2db97e96c2e67fa27d38283b41f8", size = 390772, upload-time = "2026-06-18T16:12:49.624Z" },
-    { url = "https://files.pythonhosted.org/packages/a8/46/62ed8c2e87d7021eab19921594d961ef3aa3794eec76c716dc30f3bfd433/msgpack-1.2.1-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:8ff92d7feeaf5bc26c51495b69e2f99ed97ab79346fb6555f44be7dd2ac6503b", size = 409559, upload-time = "2026-06-18T16:12:50.936Z" },
-    { url = "https://files.pythonhosted.org/packages/70/ff/59aa3887b860bbf43532835e192b1c388a17590d6068ae4f8b2bc74c906e/msgpack-1.2.1-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:779197a6513bab3c3632265e3d0f7cb3227e62510841a6f34f1eaa37efbb345e", size = 387838, upload-time = "2026-06-18T16:12:52.161Z" },
-    { url = "https://files.pythonhosted.org/packages/09/11/f8563e471093420cf6478cb3271a0175d8402b82d879783d4035d2d03360/msgpack-1.2.1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:67f6dd22fa72a93752643f07889796d62739a13415ee630169a8ce764f86cf9f", size = 421732, upload-time = "2026-06-18T16:12:53.556Z" },
-    { url = "https://files.pythonhosted.org/packages/bc/dd/9e8cbd8f5582ca4b590336f2b91ee5662f6a6ca562b565abaf696a0f81ff/msgpack-1.2.1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:2ef59c659f289eddf8aa6623823f19fa2f40a4029266889eac7a2505dd210c35", size = 83531, upload-time = "2026-06-18T16:12:58.249Z" },
-    { url = "https://files.pythonhosted.org/packages/50/2e/ebdb85a8da151397a2790363676b7ed7c125924fe618e4c6d8befb0cc62c/msgpack-1.2.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d3567748a5107cb40cdf66a275430c2f87c07777698f4bfd25c35f44d533258c", size = 82657, upload-time = "2026-06-18T16:12:59.396Z" },
-    { url = "https://files.pythonhosted.org/packages/26/aa/753ad8b007b464e1d8aa0c8e650b9c5f4f725e658fc5ac8a7635c55b7f6e/msgpack-1.2.1-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:60926b75d00c8e816ef98f3034f484a8bc64242d66839cef4cf7e503142316a0", size = 410634, upload-time = "2026-06-18T16:13:00.383Z" },
-    { url = "https://files.pythonhosted.org/packages/6a/fd/6adabd4f6d5e686f97dd02ce7fce3fe4cf672cbac36b8f67ff4040e8ad8b/msgpack-1.2.1-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:020e881a764b20d8d7ca1a54fc01b8175519d108e3c3f194fddc200bda95951a", size = 419989, upload-time = "2026-06-18T16:13:01.776Z" },
-    { url = "https://files.pythonhosted.org/packages/5a/cc/85039b7b0eb168aaad7383a23c97e291a11f08351cb45a606ce865e4e3f1/msgpack-1.2.1-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:4202c74688ca06591f78cb18988228bd4cca2cc75d57b60008372892d2f1e6e6", size = 377544, upload-time = "2026-06-18T16:13:03.637Z" },
-    { url = "https://files.pythonhosted.org/packages/ed/bf/35963899493b32030c85fc513b723ae66144ac70c11ebc52e889e16e3d99/msgpack-1.2.1-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:8b267ce94efb76fbd1b3373511420074ee3187f0f7811bf394531de13294735a", size = 400842, upload-time = "2026-06-18T16:13:05.012Z" },
-    { url = "https://files.pythonhosted.org/packages/a6/df/8e2ac970c8f99264cd9997d1c73df5466bc19da3301d7dc5500862a9b089/msgpack-1.2.1-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:e4f1d0f8f98ade9634e01fb704a408f9336c0a8f1117b369f5db83dc7551d8b1", size = 374108, upload-time = "2026-06-18T16:13:06.232Z" },
-    { url = "https://files.pythonhosted.org/packages/17/dd/fa8bd265110dfa51c20cb529f9e6d240a16fafe7e645004c6af2d01353ba/msgpack-1.2.1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:f02cf17a6ca1abe29b5f980644f7551f94d71f2011509b26d8625ce038f0df64", size = 414939, upload-time = "2026-06-18T16:13:07.478Z" },
-    { url = "https://files.pythonhosted.org/packages/b0/ac/dcddcab6f6c20ecb387ca5e980371cdb3f87ff69aeca388be97eebc4c074/msgpack-1.2.1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:0a70e3cf2804a300d921bb0940426e35f4e489a23adfb77a808892241db0a064", size = 83151, upload-time = "2026-06-18T16:13:12.173Z" },
-    { url = "https://files.pythonhosted.org/packages/64/71/fbcfa83a1d6a9c6091942d1cfd070962244664b87427a9a49a6897b1b219/msgpack-1.2.1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:491cc39455ca765fad51fb451bf2915eb2cf41192ab5801ce8d67c1d614fe056", size = 82351, upload-time = "2026-06-18T16:13:13.194Z" },
-    { url = "https://files.pythonhosted.org/packages/e3/10/ddf7b06db879e8792d13934ddda09ff20bd2a583fd84c9b59aae9b0e650b/msgpack-1.2.1-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f310233ef7fb9c14e201c93639fe5f5260b005f56f0b29048e999c30935596cc", size = 407518, upload-time = "2026-06-18T16:13:14.233Z" },
-    { url = "https://files.pythonhosted.org/packages/79/d3/36a46a8ed992b781acbc05928bd5bee3c810cb0c3563bf81a7b0c04a1a76/msgpack-1.2.1-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:787c9bebb5833e8f6fc8abca3c0597683d8d87f56a8842b6b89c75a5f3176e2d", size = 416405, upload-time = "2026-06-18T16:13:15.435Z" },
-    { url = "https://files.pythonhosted.org/packages/f9/84/e8e9598b557c0ba6ddae901a73780a4c75ac667dddf59414b1e56a42fb34/msgpack-1.2.1-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:dc871b997a9370d855b7394465f2f350e847a5b806dd38dcc9c989e7d87da155", size = 376257, upload-time = "2026-06-18T16:13:17.022Z" },
-    { url = "https://files.pythonhosted.org/packages/40/16/738fe6d875ad7e2a9429c165322a4ec088f4f273cdfae63d96a89c467961/msgpack-1.2.1-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:85f57e960d877f2977f6430896191b04a21f8901b3b4baf2e4604329f4db5402", size = 397469, upload-time = "2026-06-18T16:13:18.287Z" },
-    { url = "https://files.pythonhosted.org/packages/ca/be/6d5952df75a7f24f35833af764c3a6860780364cb3a0030beb8099e1b2b4/msgpack-1.2.1-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:1233ee2dd0cefba127583de50ea654677277047d238303521db35def3d7b2e7c", size = 372802, upload-time = "2026-06-18T16:13:19.685Z" },
-    { url = "https://files.pythonhosted.org/packages/e1/39/e2ef7dbf0473bcb8dc7c50bf782a892d67414877b63e47fc88eb189ef5e6/msgpack-1.2.1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:e3dc2feb0876209d9c38aa56cb1de169bd6c4348f1aa48271f241226590993e6", size = 411273, upload-time = "2026-06-18T16:13:21.028Z" },
-    { url = "https://files.pythonhosted.org/packages/77/58/cce442852c6b9e1639c7c8ac8fd9143121cb32dab0f308df4d1426a8eb9c/msgpack-1.2.1-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:05f340e47e7e47d2da8db9b53e1bb1d294369e9ef45a747441309f6650b8351d", size = 83610, upload-time = "2026-06-18T16:13:25.724Z" },
-    { url = "https://files.pythonhosted.org/packages/60/5c/15b4c7a0182f75ffa90751958ba36a9c01cafee367d49a3edc10ed140b01/msgpack-1.2.1-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:810b916696c86ef0deb3b74588480224df4c1b071136c34183e4a2a4284d7ac7", size = 83138, upload-time = "2026-06-18T16:13:26.781Z" },
-    { url = "https://files.pythonhosted.org/packages/b8/a6/99e58722feaffc5f2fbcc0c8c0d1451ab9f84097f7af87291b46af2390f4/msgpack-1.2.1-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:ca0dacff965c47afdc3749a8469d7302a8f801d6a28758d55120d75e66ce6889", size = 406090, upload-time = "2026-06-18T16:13:28.072Z" },
-    { url = "https://files.pythonhosted.org/packages/19/03/8c63e8cf52958534ef688625965ab04c269a6cadd8caef16758b380a821a/msgpack-1.2.1-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0e2bf9280bceb5efca998435904b5d3e9fdbcc11d90dc9df30aec7973252b720", size = 412106, upload-time = "2026-06-18T16:13:29.427Z" },
-    { url = "https://files.pythonhosted.org/packages/63/d2/155d9e71b40e41fd934bc0c48b9b2770f22263e1ac20aad8e29fdca7be3f/msgpack-1.2.1-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:aa6c4be5d1c02a42b066ca6ddb71adf36432868fdcdb6ee87e634e86e0674190", size = 374851, upload-time = "2026-06-18T16:13:30.631Z" },
-    { url = "https://files.pythonhosted.org/packages/98/48/deaf2326262a8d5ea3295ce9649912ecd3f551ba7ec8e33c665d2ba583f3/msgpack-1.2.1-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:ec0e675d59150a6269ddc9139087c722292664a37d071a849c05c473350f1f2d", size = 396168, upload-time = "2026-06-18T16:13:31.977Z" },
-    { url = "https://files.pythonhosted.org/packages/10/2a/b4410f906c2ec0008f1608d3ab5143afc3ad3f4e6da0fed3ea2231d0bef4/msgpack-1.2.1-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:dd3bfe82d53edfe4b7fc9a7ec9761e23a7a5b1dac22264505af428253c29ed24", size = 371959, upload-time = "2026-06-18T16:13:33.282Z" },
-    { url = "https://files.pythonhosted.org/packages/59/86/1edc67270099a528fa2093ea60fe191233cd238e4bd30cfacf7db79fc959/msgpack-1.2.1-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:5ad5467fc3f68b5468e06c5f788d712e9f8ffc8b0cd1bcb160c105c1ee92dae7", size = 408457, upload-time = "2026-06-18T16:13:34.567Z" },
-    { url = "https://files.pythonhosted.org/packages/1b/02/ad2afb678b4de94496cd432b581759b756a92c1192d8c767edd6b132efdc/msgpack-1.2.1-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:8d00f177ca88a77c1cf848d204a38f249751650b601cb6532acc68805d8a8273", size = 86000, upload-time = "2026-06-18T16:13:39.44Z" },
-    { url = "https://files.pythonhosted.org/packages/54/74/0b797484013128837f3b1cbb6cea019277c4de4e377dc512b4d9a0f92940/msgpack-1.2.1-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5bb9c386f0a329c035ddbab4b72d1028bf9627add8dda41070288563d57ed1b1", size = 86544, upload-time = "2026-06-18T16:13:40.447Z" },
-    { url = "https://files.pythonhosted.org/packages/a9/b4/b774d7eb95561739907fec675582f83203cf41c597a418c2589b4bfb8e9d/msgpack-1.2.1-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:20466cca18c49c7292a8984bc15d65857b171e7264bdcb5f96baf8be238791fc", size = 427661, upload-time = "2026-06-18T16:13:41.574Z" },
-    { url = "https://files.pythonhosted.org/packages/b2/f9/3243191dc9937e00756c8bc1b0272fed8f23758e43df2a3b46f533e5090f/msgpack-1.2.1-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:196300e7e5d6e74d50f1607ab9c06c4a1484c383cd22defd727902591f7e8dde", size = 426375, upload-time = "2026-06-18T16:13:42.936Z" },
-    { url = "https://files.pythonhosted.org/packages/23/c7/1693111db9944ba4ad4b67a1e788400d78a0b6af7a6523dc7e4e58f8274b/msgpack-1.2.1-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:575957e79cd51903a4e8495a242442949641e08f1efd5197b43bebd3ea7682b4", size = 380495, upload-time = "2026-06-18T16:13:44.306Z" },
-    { url = "https://files.pythonhosted.org/packages/3e/2b/92f86956a0c13e8662f7e2ad630c4eb4db07497b967589bd5245e018b2c1/msgpack-1.2.1-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:8c2ed1e48cc0f460bf3c7780e7137ff21a4e18433451916f2442c1b21036cd7d", size = 410897, upload-time = "2026-06-18T16:13:45.629Z" },
-    { url = "https://files.pythonhosted.org/packages/da/ea/1479f72d200313a76fc2f823a79d1e07ed052ab7b8a0280640aa7b95de42/msgpack-1.2.1-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:5f6277e5f783c36786a145e0247fc189a03f35f84b251646e53592d2bc12b355", size = 378519, upload-time = "2026-06-18T16:13:46.998Z" },
-    { url = "https://files.pythonhosted.org/packages/f5/4d/fa006060ffa1011d32bfae826fe766fe73e02982183601633b7121058ab3/msgpack-1.2.1-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:f9389552ecf4784886345ead0647e4edc96bee37cbab05b75540f542f766c48c", size = 419815, upload-time = "2026-06-18T16:13:48.205Z" },
+    { url = "https://files.pythonhosted.org/packages/64/cb/a3bd4d234c0f2f7e646b9be259b801c5d6a35c97f93dded4f722e6b80acd/msgpack-1.2.4-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1095b1ebcc8c9d3e70c51240b7160d8e9da66044e0a45c3ef8403d3a9ef0c5ad", size = 90935, upload-time = "2026-10-26T17:53:46.588Z" },
+    { url = "https://files.pythonhosted.org/packages/56/3c/fc87d06bdfc99b302f4379f0eb34bb8695b6ecd90b965652d0a3195d1acd/msgpack-1.2.4-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a4b47ec7422bef149223786a87df80067ac65bfc7c0565e5cf1dfbdc40acee50", size = 90187, upload-time = "2026-10-26T17:53:48.151Z" },
+    { url = "https://files.pythonhosted.org/packages/05/a3/abebe12c1b589b7eeab60cb87dd5eb398fcf549bdafca8c30d8d73e48493/msgpack-1.2.4-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0c75cfda0d3ccb1f6abc20e0608ad6b226e11f317b5ac297721504d2509e2bd9", size = 466911, upload-time = "2026-10-26T17:53:49.536Z" },
+    { url = "https://files.pythonhosted.org/packages/03/41/ed5517a107628f6f7f3a1f46f19de3aca979bd1fc95861cb56ce0e4bcc02/msgpack-1.2.4-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a45ceb5f199d5e388f28b550ba881096a3740d4bda10e661d77f59d9a2e8187a", size = 480247, upload-time = "2026-10-26T17:53:51.211Z" },
+    { url = "https://files.pythonhosted.org/packages/31/71/14c39858380e11408fcf75aeab1cda0afb253cd8f62a01fbe4ae1838b66f/msgpack-1.2.4-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:7ca62b31a873c70b73f367bb2c1efec1d143016642c5191405549578184ff6ff", size = 438298, upload-time = "2026-10-26T17:53:52.919Z" },
+    { url = "https://files.pythonhosted.org/packages/3b/73/ba40b91632e011851e1a397d53e0bd031848751902424a5b37c33f7de412/msgpack-1.2.4-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:f641971d3eec89ffca57fa36d151ad1cf1b6a214b47faca16cb165c7d45ef8be", size = 461600, upload-time = "2026-10-26T17:53:54.8Z" },
+    { url = "https://files.pythonhosted.org/packages/51/f0/c13ce7e7a7d8dabc1a48eecf61eb789084dbcc64374a7f19770eaf96f2c3/msgpack-1.2.4-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:b9eff629190a4b118549b654df32a56ed535351819f690d0c935d185500cc90b", size = 435020, upload-time = "2026-10-26T17:53:56.433Z" },
+    { url = "https://files.pythonhosted.org/packages/b4/d2/2a4e254f8ee5d5dd5019bd9f99164d79704788dbe16d9d6de77fda4e6727/msgpack-1.2.4-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:4e22c6571ab6ac9036da87d8a6fddb4baf86981844b480c0c60a4a4be417ee48", size = 479138, upload-time = "2026-10-26T17:53:57.918Z" },
+    { url = "https://files.pythonhosted.org/packages/27/fd/45f6cd13cefbb659a8e0128ea64d51b349571163fec3c9c20f99792dc42a/msgpack-1.2.4-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:90cba4996b18ec1201fcaabd01ec48ff4b9755416bcd52105ded2f89fe145c49", size = 91903, upload-time = "2026-10-26T17:54:03.097Z" },
+    { url = "https://files.pythonhosted.org/packages/7f/89/169c2a0b1ffeafe68a4f13d8d96b6ed1cd8d40d8262b3a6690851da7eda1/msgpack-1.2.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:112933726919f4239646cca9572e2c2fa5626358c670da8440aac09403100a48", size = 90573, upload-time = "2026-10-26T17:54:04.383Z" },
+    { url = "https://files.pythonhosted.org/packages/cf/8e/272a384f2a001cfced1baab0a8abdd912d6281432670f4609d1aab718d7b/msgpack-1.2.4-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:9ca1e78106675f2aed07dc37b842ce19be70010ab22c5c5c04688f0840d48539", size = 461057, upload-time = "2026-10-26T17:54:05.821Z" },
+    { url = "https://files.pythonhosted.org/packages/1e/d9/f59bd841fc2fd2b74dc50ce85860a6a25f58e588dd48946aeaf2862cf990/msgpack-1.2.4-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:c4d5bbdbea8f5669b3a734d6c226772804fb120848f99cbe63a0ddee63b049c9", size = 475652, upload-time = "2026-10-26T17:54:07.414Z" },
+    { url = "https://files.pythonhosted.org/packages/00/03/afd000e1b1e28fd535dc8c7bc21ebb88923bc1964a2429fe660fb313ace3/msgpack-1.2.4-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:0d9ff7f3aaffd84010f1c501b05406a497584f5cab2f732eb9d89bf960e12f6f", size = 427082, upload-time = "2026-10-26T17:54:09.1Z" },
+    { url = "https://files.pythonhosted.org/packages/f7/7a/e2890b272883c496faad777324ddb70e9cc4a6c63731962a4a39a6a40f44/msgpack-1.2.4-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:aa10dc04c03408f31948ac1896a942141fd8d7a954b3612edac79f19663e4076", size = 451956, upload-time = "2026-10-26T17:54:10.476Z" },
+    { url = "https://files.pythonhosted.org/packages/c2/46/0c1b240b8a580af3e72139c33b018025440a1a42c2579e82e39b1195ee36/msgpack-1.2.4-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:472a25463678f2795143a7cb42e88a1b59cc2375e9881917e69a9323bde42114", size = 423833, upload-time = "2026-10-26T17:54:12.195Z" },
+    { url = "https://files.pythonhosted.org/packages/80/8e/851415b1a9264e6abf64d8a9617d856769d59e247fb9470106f133aedbae/msgpack-1.2.4-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:cbb8a677da3e845713925e9a203b8a120b1e9da9989836890ba4a4a187902701", size = 470951, upload-time = "2026-10-26T17:54:13.764Z" },
+    { url = "https://files.pythonhosted.org/packages/2d/26/16eaad5fe6e199334fa5bd66070778665717c86e9a273525dc706ddb06a7/msgpack-1.2.4-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:fb811ac3d463a75013b234d2aae56b9f0bdb0105caf4dd2ee65305b6a8a6078d", size = 92057, upload-time = "2026-10-26T17:54:19.616Z" },
+    { url = "https://files.pythonhosted.org/packages/9c/b8/9660be6d120820bc05106f291e824c73d35f4ab77d927788ae67ea80889c/msgpack-1.2.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:36258fd0909e1bf26e94604439108846432abe4ffa9a23c9dc2f6f1c60f94b60", size = 90542, upload-time = "2026-10-26T17:54:20.965Z" },
+    { url = "https://files.pythonhosted.org/packages/6c/10/cd55a69fec29df26884b178dc4b1803442ec82abf929604aac619881917a/msgpack-1.2.4-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:e9c5ba0f053a7e98f013f083c9d1b2dffb26cad8c897c533d8286e44ed24c669", size = 455798, upload-time = "2026-10-26T17:54:22.434Z" },
+    { url = "https://files.pythonhosted.org/packages/c9/94/562e0733593a780c70b0b18994f30c205149f7f9f4efbe3e9b00b88612c5/msgpack-1.2.4-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7fabd415c41e62006c6641fcdf5b3e866f581c4e11c58328c0d0f69584b9577d", size = 469262, upload-time = "2026-10-26T17:54:24.043Z" },
+    { url = "https://files.pythonhosted.org/packages/bb/92/76d1a5c597e04e1d360b05573d150bdb4502f5a014e6e9cf089c9537c156/msgpack-1.2.4-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:7433d340de45003db3ed909a642c9469b598d175530f7a707cbaba64287d27ce", size = 420789, upload-time = "2026-10-26T17:54:25.587Z" },
+    { url = "https://files.pythonhosted.org/packages/8a/c6/b72b8d8022718380db459ced8ffbabc7570ad2d22c7f2fa659c872cb6734/msgpack-1.2.4-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:ccd6e4af5347eb9828147320449bcd30e3321f6397d4583ff16047485dd8be3d", size = 447068, upload-time = "2026-10-26T17:54:27.721Z" },
+    { url = "https://files.pythonhosted.org/packages/cb/dc/f378ef1def4aa135e70325c09e22457f3203ae2a390a192e892267906f33/msgpack-1.2.4-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:23d1459a1d0b4c9f6629df072d592eb74424b3ed3656b69af507bc9023cc027f", size = 418896, upload-time = "2026-10-26T17:54:29.325Z" },
+    { url = "https://files.pythonhosted.org/packages/62/93/a7e507378f43e91415cb6fda47e0ded0c9de1618a1f4ac4f2887912a92dd/msgpack-1.2.4-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:9e73761fe9fc55a4e9d2df8e8f59b0979231af4dbf80b8bf90cd64c74173d779", size = 465764, upload-time = "2026-10-26T17:54:30.719Z" },
+    { url = "https://files.pythonhosted.org/packages/60/76/7f39f49cbcdaa4aafe64b4941b2640772dbdc1cac3a9332f4c9ba6994da9/msgpack-1.2.4-cp313-cp313-pyemscripten_2025_0_wasm32.whl", hash = "sha256:d088d1f552e129859db830692268747aba0a1ee3e6e0fe6344dbb3aab1df9f6c", size = 53615, upload-time = "2026-10-26T17:54:32.213Z" },
+    { url = "https://files.pythonhosted.org/packages/86/34/747f9ea2b428088201c73fcb3a885cebcbedcd71def0f1f3c36896294b27/msgpack-1.2.4-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:895e9369185df4a874768849405c30cba7990caceb3fcb1692ebe62bb050f55e", size = 92449, upload-time = "2026-10-26T17:54:37.503Z" },
+    { url = "https://files.pythonhosted.org/packages/83/7e/52d208cb1561f869762c17be0e2c004e4d34f2842d239a450492d6246d62/msgpack-1.2.4-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c97f5f17407e1761f23f1944be33cbf1d5ce67017db32544dcd5e16e0b1b4a3b", size = 91202, upload-time = "2026-10-26T17:54:38.797Z" },
+    { url = "https://files.pythonhosted.org/packages/2e/58/5516cabb60da83506024015c669622a0277979aef51eb611308cebaf4cc9/msgpack-1.2.4-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:2444a4e04f924630d059ae6eae8f91fdfcd28ed9fd17b21bacf4e74550a091f7", size = 455185, upload-time = "2026-10-26T17:54:40.213Z" },
+    { url = "https://files.pythonhosted.org/packages/39/8f/bf975b5d2111e4954a0f8567fc6b60bab22c8766dd4fa509af1334c91a4f/msgpack-1.2.4-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:5d65b791ce4283e02b6267742ad540899155e1b32887b9cbdda47f38f5a076b5", size = 465078, upload-time = "2026-10-26T17:54:41.971Z" },
+    { url = "https://files.pythonhosted.org/packages/32/2f/c74baeafc53d1c1fadfbeb774444d0e6354778d12b40b827e437a7a35856/msgpack-1.2.4-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:5e4c67dbac05dce90a3fa1d845137617383c415e6b319062baac9734540706ae", size = 420144, upload-time = "2026-10-26T17:54:44.994Z" },
+    { url = "https://files.pythonhosted.org/packages/b0/f2/bdf2ce9e284821397dc5549101824c7607ee6ba6e0635390d168a77ac49c/msgpack-1.2.4-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:781e856db4f2cb398e4992e2a74305295d3ebf694eec26fa0f4bc766eb9fa0a0", size = 446479, upload-time = "2026-10-26T17:54:46.484Z" },
+    { url = "https://files.pythonhosted.org/packages/76/8d/b4572d24bb75d98bcbbd031a934a3a1d03494ea88a100cd51ab16c4c7d57/msgpack-1.2.4-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:cfc1cc237792f9a5664002b66acb961027d4184528ec9d10e0e42330f7972383", size = 418780, upload-time = "2026-10-26T17:54:48.04Z" },
+    { url = "https://files.pythonhosted.org/packages/55/8e/4493bef4422730cfd3420b84094652fabd27ef8aadc8b443a8995b524d08/msgpack-1.2.4-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:f60de6ae13d4d2a12a483f15c5e47cb6fa2731aa32d92fb31178e2017d6574a8", size = 462009, upload-time = "2026-10-26T17:54:49.433Z" },
+    { url = "https://files.pythonhosted.org/packages/41/29/efdc3d1d09e4e0e45955b0aad559b4c1f5d908767c9fb1021990c52182a5/msgpack-1.2.4-cp314-cp314-pyemscripten_2026_0_wasm32.whl", hash = "sha256:06a0657a4110d563255006b7cb7147432f67827144e429c2cdb1c967548d1817", size = 53714, upload-time = "2026-10-26T17:54:50.753Z" },
+    { url = "https://files.pythonhosted.org/packages/d0/4a/6defc8fd0270c4ba675e6625f4f76ce936fd0c48733395fd7ba912cd423e/msgpack-1.2.4-cp314-cp314t-macosx_10_15_x86_64.whl", hash = "sha256:45506bfb902cde24a0d33fb0581f58497ddb2682686dd1f6aa07e7b769df7ca4", size = 94083, upload-time = "2026-10-26T17:54:57.108Z" },
+    { url = "https://files.pythonhosted.org/packages/c8/e8/59f7e076739048864710a4de3403ae1c1b43ed5077b796cd9e8cbce9b3f6/msgpack-1.2.4-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:dc9dc681958e69f46b9f37def3e7fd6cc5dcfaa5943fb00bfe9c223a1a1052f6", size = 95037, upload-time = "2026-10-26T17:54:58.489Z" },
+    { url = "https://files.pythonhosted.org/packages/2c/dd/dbae250b23b831cd0571eb664089f80de3249a39e98c6ef55f9a0efe928d/msgpack-1.2.4-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:0bef691e2a95119cc6bf3ded29325dbd89c4b6f8ff233070431948ed70902421", size = 472722, upload-time = "2026-10-26T17:54:59.924Z" },
+    { url = "https://files.pythonhosted.org/packages/a9/e2/383ece1c1b27c1ed322055fce8ab8972bc6d529ede881592065ce0c461bf/msgpack-1.2.4-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:55e6106d2d085af42b2de72efeb38ed255241a24b32295ca889707c1d679c442", size = 468726, upload-time = "2026-10-26T17:55:01.492Z" },
+    { url = "https://files.pythonhosted.org/packages/37/2f/5410a8815ae74a824ac87543c612e40cb6674851b70a6ad858bb32813203/msgpack-1.2.4-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:996dfc4774c240c8e6adf1166ae102141cfbed33c8856fde821bd6c0bd35ee41", size = 420488, upload-time = "2026-10-26T17:55:02.848Z" },
+    { url = "https://files.pythonhosted.org/packages/39/8e/16fdf02b4f91dff9c1480433c1bf80756c2fedc0b74fc6a231f02dfed007/msgpack-1.2.4-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:efa1357fb0c7201e833de28638be371ee127476f7ccff9e7a94211b0afc33ddf", size = 455541, upload-time = "2026-10-26T17:55:04.564Z" },
+    { url = "https://files.pythonhosted.org/packages/c4/76/2454ef54d780a167667552d02e7bc977a3d419943bcbdf6a96a4da6786ad/msgpack-1.2.4-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:b9270b63409e70c8c6deb5faedc81fc27c6bd0196b38084a8773f68286abf034", size = 419514, upload-time = "2026-10-26T17:55:06.257Z" },
+    { url = "https://files.pythonhosted.org/packages/ac/8b/2af9bf378def33c24875f250421b0d0b1b06f72a1c2c3f964749fc4cdee1/msgpack-1.2.4-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:2b597bb01aff61d65e305c2cf2589c93c86609929d42d575bfc359f3c54ea8e1", size = 461910, upload-time = "2026-10-26T17:55:08.05Z" },
+    { url = "https://files.pythonhosted.org/packages/d0/d8/0465d475c1a7063af1a1fb4f8c69e0dd661c4dd172055c9757a343a07d5d/msgpack-1.2.4-cp315-cp315-macosx_10_15_x86_64.whl", hash = "sha256:765584b93ed6f0b561f0c56e9735f24945c0682f857c9b3ee3b4caad9c32f66a", size = 92449, upload-time = "2026-10-26T17:55:13.665Z" },
+    { url = "https://files.pythonhosted.org/packages/b2/d0/5220a8a53579dda39f3526394ba5b7eafc28736085f2626deda7fcd22cd1/msgpack-1.2.4-cp315-cp315-macosx_11_0_arm64.whl", hash = "sha256:0221748c30ace75fde0dec8c470abe65fb5374cd4f37adb9db6aca7a3c362c0a", size = 91209, upload-time = "2026-10-26T17:55:14.913Z" },
+    { url = "https://files.pythonhosted.org/packages/b2/98/f151742eba413503074a10d8f636bf03dd4f3f7cba29689767a35d19bd1c/msgpack-1.2.4-cp315-cp315-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:c5917972ce1bf5f85f761031e00dab6fe0ad9f880cb3d2d43ed74b330c850400", size = 455713, upload-time = "2026-10-26T17:55:16.406Z" },
+    { url = "https://files.pythonhosted.org/packages/b0/54/890510a2c9841aff63258e085d15d4e140c7eef559d4da81ef2d2d867436/msgpack-1.2.4-cp315-cp315-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:e7ae8cf6012372cecb43016132d1b87ccc2ebb8ae5ab5078687399e82423386a", size = 466177, upload-time = "2026-10-26T17:55:18.351Z" },
+    { url = "https://files.pythonhosted.org/packages/3d/41/a6f20d7c2c380fb072b95ffc5b865a1d62eaf49d77fbee44466c45a1a8de/msgpack-1.2.4-cp315-cp315-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e78c66cf97ac5675037f705ca433ad98ac9177f9523e7fdbb34e486ae29044c8", size = 424398, upload-time = "2026-10-26T17:55:19.979Z" },
+    { url = "https://files.pythonhosted.org/packages/89/86/fa9559961f2b0d498e6cefa226298ddee2b896cb223449c211702bc34071/msgpack-1.2.4-cp315-cp315-musllinux_1_2_aarch64.whl", hash = "sha256:59887281c3c163a7afff7dffaaad2f78cd2b513b7e1a7843f1ee8e7cd6a94231", size = 445686, upload-time = "2026-10-26T17:55:21.775Z" },
+    { url = "https://files.pythonhosted.org/packages/39/23/5a9d94036cdd77d4310bbb7cfaf3ccd1f087c4a5d5a4befec4361c5fc0dc/msgpack-1.2.4-cp315-cp315-musllinux_1_2_riscv64.whl", hash = "sha256:9f46e70c8d22e96856967ab9d80c51dcf5bc63133e4da2d66fab64c0d4119b82", size = 422096, upload-time = "2026-10-26T17:55:24Z" },
+    { url = "https://files.pythonhosted.org/packages/6e/4b/86a5384112509a94ff6e20028aba6845138743effb7c6617e959ad1256ab/msgpack-1.2.4-cp315-cp315-musllinux_1_2_x86_64.whl", hash = "sha256:0a1fd6c31952155b7cd01061288c70303e6554ae855244dfb38a897fd94f8749", size = 463407, upload-time = "2026-10-26T17:55:26.146Z" },
+    { url = "https://files.pythonhosted.org/packages/f4/cf/14db289e0ad531e22ce0f03284865f81d14fbc80bf3f79d3b1714bcf76cf/msgpack-1.2.4-cp315-cp315-pyemscripten_2026_5_wasm32.whl", hash = "sha256:b1f08ec826417e3c8dc3edadb50f38debba033af6cb849229f0eac72f80f2342", size = 53743, upload-time = "2026-10-26T17:55:27.497Z" },
+    { url = "https://files.pythonhosted.org/packages/b4/fa/37c3219b250d81bee788c0dd78ae2fc673db2da1c21ae51f7982d85698f7/msgpack-1.2.4-cp315-cp315t-macosx_10_15_x86_64.whl", hash = "sha256:fb9ddbf23b8c6e89752af399fcf4daed60055e239cda44c6acfaa76d19331e8c", size = 93793, upload-time = "2026-10-26T17:55:32.304Z" },
+    { url = "https://files.pythonhosted.org/packages/83/9f/b8afcd20d32cf4be1fa3c327e997656d6d446e667452b0fcc66b91710e82/msgpack-1.2.4-cp315-cp315t-macosx_11_0_arm64.whl", hash = "sha256:e283cf563166c21762131b88e3870ee2ec57757b08a8736929757b5a67541061", size = 94746, upload-time = "2026-10-26T17:55:33.624Z" },
+    { url = "https://files.pythonhosted.org/packages/e6/4f/03348d381fcbbc2685356833408cc7e9d2af0fe0775926935a2889650f64/msgpack-1.2.4-cp315-cp315t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:40e91bf8325f492e8eb3c3aa6de06b20593c225336bb52b585c913d7c1da025b", size = 468480, upload-time = "2026-10-26T17:55:34.991Z" },
+    { url = "https://files.pythonhosted.org/packages/16/46/e54af8d9a51fb562e068e69a0d75a51e9c2fedec49f911f888515f5477ab/msgpack-1.2.4-cp315-cp315t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:cfa86432bf329d6b976f5a00ad4c9064fd51736e4967a52526750236345cc2da", size = 470064, upload-time = "2026-10-26T17:55:36.615Z" },
+    { url = "https://files.pythonhosted.org/packages/74/f5/8f9a6b3af1d803e832b11017c8dad44d761fefdb91dba04ee58cb51838da/msgpack-1.2.4-cp315-cp315t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:42e0a7dc26df739149478585d4264338b4d330f24b3e3b57d5aa89e48866e8ab", size = 421267, upload-time = "2026-10-26T17:55:38.076Z" },
+    { url = "https://files.pythonhosted.org/packages/4b/8f/7302b0d18eadbbfef9be1dbbdc49905f7f3b847200c3e47068d093976be4/msgpack-1.2.4-cp315-cp315t-musllinux_1_2_aarch64.whl", hash = "sha256:8e680367090a58c966052d61418cc943111863538fd82471d61fca5271d911e1", size = 451244, upload-time = "2026-10-26T17:55:39.639Z" },
+    { url = "https://files.pythonhosted.org/packages/36/c6/05717fb56b510b5e974446f2cb8e9b26fa4347fafc0c5927745b176939b3/msgpack-1.2.4-cp315-cp315t-musllinux_1_2_riscv64.whl", hash = "sha256:a6c9926f8871b261622fe6b599db72c69be5bca8fdc0976886f9a531a301dee9", size = 420273, upload-time = "2026-10-26T17:55:41.488Z" },
+    { url = "https://files.pythonhosted.org/packages/05/d9/a19077d664c37319097e16ba8de14e6b3a2edcc8ee78a2069c0808e38960/msgpack-1.2.4-cp315-cp315t-musllinux_1_2_x86_64.whl", hash = "sha256:c50bac325dbf1a9c80e10da6dbd1100d7082f6b12e153084501e18e86cd3a037", size = 460421, upload-time = "2026-10-26T17:55:43.223Z" },
 ]
 
 [[package]]
@@ -2962,11 +3007,11 @@ wheels = [
 
 [[package]]
 name = "oauthlib"
-version = "3.3.1"
+version = "4.0.0"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/0b/5f/19930f824ffeb0ad4372da4812c50edbd1434f678c90c2733e1188edfc63/oauthlib-3.3.1.tar.gz", hash = "sha256:0f0f8aa759826a193cf66c12ea1af1637f87b9b4622d46e866952bb022e538c9", size = 185918, upload-time = "2025-06-19T22:48:08.269Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/7a/d8/a1bcc8ba112a627f8ffbdc212a78ce18d3ac07e91a5ca65d27918eee25a1/oauthlib-4.0.0.tar.gz", hash = "sha256:efb274799819440f95b4ab3b818869f1ce9ae26c5beacba0201d1a1b76b54f86", size = 187232, upload-time = "2026-09-28T06:01:18.77Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/be/9c/92789c596b8df838baa98fa71844d84283302f7604ed565dafe5a6b5041a/oauthlib-3.3.1-py3-none-any.whl", hash = "sha256:88119c938d2b8fb88561af5f6ee0eec8cc8d552b7bb1f712743136eb7523b7a1", size = 160065, upload-time = "2025-06-19T22:48:06.508Z" },
+    { url = "https://files.pythonhosted.org/packages/d9/f4/78229a1066068ca14fc60fb26cf7381cabe4382261392b90e5f9552722d4/oauthlib-4.0.0-py3-none-any.whl", hash = "sha256:624c28c13a0a59cabf9747dfa52af63be3e512a7f2714df16e91b5b3a145e6cd", size = 159715, upload-time = "2026-09-28T06:01:17.008Z" },
 ]
 
 [[package]]
@@ -3202,7 +3247,7 @@ requires-dist = [
     { name = "concurrent-log-handler", specifier = "~=0.9.25" },
     { name = "dateparser", specifier = "~=1.4" },
     { name = "django", specifier = "~=5.2.13" },
-    { name = "django-allauth", extras = ["mfa", "socialaccount"], specifier = "~=65.16.0" },
+    { name = "django-allauth", extras = ["mfa", "socialaccount"], specifier = "~=65.20.0" },
     { name = "django-auditlog", specifier = "~=3.4.1" },
     { name = "django-cachalot", specifier = "~=2.9.0" },
     { name = "django-compression-middleware", specifier = "~=0.5.0" },
@@ -3218,7 +3263,7 @@ requires-dist = [
     { name = "drf-spectacular", specifier = "~=0.30" },
     { name = "drf-spectacular-sidecar", specifier = ">=2026.7.1,<2026.10" },
     { name = "drf-writable-nested", specifier = "~=0.7.1" },
-    { name = "filelock", specifier = ">=3.32,<4.1" },
+    { name = "filelock", specifier = ">=3.32,<4.3" },
     { name = "flower", specifier = ">=2.0.1,<2.3" },
     { name = "gotenberg-client", extras = ["httpx"], specifier = "~=1.0" },
     { name = "granian", extras = ["uvloop"], marker = "extra == 'webserver'", specifier = ">=2.7,<2.9" },
@@ -4873,11 +4918,11 @@ wheels = [
 
 [[package]]
 name = "setuptools"
-version = "83.0.0"
+version = "84.2.1"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/34/26/f5d29e25ffdb535afef2d35cdb55b325298f96debd670da4c325e08d70f4/setuptools-83.0.0.tar.gz", hash = "sha256:025bccbbf0fa05b6192bc64ae1e7b16e001fd6d6d4d5de03c97b1c1ade523bef", size = 1154254, upload-time = "2026-07-04T15:31:22.699Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/70/b3/c19426f783614d625699a4b247faf628ea9ab1db228674491767b417f9e1/setuptools-84.2.1.tar.gz", hash = "sha256:3ff8b3b5492a0aa66960f4419365a86b84e013070d4313e4d4a6894f5d64d6bc", size = 1230289, upload-time = "2026-10-20T19:01:37.742Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/5d/40/e1e72872c6354b306daef1703549e8e83b4d43cfea356311bf722a043752/setuptools-83.0.0-py3-none-any.whl", hash = "sha256:29b23c360f22f414dc7336bb39178cc7bcbf6021ed2733cde173f09dba19abb3", size = 1008090, upload-time = "2026-07-04T15:31:20.885Z" },
+    { url = "https://files.pythonhosted.org/packages/ef/55/6dc6d6bb953bdfc52519a0059592c52b6e3b8ad51cf8256dffceb55b0610/setuptools-84.2.1-py3-none-any.whl", hash = "sha256:ca140b45d5325a9478f880e351484f62fef15f336462e449ca0c03c873d589c2", size = 876263, upload-time = "2026-10-20T19:01:35.678Z" },
 ]
 
 [[package]]
@@ -6050,7 +6095,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/2d/18/2cff20ec259ab7577ef17e51c67b63b0989e39b1a469ff4b8ea310f71805/zensical-0.0.65-cp310-abi3-macosx_10_12_x86_64.whl", hash = "sha256:62c3a61be738d147d27c499bd84ee2b9afe5c0b97ca072aad6de28e05122e9ee", size = 15334565, upload-time = "2026-09-24T18:07:17.099Z" },
     { url = "https://files.pythonhosted.org/packages/23/a7/3583b987894dbded915869c7df35016a0e256a7a48627ede009270a8549d/zensical-0.0.65-cp310-abi3-macosx_11_0_arm64.whl", hash = "sha256:36ccd6f3e2c7e69d35015d4f4c4503146777a1c53d6bd9fbe7adbdc4cbd5a001", size = 15017811, upload-time = "2026-09-24T18:07:21.003Z" },
     { url = "https://files.pythonhosted.org/packages/77/7d/40912425a7a77ed929119768526209eb06792d3e0bd200bfd73c89b0ad6d/zensical-0.0.65-cp310-abi3-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ab497d82ed535a04008f8d12e10f028ce8769f1bac34b19281fa5b99712e34e9", size = 15307106, upload-time = "2026-09-24T18:07:24.232Z" },
-    { url = "https://files.pythonhosted.org/packages/05/e3/e65a583f0c7e849ce3298b7463fc4a607a3c242433e62b9bd14364272ddc/zensical-0.0.65-cp310-abi3-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:187f94c4cdfabad0afcec092af6d5944104efe48c6595ae057d54e3213892068", size = 15373933, upload-time = "2026-09-24T18:07:26.934Z" },
     { url = "https://files.pythonhosted.org/packages/b0/0e/55f64f4ac0d80fdb31a278a3b9434cf84742bfeff81ae9d121f1a35b3351/zensical-0.0.65-cp310-abi3-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:64ff25ec94c16853ab0d9bd3cc4a0a569d1381a116a316bd10daab41ec26b3ff", size = 15646714, upload-time = "2026-09-24T18:07:29.649Z" },
     { url = "https://files.pythonhosted.org/packages/c4/fb/7e33ed0bafd8d2803b1bb66a540923a6020ac5dc0f4deee835215a5f3838/zensical-0.0.65-cp310-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:24f3d65ebdadc58519b0c72065777ed4767e9b4935a21f471798cdfe96fa948f", size = 15483203, upload-time = "2026-09-24T18:07:32.431Z" },
     { url = "https://files.pythonhosted.org/packages/b6/0f/7b1b9eb2f06ef5aba4efb5060a7289e2082ead11ed372ef10acdcfa5dad4/zensical-0.0.65-cp310-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:db9a1b36d08540072e3eb59841b0d6485de51d8c866fb6af8c4e5b771c6b681b", size = 15880927, upload-time = "2026-09-24T18:07:35.258Z" },