Ports the safety review and the Photo Analyzer Library/Analyze/Stats experiences onto the shared API + service layer, and adds the Workflow home, enforcing the pipeline gates and the one-mutating-job policy. Backend - migration 0005 + models: safety_reviews (append-only, latest row is the current decision) and analysis_results (donor photos schema re-keyed to asset_id). - SafetyService: persist scores/decisions, review queue with filters, and the EXIF safety checkpoint (mutually-exclusive sfw/nsfw keyword written, read back, current_sha256 refreshed) that upload eligibility depends on. - AnalysisService: the privacy gate — the vision provider is called ONLY for canonical, confirmed-SFW assets; nsfw/undecided are recorded skipped without a request. Provider is an injected adapter (real OpenAI-compatible Gemini call extracted from photo_analyzer.analyze_image; a fake in tests). - LibraryService: Library search + Stats read model ported from webapp/query.py (LIKE search in place of FTS5; facets, top tags, years, albums, people). - WorkflowService + GET /api/v1/workflow: per-stage readiness derived from the source tables — counts, blockers, last-run, action, and an active_job that drives read-only-during-jobs. Safety scoring and analysis run as durable jobs under the library_write lock via new domain handlers, so a second mutating job is refused. - routes: workflow, safety (queue/counts/decisions/jobs), analysis (counts/results/jobs), library (assets/facets/stats). Frontend - five views (frontend/js/views.js) on the US02-05 shell: Workflow stepper (status text+icon, not colour alone; actions disabled with a reason while a job runs), Safety review (filter tabs, decide, persists across reload), Library (search + cards), Analyze (counts + live job log via the SSE adapter), Stats. Shared DOM helpers extracted to dom.js; Workflow is the home route. Tests - integration: provider-call privacy (nsfw never reaches the provider), sfw→nsfw flip drops analysis eligibility, decision persistence, one-mutating- job rejection, workflow counts, and the exiftool safety-keyword write/verify. - e2e: Workflow cards, actions disabled+explained during a job, safety decide-persists-across-reload, Library search, Stats, Analyze counts. - traceability map updated for US02-05 and US02-06. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
57 lines
1.7 KiB
Python
57 lines
1.7 KiB
Python
"""Job-type handler dispatch.
|
|
|
|
A handler processes one item of a job: ``handler(item_key, ctx)`` and either
|
|
returns (success), raises ``Cancelled`` (cooperative stop, resumable), or raises
|
|
any other exception (item failure). Handlers must be idempotent — at-least-once
|
|
delivery means the same item can run again after an interrupted attempt.
|
|
|
|
Domain handlers (safety scoring, analysis, …) register here in later stories; the
|
|
registry ships empty so the worker engine can be built and tested independently.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from dataclasses import dataclass
|
|
from typing import TYPE_CHECKING, Callable
|
|
|
|
if TYPE_CHECKING:
|
|
from photo_pipeline.services.jobs import JobService
|
|
|
|
Handler = Callable[[str, "JobContext"], None]
|
|
|
|
|
|
class Cancelled(Exception):
|
|
"""Raised by a handler that observed cancellation and stopped cleanly."""
|
|
|
|
|
|
@dataclass
|
|
class JobContext:
|
|
"""What a handler needs from the coordinator: cancellation checks, heartbeats,
|
|
and the session factory to build domain services against."""
|
|
|
|
job_id: str
|
|
worker_id: str
|
|
fencing_token: int
|
|
service: "JobService"
|
|
session_factory: object | None = None
|
|
|
|
def cancelled(self) -> bool:
|
|
from photo_pipeline.services.jobs import JobState
|
|
|
|
snapshot = self.service.get(self.job_id)
|
|
return snapshot is None or snapshot["state"] in (
|
|
JobState.CANCELLING,
|
|
JobState.CANCELLED,
|
|
)
|
|
|
|
def heartbeat(self, *, lease_seconds: int = 60) -> bool:
|
|
return self.service.heartbeat(self.job_id, self.worker_id, lease_seconds=lease_seconds)
|
|
|
|
|
|
# Populated by domain stories via register(); empty for now.
|
|
REGISTRY: dict[str, Handler] = {}
|
|
|
|
|
|
def register(job_type: str, handler: Handler) -> None:
|
|
REGISTRY[job_type] = handler
|