mirror of
https://github.com/snapotter-hq/SnapOtter.git
synced 2026-08-03 07:46:42 +02:00
- Replace [object Object] errors with readable messages across all 20+ API routes by normalizing Zod validation errors to strings (formatZodErrors) - Add parseApiError() on frontend to defensively handle any details type - Add global Fastify error handler with full stack traces in logs - Fix image-to-pdf auth: Object.entries(headers) → headers.forEach() - Fix passport-photo: safeParse + formatZodErrors, safe error extraction - Fix OCR silent fallbacks: log exception type/message when falling back, include actual engine used in API response and Docker logs - Fix split tool: process all uploaded images, combine into ZIP with subfolders per image - Fix batch support for blur-faces, strip-metadata, edit-metadata, vectorize: add processAllFiles branch for multi-file uploads - Docker: LOG_LEVEL=debug, PYTHONWARNINGS=default for visibility - Add Playwright e2e tests verifying all fixes against Docker container
184 lines
6.0 KiB
TypeScript
184 lines
6.0 KiB
TypeScript
import { randomUUID } from "node:crypto";
|
|
import { basename } from "node:path";
|
|
import { extractText } from "@ashim/ai";
|
|
import type { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
|
|
import { z } from "zod";
|
|
import { formatZodErrors } from "../../lib/errors.js";
|
|
import { validateImageBuffer } from "../../lib/file-validation.js";
|
|
import { createWorkspace } from "../../lib/workspace.js";
|
|
import { updateSingleFileProgress } from "../progress.js";
|
|
|
|
const settingsSchema = z.object({
|
|
quality: z.enum(["fast", "balanced", "best"]).default("balanced"),
|
|
language: z.enum(["auto", "en", "de", "fr", "es", "zh", "ja", "ko"]).default("auto"),
|
|
enhance: z.boolean().default(true),
|
|
// Backward compat: old "engine" param still accepted
|
|
engine: z.enum(["tesseract", "paddleocr"]).optional(),
|
|
});
|
|
|
|
/**
|
|
* OCR / text extraction route.
|
|
* Returns JSON with extracted text rather than an image.
|
|
*/
|
|
export function registerOcr(app: FastifyInstance) {
|
|
app.post("/api/v1/tools/ocr", async (request: FastifyRequest, reply: FastifyReply) => {
|
|
let fileBuffer: Buffer | null = null;
|
|
let filename = "image";
|
|
let settingsRaw: string | null = null;
|
|
let clientJobId: string | null = null;
|
|
|
|
try {
|
|
const parts = request.parts();
|
|
for await (const part of parts) {
|
|
if (part.type === "file") {
|
|
const chunks: Buffer[] = [];
|
|
for await (const chunk of part.file) {
|
|
chunks.push(chunk);
|
|
}
|
|
fileBuffer = Buffer.concat(chunks);
|
|
filename = basename(part.filename ?? "image");
|
|
} else if (part.fieldname === "settings") {
|
|
settingsRaw = part.value as string;
|
|
} else if (part.fieldname === "clientJobId") {
|
|
clientJobId = part.value as string;
|
|
}
|
|
}
|
|
} catch (err) {
|
|
return reply.status(400).send({
|
|
error: "Failed to parse multipart request",
|
|
details: err instanceof Error ? err.message : String(err),
|
|
});
|
|
}
|
|
|
|
if (!fileBuffer || fileBuffer.length === 0) {
|
|
return reply.status(400).send({ error: "No image file provided" });
|
|
}
|
|
|
|
const validation = await validateImageBuffer(fileBuffer);
|
|
if (!validation.valid) {
|
|
return reply.status(400).send({ error: `Invalid image: ${validation.reason}` });
|
|
}
|
|
|
|
try {
|
|
let settings: z.infer<typeof settingsSchema>;
|
|
try {
|
|
const parsed = settingsRaw ? JSON.parse(settingsRaw) : {};
|
|
const result = settingsSchema.safeParse(parsed);
|
|
if (!result.success) {
|
|
return reply
|
|
.status(400)
|
|
.send({ error: "Invalid settings", details: formatZodErrors(result.error.issues) });
|
|
}
|
|
settings = result.data;
|
|
} catch {
|
|
return reply.status(400).send({ error: "Settings must be valid JSON" });
|
|
}
|
|
|
|
// Backward compat: map old engine param to quality
|
|
let quality = settings.quality;
|
|
if (settings.engine && !settingsRaw?.includes('"quality"')) {
|
|
quality = settings.engine === "tesseract" ? "fast" : "balanced";
|
|
}
|
|
|
|
request.log.info(
|
|
{
|
|
toolId: "ocr",
|
|
imageSize: fileBuffer.length,
|
|
quality,
|
|
language: settings.language,
|
|
},
|
|
"Starting OCR",
|
|
);
|
|
const jobId = randomUUID();
|
|
const workspacePath = await createWorkspace(jobId);
|
|
|
|
const jobIdForProgress = clientJobId;
|
|
const onProgress = jobIdForProgress
|
|
? (percent: number, stage: string) => {
|
|
updateSingleFileProgress({
|
|
jobId: jobIdForProgress,
|
|
phase: "processing",
|
|
stage,
|
|
percent,
|
|
});
|
|
}
|
|
: undefined;
|
|
|
|
// Fallback chain: best -> balanced -> fast
|
|
// PaddleOCR can crash with segfault on some platforms, so we retry
|
|
// with a lower quality tier at the Node.js level.
|
|
const fallbackChain: Array<"fast" | "balanced" | "best"> =
|
|
quality === "best"
|
|
? ["best", "balanced", "fast"]
|
|
: quality === "balanced"
|
|
? ["balanced", "fast"]
|
|
: ["fast"];
|
|
|
|
let lastError: unknown;
|
|
for (const tier of fallbackChain) {
|
|
try {
|
|
const result = await extractText(
|
|
fileBuffer,
|
|
workspacePath,
|
|
{
|
|
quality: tier,
|
|
language: settings.language,
|
|
enhance: settings.enhance,
|
|
},
|
|
onProgress,
|
|
);
|
|
|
|
if (clientJobId) {
|
|
updateSingleFileProgress({
|
|
jobId: clientJobId,
|
|
phase: "complete",
|
|
percent: 100,
|
|
});
|
|
}
|
|
|
|
if (result.engine && result.engine !== tier) {
|
|
request.log.warn(
|
|
{ toolId: "ocr", requested: tier, actual: result.engine },
|
|
`OCR engine fallback: requested ${tier} but used ${result.engine}`,
|
|
);
|
|
}
|
|
|
|
return reply.send({
|
|
jobId,
|
|
filename,
|
|
text: result.text,
|
|
engine: result.engine,
|
|
});
|
|
} catch (err) {
|
|
lastError = err;
|
|
const msg = err instanceof Error ? err.message : String(err);
|
|
// If the Python process crashed (segfault, dispatcher exit), try next tier
|
|
if (
|
|
msg.includes("exited unexpectedly") ||
|
|
msg.includes("exited with code") ||
|
|
msg.includes("Segmentation fault")
|
|
) {
|
|
request.log.warn(
|
|
{ toolId: "ocr", quality: tier, err },
|
|
`OCR ${tier} crashed, falling back`,
|
|
);
|
|
if (onProgress) onProgress(15, "Retrying...");
|
|
continue;
|
|
}
|
|
// Non-crash errors (validation, timeout) should not retry
|
|
throw err;
|
|
}
|
|
}
|
|
|
|
// All tiers failed
|
|
throw lastError;
|
|
} catch (err) {
|
|
request.log.error({ err, toolId: "ocr" }, "OCR failed");
|
|
return reply.status(422).send({
|
|
error: "OCR failed",
|
|
details: err instanceof Error ? err.message : "Unknown error",
|
|
});
|
|
}
|
|
});
|
|
}
|