From dfe39a8d20a6fd99f1ed52e854d037fe9dc5320d Mon Sep 17 00:00:00 2001 From: WuYongJie <549727955@qq.com> Date: Fri, 20 Nov 2026 11:14:41 +0800 Subject: [PATCH] Add batch instruction editing with shared references and square padding --- app/api/canvas/batch-instruction/route.ts | 70 ++++++ app/api/canvas/download-zip-task/route.ts | 2 +- components/scene-fusion-view.tsx | 241 +++++++++++++++++--- lib/canvas/batch-instruction-output.ts | 45 ++++ lib/canvas/generate-image.ts | 1 + lib/canvas/image-task-queue.ts | 12 + lib/client/batch-instruction-edit.ts | 72 ++++++ lib/client/canvas-zip-download.ts | 5 +- playwright.helpers.config.ts | 1 + tests/routes/batch-instruction-edit.test.ts | 60 +++++ 10 files changed, 478 insertions(+), 31 deletions(-) create mode 100644 app/api/canvas/batch-instruction/route.ts create mode 100644 lib/canvas/batch-instruction-output.ts create mode 100644 lib/client/batch-instruction-edit.ts create mode 100644 tests/routes/batch-instruction-edit.test.ts diff --git a/app/api/canvas/batch-instruction/route.ts b/app/api/canvas/batch-instruction/route.ts new file mode 100644 index 000000000..2cd554ab6 --- /dev/null +++ b/app/api/canvas/batch-instruction/route.ts @@ -0,0 +1,70 @@ +import { NextResponse } from "next/server"; +import { z } from "zod"; +import { auth } from "@/app/(auth)/auth"; +import { createCanvasImageTask, enqueueCanvasImageTask } from "@/lib/canvas/image-task-queue"; +import { getSystemSetting } from "@/lib/db/queries"; +import type { CanvasGenerateImageRequest } from "@/lib/canvas/generate-image"; + +const imageUrl = z.string().trim().max(8192).refine(value => { + try { + const url = new URL(value); + return (url.protocol === "https:" || url.protocol === "http:") && + !url.username && !url.password; + } catch { + return false; + } +}); + +const submission = z.object({ + taskId: z.string().uuid(), + image: imageUrl, + reference: imageUrl.optional(), + instruction: z.string().trim().min(1).max(3000), + square: z.boolean(), +}); + +export async function POST(request: Request) { + const session = await auth(); + if (!session?.user?.id) return NextResponse.json({ error: "未登录" }, { status: 401 }); + const parsed = submission.safeParse(await request.json().catch(() => null)); + if (!parsed.success) return NextResponse.json({ error: "请提供原图和 1 至 3000 字的编辑指令" }, { status: 400 }); + + const { taskId, image, reference, instruction, square } = parsed.data; + if (reference === image) return NextResponse.json({ error: "共用参考图和待编辑原图相同" }, { status: 400 }); + + try { + const setting = await getSystemSetting({ key: "scene_fusion_config" }); + if ((setting?.value as { enabled?: boolean } | null)?.enabled === false) { + return NextResponse.json({ error: "批量处理功能已被管理员禁用" }, { status: 403 }); + } + + const referenceImages = reference ? [image, reference] : [image]; + const imageRequest: CanvasGenerateImageRequest = { + prompt: [ + "编辑第一张图。保留第一张图的完整构图、原始宽高比和所有未要求修改的内容。", + reference && "第二张图只提供指令指定的人脸、商品或其他特征。以第一张图为底图,保持第一张图中其余人物、姿势、衣着、商品、背景和光线,除非指令明确要求更改。", + "保持原图整幅画面的四边,避免裁切或拉伸。只输出一张编辑后的图片。", + "编辑指令:" + instruction, + ].filter(Boolean).join("\n"), + displayPrompt: instruction, + aspectRatio: "auto", + imageCount: 1, + referenceImages, + requiredReferenceImageCount: referenceImages.length, + agentImageMode: "auto", + promptExtend: false, + padBatchInstructionToSquare: square || undefined, + debugLabel: "batch-instruction-edit", + }; + const task = await createCanvasImageTask({ + userId: session.user.id, + request: { ...imageRequest }, + taskId, + }); + if (task.status === "pending") await enqueueCanvasImageTask(task.id); + return NextResponse.json({ taskId: task.id }, { status: 202 }); + } catch (error) { + console.error("[BatchInstruction] Task submission failed", { taskId, error }); + return NextResponse.json({ error: "暂时无法确认是否提交成功,请查询原任务" }, { status: 503 }); + } +} diff --git a/app/api/canvas/download-zip-task/route.ts b/app/api/canvas/download-zip-task/route.ts index 16a9a6616..57aa08d0b 100644 --- a/app/api/canvas/download-zip-task/route.ts +++ b/app/api/canvas/download-zip-task/route.ts @@ -154,7 +154,7 @@ export async function POST(request: NextRequest) { await mkdir(zipTaskPath(id), { mode: 0o700 }); }); const now = Date.now(); - const remote = body.scope === "style-detail" && + const remote = (body.scope === "style-detail" || body.scope === "batch-instruction") && process.env.CANVAS_ZIP_WORKER_URL && process.env.CANVAS_ZIP_WORKER_TOKEN ? { attempt: 0 } : undefined; task = { id, userId: session.user.id, folderName: sanitizeFolderName(String(body.folderName || "")), files, remote, diff --git a/components/scene-fusion-view.tsx b/components/scene-fusion-view.tsx index e96fcb817..0686a8c65 100644 --- a/components/scene-fusion-view.tsx +++ b/components/scene-fusion-view.tsx @@ -33,6 +33,9 @@ import { DialogTitle, } from "@/components/ui/dialog"; import { Input } from "@/components/ui/input"; +import { Textarea } from "@/components/ui/textarea"; +import { runBatchInstructionEdit, BatchInstructionEditError } from "@/lib/client/batch-instruction-edit"; +import { downloadCanvasSelectionZip } from "@/lib/client/canvas-zip-download"; import { Label } from "@/components/ui/label"; import { ScrollArea } from "@/components/ui/scroll-area"; import { @@ -59,6 +62,7 @@ import type { AgentWorkflowProductDetailChannel } from "@/types/agent"; const fetcher = (url: string) => fetch(url).then((res) => res.json()); const MAX_BATCH_ITEMS = 10; +const imageFileAccept = "image/png,image/jpeg,image/webp,image/heic,image/heif,.heic,.heif"; const BATCH_REQUEST_STAGGER_MS = 700; const BATCH_PARALLEL_WORKER_COUNT = 4; const MULTI_PRODUCT_FAILOVER_MAX_ROUNDS = 5; @@ -100,6 +104,7 @@ function formatQueueWaitLabel(estimatedWaitMs?: number | null) { type BatchMode = | "scene-fission" | "multi-product-scene" + | "instruction-edit" | "random-bg" | "rmbg" | "enhance" @@ -116,6 +121,8 @@ interface ProcessItem { error?: string; targetName?: string; customPrompt?: string; + instructionTaskId?: string; + instructionSubmitted?: boolean; queueStatus?: { queuePosition?: number; sameModelPendingCount?: number; @@ -164,6 +171,10 @@ type SceneFusionPersistedState = { randomCount: number; randomPrompt: string; batchItems: ProcessItem[]; + instructionItems: ProcessItem[]; + instructionText: string; + instructionReference: string | null; + instructionSquare: boolean; selectedResultIds: string[]; }; @@ -256,8 +267,9 @@ function createPersistableSnapshot(snapshot: SceneFusionPersistedState): SceneFu const multiProductItems = toPersistableItems(snapshot.multiProductItems); const randomItems = toPersistableItems(snapshot.randomItems); const batchItems = toPersistableItems(snapshot.batchItems); + const instructionItems = toPersistableItems(snapshot.instructionItems); const persistedIds = new Set( - [...sceneItems, ...multiProductItems, ...randomItems, ...batchItems].map( + [...sceneItems, ...multiProductItems, ...randomItems, ...batchItems, ...instructionItems].map( (item) => item.id ) ); @@ -271,6 +283,8 @@ function createPersistableSnapshot(snapshot: SceneFusionPersistedState): SceneFu toPersistableImageValue(snapshot.referenceSceneImage) || null, randomItems, batchItems, + instructionItems, + instructionReference: toPersistableImageValue(snapshot.instructionReference) || null, selectedResultIds: snapshot.selectedResultIds.filter((id) => persistedIds.has(id) ), @@ -325,6 +339,12 @@ const modeOptions: Array<{ description: "10张产品图 + 1张参考图", icon: ImageIcon, }, + { + id: "instruction-edit", + label: "批量指令编辑", + description: "多张原图执行同一条指令", + icon: Wand2, + }, { id: "random-bg", label: "随机换背景", @@ -363,6 +383,8 @@ function getModeActionLabel(mode: BatchMode, count: number) { return `开始裂变 (${count} 张)`; case "multi-product-scene": return `开始多产品替换 (${count} 张)`; + case "instruction-edit": + return `开始编辑 (${count} 张)`; case "random-bg": return `开始换背景 (${count} 张)`; case "rmbg": @@ -510,6 +532,16 @@ export function SceneFusionView({ const [randomPrompt, setRandomPrompt] = useState(""); const [batchItems, setBatchItems] = useState([]); + const [instructionItems, setInstructionItems] = useState([]); + const [instructionText, setInstructionText] = useState(""); + const [instructionReference, setInstructionReference] = useState(null); + const [instructionSquare, setInstructionSquare] = useState(false); + const [isInstructionUploading, setIsInstructionUploading] = useState(false); + const [zipStage, setZipStage] = useState(""); + const [isZipping, setIsZipping] = useState(false); + const isInstructionMode = mode === "instruction-edit"; + const activeBatchItems = isInstructionMode ? instructionItems : batchItems; + const setActiveBatchItems = isInstructionMode ? setInstructionItems : setBatchItems; const [previewImageUrl, setPreviewImageUrl] = useState(null); const [previewImageTitle, setPreviewImageTitle] = useState("处理结果预览"); @@ -522,14 +554,15 @@ export function SceneFusionView({ const multiProductInputRef = useRef(null); const referenceSceneInputRef = useRef(null); const batchInputRef = useRef(null); + const instructionReferenceInputRef = useRef(null); const productPreviewObjectUrlRef = useRef(null); const resultItems = useMemo(() => { if (mode === "scene-fission") return sceneItems; if (mode === "multi-product-scene") return multiProductItems; if (mode === "random-bg") return randomItems; - return batchItems; - }, [batchItems, mode, multiProductItems, randomItems, sceneItems]); + return activeBatchItems; + }, [activeBatchItems, mode, multiProductItems, randomItems, sceneItems]); const resultQueueMetaById = useMemo( () => new Map( @@ -547,9 +580,18 @@ export function SceneFusionView({ if (mode === "multi-product-scene") return multiProductItems.length > 0 && Boolean(referenceSceneImage); if (mode === "random-bg") return Boolean(productImage) && randomCount > 0; + if (isInstructionMode) { + return config?.enabled !== false && !isInstructionUploading && instructionItems.length > 0 && + Boolean(instructionText.trim() || instructionItems.every(item => item.instructionSubmitted)); + } return batchItems.length > 0; }, [ batchItems.length, + config?.enabled, + instructionItems, + instructionText, + isInstructionMode, + isInstructionUploading, mode, multiProductItems.length, productImage, @@ -745,6 +787,12 @@ export function SceneFusionView({ if (Array.isArray(parsed.batchItems)) { setBatchItems(toPersistableItems(parsed.batchItems)); } + if (Array.isArray(parsed.instructionItems)) { + setInstructionItems(toPersistableItems(parsed.instructionItems)); + } + if (typeof parsed.instructionText === "string") setInstructionText(parsed.instructionText); + setInstructionReference(toPersistableImageValue(parsed.instructionReference) || null); + setInstructionSquare(parsed.instructionSquare === true); if (Array.isArray(parsed.selectedResultIds)) { setSelectedResultIds(parsed.selectedResultIds.map((value) => String(value || "").trim()).filter(Boolean)); } @@ -835,6 +883,10 @@ export function SceneFusionView({ randomCount, randomPrompt, batchItems, + instructionItems, + instructionText, + instructionReference, + instructionSquare, selectedResultIds, }; @@ -854,6 +906,10 @@ export function SceneFusionView({ }, [ aspectRatio, batchItems, + instructionItems, + instructionText, + instructionReference, + instructionSquare, imageSize, mode, multiProductItems, @@ -1099,6 +1155,21 @@ export function SceneFusionView({ } }; + const handleInstructionReferenceUpload = async (event: React.ChangeEvent) => { + const input = event.currentTarget; + const [file] = validateImageFiles(Array.from(input.files || [])); + input.value = ""; + if (!file) return; + setIsInstructionUploading(true); + try { + setInstructionReference(await uploadImageFile(file)); + } catch (error) { + toast.error(error instanceof Error ? error.message : "参考图上传失败"); + } finally { + setIsInstructionUploading(false); + } + }; + const handleBatchUpload = async (e: React.ChangeEvent) => { const input = e.currentTarget; const files = validateImageFiles(Array.from(input.files || [])); @@ -1106,15 +1177,16 @@ export function SceneFusionView({ input.value = ""; return; } - if (batchItems.length + files.length > MAX_BATCH_ITEMS) { + if (activeBatchItems.length + files.length > MAX_BATCH_ITEMS) { toast.error(`单次最多上传 ${MAX_BATCH_ITEMS} 张图片`); input.value = ""; return; } + if (isInstructionMode) setIsInstructionUploading(true); try { const uploadedItems = await uploadImageFiles(files); - setBatchItems((prev) => [ + setActiveBatchItems((prev) => [ ...prev, ...uploadedItems.map((item) => ({ id: Math.random().toString(36).slice(2, 10), @@ -1126,6 +1198,7 @@ export function SceneFusionView({ } catch (error) { toast.error(error instanceof Error ? error.message : "图片上传失败"); } finally { + if (isInstructionMode) setIsInstructionUploading(false); input.value = ""; } }; @@ -1145,7 +1218,7 @@ export function SceneFusionView({ }; const removeBatchItem = (id: string) => { - setBatchItems((prev) => prev.filter((item) => item.id !== id)); + setActiveBatchItems((prev) => prev.filter((item) => item.id !== id)); }; const updateBatchItemsStatus = (ids: string[], status: ItemStatus) => { @@ -1746,6 +1819,33 @@ export function SceneFusionView({ }; const processBatchImageItem = async (item: ProcessItem) => { + if (isInstructionMode) { + if (!item.instructionSubmitted && !instructionText.trim()) { + throw new Error("请填写统一编辑指令"); + } + const taskId = item.instructionTaskId || crypto.randomUUID(); + const updateTask = (patch: Partial) => setInstructionItems(items => + items.map(current => current.id === item.id ? { ...current, ...patch } : current) + ); + updateTask({ instructionTaskId: taskId }); + try { + const result = await runBatchInstructionEdit({ + taskId, + image: new URL(item.image, window.location.origin).href, + reference: instructionReference ? new URL(instructionReference, window.location.origin).href : undefined, + instruction: instructionText.trim(), + square: instructionSquare, + submitted: item.instructionSubmitted, + }, () => updateTask({ instructionSubmitted: true })); + updateTask({ instructionTaskId: undefined, instructionSubmitted: undefined }); + return result; + } catch (error) { + if (error instanceof BatchInstructionEditError && error.canStartNewTask) { + updateTask({ instructionTaskId: undefined, instructionSubmitted: undefined }); + } + throw error; + } + } if (mode === "rmbg") { const response = await fetch("/api/rmbg", { method: "POST", @@ -1828,16 +1928,16 @@ export function SceneFusionView({ }; const runBatchImageMode = async () => { - if (batchItems.length === 0) { + if (activeBatchItems.length === 0) { toast.error("请先上传图片"); return; } - let itemsToProcess = batchItems.filter( - (item) => item.status === "pending" || item.status === "failed" + let itemsToProcess = activeBatchItems.filter( + (item) => item.status === "pending" || item.status === "failed" || (isInstructionMode && item.status === "processing") ); if (itemsToProcess.length === 0) { - itemsToProcess = batchItems; + itemsToProcess = activeBatchItems; } if (itemsToProcess.length > MAX_BATCH_ITEMS) { @@ -1846,7 +1946,7 @@ export function SceneFusionView({ } setIsProcessing(true); - setBatchItems((prev) => + setActiveBatchItems((prev) => prev.map((item) => itemsToProcess.some((target) => target.id === item.id) ? markProcessItemRegenerating(item, "pending") @@ -1866,7 +1966,7 @@ export function SceneFusionView({ while (queue.length > 0) { const current = queue.shift(); if (!current) break; - setBatchItems((prev) => + setActiveBatchItems((prev) => prev.map((item) => item.id === current.id ? markProcessItemRegenerating(item, "processing") @@ -1876,7 +1976,7 @@ export function SceneFusionView({ try { const result = await processBatchImageItem(current); successCount += 1; - setBatchItems((prev) => + setActiveBatchItems((prev) => prev.map((item) => item.id === current.id ? { @@ -1892,7 +1992,7 @@ export function SceneFusionView({ } catch (error) { const message = error instanceof Error ? error.message : "处理失败"; failedCount += 1; - setBatchItems((prev) => + setActiveBatchItems((prev) => prev.map((item) => item.id === current.id ? { @@ -1928,7 +2028,7 @@ export function SceneFusionView({ } setIsProcessing(true); - setBatchItems((prev) => + setActiveBatchItems((prev) => prev.map((batchItem) => batchItem.id === item.id ? markProcessItemRegenerating(batchItem, "processing") @@ -1938,7 +2038,7 @@ export function SceneFusionView({ try { const result = await processBatchImageItem(item); - setBatchItems((prev) => + setActiveBatchItems((prev) => prev.map((batchItem) => batchItem.id === item.id ? { @@ -1954,7 +2054,7 @@ export function SceneFusionView({ toast.success("已重新处理 1 张图片"); } catch (error) { const message = error instanceof Error ? error.message : "处理失败"; - setBatchItems((prev) => + setActiveBatchItems((prev) => prev.map((batchItem) => batchItem.id === item.id ? { ...batchItem, status: "failed", error: message } @@ -2089,6 +2189,30 @@ export function SceneFusionView({ toast.error("没有可下载的图片"); return; } + if (isInstructionMode) { + if (isZipping) return; + setIsZipping(true); + setZipStage("正在准备下载"); + try { + const task = await downloadCanvasSelectionZip({ + folderName: "批量指令编辑", + files: completed.map(item => ({ + url: getProcessItemSourceUrl(item), + name: `编辑结果 ${resultItems.indexOf(item) + 1}`, + })), + selectionKey: persistenceKey || "batch-instruction", + scope: "batch-instruction", + onProgress: task => setZipStage(task.stage), + }); + toast.success(task.failedCount ? `已开始下载,${task.failedCount} 张未打包` : "已开始下载 ZIP"); + } catch (error) { + toast.error(error instanceof Error ? error.message : "无法下载 ZIP"); + } finally { + setIsZipping(false); + setZipStage(""); + } + return; + } for (let i = 0; i < completed.length; i += 1) { const item = completed[i]!; await downloadImage( @@ -2220,7 +2344,7 @@ export function SceneFusionView({
- {batchItems.length === 0 && ( + {activeBatchItems.length === 0 && (
batchInputRef.current?.click()} + onClick={() => !isProcessing && !isInstructionUploading && batchInputRef.current?.click()} >

@@ -2869,7 +2995,7 @@ export function SceneFusionView({

)} - {batchItems.map((item, index) => ( + {activeBatchItems.map((item, index) => (
{item.error && ( -
+
{item.error}
)} @@ -2918,6 +3044,58 @@ export function SceneFusionView({
)} + + {isInstructionMode && ( +
+
+ +