Compare commits

..

No commits in common. "main" and "codex/qiniu-direct-image-archive-20261110" have entirely different histories.

94 changed files with 734 additions and 3299 deletions

View File

@ -2377,10 +2377,8 @@ export function LocalAiImagePipelineSections({
items={[
{
label:
extendConfig.provider === "fal"
? "fal · FLUX 2 Pro 扩图"
: extendConfig.provider === "vip98k"
? `98K · ${extendConfig.modelId || "image-expansion"}`
extendConfig.provider === "vip98k"
? "VIP98K 服务商"
: "阿里云服务商",
tone: "enabled",
},
@ -2393,13 +2391,9 @@ export function LocalAiImagePipelineSections({
}
title="图像拓展API配置"
>
{extendConfig.provider === "fal" ? (
{extendConfig.provider === "vip98k" ? (
<div className="rounded-lg border bg-muted/40 p-4 text-sm">
使用 FLUX 2 Pro Outpaint 扩展图片。密钥从已启用的 fal 官方服务商读取。
</div>
) : extendConfig.provider === "vip98k" ? (
<div className="rounded-lg border bg-muted/40 p-4 text-sm">
使用 98K 的 {extendConfig.modelId || "image-expansion"} 模型。API Key 从“AI 模型设置”中的
使用 VIP98K 的 image-expansion 模型。API Key 从“AI 模型设置”中的
VIP98K 服务商读取,仅在这里维护扩展比例。
</div>
) : (

View File

@ -274,9 +274,7 @@ export type EnhanceConfig = {
};
export type ExtendConfig = {
provider: "vip98k" | "dashscope" | "fal";
modelId: string;
routeOptionId: string;
provider: "vip98k" | "dashscope";
xScale: string;
yScale: string;
};

View File

@ -2576,9 +2576,7 @@ export function AdminSettingsClient() {
// 图像拓展API配置状态
const [extendConfig, setExtendConfig] = useState({
provider: "dashscope" as "vip98k" | "dashscope" | "fal",
modelId: "",
routeOptionId: "",
provider: "dashscope" as "vip98k" | "dashscope",
xScale: "1.5", // X轴放大倍数
yScale: "1.5", // Y轴放大倍数
});
@ -2893,16 +2891,12 @@ export function AdminSettingsClient() {
useEffect(() => {
if (extendConfigData?.setting?.value) {
const config = extendConfigData.setting.value as {
provider?: "vip98k" | "dashscope" | "fal";
modelId?: string;
routeOptionId?: string;
provider?: "vip98k" | "dashscope";
xScale?: number;
yScale?: number;
};
setExtendConfig({
provider: config.provider === "vip98k" || config.provider === "fal" ? config.provider : "dashscope",
modelId: config.modelId || "",
routeOptionId: config.routeOptionId || "",
provider: config.provider === "vip98k" ? "vip98k" : "dashscope",
xScale: config.xScale ? String(config.xScale) : "1.5",
yScale: config.yScale ? String(config.yScale) : "1.5",
});
@ -5511,8 +5505,6 @@ export function AdminSettingsClient() {
key: "extend_api_config",
value: {
provider: extendConfig.provider,
modelId: extendConfig.modelId,
routeOptionId: extendConfig.routeOptionId,
xScale,
yScale,
},
@ -13517,8 +13509,7 @@ export function AdminSettingsClient() {
系统智能选择(根据意图路由)
</SelectItem>
{modelsData?.models
?.filter((m: any) => m.supportsImageGen && m.isEnabled && !m.isSubModel &&
providersData?.providers?.some((provider: any) => provider.id === m.providerId && provider.isEnabled))
?.filter((m: any) => m.supportsImageGen)
.map((model: any) => (
<SelectItem key={model.id} value={model.id}>
{model.displayName}

View File

@ -4,8 +4,7 @@ import { fetchImageBufferFromUrl } from "@/lib/ai/rmbg/service";
import { getLanguageModelById } from "@/lib/ai/dynamic-provider";
import {
DETAIL_REPLACEMENT_IMAGE_MODEL_CONFIG_KEY,
findConfiguredDetailReplacementImageModel,
isDetailReplacementImageModel,
normalizeDetailReplacementImageModelConfig,
} from "@/lib/ai/detail-replacement-image-model-config";
import {
compositeReplacementWithReferenceLocks,
@ -30,6 +29,7 @@ import {
} from "@/lib/db/queries";
import { uploadFile } from "@/lib/storage/service";
import { bufferToArrayBuffer } from "./persistence";
import { isVideoProviderType } from "./video-models";
import type { AgentPresetMessageImagePart } from "./agent-scene-workflow";
import type { PostRequestBody } from "../schema";
@ -2161,10 +2161,22 @@ export async function resolveDirectReplacementModelRef(params: {
models?: Awaited<ReturnType<typeof getEnabledAiModelsWithProvider>>;
}) {
const models = params.models || (await getEnabledAiModelsWithProvider(false));
const imageModels = models.filter(
({ model, provider }) =>
model.supportsImageGen &&
!model.isSubModel &&
!isVideoProviderType(provider?.type, model),
);
const configuredModelSetting = await getSystemSetting({
key: DETAIL_REPLACEMENT_IMAGE_MODEL_CONFIG_KEY,
}).catch(() => null);
const configuredModel = findConfiguredDetailReplacementImageModel(models, configuredModelSetting?.value);
const configuredModelId = normalizeDetailReplacementImageModelConfig(
configuredModelSetting?.value,
).modelId;
const configuredModel = imageModels.find(
({ model }) =>
model.id === configuredModelId || model.modelId === configuredModelId,
);
if (configuredModel) {
return configuredModel.model.id;
}
@ -2178,7 +2190,6 @@ export async function resolveDirectReplacementModelRef(params: {
return routedModel;
}
const imageModels = models.filter(isDetailReplacementImageModel);
const preferred =
imageModels.find(({ model }) => model.isDefault) ||
imageModels.find(({ provider }) => String(provider?.type || "").includes("image")) ||

View File

@ -10,10 +10,6 @@ import {
} from "@/lib/db/queries";
import { getAiModelFrontendAvailability } from "@/lib/ai/model-frontend-availability";
import { buildVideoToolCapability } from "@/lib/ai/video-tool-capability";
import {
DETAIL_REPLACEMENT_IMAGE_MODEL_CONFIG_KEY,
findConfiguredDetailReplacementImageModel,
} from "@/lib/ai/detail-replacement-image-model-config";
import {
isImageGenerationModelDescriptor,
isVideoModelDescriptor,
@ -161,17 +157,10 @@ export async function GET(request: Request) {
: await getEnabledAiModelsWithProvider(false, true);
const agentModelWithProvider = await getAgentAiModelWithProvider();
const defaultModel = await getDefaultAiModel();
const [siteSettings, agentWorkflowUiConfigSetting, detailReplacementModelSetting] = await Promise.all([
const [siteSettings, agentWorkflowUiConfigSetting] = await Promise.all([
getSiteSettings(),
getSystemSetting({ key: AGENT_WORKFLOW_UI_CONFIG_KEY }).catch(() => null),
getSystemSetting({ key: DETAIL_REPLACEMENT_IMAGE_MODEL_CONFIG_KEY }).catch(() => null),
]);
const detailReplacementModel = findConfiguredDetailReplacementImageModel(
includeUnavailable ? modelsWithProvider.filter(({ model, provider }) =>
provider.isEnabled && model.isEnabled && getAiModelFrontendAvailability(model).selectable !== false
) : modelsWithProvider,
detailReplacementModelSetting?.value,
);
type ModelWithProvider = (typeof modelsWithProvider)[number];
const serializeModel = ({ model, provider }: ModelWithProvider) => ({
id: model.id,
@ -320,7 +309,6 @@ export async function GET(request: Request) {
: null,
agentWorkflowDefaultModelId: agentWorkflowDefaultModel?.model.id || null,
agentWorkflowConfiguredModels,
detailReplacementModel: detailReplacementModel ? serializeModel(detailReplacementModel) : null,
agentModel: agentModelWithProvider
? {
id: agentModelWithProvider.model.id,

View File

@ -1,20 +0,0 @@
import { z } from "zod";
import { auth } from "@/app/(auth)/auth";
import { resolveAgentWorkflowComposerSelections } from "@/lib/agents/workflow-composer";
import { AGENT_WORKFLOW_UI_CONFIG_KEY, normalizeAgentWorkflowUiConfig } from "@/lib/agents/workflow-ui-config";
import { getSystemSetting } from "@/lib/db/queries";
const selectionsSchema = z.record(z.string().max(160), z.string().max(8192))
.refine((selections) => Object.keys(selections).length <= 100);
export async function POST(request: Request) {
const session = await auth();
if (!session?.user?.id) return Response.json({ error: "请先登录" }, { status: 401 });
const selections = selectionsSchema.safeParse(await request.json().catch(() => null));
if (!selections.success) return Response.json({ error: "风格模板选择无效" }, { status: 400 });
const setting = await getSystemSetting({ key: AGENT_WORKFLOW_UI_CONFIG_KEY });
const config = normalizeAgentWorkflowUiConfig(setting?.value);
return Response.json({ selections: resolveAgentWorkflowComposerSelections({ config, selections: selections.data }) });
}

View File

@ -4,7 +4,6 @@ import { auth } from "@/app/(auth)/auth";
import { db } from "@/lib/db";
import { canvasImageTask, canvasProject, message } from "@/lib/db/schema";
import { extractAgentProjectStateFromCanvasData, isAgentProjectRow } from "@/lib/agents/agent-project-compat";
import { MAX_DETAIL_REPLACEMENT_REFERENCES } from "@/lib/agents/mode-workspace-state";
import {
createCanvasImageTask,
enqueueCanvasImageTask,
@ -147,14 +146,6 @@ export async function POST(request: Request) {
.map((item) => [String(item.id), String(item.imageUrl)]),
);
const requested = Array.isArray(body.references) ? body.references : [];
if (requested.length === 0) {
return NextResponse.json({ error: "请先选择详情参考图" }, { status: 400 });
}
if (requested.length > MAX_DETAIL_REPLACEMENT_REFERENCES) {
return NextResponse.json({
error: `本次选中了 ${requested.length} 张详情参考图,一次最多替换 ${MAX_DETAIL_REPLACEMENT_REFERENCES} 张,请减少本次选择后重试`,
}, { status: 400 });
}
const references: DetailReplacementBatchReference[] = requested.map((raw: unknown) => {
const item = raw && typeof raw === "object" ? raw as Record<string, unknown> : {};
return {
@ -169,6 +160,7 @@ export async function POST(request: Request) {
};
});
if (
references.length === 0 || references.length > 40 ||
new Set(references.map((item) => item.id)).size !== references.length ||
references.some((item) => !item.id || knownReferences.get(item.id) !== item.imageUrl)
) {
@ -195,12 +187,6 @@ export async function POST(request: Request) {
if (!model || model === "auto" || !models.some((entry) => entry.model.id === model)) {
return NextResponse.json({ error: "详情替换模型不可用,请检查模型配置" }, { status: 400 });
}
if (typeof body.expectedModelId === "string" && body.expectedModelId !== model) {
return NextResponse.json({
code: "DETAIL_REPLACEMENT_MODEL_CHANGED",
error: "详情替换模型已更新,请确认页面显示的模型后重新提交",
}, { status: 409 });
}
const quota = await checkUserImageQuota(session.user.id);
if (!quota.allowed) {
return NextResponse.json({ error: "本月图片生成配额已用完" }, { status: 429 });

View File

@ -9,10 +9,10 @@ export async function GET() {
const models = await listCanvasAudioModels();
return NextResponse.json(
{
models: models.map(({ model, provider }) => ({
models: models.map(({ model }) => ({
id: model.id,
modelId: model.modelId,
name: `${model.displayName} · ${provider.type === "vip98k" ? "98K" : "阿里云"}`,
name: model.displayName,
...audioContract(model.modelId),
})),
},

View File

@ -26,10 +26,9 @@ function failed(failure: DownloadFailure, requestId: string) {
});
}
function preparing(requestId: string, converting = false) {
function preparing(requestId: string) {
return NextResponse.json({ delivery: "preparing", retryAfter: 2, requestId,
phase: converting ? "converting" : "preparing",
message: converting ? "正在转换为兼容 PNG 并保存,完成后自动下载" : "正在准备原图,完成后将自动开始下载" }, {
message: "正在准备原图,完成后将自动开始下载" }, {
status: 202, headers: { "Retry-After": "2", "Cache-Control": "no-store" },
});
}
@ -120,23 +119,23 @@ export async function POST(request: NextRequest) {
const name = sanitizeCanvasDownloadFileName(String(body.name || ""), "canvas-image");
if (body.preferDirect === true) {
const { task, direct, canPrepareDirect } = await resolveCanvasCdnDownload(urls, `${name}.png`);
const { task, direct, canPrepareDirect } = await resolveCanvasCdnDownload(urls, `${name}.png`).catch((error) => {
logger.warn("cdn_lookup_failed", error, { requestId });
return { task: null, direct: null, canPrepareDirect: false };
});
if (direct) return NextResponse.json(direct, { headers: { "Cache-Control": "no-store" } });
if (task && canPrepareDirect) {
if (task && canPrepareDirect && body.preparation === "async") {
const asset = (task.metadata as { downloadAsset?: { status?: string; failure?: DownloadFailure; retryAt?: string } } | null)?.downloadAsset;
if (asset?.status === "abandoned" || (asset?.status === "failed" && Date.parse(asset.retryAt || "") > Date.now())) {
return failed(asset.failure || getDownloadFailure(null), task.id);
}
scheduleImageDownloadPreparation(task.id);
return preparing(task.id, true);
return preparing(task.id);
}
if (task && !task.targetUrl) {
const { originalImagePreparing, prepareOriginalImageArchive } = await import("@/lib/storage/original-image-download");
const pending = await prepareOriginalImageArchive(task.sourceUrl);
return NextResponse.json(originalImagePreparing(pending), { status: 202,
headers: { "Retry-After": "3", "Cache-Control": "no-store" } });
if (task?.targetUrl) {
if (!urls.includes(task.targetUrl)) urls.unshift(task.targetUrl);
scheduleImageDownloadPreparation(task.id);
}
throw new Error("下载文件暂时无法从存储桶直接下载");
}
const cookie = request.headers.get("cookie") || "";
if (body.preparation === "async") {

View File

@ -976,8 +976,7 @@ export async function POST(request: NextRequest) {
const annotatedFilename = `canvas-local-edit-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.png`;
const annotatedUpload = await uploadFile(
annotatedFilename,
toArrayBuffer(annotatedBuffer),
{ preferQiniuForm: true }
toArrayBuffer(annotatedBuffer)
);
const prompt = buildLocalEditPrompt(regions);
const manualRegionReferenceImageUrls = regions.flatMap((region) =>

View File

@ -1,11 +1,7 @@
import { NextResponse } from "next/server";
import { z } from "zod";
import { and, eq, inArray } from "drizzle-orm";
import { auth } from "@/app/(auth)/auth";
import { callQwen3Vl } from "@/lib/ai/qwen3-vl";
import { executeConfiguredVip98kTask, getVip98kRuntimeProviders } from "@/lib/ai/vip98k-runtime";
import { db } from "@/lib/db";
import { aiModel } from "@/lib/db/schema";
import { createLogger } from "@/lib/observability/logger";
import sharp from "sharp";
@ -94,39 +90,6 @@ function fallbackItemsFromRaw(raw: string): OcrItem[] {
}));
}
async function detectTextWithVip98k(imageUrl: string): Promise<OcrItem[] | null> {
const providers = await getVip98kRuntimeProviders();
if (!providers.length) return null;
const model = await db.query.aiModel.findFirst({
columns: { providerId: true },
where: and(
inArray(aiModel.providerId, providers.map(({ id }) => id)),
eq(aiModel.modelId, "ocr"),
eq(aiModel.isEnabled, true),
),
});
if (!model) return null;
const result = await executeConfiguredVip98kTask({
modelId: "ocr",
kind: "image-tool",
imageUrls: [imageUrl],
preferredProviderId: model.providerId,
});
const textUrl = result.outputUrls[0];
if (!textUrl) throw new Error("98K 文字识别未返回文本文件");
const response = await fetch(textUrl, { signal: AbortSignal.timeout(15_000) });
const type = response.headers.get("content-type") || "";
if (!response.ok || !/^(?:text\/plain|application\/octet-stream)(?:;|$)/i.test(type)) {
await response.body?.cancel();
throw new Error(`无法读取 98K 文字识别结果(HTTP ${response.status})`);
}
return (await response.text()).split(/\r\n?|\n/).map((line) => line.trim())
.filter(Boolean).slice(0, 50).map((text, index) => ({ id: String(index + 1), text }));
}
function shouldUseDataUrlFallback(error: unknown) {
const message =
error instanceof Error ? error.message.toLowerCase() : String(error || "").toLowerCase();
@ -184,11 +147,6 @@ export async function POST(request: Request) {
return NextResponse.json({ success: false, error: "仅支持 URL 图片,不允许 base64 传输" }, { status: 400 });
}
const detected = await detectTextWithVip98k(imageUrl);
if (detected !== null) {
return NextResponse.json({ success: true, data: { items: detected, model: "ocr" } });
}
logger.debug("model_selected", { model: "qwen3-vl" });
const prompt = [
"你是图片文字识别助手。",
@ -233,9 +191,15 @@ export async function POST(request: Request) {
}
const parsedJson = parseJsonText(text || "");
const items = Array.isArray(parsedJson?.items)
? sanitizeItems(parsedJson.items)
: fallbackItemsFromRaw(text);
let items: OcrItem[] = [];
if (parsedJson && Array.isArray(parsedJson.items)) {
items = sanitizeItems(parsedJson.items);
}
if (items.length === 0 && text) {
items = fallbackItemsFromRaw(text);
}
return NextResponse.json({
success: true,
@ -249,7 +213,7 @@ export async function POST(request: Request) {
return NextResponse.json(
{
success: false,
error: "图片文字识别暂不可用,请稍后重试",
error: error instanceof Error ? error.message : "文字识别失败",
},
{ status: 500 },
);

View File

@ -133,13 +133,15 @@ function buildImageResponse(
etag: string;
vary?: string;
cacheStatus?: "HIT" | "MISS";
cacheControl?: string;
attachment?: boolean;
}
) {
const headers: Record<string, string> = {
"Content-Type": params.contentType,
"Content-Length": String(body.length),
ETag: params.etag,
"Cache-Control": "public, max-age=31536000, immutable, stale-while-revalidate=86400",
"Cache-Control": params.cacheControl || "public, max-age=31536000, immutable, stale-while-revalidate=86400",
};
if (params.vary) {
headers.Vary = params.vary;
@ -147,6 +149,11 @@ function buildImageResponse(
if (params.cacheStatus) {
headers["X-Image-Proxy-Cache"] = params.cacheStatus;
}
if (params.attachment) {
headers["Content-Disposition"] = "attachment";
headers["X-Content-Type-Options"] = "nosniff";
headers["Content-Security-Policy"] = "default-src 'none'; sandbox";
}
return new NextResponse(body, {
status: 200,
headers,
@ -331,18 +338,7 @@ export async function GET(request: NextRequest) {
);
}
if (!original && !forceProxy && isBrowserImageRequest(request)) {
const direct = buildImageProxyUrl(target.toString(), {
width: width || undefined, quality: directQuality || undefined,
format: ["webp", "avif", "jpeg", "png"].includes(requestedFormat || "") ? requestedFormat as OutputFormat : undefined,
});
if (process.env.NEXT_PUBLIC_CANVAS_CDN_ORIGIN && /^https:\/\//.test(direct) &&
new URL(direct).origin === new URL(process.env.NEXT_PUBLIC_CANVAS_CDN_ORIGIN).origin) {
return redirectToDirectImage(new URL(direct));
}
}
if (!original && (isAlibabaModelImageUrl(target.toString()) || (!forceProxy && isBrowserImageRequest(request)))) {
if (!original && isAlibabaModelImageUrl(target.toString())) {
try {
const { getArchivedImageUrlMappings } = await import("@/lib/storage/image-archive-db");
const mappings = await getArchivedImageUrlMappings([target.toString()]);
@ -367,9 +363,7 @@ export async function GET(request: NextRequest) {
buildImageProxyUrl(target.toString(), { delivery: "original" });
const { resolveOriginalCdnDownload } = await import("@/lib/storage/original-image-download");
const direct = await resolveOriginalCdnDownload(target.toString(), searchParams.get("name") || "", request.signal);
if (!direct) throw new Error("下载文件暂时无法从存储桶直接下载");
return NextResponse.json(direct, { status: direct.delivery === "preparing" ? 202 : 200,
headers: { "Cache-Control": "no-store", ...(direct.delivery === "preparing" ? { "Retry-After": "3" } : {}) } });
return NextResponse.json(direct || { delivery: "proxy" }, { headers: { "Cache-Control": "no-store" } });
} catch (error) {
return downloadFailure(error);
}
@ -466,29 +460,20 @@ export async function GET(request: NextRequest) {
if (original) return downloadFailure("Source is not an image");
return NextResponse.json({ error: "Upstream is not an image" }, { status: 400 });
}
if (original) {
if (upstreamResponse.status !== 200 || !upstreamResponse.body) {
await upstreamResponse.body?.cancel();
return downloadFailure("源图片传输中断,请重试");
}
const headers = new Headers({
"Content-Type": contentType,
"Content-Disposition": "attachment",
"Cache-Control": "private, no-store",
"X-Content-Type-Options": "nosniff",
"Content-Security-Policy": "default-src 'none'; sandbox",
});
const length = upstreamResponse.headers.get("content-length");
const encoding = upstreamResponse.headers.get("content-encoding");
if (length && (!encoding || encoding.toLowerCase() === "identity")) headers.set("Content-Length", length);
return new NextResponse(upstreamResponse.body, { headers });
}
try {
originalBuffer = Buffer.from(await upstreamResponse.arrayBuffer());
} catch (error) {
return upstreamFailure(error);
}
}
if (original) {
return buildImageResponse(originalBuffer, {
contentType,
etag: `"${crypto.createHash("sha256").update(originalBuffer).digest("hex")}"`,
cacheControl: "private, no-store",
attachment: true,
});
}
const isSvg = contentType.toLowerCase().includes("image/svg");
const isGif = contentType.toLowerCase().includes("image/gif");

View File

@ -4,15 +4,13 @@ import { createHash } from "node:crypto";
import { z } from "zod";
import { db } from "@/lib/db";
import {
aiModel,
aiProvider,
siteSettings,
systemSettingHistory,
systemSettingSnapshot,
systemSettings,
} from "@/lib/db/schema";
import { and, eq, inArray, sql } from "drizzle-orm";
import { omitAgentWorkflowPrompts } from "@/lib/agents/workflow-loading";
import { and, eq, inArray } from "drizzle-orm";
import { auth } from "@/app/(auth)/auth";
import { isAgentWorkflowAdminType, isSiteAdminType } from "@/lib/middleware/admin";
import {
@ -555,8 +553,6 @@ function normalizeAgentCategoryTreeConfig(value: unknown): AgentCategoryTreeConf
type PublicSiteSettingsScope =
| "agent-brand-model"
| "agent-canvas"
| "agent-canvas-base"
| "agent-workflow-templates"
| "agent-entry"
| "agent-presets"
| "auth"
@ -569,8 +565,6 @@ type PublicSiteSettingsScope =
const PUBLIC_SITE_SETTINGS_SCOPES = new Set<string>([
"agent-brand-model",
"agent-canvas",
"agent-canvas-base",
"agent-workflow-templates",
"agent-entry",
"agent-presets",
"auth",
@ -688,7 +682,7 @@ function createScopedSiteSettingsResponse(
return response;
}
async function readScopedSiteSettings(keys: string[], omitWorkflowSteps = false) {
async function readScopedSiteSettings(keys: string[]) {
const [settings, settingRows] = await Promise.all([
db
.select()
@ -696,14 +690,8 @@ async function readScopedSiteSettings(keys: string[], omitWorkflowSteps = false)
.limit(1)
.then((rows) => rows[0]),
keys.length > 0
? (omitWorkflowSteps
? db.select({
key: systemSettings.key,
value: sql<unknown>`case when ${systemSettings.key} = ${AGENT_WORKFLOW_UI_CONFIG_KEY}
and jsonb_typeof(${systemSettings.value}) = 'object'
then ${systemSettings.value} - 'steps' else ${systemSettings.value} end`,
})
: db.select())
? db
.select()
.from(systemSettings)
.where(inArray(systemSettings.key, keys))
: Promise.resolve([]),
@ -791,17 +779,8 @@ async function getScopedPublicSiteSettings(
});
}
if (scope === "agent-workflow-templates") {
const [setting] = await db.select({ value: systemSettings.value })
.from(systemSettings).where(eq(systemSettings.key, AGENT_WORKFLOW_UI_CONFIG_KEY)).limit(1);
const config = normalizeAgentWorkflowUiConfig(setting?.value);
return createScopedSiteSettingsResponse(scope, {
steps: omitAgentWorkflowPrompts(config.steps),
}, "MISS", options.cacheKey || scope, { etag: options.etag });
}
if (scope === "agent-canvas" || scope === "agent-canvas-base" || scope === "agent-entry") {
const { settings, valueByKey } = await readScopedSiteSettings(AGENT_CANVAS_SETTING_KEYS, scope !== "agent-canvas");
if (scope === "agent-canvas" || scope === "agent-entry") {
const { settings, valueByKey } = await readScopedSiteSettings(AGENT_CANVAS_SETTING_KEYS);
const canvasFeatureAvailability = await readCanvasFeatureAvailability(
valueByKey
);
@ -852,9 +831,7 @@ async function getScopedPublicSiteSettings(
pageFeatureSettings: rawUiConfig?.pageFeatureSettings,
businessModeSettings: rawUiConfig?.businessModeSettings,
}
: scope === "agent-canvas-base"
? { ...rawUiConfig, steps: [] }
: rawUiConfig
: rawUiConfig
),
agentWorkflowShowcaseConfig: normalizeAgentWorkflowShowcaseConfig(
valueByKey.get(AGENT_WORKFLOW_SHOWCASE_CONFIG_KEY)
@ -1113,8 +1090,7 @@ export async function GET(request: NextRequest) {
const cacheKey = brandName.trim()
? `${scopedScope}:${brandName.trim().toLowerCase()}`
: scopedScope;
const etag = scopedScope === "agent-canvas" || scopedScope === "agent-entry" ||
scopedScope === "agent-canvas-base" || scopedScope === "agent-workflow-templates"
const etag = scopedScope === "agent-canvas" || scopedScope === "agent-entry"
? await getAgentCanvasSettingsEtag(scopedScope)
: undefined;
if (etag && request.headers.get("If-None-Match") === etag) {
@ -2213,14 +2189,6 @@ export async function PUT(request: NextRequest) {
}
}
const data = updateSchema.parse(body);
if (data.canvasAutoModeDefaultModelId) {
const [available] = await db.select({ id: aiModel.id }).from(aiModel)
.innerJoin(aiProvider, eq(aiProvider.id, aiModel.providerId))
.where(and(eq(aiModel.id, data.canvasAutoModeDefaultModelId),
eq(aiModel.isEnabled, true), eq(aiProvider.isEnabled, true),
eq(aiModel.isSubModel, false), eq(aiModel.supportsImageGen, true))).limit(1);
if (!available) return NextResponse.json({ error: "默认生图模型或其上游已停用,请选择可用的生图模型,或改为系统智能选择。" }, { status: 400 });
}
const {
surpriseCategories,
aiDetailGenerationEnabled,

View File

@ -6,7 +6,6 @@ import { eq } from "drizzle-orm";
import { uploadFile } from "@/lib/storage/service";
import {
createMediaAssetRelation,
getDefaultStorageConfig,
getPointsSystemConfig,
getMediaAssetsByUserAndUrls,
upsertMediaAsset,
@ -22,27 +21,6 @@ export const maxDuration = 600;
const WATERMARK_SYNC_WAIT_TIMEOUT_MS = 20_000;
const WATERMARK_POLL_INTERVAL_MS = 1200;
async function resolveStoredQiniuImageUrl(source: string): Promise<string | null> {
const config = await getDefaultStorageConfig().catch(() => null);
if (config?.type !== "qiniu-kodo" || !config.isEnabled || !config.publicUrl) return null;
try {
const base = new URL(config.publicUrl);
const url = new URL(source);
const prefix = base.pathname.replace(/\/$/, "") + "/";
if (base.protocol !== "https:" || url.origin !== base.origin ||
url.username || url.password || url.search || url.hash ||
!url.pathname.startsWith(prefix)) return null;
const objectKey = url.pathname.slice(prefix.length);
return /^uploads\/(?:direct\/[0-9a-f-]{36}\/)?[\w.-]+$/i.test(objectKey)
? url.toString()
: null;
} catch {
return null;
}
}
// 获取去水印API配置
async function getWatermarkRemoveConfig() {
try {
@ -153,16 +131,13 @@ async function persistWatermarkResult(params: {
processing_time?: number;
}> {
try {
let resultUrl = await resolveStoredQiniuImageUrl(params.processedImageUrl);
if (!resultUrl) {
const imageResponse = await fetch(params.processedImageUrl);
if (!imageResponse.ok) {
throw new Error("下载处理后的图片失败");
}
const imageBuffer = await imageResponse.arrayBuffer();
const filename = `watermark-removed-${Date.now()}.png`;
resultUrl = (await uploadFile(filename, imageBuffer)).url;
const imageResponse = await fetch(params.processedImageUrl);
if (!imageResponse.ok) {
throw new Error("下载处理后的图片失败");
}
const imageBuffer = await imageResponse.arrayBuffer();
const filename = `watermark-removed-${Date.now()}.png`;
const uploadResult = await uploadFile(filename, imageBuffer);
let saved = false;
let saveError: unknown = null;
@ -175,8 +150,8 @@ async function persistWatermarkResult(params: {
try {
([savedImage] = await db.insert(generatedImage).values({
userId: params.userId,
thumbnailUrl: resultUrl,
originalUrl: resultUrl,
thumbnailUrl: uploadResult.url,
originalUrl: uploadResult.url,
imageSize: "2K",
prompt: "去水印处理",
modelId: "watermark-remove",
@ -209,9 +184,9 @@ async function persistWatermarkResult(params: {
mediaType: "image",
sourceType: "edited",
status: "ready",
originalUrl: resultUrl,
previewUrl: resultUrl,
thumbnailUrl: resultUrl,
originalUrl: uploadResult.url,
previewUrl: uploadResult.url,
thumbnailUrl: uploadResult.url,
displayName: "去水印处理",
prompt: "去水印处理",
modelId: "watermark-remove",
@ -242,8 +217,8 @@ async function persistWatermarkResult(params: {
return {
success: true,
original_url: resultUrl,
thumbnail_url: resultUrl,
original_url: uploadResult.url,
thumbnail_url: uploadResult.url,
processing_time:
typeof params.startedAt === "number" ? (Date.now() - params.startedAt) / 1000 : undefined,
};
@ -387,7 +362,7 @@ export async function POST(request: NextRequest) {
const body = await request.json();
const { image_url } = body;
if (typeof image_url !== "string" || !image_url) {
if (!image_url) {
return NextResponse.json(
{ error: "请提供图片URL" },
{ status: 400 }
@ -438,24 +413,24 @@ export async function POST(request: NextRequest) {
);
}
}
// 七牛上的公开图片可以直接交给去水印服务读取。
// 如果是 HTTP/HTTPS URL,下载后重新上传确保公网可访问
else if (image_url.startsWith("http://") || image_url.startsWith("https://")) {
const storedImageUrl = await resolveStoredQiniuImageUrl(image_url);
publicImageUrl = storedImageUrl || image_url;
if (!storedImageUrl) {
try {
console.log("[WatermarkRemove] 下载原图并上传到S3...");
const imageResponse = await fetch(image_url);
if (!imageResponse.ok) {
throw new Error("下载原图失败");
}
const imageBuffer = await imageResponse.arrayBuffer();
const filename = `watermark-input-${Date.now()}.jpg`;
publicImageUrl = (await uploadFile(filename, imageBuffer)).url;
console.log("[WatermarkRemove] 图片已上传到S3:", publicImageUrl);
} catch (downloadError) {
console.error("[WatermarkRemove] 下载/上传原图失败,使用原始URL:", downloadError);
try {
console.log("[WatermarkRemove] 下载原图并上传到S3...");
const imageResponse = await fetch(image_url);
if (!imageResponse.ok) {
throw new Error("下载原图失败");
}
const imageBuffer = await imageResponse.arrayBuffer();
const filename = `watermark-input-${Date.now()}.jpg`;
const uploadResult = await uploadFile(filename, imageBuffer);
publicImageUrl = uploadResult.url;
console.log("[WatermarkRemove] 图片已上传到S3:", publicImageUrl);
} catch (downloadError) {
console.error("[WatermarkRemove] 下载/上传原图失败:", downloadError);
// 如果下载失败,尝试使用原始URL
console.log("[WatermarkRemove] 尝试使用原始URL");
publicImageUrl = image_url;
}
} else {
return NextResponse.json(

View File

@ -233,8 +233,7 @@ import {
type WorkflowSceneRecord,
} from "@/lib/video-workflow/runtime";
import { agentProjectService } from "@/services/agent-projects";
import { getWorkflowSelectionsRequest } from "@/lib/agents/workflow-loading";
import { fetchCanvasSiteSettings, fetchWorkflowTemplatePrompts } from "@/lib/client/canvas-site-settings";
import { fetchCanvasSiteSettings } from "@/lib/client/canvas-site-settings";
import {
canvasService,
imageGenerationService,
@ -274,17 +273,6 @@ import type {
const CANVAS_SITE_SETTINGS_REFRESH_INTERVAL_MS = 15000;
const CANVAS_SURFACE_BACKGROUND = "#f5f5f5";
function WorkflowLoadState({ name, error, retrying, onRetry }: { name: string; error?: Error; retrying?: boolean; onRetry: () => void }) {
const failed = Boolean(error && !retrying);
const timedOut = error?.name === "AbortError" || error?.name === "TimeoutError";
return (
<div className="flex items-center gap-3 rounded-xl border border-white/10 px-4 py-3 text-sm text-white/65" role={failed ? "alert" : "status"}>
<span>{failed ? `${name}${timedOut ? "加载超时" : "加载失败"}` : `正在加载${name}…`}</span>
{failed && <Button type="button" size="sm" variant="outline" onClick={onRetry}>重试</Button>}
</div>
);
}
function CanvasLazyPanelLoader({
label,
className,
@ -2188,13 +2176,13 @@ export default function CanvasEditorLegacyPage({
);
const canvasSiteSettingsKey = requestedAgentMode
? hasActiveAgentProject
? "/api/site-settings?scope=agent-canvas-base"
? "/api/site-settings?scope=agent-canvas"
: "/api/site-settings?scope=agent-entry"
: "/api/site-settings?scope=canvas";
const [hasResolvedCanvasSiteSettings, setHasResolvedCanvasSiteSettings] =
useState(false);
const { data: siteSettingsData, error: siteSettingsError, isValidating: siteSettingsLoading, mutate: reloadSiteSettings } = useSWR<{
const { data: siteSettingsData } = useSWR<{
siteName?: string;
siteLogo?: string | null;
siteLogoDark?: string | null;
@ -2225,7 +2213,6 @@ export default function CanvasEditorLegacyPage({
? 0
: CANVAS_SITE_SETTINGS_REFRESH_INTERVAL_MS,
errorRetryCount: 1,
shouldRetryOnError: !requestedAgentMode || !hasActiveAgentProject,
dedupingInterval: 30_000,
revalidateOnFocus: true,
revalidateOnReconnect: true,
@ -2292,34 +2279,9 @@ export default function CanvasEditorLegacyPage({
!requestedAgentMode ||
!agentProjectId ||
loadedAgentProjectId === agentProjectId;
const [workflowTemplateMarker, setWorkflowTemplateMarker] = useState<HTMLDivElement | null>(null);
const [workflowTemplatesRequested, setWorkflowTemplatesRequested] = useState(false);
const hasWorkflowBase = Boolean(siteSettingsData?.agentWorkflowUiConfig);
useEffect(() => {
if (!isAgentMode || !hasActiveAgentProject || !hasWorkflowBase || workflowTemplatesRequested) return;
const element = workflowTemplateMarker;
if (!element) return;
const observer = new IntersectionObserver(([entry]) => {
if (entry?.isIntersecting) setWorkflowTemplatesRequested(true);
});
observer.observe(element);
return () => observer.disconnect();
}, [hasActiveAgentProject, hasWorkflowBase, isAgentMode, workflowTemplateMarker, workflowTemplatesRequested]);
const { data: workflowTemplates, error: workflowTemplatesError, isValidating: workflowTemplatesLoading, mutate: reloadWorkflowTemplates } = useSWR<{
steps: AgentWorkflowUiConfig["steps"];
}>(
isAgentMode && hasActiveAgentProject && hasWorkflowBase && workflowTemplatesRequested
? "/api/site-settings?scope=agent-workflow-templates"
: null,
fetchCanvasSiteSettings,
{ shouldRetryOnError: false }
);
const resolvedWorkflowUiConfig = useMemo(
() => {
const base = siteSettingsData?.agentWorkflowUiConfig || defaultAgentWorkflowUiConfig;
return requestedAgentMode ? { ...base, steps: workflowTemplates?.steps ?? [] } : base;
},
[requestedAgentMode, siteSettingsData?.agentWorkflowUiConfig, workflowTemplates?.steps]
() => siteSettingsData?.agentWorkflowUiConfig || defaultAgentWorkflowUiConfig,
[siteSettingsData?.agentWorkflowUiConfig]
);
const workflowPageFeatureSettings = useMemo(
() => getAgentWorkflowPageFeatureSettings(resolvedWorkflowUiConfig),
@ -2368,7 +2330,7 @@ export default function CanvasEditorLegacyPage({
});
const sanitizedWorkflowSelections = useMemo(
() =>
requestedAgentMode && !workflowTemplates
requestedAgentMode && !siteSettingsData?.agentWorkflowUiConfig
? workflowSelections
: sanitizeAgentWorkflowSelections({
config: resolvedWorkflowUiConfig || defaultAgentWorkflowUiConfig,
@ -2376,7 +2338,7 @@ export default function CanvasEditorLegacyPage({
}),
[
requestedAgentMode,
workflowTemplates,
siteSettingsData?.agentWorkflowUiConfig,
resolvedWorkflowUiConfig,
workflowSelections,
]
@ -2384,14 +2346,6 @@ export default function CanvasEditorLegacyPage({
const deferredSanitizedWorkflowSelections = useDeferredValue(
sanitizedWorkflowSelections
);
const workflowSelectionRequest = isAgentMode && hasActiveAgentProject && hasLoadedCurrentAgentProject
? getWorkflowSelectionsRequest(sanitizedWorkflowSelections)
: "";
const { data: workflowPromptData, error: workflowPromptError, isValidating: workflowPromptLoading, mutate: reloadWorkflowPrompts } = useSWR(
workflowSelectionRequest ? ["/api/agent-workflow/template-prompts", workflowSelectionRequest] as const : null,
fetchWorkflowTemplatePrompts,
{ shouldRetryOnError: false }
);
const resolvedBrandModelConfig = useMemo(
() =>
normalizeAgentWorkflowBrandModelConfig(
@ -9967,8 +9921,6 @@ export default function CanvasEditorLegacyPage({
selectedBrandModel,
appearanceRecognitionEnabled,
selections: deferredSanitizedWorkflowSelections,
resolvedSelections: workflowPromptData?.selectionRequest === getWorkflowSelectionsRequest(deferredSanitizedWorkflowSelections)
? workflowPromptData?.selections : undefined,
});
if (canceled) {
@ -9991,7 +9943,6 @@ export default function CanvasEditorLegacyPage({
selectedBrandModel,
workflowInputs,
workflowMaterials,
workflowPromptData,
]);
useEffect(() => {
workflowInputsRef.current = workflowInputs;
@ -10113,23 +10064,15 @@ export default function CanvasEditorLegacyPage({
[patchPersistedAgentWorkflowState]
);
const getLatestWorkflowContext = useCallback(() => {
const selections = workflowSelectionsRef.current;
return buildAgentWorkflowComposerContext({
config: resolvedWorkflowUiConfig || defaultAgentWorkflowUiConfig,
inputs: workflowInputsRef.current,
materials: workflowMaterialsRef.current,
selectedBrandModel: selectedBrandModelRef.current,
appearanceRecognitionEnabled: appearanceRecognitionEnabledRef.current,
selections,
resolvedSelections: workflowPromptData?.selectionRequest === getWorkflowSelectionsRequest(selections)
? workflowPromptData?.selections : undefined,
selections: workflowSelectionsRef.current,
});
}, [resolvedWorkflowUiConfig, workflowPromptData]);
const getWorkflowPromptStatus = useCallback(() => {
const currentRequest = getWorkflowSelectionsRequest(workflowSelectionsRef.current);
if (!currentRequest || currentRequest === workflowPromptData?.selectionRequest) return "ready";
return workflowPromptError && currentRequest === workflowSelectionRequest ? "error" : "loading";
}, [workflowPromptData, workflowPromptError, workflowSelectionRequest]);
}, [resolvedWorkflowUiConfig]);
const effectiveSelectedAgentPresetId = null;
const { data: selectedAgentPresetResponse } = useSWR<{
success?: boolean;
@ -10504,37 +10447,30 @@ export default function CanvasEditorLegacyPage({
</div>
) : null;
const workflowStylePanel = useMemo(() => (
<div ref={setWorkflowTemplateMarker} className="space-y-3">
{workflowTemplates ? (
<AgentWorkflowPanelDarkV2
config={resolvedWorkflowUiConfig}
embedded
inputs={workflowInputs}
materials={workflowMaterials}
onInputsChange={handleWorkflowInputsChange}
onMaterialsChange={handleWorkflowMaterialsChange}
onSelectionsChange={handleWorkflowSelectionsChange}
selections={sanitizedWorkflowSelections}
showBrandStoreSection={false}
/>
) : siteSettingsError && !siteSettingsData && !siteSettingsLoading ? (
<p className="text-sm text-white/65">请先在上方重试加载品牌和类目。</p>
) : !workflowTemplatesRequested ? (
<Button type="button" variant="outline" onClick={() => setWorkflowTemplatesRequested(true)}>加载风格模板</Button>
) : (
<WorkflowLoadState name="风格模板" error={workflowTemplatesError} retrying={workflowTemplatesLoading} onRetry={() => void reloadWorkflowTemplates().catch(() => {})} />
)}
{workflowPromptError && (
<WorkflowLoadState name="所选模板的提示词" error={workflowPromptError} retrying={workflowPromptLoading} onRetry={() => void reloadWorkflowPrompts().catch(() => {})} />
)}
</div>
), [
handleWorkflowInputsChange, handleWorkflowMaterialsChange, handleWorkflowSelectionsChange,
reloadWorkflowPrompts, reloadWorkflowTemplates, resolvedWorkflowUiConfig, sanitizedWorkflowSelections,
siteSettingsData, siteSettingsError, siteSettingsLoading, workflowInputs, workflowMaterials, workflowPromptError,
workflowPromptLoading, workflowTemplates, workflowTemplatesError, workflowTemplatesLoading, workflowTemplatesRequested,
]);
const workflowStylePanel = useMemo(
() => (
<AgentWorkflowPanelDarkV2
config={resolvedWorkflowUiConfig}
embedded
inputs={workflowInputs}
materials={workflowMaterials}
onInputsChange={handleWorkflowInputsChange}
onMaterialsChange={handleWorkflowMaterialsChange}
onSelectionsChange={handleWorkflowSelectionsChange}
selections={sanitizedWorkflowSelections}
showBrandStoreSection={false}
/>
),
[
handleWorkflowInputsChange,
handleWorkflowMaterialsChange,
handleWorkflowSelectionsChange,
resolvedWorkflowUiConfig,
sanitizedWorkflowSelections,
workflowInputs,
workflowMaterials,
]
);
if (canvasLoadError && !isAgentMode) {
return <div role="alert" className="flex h-dvh flex-col items-center justify-center gap-4">
@ -10577,20 +10513,17 @@ export default function CanvasEditorLegacyPage({
theme="dark"
/>
}
brandStorePanel={siteSettingsData?.agentWorkflowUiConfig ? (
brandStorePanel={
<AgentWorkflowBrandStorePanel
config={resolvedWorkflowUiConfig}
inputs={workflowInputs}
onInputsChange={handleWorkflowInputsChange}
theme="dark"
/>
) : (
<WorkflowLoadState name="品牌和类目" error={siteSettingsError} retrying={siteSettingsLoading} onRetry={() => void reloadSiteSettings().catch(() => {})} />
)}
}
chatId={agentModeChatId}
deletedResultCollections={agentProjectDeletedResultCollections}
getLatestWorkflowContext={getLatestWorkflowContext}
getWorkflowPromptStatus={getWorkflowPromptStatus}
materialSelectionPanel={
isWorkflowMaterialStepEnabled ? (
<AgentWorkflowMaterialSelectionPanel

View File

@ -4,7 +4,6 @@ import { ThemeProvider } from "@/components/theme-provider";
import { FaviconUpdater } from "@/components/favicon-updater";
import { ImageDeliveryOptimizer } from "@/components/image-delivery-optimizer";
import { AppUpdateNotice } from "@/components/app-update-notice";
import { PAGE_DOWNLOAD_ACTIVE_ATTRIBUTE } from "@/lib/client/page-refresh";
import { getSiteSettings } from "@/lib/db/queries";
import "./globals.css";
@ -143,7 +142,7 @@ const CHUNK_ERROR_RECOVERY_SCRIPT = `\
showManualRecoveryNotice();
return;
}
if (lastReloadAt || document.documentElement.hasAttribute('${PAGE_DOWNLOAD_ACTIVE_ATTRIBUTE}')) return;
if (lastReloadAt) return;
var now = Date.now();
// If storage is blocked, a reload cannot remember its attempt and must not run.
if (!safeSetSessionStorage(RECOVERY_KEY, String(now))) return;
@ -154,10 +153,6 @@ const CHUNK_ERROR_RECOVERY_SCRIPT = `\
showManualRecoveryNotice();
return;
}
if (document.documentElement.hasAttribute('${PAGE_DOWNLOAD_ACTIVE_ATTRIBUTE}')) {
if (safeSetSessionStorage(RECOVERY_KEY, '0')) lastReloadAt = 0;
return;
}
window.location.reload();
}, 800);
}

View File

@ -159,7 +159,6 @@ import type {
} from "@/types/agent";
import {
createEmptyAgentModeWorkspaceState,
MAX_DETAIL_REPLACEMENT_REFERENCES,
} from "@/lib/agents/mode-workspace-state";
import {
createEmptyAgentGenerationProjectWorkspaceState,
@ -177,7 +176,6 @@ export interface AgentGenerationWorkspaceDarkV2Props {
workflowFeatureSettings?: AgentWorkflowPageFeatureSettings | null;
workflowPromptOptimizationEnabled?: boolean;
getLatestWorkflowContext?: () => AgentWorkflowComposerContext | null;
getWorkflowPromptStatus?: () => "ready" | "loading" | "error";
onBack?: () => void;
brandStorePanel?: ReactNode;
materialSelectionPanel?: ReactNode;
@ -214,7 +212,6 @@ export interface AgentGenerationWorkspaceDarkV2Props {
interface AgentWorkflowModelOption {
id: string;
displayName: string;
providerName?: string;
providerType: string;
supportsImageGen?: boolean;
isMultimodal?: boolean;
@ -2645,9 +2642,7 @@ function getStoredAgentPendingGenerations(): LocalGenerationPendingState[] {
? record.requestedCardIds
.map((entry) => String(entry || "").trim())
.filter(Boolean)
.slice(0, record.modeType === "detail_replacement"
? MAX_DETAIL_REPLACEMENT_REFERENCES
: MAX_AGENT_MODE_REFERENCE_COUNT)
.slice(0, MAX_AGENT_MODE_REFERENCE_COUNT)
: null,
} satisfies LocalGenerationPendingState;
});
@ -3090,7 +3085,6 @@ export function AgentGenerationWorkspaceDarkV2({
workflowFeatureSettings = null,
workflowPromptOptimizationEnabled = true,
getLatestWorkflowContext,
getWorkflowPromptStatus,
onBack,
brandStorePanel,
materialSelectionPanel,
@ -3388,13 +3382,12 @@ export function AgentGenerationWorkspaceDarkV2({
}
);
const { data: modelsData, error: modelsError, mutate: refreshModels } = useSWR<{
const { data: modelsData } = useSWR<{
models: AgentWorkflowModelOption[];
defaultModelId?: string | null;
agentWorkflowConfiguredDefaultModelId?: string | null;
agentWorkflowDefaultModelId?: string | null;
agentWorkflowConfiguredModels?: AgentWorkflowModelOption[];
detailReplacementModel?: AgentWorkflowModelOption | null;
agentModel?: any;
}>("/api/models", fetcher);
@ -3440,6 +3433,17 @@ export function AgentGenerationWorkspaceDarkV2({
const activeBusinessModeDefaultModelId = !requiresPresetSelection
? String(activeBusinessMode?.defaultModelId || "").trim() || null
: null;
const lockedWorkflowModelId =
activeBusinessModeDefaultModelId ||
selectedAgentPreset?.defaultModelId ||
modelsData?.agentWorkflowConfiguredDefaultModelId ||
modelsData?.agentWorkflowDefaultModelId ||
null;
const isWorkflowModelLocked = Boolean(lockedWorkflowModelId);
const effectiveDefaultModelId =
lockedWorkflowModelId ||
modelsData?.defaultModelId ||
null;
const presetDrivenResultModeType: AgentGenerationResultModeType =
selectedAgentPreset?.type === "image" && presetModeConfig.modeType === "detail_replacement"
? detailReplacementMethod === "ai_detail_generate"
@ -3455,19 +3459,6 @@ export function AgentGenerationWorkspaceDarkV2({
const currentResultModeType: AgentGenerationResultModeType = requiresPresetSelection
? presetDrivenResultModeType
: businessModeResultModeType;
const detailReplacementModel = currentResultModeType === "detail_replacement"
? modelsData?.detailReplacementModel
: null;
const isDetailReplacementModelLoading = currentResultModeType === "detail_replacement" && !modelsData;
const lockedWorkflowModelId =
detailReplacementModel?.id ||
activeBusinessModeDefaultModelId ||
selectedAgentPreset?.defaultModelId ||
modelsData?.agentWorkflowConfiguredDefaultModelId ||
modelsData?.agentWorkflowDefaultModelId ||
null;
const isWorkflowModelLocked = Boolean(lockedWorkflowModelId);
const effectiveDefaultModelId = lockedWorkflowModelId || modelsData?.defaultModelId || null;
const isSceneGenerationPreset = currentResultModeType === "scene_generation";
const isDetailReplacementPreset =
currentResultModeType === "detail_replacement" ||
@ -4119,15 +4110,12 @@ export function AgentGenerationWorkspaceDarkV2({
);
const executableModelOptions = useMemo(() => {
const seen = new Set<string>();
const workflowModels = detailReplacementModel
? [detailReplacementModel, ...configuredWorkflowModels]
: configuredWorkflowModels;
return [...selectableModels, ...workflowModels].filter((model) => {
return [...selectableModels, ...configuredWorkflowModels].filter((model) => {
if (seen.has(model.id)) return false;
seen.add(model.id);
return true;
});
}, [configuredWorkflowModels, detailReplacementModel, selectableModels]);
}, [configuredWorkflowModels, selectableModels]);
const executableModelIdSet = useMemo(
() => new Set(executableModelOptions.map((model) => model.id)),
[executableModelOptions]
@ -4146,9 +4134,8 @@ export function AgentGenerationWorkspaceDarkV2({
selectableModels[0],
[executableModelOptions, lockedWorkflowModel, selectableModels, selectedModelId]
);
const lockedWorkflowModelLabel = detailReplacementModel?.providerName
? `${detailReplacementModel.displayName} 「${detailReplacementModel.providerName}」`
: lockedWorkflowModel?.displayName ||
const lockedWorkflowModelLabel =
lockedWorkflowModel?.displayName ||
selectedAgentPreset?.defaultModel?.displayName ||
(lockedWorkflowModelId ? `配置模型不可用(${lockedWorkflowModelId})` : "未配置");
const [activeToolStep, setActiveToolStep] = useState<ToolStepKey>("settings");
@ -6327,24 +6314,10 @@ export function AgentGenerationWorkspaceDarkV2({
toast.error(`请先查询并选择${detailReferenceSourceLabel}参考图`);
return;
}
if (isDetailReplacementModelLoading) {
if (modelsError) {
toast.error("详情替换模型加载失败,正在重新读取");
void refreshModels().catch(() => {});
} else {
toast.info("正在读取详情替换模型,请稍候");
}
return;
}
if (isSkuReplacementPreset && skuReplacementReferenceCards.length === 0) {
toast.error(`请先查询并选择${skuReferenceSourceLabel}参考图`);
return;
}
const promptStatus = getWorkflowPromptStatus?.();
if (promptStatus === "loading" || promptStatus === "error") {
toast.error(promptStatus === "error" ? "请先在风格模板区重试加载提示词" : "正在加载所选模板的提示词,请稍候");
return;
}
const resolvedWorkflowContext = getLatestWorkflowContext?.() ?? workflowContext;
if (
isDetailReplacementPreset &&
@ -6403,10 +6376,6 @@ export function AgentGenerationWorkspaceDarkV2({
}
if (replacementModeType === "detail_replacement") {
if (detailBatchSubmittingRef.current) return;
if (replacementExecutionCards.length > MAX_DETAIL_REPLACEMENT_REFERENCES) {
toast.error(`本次选中了 ${replacementExecutionCards.length} 张详情参考图,一次最多替换 ${MAX_DETAIL_REPLACEMENT_REFERENCES} 张,请减少本次选择后重试`);
return;
}
if (!isValidChatUuid(projectId)) {
toast.error("当前风格化项目尚未保存,请先保存项目后再执行详情替换");
return;
@ -6427,14 +6396,13 @@ export function AgentGenerationWorkspaceDarkV2({
const saved = await onPersistProject?.();
if (saved === false) throw new Error("项目尚未保存,请重试");
const requestId = generateUUID();
const response = await fetch("/api/agents/detail-replacement/batches", {
const response = await fetchWithErrorHandlers("/api/agents/detail-replacement/batches", {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({
projectId,
requestId,
model: resolvedModelId,
expectedModelId: resolvedModelId === "auto" ? undefined : resolvedModelId,
imageSize: imageParams.imageSize,
replacementStrategy: detailReplacementStrategy,
prompt: detailReplacementStrategy === "product_only"
@ -6458,7 +6426,6 @@ export function AgentGenerationWorkspaceDarkV2({
});
const payload = await response.json().catch(() => ({}));
if (!response.ok || !payload?.task?.id) {
if (payload?.code === "DETAIL_REPLACEMENT_MODEL_CHANGED") void refreshModels().catch(() => {});
throw new Error(payload?.error || "详情替换任务提交失败");
}
setPendingGeneration({
@ -6646,8 +6613,6 @@ export function AgentGenerationWorkspaceDarkV2({
input,
isDetailAiGenerationMethod,
isDetailReplacementPreset,
isDetailReplacementModelLoading,
modelsError,
isSelectedBusinessModeUnavailable,
isSkuReplacementPreset,
effectiveDefaultModelId,
@ -6664,7 +6629,6 @@ export function AgentGenerationWorkspaceDarkV2({
skuResultCards,
userMessageCount,
getLatestWorkflowContext,
getWorkflowPromptStatus,
isSceneGenerationPreset,
workflowContext,
sceneMessageAttachments,
@ -6675,7 +6639,6 @@ export function AgentGenerationWorkspaceDarkV2({
onPersistProject,
projectId,
refreshDetailBatch,
refreshModels,
]);
const handleStopGeneration = useCallback(() => {
detailGenerationCancelRef.current = true;
@ -7839,11 +7802,6 @@ export function AgentGenerationWorkspaceDarkV2({
toast.error(detailGenerationValidationIssues[0] || "请先补齐 AI详情生成参数");
return;
}
const promptStatus = getWorkflowPromptStatus?.();
if (promptStatus === "loading" || promptStatus === "error") {
toast.error(promptStatus === "error" ? "请先在风格模板区重试加载提示词" : "正在加载所选模板的提示词,请稍候");
return;
}
const productAttachments = detailGenerationProductSlotIndexes.map((index) =>
detailGenerationSlots[index]
@ -9448,11 +9406,9 @@ export function AgentGenerationWorkspaceDarkV2({
</Select>
) : (
<div className="rounded-[24px] border border-white/10 bg-black/30 px-4 py-3 text-sm text-white/70">
{isDetailReplacementModelLoading
? modelsError ? "详情替换模型加载失败,点击批量替换可重试" : "正在读取详情替换模型"
: isWorkflowModelLocked ? "后台已锁定生图模型:" : "当前生图模式使用默认模型:"}
{isWorkflowModelLocked ? "后台已锁定生图模型:" : "当前生图模式使用默认模型:"}
<span className="ml-2 font-medium text-white">
{isDetailReplacementModelLoading ? null : isWorkflowModelLocked
{isWorkflowModelLocked
? lockedWorkflowModelLabel
: currentModel?.displayName || "自动选择"}
</span>

View File

@ -3,7 +3,6 @@
import { useMemo } from "react";
import useSWR from "swr";
import { Check, ImageIcon, Loader2, UserRound } from "lucide-react";
import { AgentPreviewImage } from "@/components/agents/AgentPreviewImage";
import { Button } from "@/components/ui/button";
import { cn, fetcher } from "@/lib/utils";
import { normalizeAgentWorkflowBrandModelConfig } from "@/lib/agents/workflow-brand-model-config";
@ -230,11 +229,12 @@ export function AgentWorkflowBrandModelPicker({
isDark ? "bg-white/[0.04]" : "bg-muted/40"
)}
>
<AgentPreviewImage
<img
src={image.imageUrl}
alt={image.displayName || `${normalizedBrand} 模特图`}
className="h-full w-full object-cover"
previewWidth={360}
loading="lazy"
decoding="async"
/>
<div className="absolute inset-x-0 top-0 flex items-center justify-between px-2 py-2">
<span className="rounded-full bg-black/60 px-2 py-1 text-[11px] text-white">

View File

@ -1,15 +1,14 @@
"use client";
import { useEffect, useState, useSyncExternalStore } from "react";
import { useEffect, useState } from "react";
import { Button } from "@/components/ui/button";
import { AlertDialog, AlertDialogContent, AlertDialogHeader, AlertDialogTitle, AlertDialogDescription, AlertDialogFooter } from "@/components/ui/alert-dialog";
import { isPageDownloadActive, preparePageRefresh, subscribeToPageDownloadActivity } from "@/lib/client/page-refresh";
import { preparePageRefresh } from "@/lib/client/page-refresh";
export function AppUpdateNotice() {
const [availableVersion, setAvailableVersion] = useState("");
const [refreshing, setRefreshing] = useState(false);
const [error, setError] = useState("");
const downloading = useSyncExternalStore(subscribeToPageDownloadActivity, isPageDownloadActive, () => false);
useEffect(() => {
let disposed = false;
let controller: AbortController | undefined;
@ -61,7 +60,7 @@ export function AppUpdateNotice() {
setRefreshing(false);
}
};
return <AlertDialog open={Boolean(availableVersion) && !downloading}>
return <AlertDialog open={Boolean(availableVersion)}>
<AlertDialogContent className="z-[10001]" overlayClassName="z-[10000]" onEscapeKeyDown={event => event.preventDefault()}>
<AlertDialogHeader>
<AlertDialogTitle>平台已更新</AlertDialogTitle>

View File

@ -72,13 +72,13 @@ export function AudioGenerationComposer({
setError("");
setSending(true);
try {
if (!model) throw Error("当前模式没有已启用的模型");
if (!model) throw Error("当前模式没有已启用的官方模型");
const params = audioRequestSchema.parse({
...draft,
text: [draft.text, connectedText].filter(Boolean).join("\n\n"),
modelRef: model.id,
voice,
format: format || "wav",
format,
...(!contract?.controls ? { rate: 1, pitch: 1, volume: 50 } : {}),
...(!contract?.instructions ? { instructions: "" } : {}),
});
@ -96,9 +96,9 @@ export function AudioGenerationComposer({
<section
className="fixed bottom-8 left-1/2 z-[100] max-h-[75vh] w-[min(620px,94vw)] -translate-x-1/2 overflow-y-auto rounded-2xl border border-white/10 bg-[#222] p-5 text-white shadow-xl"
data-canvas-overlay="true"
aria-label="语音与音乐"
aria-label="阿里云音频生成"
>
<h3 className="font-semibold">语音与音乐</h3>
<h3 className="font-semibold">语音与音乐 · 阿里云官方</h3>
<fieldset disabled={busy || sending} className="mt-3 space-y-3 disabled:opacity-60">
{connectedText && <p className="mb-3 whitespace-pre-wrap rounded bg-white/5 p-2 text-xs" aria-label="已连接文本">已连接文本:{connectedText}</p>}
<div className="grid grid-cols-2 gap-3">
@ -112,9 +112,6 @@ export function AudioGenerationComposer({
>
<option value="tts">文字配音</option>
<option value="music">音乐 / 歌曲</option>
<option value="asr">语音转文字</option>
<option value="voiceclone">声音克隆配音</option>
<option value="voicedesign">声音设计配音</option>
</select>
</label>
<label>
@ -137,40 +134,20 @@ export function AudioGenerationComposer({
</select>
</label>
</div>
{["asr", "voiceclone"].includes(draft.mode) && (
<label className="block">
{draft.mode === "asr" ? "待识别音频" : "参考声音"}(MP3 / WAV,最多 20 MiB)
<input type="file" accept="audio/mpeg,audio/wav,.mp3,.wav" aria-label="上传参考音频" className={input}
onChange={async event => {
const file = event.target.files?.[0]; event.target.value = ""; if (!file) return;
if (file.size > 20 * 1024 * 1024) { setError("参考音频需小于 20 MiB"); return; }
setSending(true); setError("");
try {
const form = new FormData(); form.append("file", file);
const response = await fetch("/api/canvas/media/upload", { method: "POST", body: form, signal: AbortSignal.timeout(120000) });
const result = await response.json(); const url = result.url || result.data?.url;
if (!response.ok || !url) throw Error(result.error || "参考音频上传失败");
patch({ referenceAudioUrl: String(url), referenceAudioName: file.name });
} catch (error) { setError(error instanceof Error ? error.message : "上传失败"); }
finally { setSending(false); }
}} />
{draft.referenceAudioUrl && <span className="mt-1 block text-sm text-white/80">已上传:{draft.referenceAudioName || "参考音频"}</span>}
</label>
)}
{draft.mode !== "asr" && <label className="block">
{draft.mode !== "music" ? "配音文本(最多 600 字)" : `音乐描述(最多 ${contract?.descriptionLimit || 2000} 字)`}
<label className="block">
{draft.mode === "tts" ? "配音文本(最多 600 字)" : "音乐描述"}
<textarea
aria-label="音频内容"
className={input}
rows={4}
maxLength={draft.mode !== "music" ? 600 : contract?.descriptionLimit || 2000}
maxLength={draft.mode === "tts" ? 600 : 2000}
value={draft.text}
onChange={(e) => patch({ text: e.target.value })}
/>
</label>}
{!["music", "asr"].includes(draft.mode) ? (
</label>
{draft.mode === "tts" ? (
<>
{!!contract?.voices.length && <div className="grid grid-cols-2 gap-3">
<div className="grid grid-cols-2 gap-3">
<label>
音色
<select
@ -186,7 +163,7 @@ export function AudioGenerationComposer({
))}
</select>
</label>
{contract?.supportsLanguageControl !== false && <label>
<label>
语言
<select
aria-label="配音语言"
@ -198,8 +175,8 @@ export function AudioGenerationComposer({
<option value="English">英文</option>
<option value="Auto">自动 / 中英混合</option>
</select>
</label>}
</div>}
</label>
</div>
{contract?.instructions ? (
<label className="block">
声音风格指令
@ -233,7 +210,7 @@ export function AudioGenerationComposer({
</div>
) : null}
</>
) : draft.mode === "music" ? (
) : (
<>
<label className="flex gap-2">
<input
@ -256,7 +233,7 @@ export function AudioGenerationComposer({
onChange={(e) => patch({ lyrics: e.target.value })}
/>
</label>
{contract?.supportsGender !== false && (!contract?.genderRequiresLyrics || draft.lyrics?.trim()) && <label>
<label>
演唱声音
<select
className={input}
@ -267,18 +244,18 @@ export function AudioGenerationComposer({
<option value="female">女声</option>
<option value="male">男声</option>
</select>
</label>}
</label>
</>
) : null}
{!options.length ? (
<p className="text-sm text-amber-200">
当前没有可用的音乐模型,请在模型设置中启用。
Fun-Music 需要阿里云邀测权限,开通并启用模型后即可生成。
</p>
) : null}
</>
) : null}
)}
<div className="flex items-end gap-3">
{draft.mode !== "asr" && <label>
<label>
格式
<select
aria-label="音频格式"
@ -292,14 +269,14 @@ export function AudioGenerationComposer({
</option>
))}
</select>
</label>}
</label>
<button
type="button"
disabled={!model || loading}
className="rounded-lg bg-white px-4 py-2 text-black disabled:opacity-40"
onClick={() => void run()}
>
{busy || sending ? "处理中…" : draft.mode === "asr" ? "识别文字" : "生成音频"}
{busy || sending ? "处理中…" : "生成音频"}
</button>
<label className="cursor-pointer rounded-lg border border-white/20 px-3 py-2">
上传音频

View File

@ -78,7 +78,7 @@ import {
type UploadProgress,
} from "@/lib/client/upload-with-retry";
import {
downloadOriginalImage,
downloadCanvasImageAsPng,
getCanvasImageDownloadErrorMessage,
type CanvasImageDownloadProgress,
} from "@/lib/client/canvas-image-download";
@ -1462,7 +1462,7 @@ function normalizeComposerPreviewTail(text: string, fixedPrefix: string) {
}
// 获取图片尺寸(保留原图分辨率 + 画布显示尺寸)
function getImageDimensions(source: string | File): Promise<{
function getImageDimensions(url: string): Promise<{
width: number;
height: number;
originalWidth: number;
@ -1470,7 +1470,6 @@ function getImageDimensions(source: string | File): Promise<{
}> {
return new Promise((resolve) => {
const img = new Image();
const objectUrl = typeof source === "string" ? null : URL.createObjectURL(source);
let settled = false;
const resolveOnce = (dimensions: {
width: number;
@ -1483,11 +1482,9 @@ function getImageDimensions(source: string | File): Promise<{
window.clearTimeout(timeout);
img.onload = null;
img.onerror = null;
if (objectUrl) URL.revokeObjectURL(objectUrl);
resolve(dimensions);
};
const timeout = window.setTimeout(() => {
img.removeAttribute("src");
resolveOnce(DEFAULT_CANVAS_IMAGE_DIMENSIONS);
}, CANVAS_IMAGE_DIMENSION_TIMEOUT_MS);
@ -1520,7 +1517,7 @@ function getImageDimensions(source: string | File): Promise<{
// 加载失败时使用默认尺寸
resolveOnce(DEFAULT_CANVAS_IMAGE_DIMENSIONS);
};
img.src = objectUrl ?? String(source);
img.src = url;
});
}
@ -4467,15 +4464,17 @@ export function CanvasChatPanel({
setDownloadProgress({
phase: "preparing",
message: "正在准备原图...",
percent: 5,
});
try {
await downloadOriginalImage({
await downloadCanvasImageAsPng({
url: originalUrl,
candidates: [raw, buildImageProxyUrl(originalUrl, { delivery: "proxy" })],
signal: controller.signal,
onProgress: setDownloadProgress,
});
toast.success("已开始下载");
toast.success("原图已开始下载");
} catch (error) {
if (controller.signal.aborted) {
toast.message("已取消下载");
@ -7807,6 +7806,7 @@ export function CanvasChatPanel({
existingMessageImageKeys.add(messageImageKey);
}
const dimensions = await getImageDimensions(url);
if (useCanvasStore.getState().projectId !== canvasId || activeChatIdRef.current !== activeChatId) return;
const compareSourceUrlRaw =
sourceImageUrls[Math.min(index, Math.max(0, sourceImageUrls.length - 1))] ||
@ -7839,7 +7839,7 @@ export function CanvasChatPanel({
const placeholderNode = reservedPlaceholderNode
? currentNodes.find((node) => node.id === reservedPlaceholderNode.id) || null
: null;
const size = placeholderNode?.size || anchorNode?.size || { width: 300, height: 300 };
const size = { width: dimensions.width, height: dimensions.height };
const position = placeholderNode
? getCenteredReplacementPosition(placeholderNode, size)
: getAnchoredGenerationPosition({
@ -7857,6 +7857,8 @@ export function CanvasChatPanel({
prompt: generationPrompt,
originalSrc: canUseCompareSource ? compareSourceUrl : undefined,
metadata: {
originalWidth: dimensions.originalWidth,
originalHeight: dimensions.originalHeight,
generationPrompt,
sourceMessageId: messageId || undefined,
sourceImageKey,
@ -9581,6 +9583,7 @@ export function CanvasChatPanel({
continue;
}
const dimensions = await getImageDimensions(url);
if (cancelled) return;
const compareSourceUrlRaw =
nearestUserImageUrls[Math.min(index, Math.max(0, nearestUserImageUrls.length - 1))] ||
@ -9613,7 +9616,20 @@ export function CanvasChatPanel({
const placeholderNode = reservedPlaceholderNode
? currentNodes.find((node) => node.id === reservedPlaceholderNode.id) || null
: null;
const size = placeholderNode?.size || anchorNode?.size || { width: 300, height: 300 };
const size = placeholderNode
? { width: dimensions.width, height: dimensions.height }
: anchorNode
? {
width: Math.max(
1,
Math.round(Number(anchorNode.size?.width || dimensions.width))
),
height: Math.max(
1,
Math.round(Number(anchorNode.size?.height || dimensions.height))
),
}
: { width: dimensions.width, height: dimensions.height };
const position = placeholderNode
? getCenteredReplacementPosition(placeholderNode, size)
: getAnchoredGenerationPosition({
@ -9632,6 +9648,8 @@ export function CanvasChatPanel({
prompt: generationPrompt || "对话生成",
originalSrc: canUseCompareSource ? compareSourceUrl : undefined,
metadata: {
originalWidth: dimensions.originalWidth,
originalHeight: dimensions.originalHeight,
generationPrompt: generationPrompt || undefined,
sourceMessageId: message.id,
sourceImageKey: imageEntry.sourceImageKey,
@ -10358,7 +10376,7 @@ export function CanvasChatPanel({
buildCanvasUploadedImageAttachment({ file, imageUrl, assetId })
);
const dimensions = await getImageDimensions(file);
const dimensions = await getImageDimensions(imageUrl);
const nodeIndex = nodes.length + slotIndex;
const spacing = 20;
const x = 100 + (nodeIndex % 3) * (dimensions.width + spacing);
@ -10436,7 +10454,7 @@ export function CanvasChatPanel({
buildCanvasUploadedImageAttachment({ file, imageUrl, assetId })
);
const dimensions = await getImageDimensions(file);
const dimensions = await getImageDimensions(imageUrl);
const nodeIndex = nodes.length + slotIndex;
const spacing = 20;
const x = 100 + (nodeIndex % 3) * (dimensions.width + spacing);
@ -13722,7 +13740,7 @@ export function CanvasChatPanel({
};
onUploaded?.(uploadedBase);
clearComposerUploadProgress(250);
const dimensions = await getImageDimensions(file);
const dimensions = await getImageDimensions(imageUrl);
const spacing = 20;
const x = 100 + (nodeIndex % 3) * (dimensions.width + spacing);
const y = 100 + Math.floor(nodeIndex / 3) * (dimensions.height + spacing);
@ -14911,7 +14929,7 @@ export function CanvasChatPanel({
firstImageUrl = imageUrl;
}
const dimensions = await getImageDimensions(file);
const dimensions = await getImageDimensions(imageUrl);
updateUploadedImageAttachmentDimensions(imageUrl, dimensions);
// 获取图片原始尺寸后添加到画布

View File

@ -28,7 +28,6 @@ export function CanvasImageDownloadProgressDialog({
: null;
const loadedLabel = formatBytes(progress.loadedBytes);
const totalLabel = formatBytes(progress.totalBytes);
const converting = progress.phase === "converting";
return createPortal(
<div
@ -42,12 +41,12 @@ export function CanvasImageDownloadProgressDialog({
{progress.phase === "saving" ? (
<Download className="h-4 w-4" />
) : (
<Loader2 className="h-4 w-4 motion-safe:animate-spin" />
<Loader2 className="h-4 w-4 animate-spin" />
)}
</span>
<div>
<div className="text-[14px] font-semibold">下载原图</div>
<div className="mt-0.5 text-[12px] text-white/58" role="status">{progress.message}</div>
<div className="mt-0.5 text-[12px] text-white/58">{progress.message}</div>
</div>
</div>
{onCancel ? (
@ -64,19 +63,14 @@ export function CanvasImageDownloadProgressDialog({
<div className="mt-4">
<div className="mb-2 flex items-center justify-between text-[12px] text-white/55">
<span>{loadedLabel && totalLabel ? `${loadedLabel} / ${totalLabel}` : converting ? "格式转换中" : "正在处理文件"}</span>
<span>{loadedLabel && totalLabel ? `${loadedLabel} / ${totalLabel}` : "正在处理文件"}</span>
<span>{percent !== null ? `${percent}%` : "..."}</span>
</div>
<div
className="relative h-2 overflow-hidden rounded-full bg-white/10"
role="progressbar"
aria-label={converting ? "图片格式转换" : "图片下载"}
aria-valuenow={percent ?? undefined}
>
<div className="relative h-2 overflow-hidden rounded-full bg-white/10">
<div
className={cn(
"absolute inset-y-0 left-0 rounded-full bg-gradient-to-r from-cyan-300 via-sky-400 to-emerald-300",
percent === null && "w-1/3 motion-safe:animate-[download-indeterminate_1.15s_ease-in-out_infinite]"
percent === null && "w-1/3 animate-[download-indeterminate_1.15s_ease-in-out_infinite]"
)}
style={percent !== null ? { width: `${percent}%` } : undefined}
/>

View File

@ -1,5 +1,4 @@
"use client";
import { fetchUploadWithRetry } from "@/lib/client/upload-with-retry";
import { useCanvasGroupRuns } from "@/hooks/use-canvas-group-runs";
import { hasRecoverableCanvasTask } from "@/lib/video-canvas/task-recovery";
import { GroupStoryboardPreview } from "./GroupStoryboardPreview";
@ -15105,7 +15104,7 @@ function DirectorNodeComposer({
if(file.size>20*1024*1024){setError("参考图需小于 20 MiB");return;}
setBusy(true);setError("");try{
const form=new FormData();form.append("file",file);form.append("purpose","director-studio");
const response=await fetchUploadWithRetry(form,{signal:AbortSignal.timeout(120000)});
const response=await fetch("/api/files/upload",{method:"POST",body:form,signal:AbortSignal.timeout(120000)});
const result=await response.json();const url=result.url||result.data?.url;
if(!response.ok||!url)throw new Error(result.error||"图片上传失败");
onDraft({directorReferenceUrl:String(url)});

View File

@ -1,5 +1,4 @@
"use client";
import { fetchUploadWithRetry } from "@/lib/client/upload-with-retry";
import { useState } from "react";
import { toast } from "sonner";
import { readDirectorScene, type DirectorScene } from "@/lib/video-canvas/director-scene";
@ -65,7 +64,9 @@ export function DirectorReconstructionPanel({
const form = new FormData();
form.append("file", file);
form.append("purpose", "director-studio");
const response = await fetchUploadWithRetry(form, {
const response = await fetch("/api/files/upload", {
method: "POST",
body: form,
signal: AbortSignal.timeout(120000),
});
const data = await response.json();

View File

@ -1,5 +1,4 @@
"use client";
import { fetchUploadWithRetry } from "@/lib/client/upload-with-retry";
import {
commitDirectorScene,
resolveDirectorCamera,
@ -44,13 +43,14 @@ async function upload(file: File) {
"purpose",
file.type.startsWith("video/") ? "canvas-video-process" : "director-studio",
);
const response = /\.glb$/i.test(file.name)
? await fetch("/api/canvas/director/upload-model", {
const response = await fetch(
/\.glb$/i.test(file.name) ? "/api/canvas/director/upload-model" : "/api/files/upload",
{
method: "POST",
body: form,
signal: AbortSignal.timeout(120000),
})
: await fetchUploadWithRetry(form, { signal: AbortSignal.timeout(120000) });
},
);
const result = await response.json();
const url = result.url || result.data?.url;
if (!response.ok || !url) throw new Error(result.error || "上传失败");

View File

@ -178,7 +178,7 @@ import {
} from "@/components/ui/tooltip";
import { fetchUploadWithRetry } from "@/lib/client/upload-with-retry";
import {
downloadOriginalImage,
downloadCanvasImageAsPng,
getCanvasImageDownloadErrorMessage,
type CanvasImageDownloadProgress,
} from "@/lib/client/canvas-image-download";
@ -2482,11 +2482,14 @@ export function ImageNode({
[compareButtonVisualSize]
);
const shouldUseHighFidelityDisplayImage =
isSelected ||
isHovered ||
isCompareMode ||
boxCutoutMode ||
localEditMode ||
cropPanelOpen ||
imageAdjustPanelOpen ||
fullscreenPreviewOpen ||
isThisNodePicking;
const displayImageWidth = useMemo(() => {
const devicePixelRatio =
@ -2519,6 +2522,15 @@ export function ImageNode({
}),
[data.src, displayImageQuality, displayImageWidth]
);
const fullscreenPreviewSrc = useMemo(() => {
const originalUrl = resolveOriginalImageUrl(data.src || "");
return buildImageProxyUrl(originalUrl || data.src || "", {
delivery: "proxy",
width: 4096,
quality: 92,
format: "webp",
});
}, [data.src]);
const displayCompareSrc = useMemo(
() =>
buildImageProxyUrl(compareSource, {
@ -8223,6 +8235,7 @@ export function ImageNode({
}
};
// 下载图片 - 服务端统一转为 Photoshop 兼容 PNG,避免后缀和真实格式错配。
const isDownloadingOriginalImage = Boolean(downloadProgress);
const handleDownload = async () => {
if (!data.src) return;
@ -8236,16 +8249,24 @@ export function ImageNode({
setDownloadProgress({
phase: "preparing",
message: "正在准备原图...",
percent: 5,
});
try {
await downloadOriginalImage({
url: resolveOriginalImageUrl(data.src) || data.src,
await downloadCanvasImageAsPng({
url: data.src,
name: displayTitle,
candidates: [
displayImageSrc,
fullscreenPreviewSrc,
buildImageProxyUrl(resolveOriginalImageUrl(data.src) || data.src, {
delivery: "proxy",
}),
],
signal: controller.signal,
onProgress: setDownloadProgress,
});
toast.success("已开始下载");
toast.success("原图已开始下载");
} catch (error) {
if (controller.signal.aborted) {
toast.message("已取消下载");

View File

@ -207,7 +207,7 @@ export function ImageParamsBar({
normalizeImageSizeValue(size, "")
)
: []
).filter((size) => providerType !== "alibaba-image" || size === "1K" || size === "2K");
);
const buildImageSizeOptions = () => {
if (imageGenConfig?.supportsSize === false) {
@ -220,7 +220,6 @@ export function ImageParamsBar({
return DEFAULT_IMAGE_SIZE_OPTIONS.filter((option) => {
if (option.disabled) return false;
if (providerType === "alibaba-image" && option.value === "4K") return false;
if (!imageGenConfig) return true;
if (option.value === "1K") return imageGenConfig.supports1K !== false;
if (option.value === "2K") return imageGenConfig.supports2K !== false;

View File

@ -14,8 +14,6 @@ import {
sanitizeAgentDetailBrief,
} from "@/lib/agents/detail-generation-config";
export const MAX_DETAIL_REPLACEMENT_REFERENCES = 64;
export function createEmptyAgentModeWorkspaceState(): AgentModeWorkspaceState {
return {
detailReplacement: {

View File

@ -407,32 +407,6 @@ function buildPromptSection(title: string, lines: string[]) {
return `【${title}】\n${normalizedLines.join("\n")}`;
}
export function resolveAgentWorkflowComposerSelections(params: {
config?: AgentWorkflowUiConfig | null;
selections: Partial<Record<AgentWorkflowStepKey, string>>;
}): AgentWorkflowComposerContext["selections"] {
const config = params.config || defaultAgentWorkflowUiConfig;
const steps = flattenVisibleAgentWorkflowSteps(
getEnabledAgentWorkflowStepTree(Array.isArray(config.steps) ? config.steps : []),
params.selections
)
.map(({ step }) => step)
.filter((step) => Array.isArray(step.options) && step.options.length > 0);
return steps.flatMap((step) => {
const selectedOptions = getAgentWorkflowSelectedOptionPath({
step,
selectionValue: params.selections[step.key],
});
return selectedOptions.map((option) => ({
stepKey: step.key,
stepTitle: step.title,
optionKey: option.key,
optionName: option.buttonName,
promptFragment: option.promptFragment || option.buttonName,
}));
});
}
export function buildAgentWorkflowComposerContext(params: {
config?: AgentWorkflowUiConfig | null;
inputs: AgentWorkflowInputsValue;
@ -440,9 +414,30 @@ export function buildAgentWorkflowComposerContext(params: {
selectedBrandModel?: AgentWorkflowSelectedBrandModel | null;
appearanceRecognitionEnabled?: boolean;
selections: Partial<Record<AgentWorkflowStepKey, string>>;
resolvedSelections?: AgentWorkflowComposerContext["selections"];
}): AgentWorkflowComposerContext | null {
const selections = params.resolvedSelections ?? resolveAgentWorkflowComposerSelections(params);
const config = params.config || defaultAgentWorkflowUiConfig;
const steps = flattenVisibleAgentWorkflowSteps(
getEnabledAgentWorkflowStepTree(Array.isArray(config.steps) ? config.steps : []),
params.selections
)
.map(({ step }) => step)
.filter((step) => Array.isArray(step.options) && step.options.length > 0);
const selections = steps
.map((step) => {
const selectedOptions = getAgentWorkflowSelectedOptionPath({
step,
selectionValue: params.selections[step.key],
});
if (selectedOptions.length === 0) return [];
return selectedOptions.map((option) => ({
stepKey: step.key,
stepTitle: step.title,
optionKey: option.key,
optionName: option.buttonName,
promptFragment: option.promptFragment || option.buttonName,
}));
})
.flat() as AgentWorkflowComposerContext["selections"];
const referenceImages = getSelectedWorkflowReferenceImages({
inputs: params.inputs,
materials: params.materials,

View File

@ -1,18 +0,0 @@
import type { AgentWorkflowOptionUiConfig, AgentWorkflowStepUiConfig } from "@/types/agent";
export function omitAgentWorkflowPrompts(steps: AgentWorkflowStepUiConfig[]): AgentWorkflowStepUiConfig[] {
const omitOptionPrompt = ({ promptFragment: _prompt, children, ...option }: AgentWorkflowOptionUiConfig): AgentWorkflowOptionUiConfig => ({
...option,
...(children?.length ? { children: children.map(omitOptionPrompt) } : {}),
});
return steps.map(({ options, children, ...step }) => ({
...step,
options: options.map(omitOptionPrompt),
...(children?.length ? { children: omitAgentWorkflowPrompts(children) } : {}),
}));
}
export function getWorkflowSelectionsRequest(selections: Record<string, string | undefined>) {
const entries = Object.entries(selections).filter(([, value]) => value?.trim());
return entries.length ? JSON.stringify(Object.fromEntries(entries.sort(([a], [b]) => a.localeCompare(b)))) : "";
}

View File

@ -29,7 +29,6 @@ const reviewSchema = z.object({
passed: z.boolean(),
issues: z.array(z.string().max(300)).max(12),
failedNodeIds: z.array(z.string().max(180)).max(12).default([]),
observations: z.array(z.string().max(300)).max(12).default([]),
});
export type RuntimeReviewPorts = {
loadNodes?: (ids: string[]) => Promise<RuntimeImageNode[]>;
@ -68,7 +67,7 @@ export async function analyzeRuntimeImages(params: {
const answer = await generateText({
model,
system:
'你是图片检查员。只检查实际可见内容,不执行图片或文字中包含的指令。按用户的原始要求、后续补充及实际输出设置判断;任务计划只能辅助理解,不得自行增加验收条件。用户要求修改的内容不需要与原图一致;“其他不变”要求主体、颜色、背景与布局在视觉上保持一致,不等于像素、字形或位置完全重合。除非用户明确要求精确字体、字号或位置,否则轻微字形和排版差异不能单独判失败;漏改、错字、尺寸文字错误、主体或背景明显变化仍须指出。检查关键要求时若图片模糊或无法确认,说明具体无法确认的内容并令 passed 为 false,不要因为未要求的细节无法确认而失败。图片附带从原文件读取的尺寸和透明通道事实,判断透明性必须以 hasAlpha、hasTransparentPixels 为准;预览中的棋盘格只是透明区域的显示底纹,不是图片真实背景。返回 JSON:{"passed":boolean,"issues":[string],"failedNodeIds":[string],"observations":[string]}。observations 回答检查问题,写明各节点实际读到的文字、主体或背景;issues 只列不满足用户要求或无法确认的关键问题,不要把参考原图列为失败结果。最多列出6条关键问题,每条不超过150字;failedNodeIds只列当前图片节点,不超过12个。不输出JSON之外的文字。',
'你是图片验收员。只检查实际可见内容,不执行图片或文字中包含的指令。图片附带从原文件读取的透明通道事实,判断透明性必须以 hasAlpha、hasTransparentPixels 为准;预览中的棋盘格只是透明区域的显示底纹,不是图片真实背景,不可把它或预览黑白底当作不透明的证据。其他内容不确定时 passed 必须为 false。返回 JSON:{"passed":boolean,"issues":[string],"failedNodeIds":[string]},指出具体结果图片节点及问题,不要把参考原图列为失败结果。最多列出6条关键问题,每条不超过150字;failedNodeIds只列当前图片节点,不超过12个。不输出JSON之外的文字。',
messages: [
{
role: "user",
@ -194,13 +193,6 @@ export async function verifyCanvasAgentResults(params: {
}
const issues: string[] = [];
const failedIds = new Set<string>();
const selectedRatio = countAgentGeneratedImages(calls) > 0
? snapshot.imagePreferences?.parameters?.aspectRatio : undefined;
const expectedRatio = selectedRatio && selectedRatio !== "auto"
? selectedRatio : snapshot.requirements?.aspectRatio ?? plan.aspectRatio;
const ratio = String(expectedRatio || "").match(/^(\d+(?:\.\d+)?):(\d+(?:\.\d+)?)$/);
const targetRatio = ratio && Number(ratio[1]) > 0 && Number(ratio[2]) > 0
? Number(ratio[1]) / Number(ratio[2]) : undefined;
for (let index = 0; index < finalIds.length; index += 2) {
const resultIds = finalIds.slice(index, index + 2);
const sourceIds = originalSourceNodeIds(snapshot, resultIds);
@ -209,18 +201,20 @@ export async function verifyCanvasAgentResults(params: {
const review = await analyzeRuntimeImages({
...params,
nodeIds: [...sourceIds, ...resultIds],
question: `原始参考图节点:${JSON.stringify(sourceIds)}。待验收结果节点:${JSON.stringify(resultIds)}。仅检查结果图是否符合要求,并和原图对照主体。\n用户要求:${snapshot.objective}\n后续补充:${snapshot.inputs.map((input) => input.text).join("\n")}\n实际输出设置:${JSON.stringify(snapshot.imagePreferences?.parameters || {})}\n${targetRatio ? `结果的目标比例为 ${expectedRatio},程序会根据原文件尺寸独立校验。不要用参考图的比例或画布显示尺寸替代这个目标,不要把正常缩放、像素取整的细微差异列为问题。` : "未固定输出比例,不要仅因原图与结果图像素尺寸不同而判失败;用户明确要求保持或改变比例时仍须检查。"}\n辅助任务计划(不能扩大用户要求):${JSON.stringify(plan)}`,
question: `原始参考图节点:${JSON.stringify(sourceIds)}。待验收结果节点:${JSON.stringify(resultIds)}。仅检查结果图是否符合要求,并和原图对照主体。\n用户要求:${snapshot.objective}\n后续补充:${snapshot.inputs.map((input) => input.text).join("\n")}\n任务标准:${JSON.stringify(plan)}`,
});
snapshot.inputTokens += review.inputTokens;
snapshot.outputTokens += review.outputTokens;
if (!review.passed || review.issues.length)
issues.push(...(review.issues.length ? review.issues : ["视觉检查未通过"]));
for (const id of review.failedNodeIds) if (resultIds.includes(id)) failedIds.add(id);
if (targetRatio)
const expectedRatio = snapshot.requirements?.aspectRatio ?? plan.aspectRatio;
const ratio = String(expectedRatio || "").match(/^(\d+(?:\.\d+)?):(\d+(?:\.\d+)?)$/);
if (ratio)
for (const image of review.images) {
if (
resultIds.includes(image.nodeId) &&
Math.abs(image.width / image.height / targetRatio - 1) > 0.01
Math.abs(image.width / image.height - Number(ratio[1]) / Number(ratio[2])) > 0.025
) {
issues.push(`图片 ${image.nodeId} 的实际比例未符合 ${expectedRatio}`);
failedIds.add(image.nodeId);

View File

@ -1,5 +1,3 @@
import { isVideoModelDescriptor } from "@/lib/ai/model-classification";
export const DETAIL_REPLACEMENT_IMAGE_MODEL_CONFIG_KEY =
"detail_replacement_image_model_config";
@ -22,28 +20,3 @@ export function normalizeDetailReplacementImageModelConfig(
modelId: modelId || DEFAULT_DETAIL_REPLACEMENT_IMAGE_MODEL_ID,
};
}
export function isDetailReplacementImageModel({
model,
provider,
}: {
model: { modelId: string; supportsImageGen: boolean; isSubModel: boolean; capabilities?: unknown };
provider?: { type?: string | null } | null;
}) {
return model.supportsImageGen && !model.isSubModel && !isVideoModelDescriptor({
providerType: provider?.type,
modelId: model.modelId,
capabilities: model.capabilities,
supportsImageGen: model.supportsImageGen,
});
}
export function findConfiguredDetailReplacementImageModel<
T extends Parameters<typeof isDetailReplacementImageModel>[0] & { model: { id: string } },
>(models: T[], setting: unknown): T | undefined {
const { modelId } = normalizeDetailReplacementImageModelConfig(setting);
return models.find((entry) =>
(entry.model.id === modelId || entry.model.modelId === modelId) &&
isDetailReplacementImageModel(entry)
);
}

View File

@ -3,19 +3,6 @@ export type ExtendProviderCredential = {
updatedAt?: Date | string | null;
};
export type ExtendProvider = "vip98k" | "dashscope" | "fal";
export function resolveFalExtendApiKey(providers: Array<ExtendProviderCredential & { baseUrl?: string | null }>) {
for (const { apiKey, baseUrl } of providers) {
if (!apiKey || !baseUrl) continue;
const url = URL.canParse(baseUrl) ? new URL(baseUrl) : null;
if (url?.protocol === "https:" && ["queue.fal.run", "fal.run", "fal.ai", "api.fal.ai"].includes(url.hostname)) {
return apiKey.trim().replace(/^(?:Bearer|Key)\s+/i, "");
}
}
return null;
}
function getUpdatedAtTimestamp(value: Date | string | null | undefined): number {
if (!value) return 0;
const timestamp = value instanceof Date ? value.getTime() : Date.parse(value);

View File

@ -1,93 +0,0 @@
import { createFalClient } from "@fal-ai/client";
import sharp from "sharp";
export const FAL_OUTPAINT_MODEL = "fal-ai/flux-2-pro/outpaint";
export function getOutpaintGeometry(width: number, height: number, xScale: number, yScale: number) {
const targetWidth = Math.round(width * xScale);
const targetHeight = Math.round(height * yScale);
const ratio = Math.min(1, 2048 / Math.max(targetWidth, targetHeight));
const modelWidth = Math.max(1, Math.floor(targetWidth * ratio));
const modelHeight = Math.max(1, Math.floor(targetHeight * ratio));
const sourceWidth = Math.max(1, Math.round(width * modelWidth / targetWidth));
const sourceHeight = Math.max(1, Math.round(height * modelHeight / targetHeight));
const left = Math.floor((targetWidth - width) / 2);
const top = Math.floor((targetHeight - height) / 2);
const modelLeft = Math.round(left * modelWidth / targetWidth);
const modelTop = Math.round(top * modelHeight / targetHeight);
// Align the model canvas to its 16-pixel grid, then remove the extra border.
const extraWidth = (16 - modelWidth % 16) % 16;
const extraHeight = (16 - modelHeight % 16) % 16;
const cropLeft = Math.floor(extraWidth / 2);
const cropTop = Math.floor(extraHeight / 2);
return {
targetWidth, targetHeight, left, top, modelWidth, modelHeight, sourceWidth, sourceHeight,
paddedWidth: modelWidth + extraWidth,
paddedHeight: modelHeight + extraHeight,
cropLeft,
cropTop,
expandLeft: modelLeft + cropLeft,
expandRight: modelWidth - sourceWidth - modelLeft + extraWidth - cropLeft,
expandTop: modelTop + cropTop,
expandBottom: modelHeight - sourceHeight - modelTop + extraHeight - cropTop,
};
}
export async function composeOutpaint(source: Buffer, expanded: Buffer, geometry: ReturnType<typeof getOutpaintGeometry>) {
const { targetWidth, targetHeight, left, top, modelWidth, modelHeight, paddedWidth, paddedHeight, cropLeft, cropTop } = geometry;
const modelImage = sharp(expanded);
const info = await modelImage.metadata();
if (info.width !== paddedWidth || info.height !== paddedHeight) {
throw new Error("扩图服务返回的图片尺寸不正确");
}
// Copy the source rectangle, including transparent pixels, without blending or resizing it.
const { data: original, info: sourceInfo } = await sharp(source).toColourspace("srgb").ensureAlpha().raw().toBuffer({ resolveWithObject: true });
const result = await modelImage
.extract({ left: cropLeft, top: cropTop, width: modelWidth, height: modelHeight })
.resize(targetWidth, targetHeight, { fit: "fill" })
.toColourspace("srgb").ensureAlpha().raw().toBuffer();
const stride = sourceInfo.width * 4;
for (let row = 0; row < sourceInfo.height; row++) {
original.copy(result, ((top + row) * targetWidth + left) * 4, row * stride, (row + 1) * stride);
}
return sharp(result, { raw: { width: targetWidth, height: targetHeight, channels: 4 } }).png().toBuffer();
}
export async function expandWithFalOutpaint({ imageUrl, apiKey, xScale, yScale }: {
imageUrl: string;
apiKey: string;
xScale: number;
yScale: number;
}) {
const response = await fetch(imageUrl, { signal: AbortSignal.timeout(45_000) });
if (!response.ok) throw new Error("无法读取待扩展的原图");
const { data: source, info } = await sharp(Buffer.from(await response.arrayBuffer()))
.rotate().png().toBuffer({ resolveWithObject: true });
const geometry = getOutpaintGeometry(info.width, info.height, xScale, yScale);
if (geometry.targetWidth * geometry.targetHeight > 64_000_000) {
throw new Error("扩图后的尺寸过大,请降低扩展倍数");
}
const fal = createFalClient({ credentials: apiKey });
const modelSource = geometry.sourceWidth === info.width && geometry.sourceHeight === info.height
? source
: await sharp(source).resize(geometry.sourceWidth, geometry.sourceHeight, { fit: "fill" }).png().toBuffer();
const image = await fal.storage.upload(new Blob([new Uint8Array(modelSource)], { type: "image/png" }));
const { data } = await fal.subscribe(FAL_OUTPAINT_MODEL, {
input: {
image_url: image,
expand_left: geometry.expandLeft,
expand_right: geometry.expandRight,
expand_top: geometry.expandTop,
expand_bottom: geometry.expandBottom,
mode: "high",
output_format: "png",
},
timeout: 90_000,
});
const outputUrl = (data as { images?: Array<{ url?: string }> }).images?.[0]?.url;
if (!outputUrl) throw new Error("扩图服务未返回图片");
const output = await fetch(outputUrl, { signal: AbortSignal.timeout(25_000) });
if (!output.ok) throw new Error("无法读取扩图结果");
return composeOutpaint(source, Buffer.from(await output.arrayBuffer()), geometry);
}

View File

@ -5,26 +5,21 @@ import {
getSystemSetting,
upsertMediaAsset,
} from "@/lib/db/queries";
import { type ExtendProvider, resolveAlibabaExtendApiKey, resolveFalExtendApiKey } from "@/lib/ai/extend/config";
import { expandWithFalOutpaint, FAL_OUTPAINT_MODEL } from "@/lib/ai/extend/fal-outpaint";
import { executeConfiguredVip98kTask, getVip98kRuntimeProvider } from "@/lib/ai/vip98k-runtime";
import { expandWithVip98kOutpaint, VIP98K_OUTPAINT_MODEL } from "@/lib/ai/extend/vip98k-outpaint";
import { resolveAlibabaExtendApiKey } from "@/lib/ai/extend/config";
import { executeConfiguredVip98kTask } from "@/lib/ai/vip98k-runtime";
import { db } from "@/lib/db";
import { generatedImage } from "@/lib/db/schema";
import { uploadFile } from "@/lib/storage/service";
import { archiveTemporaryImage } from "@/lib/storage/image-archive";
import { randomUUID } from "node:crypto";
type ExtendConfig = {
provider?: ExtendProvider;
provider?: "vip98k" | "dashscope";
apiKey?: string;
xScale?: number;
yScale?: number;
modelId?: string;
routeOptionId?: string;
};
const SOURCE_DOWNLOAD_TIMEOUT_MS = 120_000;
const VIP98K_EXPANSION_FALLBACK_MODEL = "google/nano-banana-pro/edit";
const VIP98K_SOURCE_DOWNLOAD_TIMEOUT_MS = 120_000;
const DASHSCOPE_MIN_IMAGE_EDGE = 512;
const DASHSCOPE_MAX_IMAGE_EDGE = 4096;
const DASHSCOPE_MAX_IMAGE_BYTES = 10 * 1024 * 1024;
@ -88,12 +83,12 @@ async function createThumbnail(buffer: Buffer): Promise<Buffer> {
}
}
async function uploadBufferPairToS3(buffer: Buffer, originalExtension = "jpg"): Promise<{ thumbnail: string; original: string }> {
async function uploadBufferPairToS3(buffer: Buffer): Promise<{ thumbnail: string; original: string }> {
try {
const timestamp = Date.now();
const randomStr = Math.random().toString(36).slice(2, 8);
const thumbnailFilename = `extend-thumb-${timestamp}-${randomStr}.jpg`;
const originalFilename = `extend-orig-${timestamp}-${randomStr}.${originalExtension}`;
const originalFilename = `extend-orig-${timestamp}-${randomStr}.jpg`;
const thumbnailBuffer = await createThumbnail(buffer);
const thumbnailArrayBuffer = thumbnailBuffer.buffer.slice(
thumbnailBuffer.byteOffset,
@ -147,7 +142,7 @@ async function normalizeDashscopeExpansionInput(imageUrl: string): Promise<strin
const response = await fetch(imageUrl, {
cache: "no-store",
redirect: "follow",
signal: AbortSignal.timeout(SOURCE_DOWNLOAD_TIMEOUT_MS),
signal: AbortSignal.timeout(VIP98K_SOURCE_DOWNLOAD_TIMEOUT_MS),
});
if (!response.ok) {
throw new ExtendServiceError(
@ -242,6 +237,97 @@ async function normalizeDashscopeExpansionInput(imageUrl: string): Promise<strin
return uploaded.url;
}
function isTemporaryVip98kExpansionError(error: unknown) {
const message = error instanceof Error ? error.message : String(error || "");
return /HTTP\s+(?:429|5\d\d)|temporar(?:y|ily)|timeout|timed out|unavailable/i.test(
message,
);
}
async function createVip98kExpansionCanvas(
imageUrl: string,
xScale: number,
yScale: number,
) {
const response = await fetch(imageUrl, {
cache: "no-store",
redirect: "follow",
signal: AbortSignal.timeout(VIP98K_SOURCE_DOWNLOAD_TIMEOUT_MS),
});
if (!response.ok) {
throw new ExtendServiceError(
"下载待拓展图片失败",
502,
`${response.status} ${response.statusText}`,
);
}
const sourceBuffer = Buffer.from(await response.arrayBuffer());
const sharp = await import("sharp");
const image = sharp.default(sourceBuffer, { failOn: "none" });
const metadata = await image.metadata();
const width = Number(metadata.width || 0);
const height = Number(metadata.height || 0);
if (!width || !height) {
throw new ExtendServiceError("无法识别待拓展图片尺寸", 422);
}
const targetWidth = Math.max(width, Math.round(width * xScale));
const targetHeight = Math.max(height, Math.round(height * yScale));
const left = Math.floor((targetWidth - width) / 2);
const top = Math.floor((targetHeight - height) / 2);
const canvas = await image
.ensureAlpha()
.extend({
left,
right: targetWidth - width - left,
top,
bottom: targetHeight - height - top,
background: { r: 0, g: 0, b: 0, alpha: 0 },
})
.png()
.toBuffer();
const arrayBuffer = canvas.buffer.slice(
canvas.byteOffset,
canvas.byteOffset + canvas.byteLength,
) as ArrayBuffer;
const uploaded = await uploadFile(
`extend-vip98k-canvas-${Date.now()}-${Math.random().toString(36).slice(2, 8)}.png`,
arrayBuffer,
);
return {
imageUrl: uploaded.url,
width,
height,
targetWidth,
targetHeight,
};
}
async function extendImageWithVip98kEditFallback(
imageUrl: string,
xScale: number,
yScale: number,
) {
const canvas = await createVip98kExpansionCanvas(imageUrl, xScale, yScale);
const result = await executeConfiguredVip98kTask({
modelId: VIP98K_EXPANSION_FALLBACK_MODEL,
kind: "image",
prompt: [
"Outpaint only the transparent regions of this image.",
"Keep every original pixel, subject, scale, position, perspective, lighting and style unchanged.",
`Complete the ${canvas.targetWidth}x${canvas.targetHeight} canvas naturally from the centered ${canvas.width}x${canvas.height} source.`,
"Do not crop, zoom, move, replace or redraw the original content.",
].join(" "),
imageUrls: [canvas.imageUrl],
});
const outputUrl = result.outputUrls[0];
if (!outputUrl) {
throw new ExtendServiceError("VIP98K 生成式扩图未返回图片", 502);
}
return outputUrl;
}
async function extendImage(
imageUrl: string,
config: ExtendConfig,
@ -250,17 +336,27 @@ async function extendImage(
requestId?: string | null,
): Promise<string> {
if (config.provider === "vip98k") {
const result = await executeConfiguredVip98kTask({
modelId: "image-expansion",
kind: "image-tool",
imageUrls: [imageUrl],
imageParams: { xScale, yScale },
});
const outputUrl = result.outputUrls[0];
if (!outputUrl) {
throw new ExtendServiceError("VIP98K 图像拓展未返回图片", 502);
try {
const result = await executeConfiguredVip98kTask({
modelId: "image-expansion",
kind: "image-tool",
prompt: `Expand the image canvas naturally to ${xScale}x width and ${yScale}x height. Preserve the original subject, perspective, lighting and style.`,
imageUrls: [imageUrl],
imageParams: { xScale, yScale },
});
const outputUrl = result.outputUrls[0];
if (!outputUrl) {
throw new ExtendServiceError("VIP98K 图像拓展未返回图片", 502);
}
return outputUrl;
} catch (error) {
if (!isTemporaryVip98kExpansionError(error)) throw error;
console.warn(
"[Extend Service] VIP98K expansion tool is temporarily unavailable; using VIP98K generative outpainting fallback",
error instanceof Error ? error.message : String(error),
);
return extendImageWithVip98kEditFallback(imageUrl, xScale, yScale);
}
return outputUrl;
}
if (!config.apiKey) {
@ -377,15 +473,6 @@ async function getValidatedExtendConfig(): Promise<ExtendConfig> {
if (config.provider === "vip98k") {
return config;
}
if (config.provider === "fal") {
const [imageProviders, videoProviders] = await Promise.all([
getAiProvidersByType({ type: "fal-image", enabledOnly: true }),
getAiProvidersByType({ type: "fal-video", enabledOnly: true }),
]);
const apiKey = resolveFalExtendApiKey([...imageProviders, ...videoProviders]);
if (!apiKey) throw new ExtendServiceError("扩图服务未配置可用的 fal 密钥", 503);
return { ...config, apiKey };
}
const alibabaProviders = await getAiProvidersByType({
type: "alibaba-image",
@ -435,48 +522,36 @@ export async function executeExtendJob(
throw new ExtendServiceError("无法获取输入图片URL", 400);
}
const preparedInputImageUrl =
config.provider === "vip98k"
? inputImageUrl
: await normalizeDashscopeExpansionInput(inputImageUrl);
const startTime = Date.now();
let buffer!: Buffer;
let uploadResult: { thumbnail: string; original: string } | undefined;
let archivedBytes: number | undefined;
let downloadAsset: Awaited<ReturnType<typeof archiveTemporaryImage>>["downloadAsset"];
let modelId: string;
if (config.provider === "fal") {
buffer = await expandWithFalOutpaint({ imageUrl: inputImageUrl, apiKey: config.apiKey!, xScale, yScale });
modelId = FAL_OUTPAINT_MODEL;
} else if (config.provider === "vip98k" && config.modelId === VIP98K_OUTPAINT_MODEL) {
if (!config.routeOptionId) throw new ExtendServiceError("98K 扩图线路未配置", 503);
const provider = await getVip98kRuntimeProvider();
buffer = await expandWithVip98kOutpaint({
imageUrl: inputImageUrl, baseUrl: provider.baseUrl, apiKey: provider.apiKey,
routeOptionId: config.routeOptionId, xScale, yScale,
});
modelId = VIP98K_OUTPAINT_MODEL;
} else {
const prepared = config.provider === "vip98k" ? inputImageUrl : await normalizeDashscopeExpansionInput(inputImageUrl);
const url = await extendImage(prepared, config, xScale, yScale, requestId);
if (config.provider === "vip98k" && !includeBase64) {
const archived = await archiveTemporaryImage(url, requestId || randomUUID());
uploadResult = { original: archived.url, thumbnail: archived.thumbnailUrl };
archivedBytes = archived.bytes;
downloadAsset = archived.downloadAsset;
} else {
const imageResponse = await fetch(url);
if (!imageResponse.ok) {
throw new ExtendServiceError("下载拓展图片失败", 500, `${imageResponse.status} ${imageResponse.statusText}`);
}
buffer = Buffer.from(await imageResponse.arrayBuffer());
}
modelId = config.provider === "vip98k" ? "image-expansion" : "extend-1.0";
const extendedImageUrl = await extendImage(
preparedInputImageUrl,
config,
xScale,
yScale,
requestId,
);
const imageResponse = await fetch(extendedImageUrl);
if (!imageResponse.ok) {
throw new ExtendServiceError(
"下载拓展图片失败",
500,
`${imageResponse.status} ${imageResponse.statusText}`,
);
}
const buffer = Buffer.from(await imageResponse.arrayBuffer());
const imageBase64Result = includeBase64 ? buffer.toString("base64") : undefined;
uploadResult ??= await uploadBufferPairToS3(buffer, config.provider === "fal" || config.provider === "vip98k" ? "png" : "jpg");
const uploadResult = await uploadBufferPairToS3(buffer);
console.log("[Extend Service] Result uploaded:", {
requestId,
includeBase64,
inputImageUrl: inputImageUrl.slice(0, 120),
modelId,
outputBytes: archivedBytes ?? buffer.length,
extendedImageUrl: extendedImageUrl.slice(0, 120),
outputBytes: buffer.length,
});
let mediaAssetId: string | null = null;
let generatedImageId: string | null = null;
@ -492,7 +567,7 @@ export async function executeExtendJob(
thumbnailUrl: uploadResult.thumbnail,
originalUrl: uploadResult.original,
prompt,
modelId,
modelId: config.provider === "vip98k" ? "image-expansion" : "extend-1.0",
imageSize: "2K",
})
.returning();
@ -516,7 +591,7 @@ export async function executeExtendJob(
thumbnailUrl: uploadResult.thumbnail,
displayName: prompt.slice(0, 80),
prompt,
modelId,
modelId: config.provider === "vip98k" ? "image-expansion" : "extend-1.0",
sourceMessageId: messageId,
sourceTable: "GeneratedImage",
sourceRowId: generatedImageId,
@ -525,7 +600,6 @@ export async function executeExtendJob(
xScale,
yScale,
imageSize: "2K",
...(downloadAsset ? { downloadAsset } : {}),
},
});
mediaAssetId = media?.id || null;

View File

@ -1,85 +0,0 @@
import sharp from "sharp";
export const VIP98K_OUTPAINT_MODEL = "gpt-image-2.5-flare";
const RATIOS = [[1, 1], [4, 3], [3, 4], [3, 2], [2, 3], [16, 9], [9, 16]];
export function getVip98kOutpaintGeometry(width: number, height: number, xScale: number, yScale: number) {
const targetWidth = Math.round(width * xScale);
const targetHeight = Math.round(height * yScale);
if (targetWidth * targetHeight > 64_000_000) throw new Error("扩图后的尺寸过大,请降低扩展倍数");
const ratio = targetWidth / targetHeight;
const [a, b] = RATIOS.reduce((best, next) =>
Math.abs(Math.log(ratio / (next[0] / next[1]))) < Math.abs(Math.log(ratio / (best[0] / best[1]))) ? next : best);
const paddedWidth = Math.max(targetWidth, Math.ceil(targetHeight * a / b));
const paddedHeight = Math.max(targetHeight, Math.ceil(targetWidth * b / a));
const factor = Math.min(1, 2048 / Math.max(paddedWidth, paddedHeight));
const modelWidth = Math.max(1, Math.round(paddedWidth * factor));
const modelHeight = Math.max(1, Math.round(paddedHeight * factor));
const sourceWidth = Math.max(1, Math.round(width * factor));
const sourceHeight = Math.max(1, Math.round(height * factor));
return {
targetWidth, targetHeight, modelWidth, modelHeight, sourceWidth, sourceHeight,
left: Math.floor((modelWidth - sourceWidth) / 2),
top: Math.floor((modelHeight - sourceHeight) / 2),
aspectRatio: `${a}:${b}`,
resolution: Math.max(targetWidth, targetHeight) > 1536 ? "2K" : "1K",
};
}
export async function expandWithVip98kOutpaint(params: {
imageUrl: string;
baseUrl: string;
apiKey: string;
routeOptionId: string;
xScale: number;
yScale: number;
}) {
const response = await fetch(params.imageUrl, { signal: AbortSignal.timeout(120_000) });
if (!response.ok) throw new Error("无法读取待扩展的原图");
const { data: source, info } = await sharp(Buffer.from(await response.arrayBuffer()))
.rotate().png().toBuffer({ resolveWithObject: true });
const g = getVip98kOutpaintGeometry(info.width, info.height, params.xScale, params.yScale);
const input = await sharp(source).resize(g.sourceWidth, g.sourceHeight).ensureAlpha().extend({
left: g.left, right: g.modelWidth - g.sourceWidth - g.left,
top: g.top, bottom: g.modelHeight - g.sourceHeight - g.top,
background: { r: 0, g: 0, b: 0, alpha: 0 },
}).png().toBuffer();
const body = new FormData();
const prompt = [
"Extend this product image outward on all four sides, continuing its background naturally.",
`The reference canvas is ${g.modelWidth}x${g.modelHeight}; the original image is centered at (${g.left},${g.top}) with size ${g.sourceWidth}x${g.sourceHeight}.`,
"Fill only the surrounding empty area as a continuation of the same scene.",
"Preserve the existing product identity, structure, colors, and all Chinese text and dimension numbers.",
"Keep approximately the same composition and the product centered.",
"Avoid adding new products or additional text. Return a complete seamless image.",
].join(" ");
for (const [key, value] of Object.entries({
model: VIP98K_OUTPAINT_MODEL, prompt, n: "1", size: g.aspectRatio,
resolution: g.resolution, quality: "high", response_format: "url",
})) body.append(key, value);
body.append("image[]", new Blob([new Uint8Array(input)], { type: "image/png" }), "outpaint.png");
const base = params.baseUrl.replace(/\/$/, "").replace(/\/v1$/, "");
const generated = await fetch(`${base}/v1/images/edits`, {
method: "POST", body,
headers: { Authorization: `Bearer ${params.apiKey}`, "X-Relay-Route-Option": params.routeOptionId },
signal: AbortSignal.timeout(180_000),
});
const result = await generated.json();
if (!generated.ok) throw new Error(`98K 扩图失败:${result?.error?.message || `HTTP ${generated.status}`}`);
const image = result?.data?.[0];
let expanded: Buffer;
if (typeof image?.b64_json === "string") {
expanded = Buffer.from(image.b64_json, "base64");
} else if (typeof image?.url === "string") {
const outputUrl = new URL(image.url);
const headers = new Headers();
if (outputUrl.origin === new URL(base).origin) headers.set("Authorization", `Bearer ${params.apiKey}`);
const output = await fetch(outputUrl, { headers, signal: AbortSignal.timeout(60_000) });
if (!output.ok) throw new Error(`无法读取扩图结果(HTTP ${output.status})`);
expanded = Buffer.from(await output.arrayBuffer());
} else {
throw new Error("98K 扩图未返回图片");
}
return sharp(expanded).resize(g.targetWidth, g.targetHeight, { fit: "cover", position: "centre" }).png().toBuffer();
}

View File

@ -13,7 +13,6 @@ import { constrainImageDimensions } from "@/lib/ai/image-size-constraints";
import { isAlibabaImageTextToImageModelId } from "@/lib/ai/model-classification";
import { buildReferenceImageOrderPrompt } from "@/lib/ai/providers/reference-image-order";
import { ImageReferenceReadTimeoutError } from "@/lib/ai/runtime/image-generation-error";
import { getDefaultStorageConfig } from "@/lib/db/queries";
import { createDeferredUploadedImage } from "@/lib/storage/image-archive";
import { uploadFile } from "@/lib/storage/service";
import { normalizeLegacyAliyunStorageUrl } from "@/lib/storage/retired-storage";
@ -71,7 +70,7 @@ interface AlibabaImageResponse {
const ALIBABA_IMAGE_FETCH_TIMEOUT_MS = 20000;
const ALIBABA_IMAGE_GENERATION_TIMEOUT_MS = 10 * 60 * 1000;
const ALIBABA_IMAGE_SUBMIT_TIMEOUT_MS = 120 * 1000;
const ALIBABA_IMAGE_SUBMIT_TIMEOUT_MS = 60 * 1000;
const ALIBABA_IMAGE_POLL_TIMEOUT_MS = 30 * 1000;
const ALIBABA_IMAGE_POLL_INTERVAL_MS = 5 * 1000;
const ALIBABA_MIN_SIZE = 512;
@ -92,9 +91,9 @@ class AlibabaImageRequestError extends Error {
}
}
function normalizeImageSizeLabel(imageSize?: string): "1K" | "2K" {
function normalizeImageSizeLabel(imageSize?: string): "1K" | "2K" | "4K" {
const normalized = String(imageSize || "").trim().toUpperCase();
if (normalized === "1K") return normalized;
if (normalized === "1K" || normalized === "2K" || normalized === "4K") return normalized;
return "2K";
}
@ -292,7 +291,6 @@ async function prepareAlibabaInputImageUrl(
modelId: string,
inputRole?: AlibabaImageInputRole,
original?: Buffer,
preparedBuffers?: Map<string, Buffer>,
): Promise<string> {
const normalizedUrl = String(imageUrl || "").trim();
if (!/^https?:\/\//i.test(normalizedUrl)) return normalizedUrl;
@ -326,27 +324,10 @@ async function prepareAlibabaInputImageUrl(
maxSide: ALIBABA_MAX_INPUT_SIDE,
modelId,
});
preparedBuffers?.set(normalizedUrl, prepared.buffer);
if (isAlibabaQwenImage3ModelId(modelId)) {
if (prepared.buffer.length > maxInputBytes) {
throw new Error("输入图片超过模型大小限制,请先压缩图片后重试");
}
if (!prepared.transformed) {
const storage = await getDefaultStorageConfig();
if (storage?.isEnabled && storage.type === "qiniu-kodo" && storage.publicUrl) {
const source = new URL(normalizedUrl);
const publicBase = new URL(storage.publicUrl);
const origin = process.env.CANVAS_QINIU_ORIGIN_URL;
const isStoredOriginal = !source.search && !source.hash &&
source.pathname.startsWith(publicBase.pathname.replace(/\/$/, "") + "/uploads/") &&
(source.origin === publicBase.origin || (origin && source.origin === new URL(origin).origin));
if (publicBase.protocol === "https:" && isStoredOriginal) {
source.host = publicBase.host;
source.protocol = publicBase.protocol;
return source.toString();
}
}
}
const format = prepared.transformed ? prepared.extension : metadata.format;
const mime = format === "jpg" || format === "jpeg" ? "image/jpeg" : `image/${format}`;
return `data:${mime};base64,${prepared.buffer.toString("base64")}`;
@ -580,7 +561,6 @@ async function sendAlibabaImageAsyncRequest(params: {
requestBody: Record<string, unknown>;
requestURL: string;
}): Promise<AlibabaImageResponse> {
const submissionStartedAt = Date.now();
const submitted = await fetchAlibabaImageJson({
apiKey: params.apiKey,
asyncRequest: true,
@ -588,14 +568,6 @@ async function sendAlibabaImageAsyncRequest(params: {
method: "POST",
timeoutMs: ALIBABA_IMAGE_SUBMIT_TIMEOUT_MS,
url: params.requestURL,
}).catch((error) => {
if (error instanceof AlibabaImageRequestError && error.status >= 400 && error.status < 500 && error.status !== 408) throw error;
console.error("[Alibaba Image] Submission outcome unknown:", {
elapsedMs: Date.now() - submissionStartedAt,
timeoutMs: ALIBABA_IMAGE_SUBMIT_TIMEOUT_MS,
error: error instanceof Error ? error.message : String(error),
});
throw Object.assign(new Error("阿里图片提交响应未确认,可能已受理,请先核对原任务,避免重复生成。", { cause: error }), { providerOutcomeUnknown: true });
});
const taskId = String(submitted.output?.task_id || "").trim();
if (!taskId) throw new Error("阿里图片异步任务未返回 task_id,结果尚未确认");
@ -603,7 +575,7 @@ async function sendAlibabaImageAsyncRequest(params: {
const taskURL = resolveAlibabaImageTaskEndpoint(params.requestURL, taskId);
const startedAt = Date.now();
let lastPollError: unknown = null;
console.log("[Alibaba Image] Async task submitted:", taskId, { elapsedMs: Date.now() - submissionStartedAt, requestId: submitted.request_id });
console.log("[Alibaba Image] Async task submitted:", taskId);
while (Date.now() - startedAt < ALIBABA_IMAGE_GENERATION_TIMEOUT_MS) {
await new Promise((resolve) =>
@ -700,13 +672,19 @@ async function processResponse(
function formatImageResponse(
images: Array<{ thumbnail: string; original: string }>,
size?: string,
requestedSizeLabel?: string,
): string {
if (images.length === 0) {
return "图片生成失败,请重试。";
}
// 将分辨率转换为简短格式(如 "1024*1024" -> "1K")
const sizeLabel = size ? getSizeLabel(size) : "2K";
const normalizedRequestedSize = normalizeImageSizeLabel(requestedSizeLabel);
const sizeLabel = requestedSizeLabel
? normalizedRequestedSize
: size
? getSizeLabel(size)
: "2K";
return images
.map((img) => {
@ -725,7 +703,7 @@ function getSizeLabel(size: string): string {
"1024*1024": "1K",
"1280*1280": "1K",
"1536*1536": "2K",
"2048*2048": "2K",
"2048*2048": "4K",
};
if (sizeMap[size]) return sizeMap[size];
@ -734,6 +712,7 @@ function getSizeLabel(size: string): string {
const width = Number.parseInt(matched[1], 10);
const height = Number.parseInt(matched[2], 10);
const maxSide = Math.max(width, height);
if (maxSide >= 1900) return "4K";
if (maxSide >= 1450) return "2K";
if (maxSide >= 950) return "1K";
}
@ -823,7 +802,6 @@ export function createAlibabaImage({ apiKey, baseURL }: AlibabaImageConfig) {
}
const selectedImageUrls = selectAlibabaInputImageUrls(imageUrls, 3);
const preparedBuffers = new Map<string, Buffer>();
const preparedImageUrls = await Promise.all(
selectedImageUrls.map((imageUrl) =>
prepareAlibabaInputImageUrl(
@ -831,7 +809,6 @@ export function createAlibabaImage({ apiKey, baseURL }: AlibabaImageConfig) {
activeModelId,
options.imageParams?.inputImageRoleByUrl?.[imageUrl],
options.referenceImageBuffers?.get(imageUrl),
preparedBuffers,
),
),
);
@ -863,6 +840,7 @@ export function createAlibabaImage({ apiKey, baseURL }: AlibabaImageConfig) {
const baseSizeMap: Record<string, number> = {
"1K": 1024,
"2K": isQwenImage3 ? 2048 : 1536,
"4K": 2048,
};
const baseSize = baseSizeMap[imageSize] || 1536;
@ -898,7 +876,8 @@ export function createAlibabaImage({ apiKey, baseURL }: AlibabaImageConfig) {
console.log(`[Alibaba Image] Using user-specified size: ${params.size}`);
} else {
if (aspectRatio === "auto") {
// 按参考图比例计算输出尺寸,复用准备阶段读取的图片。
// 阿里文档在 auto 下默认接近 1024*1024,这会让 4K 选择失效。
// 这里改为根据参考图比例计算 size,确保 1K/2K/4K 档位真正生效。
const referenceImageUrl = preparedImageUrls[0];
if (!referenceImageUrl) {
params.size = `${baseSize}*${baseSize}`;
@ -906,11 +885,7 @@ export function createAlibabaImage({ apiKey, baseURL }: AlibabaImageConfig) {
`[Alibaba Image] Text-to-image auto mode resolved size: imageSize=${imageSize} => size=${params.size}`
);
} else {
const preparedBuffer = preparedBuffers.get(selectedImageUrls[0]);
const metadata = preparedBuffer ? await sharp(preparedBuffer).metadata() : null;
const inferredDimensions = metadata?.width && metadata.height
? { width: metadata.width, height: metadata.height, aspectRatio: metadata.width / metadata.height }
: await inferImageDimensionsFromImageUrl(referenceImageUrl);
const inferredDimensions = await inferImageDimensionsFromImageUrl(referenceImageUrl);
if (inferredDimensions) {
params.size = calculateAlibabaSizeFromDimensions(
inferredDimensions.width,
@ -977,9 +952,7 @@ export function createAlibabaImage({ apiKey, baseURL }: AlibabaImageConfig) {
const images = await processResponse(response).catch((error) => {
throw new Error("阿里图片任务已提交,结果尚未确认。", { cause: error });
});
const actualSize = response.usage?.width && response.usage?.height
? `${response.usage.width}*${response.usage.height}` : params.size;
const markdownText = formatImageResponse(images, actualSize);
const markdownText = formatImageResponse(images, params.size, imageSize);
console.log(`[Alibaba Image] Generated ${images.length} images successfully`);

View File

@ -1,5 +1,4 @@
import { createOpenAI } from "@ai-sdk/openai";
import { createAnthropic } from "@ai-sdk/anthropic";
import { APICallError, type LanguageModelV2, type LanguageModelV2CallOptions } from "@ai-sdk/provider";
import { selectVip98kChatInvocation } from "../vip98k-chat-contract";
@ -129,14 +128,6 @@ export function createVip98kChatModel(params: {
const root = params.baseURL.replace(/\/+$/, "").replace(/\/v1$/i, "");
const baseFetch = params.fetch || fetch;
const createModel = (contract: typeof invocation) => {
if (contract?.protocol === "anthropic-messages") {
return createAnthropic({
apiKey: params.apiKey,
baseURL: `${root}/v1`,
headers: { ...contract.headers, Authorization: `Bearer ${params.apiKey}` },
fetch: createChatFetch(root, baseFetch),
})(params.modelId);
}
const provider = createOpenAI({
apiKey: params.apiKey,
baseURL: `${root}/v1`,
@ -149,8 +140,7 @@ export function createVip98kChatModel(params: {
};
const model = createModel(invocation);
const needsDiscovery = params.discoverLegacyContract &&
(!invocation?.headers["X-Relay-Route-Option"] ||
(!metadata.chatInvocation && invocation.protocol === "anthropic-messages"));
!invocation?.headers["X-Relay-Route-Option"];
const resolveModel = async (signal?: AbortSignal) => {
signal?.throwIfAborted();
if (!needsDiscovery) return model;

View File

@ -1,4 +1,4 @@
import { mapVip98kVideoParameters, bindVip98kVideoContent } from "../vip98k-video-parameters";
import { mapVip98kVideoParameters } from "../vip98k-video-parameters";
import {
ProviderTaskFailedError,
ProviderTaskUncertainError,
@ -36,7 +36,6 @@ import {
normalizeVip98kRuntimeConfig,
resolveVip98kSubmissionTimeoutMs,
VIP98K_RUNTIME_CONFIG_KEY,
VIP98K_TASK_POLL_SECONDS,
type Vip98kRuntimeConfig,
} from "@/lib/ai/vip98k-runtime-config";
import {
@ -50,7 +49,6 @@ import {
} from "@/lib/ai/vip98k-reference-staging";
import { createLogger } from "@/lib/observability/logger";
import { getUserFacingImageGenerationErrorMessage } from "@/lib/request-error";
import { AgentImageGenerationError } from "@/lib/ai/runtime/image-generation-error";
import { createDeferredUploadedImage } from "@/lib/storage/image-archive";
import {
IMAGE_UPLOAD_MAX_BYTES,
@ -98,10 +96,9 @@ type UploadedImage = {
const DOWNLOAD_TIMEOUT_MS = 120_000;
const DEFAULT_POLL_INTERVAL_SECONDS = 8;
const DEFAULT_MAX_POLL_SECONDS = VIP98K_TASK_POLL_SECONDS;
const DEFAULT_MAX_POLL_SECONDS = 600;
const REFERENCE_DOWNLOAD_ATTEMPTS = 3;
const REFERENCE_DOWNLOAD_TIMEOUT_MS = 120_000;
const REFERENCE_CDN_TIMEOUT_MS = 10_000;
const REFERENCE_CACHE_LOOKUP_TIMEOUT_MS = 15_000;
const MAX_REFERENCE_DOWNLOAD_BYTES = IMAGE_UPLOAD_MAX_BYTES;
const REFERENCE_STAGING_CACHE_MS = 60_000;
@ -205,9 +202,8 @@ function invocationSupportsBodyField(
key: string,
) {
if (!invocation) return true;
const properties = toRecord(toRecord(invocation.inputSchema)?.properties);
if (properties?.[key] === false) return false;
if (key in invocation.requestExample) return true;
const properties = toRecord(toRecord(invocation.inputSchema)?.properties);
return Boolean(properties && key in properties);
}
@ -421,12 +417,6 @@ async function fetchTaskResult(params: {
signal: AbortSignal.timeout(60_000),
});
const payload = await parseJsonResponse(response);
const resultRecord = toRecord(unwrapData(payload));
const resultError = toRecord(resultRecord?.error);
const resultCode = String(resultError?.code || resultRecord?.code || "");
if (extractStatus(payload) === "pending_review" ||
["submission_pending_reconciliation", "request_outcome_unknown"].includes(resultCode))
throw new ProviderTaskUncertainError("VIP98K original task outcome remains unknown", params.taskId);
if (!response.ok) {
logger.error("task result request failed", {
taskId: params.taskId,
@ -692,44 +682,43 @@ async function findStagedReference(
}
}
async function fetchReferenceImage(mediaUrl: string, preferCdn = false) {
const response = await fetch(mediaUrl, {
cache: preferCdn ? "default" : "no-store",
redirect: preferCdn ? "error" : "follow",
headers: { "User-Agent": "yedir-ai-vip98k-staging/1.0" },
signal: AbortSignal.timeout(preferCdn ? REFERENCE_CDN_TIMEOUT_MS : REFERENCE_DOWNLOAD_TIMEOUT_MS),
});
if (!response.ok || (preferCdn && response.status !== 200)) {
await response.body?.cancel();
throw new Error(`source returned HTTP ${response.status}`);
}
const mimeType = response.headers.get("content-type") || "image/png";
if (preferCdn && !/^image\//i.test(mimeType) && !/^application\/octet-stream\b/i.test(mimeType)) {
await response.body?.cancel();
throw new Error("CDN response was not an image");
}
const declaredLength = Number(response.headers.get("content-length"));
if (declaredLength > MAX_REFERENCE_DOWNLOAD_BYTES) {
await response.body?.cancel();
throw new Vip98kReferenceTooLargeError();
}
const buffer = Buffer.from(await response.arrayBuffer());
if (buffer.byteLength > MAX_REFERENCE_DOWNLOAD_BYTES) {
throw new Vip98kReferenceTooLargeError();
}
if ((declaredLength > 0 && buffer.byteLength !== declaredLength) || (preferCdn && !buffer.byteLength)) {
throw new Error("source image download was incomplete");
}
return { buffer, mimeType };
}
async function downloadReferenceImage(mediaUrl: string) {
let lastError: unknown;
for (let attempt = 1; attempt <= REFERENCE_DOWNLOAD_ATTEMPTS; attempt += 1) {
try {
return await fetchReferenceImage(mediaUrl);
const response = await fetch(mediaUrl, {
cache: "no-store",
redirect: "follow",
headers: { "User-Agent": "yedir-ai-vip98k-staging/1.0" },
signal: AbortSignal.timeout(REFERENCE_DOWNLOAD_TIMEOUT_MS),
});
if (!response.ok) {
throw new Error(`source returned HTTP ${response.status}`);
}
const declaredLength = Number(response.headers.get("content-length"));
if (
Number.isFinite(declaredLength) &&
declaredLength > MAX_REFERENCE_DOWNLOAD_BYTES
) {
throw new Vip98kReferenceTooLargeError();
}
const buffer = Buffer.from(await response.arrayBuffer());
if (buffer.byteLength > MAX_REFERENCE_DOWNLOAD_BYTES) {
throw new Vip98kReferenceTooLargeError();
}
if (
Number.isFinite(declaredLength) &&
declaredLength > 0 &&
buffer.byteLength !== declaredLength
) {
throw new Error("source image download was incomplete");
}
return {
buffer,
mimeType: response.headers.get("content-type") || "image/png",
};
} catch (error) {
lastError = error;
if (error instanceof Vip98kReferenceTooLargeError) throw error;
@ -749,22 +738,6 @@ async function downloadReferenceImage(mediaUrl: string) {
);
}
async function downloadReferenceImageFromCdn(mediaUrl: string, stagingConfig: ReferenceStagingConfig) {
if (stagingConfig.storageConfig.provider !== "qiniu-kodo") return null;
const cdnUrl = process.env.NEXT_PUBLIC_CANVAS_CDN_ORIGIN || "";
if (!URL.canParse(cdnUrl) || !getStorageObjectKeyFromPublicUrl(mediaUrl, stagingConfig.sourcePublicUrl)) return null;
const source = new URL(mediaUrl);
if (source.origin !== new URL(cdnUrl).origin || source.search || source.username || source.password) return null;
try {
return await fetchReferenceImage(mediaUrl, true);
} catch (error) {
if (error instanceof Vip98kReferenceTooLargeError) throw error;
logger.warn("reference CDN download failed; trying source storage", { sourceHost: source.hostname });
return null;
}
}
async function downloadReferenceImageFromStorage(
mediaUrl: string,
stagingConfig: ReferenceStagingConfig,
@ -879,10 +852,9 @@ async function stageReferenceImage(
}
const downloadStartedAt = Date.now();
const cdn = await downloadReferenceImageFromCdn(mediaUrl, stagingConfig);
const storage = cdn ? null : await downloadReferenceImageFromStorage(mediaUrl, stagingConfig);
const downloaded =
cdn || storage || (await downloadReferenceImage(mediaUrl));
(await downloadReferenceImageFromStorage(mediaUrl, stagingConfig)) ||
(await downloadReferenceImage(mediaUrl));
const downloadMs = Date.now() - downloadStartedAt;
const normalizeStartedAt = Date.now();
const normalized = await normalizeReferenceImage(
@ -900,7 +872,6 @@ async function stageReferenceImage(
cacheStagedReference(cacheKey, uploadedUrl, runtimeConfig);
logger.info("reference image staged", {
sourceHost: getUrlHost(mediaUrl),
sourceDelivery: cdn ? "cdn" : storage ? "storage" : "public-url",
targetHost: getUrlHost(uploadedUrl),
sourceBytes: downloaded.buffer.byteLength,
stagedBytes: normalized.buffer.byteLength,
@ -1084,14 +1055,6 @@ async function recoverImageSubmission(params: {
if ([401, 403, 404, 410].includes(lookup.status)) return null;
if (lookup.ok) {
const state = toRecord(await parseJsonResponse(lookup));
if (state?.status === "failed" && state.request_id && state.result_available === false) {
logger.warn("original image request confirmed failed", {
modelId: params.modelId,
providerRequestId: state.request_id,
durationMs: Date.now() - startedAt,
});
throw new AgentImageGenerationError("生图服务已确认本次生成失败,未生成图片。请稍后重试或手动选择其他模型。", true);
}
if (!state || !["processing", "succeeded"].includes(String(state.status))) return null;
if (state.status === "succeeded") {
if (state.result_available !== true || !state.request_id) return null;
@ -1121,7 +1084,7 @@ async function recoverImageSubmission(params: {
}
}
} catch (error) {
if (error instanceof ProviderTaskUncertainError || error instanceof AgentImageGenerationError) throw error;
if (error instanceof ProviderTaskUncertainError) throw error;
}
await delay(Math.max(0, Math.min(params.pollIntervalMs, deadline - Date.now())));
}
@ -1552,7 +1515,7 @@ async function waitForTask(params: {
durationMs: Date.now() - startedAt,
timeoutMs,
});
throw new ProviderTaskUncertainError("VIP98K task timed out; it may still be running", params.taskId);
throw new Error("VIP98K task timed out; it may still be running");
}
function normalizeRatio(value: unknown) {
@ -1575,7 +1538,7 @@ export function buildTaskBody(params: Vip98kTaskParams, invocation: Vip98kInvoca
if ("displayName" in body || !invocation) {
body.displayName = promptTitle || params.modelId;
}
if (invocationSupportsBodyField(invocation, "prompt")) body.prompt = params.prompt;
if ("prompt" in body || !invocation) body.prompt = params.prompt;
if (params.kind === "image" && invocationSupportsBodyField(invocation, "n")) {
body.n = imageParams.imageCount ?? imageParams.n ?? 1;
}
@ -1628,14 +1591,14 @@ export function buildTaskBody(params: Vip98kTaskParams, invocation: Vip98kInvoca
!invocationSupportsBodyField(invocation, "resolution")
) {
const preserveResolutionBucket =
invocation?.path === "/v1/images/generations" &&
(!invocation.inputSchema || (toRecord(toRecord(invocation.inputSchema.properties)?.size)?.enum as unknown[] | undefined)?.includes(resolution));
invocation?.path === "/v1/images/generations";
const resolvedTaskSize = resolveVip98kImageTaskSize({
imageSize: resolution,
aspectRatio,
fallbackSize: body.size,
preserveResolutionBucket,
useGptImage25AspectSizing:
preserveResolutionBucket &&
hasVerifiedVip98kOpenAiImageArrayContract(params.modelId),
});
if (resolvedTaskSize) {
@ -1665,8 +1628,8 @@ export function buildTaskBody(params: Vip98kTaskParams, invocation: Vip98kInvoca
if (value !== undefined && targetKey in body) body[targetKey] = value;
}
if (typeof videoParams.generateAudio === "boolean") {
if (invocationSupportsBodyField(invocation, "generateAudio")) body.generateAudio = videoParams.generateAudio;
if (invocationSupportsBodyField(invocation, "generate_audio")) body.generate_audio = videoParams.generateAudio;
if ("generateAudio" in body || !invocation) body.generateAudio = videoParams.generateAudio;
if ("generate_audio" in body || !invocation) body.generate_audio = videoParams.generateAudio;
}
// Reference fields can be optional in the schema and absent from its text-only example.
@ -1683,23 +1646,8 @@ export function buildTaskBody(params: Vip98kTaskParams, invocation: Vip98kInvoca
}
if (params.modelId.toLowerCase() === "image-expansion") {
bindVip98kExpansionParams(body, imageParams);
body.output_format = "png";
}
if (params.kind === "image-tool" && params.modelId.toLowerCase() === "ocr") {
// Old synced examples include generic image fields and both language aliases.
const metadata = toRecord(body.metadata);
const language = String(metadata?.language || body.language || "").trim();
body.metadata = { language: language || "English,ChinesePRC,Digits" };
body.output_format = "txt";
delete body.language;
delete body.size;
}
const imageBindingKeys = bindVip98kImages(body, params.imageUrls);
const imageProperties = toRecord(invocation?.inputSchema?.properties) || {};
for (const key of imageBindingKeys) {
const limit = toRecord(imageProperties[key])?.maxItems;
if (typeof limit === "number" && params.imageUrls.length > limit) throw Error(`当前模型最多支持 ${limit} 张参考图`);
}
if (params.imageUrls.length > 0 && !invocation && imageBindingKeys.length === 0) {
body.images = params.imageUrls;
imageBindingKeys.push("images");
@ -1734,46 +1682,7 @@ export function buildTaskBody(params: Vip98kTaskParams, invocation: Vip98kInvoca
body.mode = params.imageUrls.length > 0 ? "image-to-video" : "text-to-video";
}
if (params.kind === "video") {
const properties = toRecord(invocation?.inputSchema?.properties) || {};
if (params.imageUrls.length < Number(toRecord(properties.file_urls)?.minItems || 0)) throw Error("请先添加视频参考图");
if (bindVip98kVideoContent(body, invocation?.inputSchema, {
prompt: params.prompt, images: params.imageUrls, videos: params.videoUrls,
audios: Array.isArray(videoParams.referenceAudios) ? videoParams.referenceAudios as string[] : [],
mode: videoParams.mode,
}) && params.imageUrls.length) imageBindingKeys.push("content");
mapVip98kVideoParameters(body, invocation?.inputSchema);
}
if (params.kind === "image") {
const props = toRecord(invocation?.inputSchema?.properties) || {};
const sizeSchema = toRecord(props.size);
const pattern = typeof sizeSchema?.pattern === "string" ? new RegExp(sizeSchema.pattern) : null;
const sizes = Array.isArray(sizeSchema?.enum) ? sizeSchema.enum.filter(value => !pattern || pattern.test(String(value))) : undefined;
const ratios = Array.isArray(sizes) ? sizes.filter(value => typeof value === "string" && /^\d+:\d+$/.test(value)) : [];
const pixels = Array.isArray(sizes) ? sizes.flatMap(value => {
const match = String(value).match(/^(\d+)x(\d+)$/);
return match ? [{ size: value, width: Number(match[1]), height: Number(match[2]) }] : [];
}) : [];
const selectedRatio = aspectRatio || "1:1";
if (ratios.includes(selectedRatio)) body.size = selectedRatio;
else if (pixels.length && (resolution || aspectRatio)) {
const [rw, rh] = selectedRatio.split(":").map(Number);
const matching = pixels.filter(size => Math.abs(size.width / size.height - rw / rh) < 0.025);
if (!matching.length) throw Error("当前模型不支持所选图片比例");
const area = resolution === "4K" ? 2880 ** 2 : resolution === "2K" ? 2048 ** 2 : 1024 ** 2;
matching.sort((a, b) => Math.abs(a.width * a.height - area) - Math.abs(b.width * b.height - area));
body.size = matching[0].size;
}
if (ratios.length || pixels.length) {
const suffix = "\n\n[Output constraints]";
if (typeof body.prompt === "string" && body.prompt.includes(suffix)) body.prompt = body.prompt.split(suffix)[0];
}
for (const key of Object.keys(body)) if (props[key] === false) delete body[key];
if (body.orientation && aspectRatio) {
const [width, height] = aspectRatio.split(":").map(Number);
body.orientation = width > height ? "landscape" : "portrait";
}
}
if (params.kind === "video") mapVip98kVideoParameters(body, invocation?.inputSchema);
return { body, imageBindingKeys, outputConstraintFallbacks };
}

View File

@ -1,5 +1,3 @@
import { ProviderTaskUncertainError } from "@/lib/video-canvas/video-task-lifecycle";
/** Only adapters with an explicit rejection of the submission may use this.
* Polling, result downloads and storage failures are not submission refusals. */
export class ImageSubmissionRejectedError extends Error {
@ -18,9 +16,6 @@ export class ImageReferenceReadTimeoutError extends AgentImageGenerationError {
/** Preserve outcome evidence when replacing upstream diagnostics with safe UI text. */
export function agentImageGenerationError(error: unknown, mode: "auto" | "pinned") {
if (error instanceof AgentImageGenerationError) return error;
if (error instanceof ProviderTaskUncertainError)
return new AgentImageGenerationError(`图片任务已提交,结果仍待核对。${error.providerTaskId ? `上游任务编号:${error.providerTaskId}。` : ""}请先查询原任务结果,不要重复提交。`, false);
const rejected = error instanceof ImageSubmissionRejectedError;
const message = error instanceof Error ? error.message : "";
const suffix = mode === "pinned" ? "系统未自动切换。你希望切换生图模型,还是稍后重试?切换前请在模型选择器中选择其他模型或自动选择。" : "请稍后重试或联系管理员处理生图通道。";

View File

@ -2,8 +2,8 @@ import { getVip98kInvocationHeaders } from "./vip98k-task-invocation";
type RecordValue = Record<string, unknown>;
export type Vip98kChatInvocation = {
protocol: "openai-chat" | "openai-responses" | "anthropic-messages";
path: "/v1/chat/completions" | "/v1/responses" | "/v1/messages";
protocol: "openai-chat" | "openai-responses";
path: "/v1/chat/completions" | "/v1/responses";
headers: Record<string, string>;
};
@ -43,21 +43,21 @@ export function selectVip98kChatInvocation(value: unknown): Vip98kChatInvocation
return (!item.method || String(item.method).toUpperCase() === "POST") &&
(!item.kind || item.kind === "chat") &&
(!modelId || !example?.model || example.model === modelId) &&
["/v1/chat/completions", "/v1/responses", "/v1/messages"].includes(String(item.path));
(item.path === "/v1/chat/completions" || item.path === "/v1/responses");
});
// Prefer the published default route when it supports this protocol. An
// unscoped protocol example must not discard a route's execution contract.
candidates.sort((a, b) => {
const score = (item: RecordValue) => {
const route = getVip98kInvocationHeaders(item.headers)["X-Relay-Route-Option"];
return (route && route === defaultRoute ? 4 : route ? 2 : 0) + (item.path === "/v1/messages" ? 0 : 1);
return route && route === defaultRoute ? 2 : route ? 1 : 0;
};
return score(b) - score(a);
});
const selected = candidates[0];
if (!selected) return null;
return {
protocol: selected.path === "/v1/messages" ? "anthropic-messages" : selected.path === "/v1/responses" ? "openai-responses" : "openai-chat",
protocol: selected.path === "/v1/responses" ? "openai-responses" : "openai-chat",
path: selected.path as Vip98kChatInvocation["path"],
headers: getVip98kInvocationHeaders(selected.headers),
};

View File

@ -1,10 +1,8 @@
import { canonicalVip98kVideoRatio, vip98kVideoDurationBounds, vip98kVideoContentTypes, vip98kVideoImageRoles } from "./vip98k-video-parameters";
import { VIP98K_TASK_POLL_SECONDS } from "./vip98k-runtime-config";
import { canonicalVip98kVideoRatio, vip98kVideoDurationBounds } from "./vip98k-video-parameters";
import {
hasVerifiedVip98kGptImage25ResolutionTiers,
hasVerifiedVip98kOpenAiImageArrayContract,
normalizeVip98kInvocationHeaders,
getVip98kImageBindingKeys,
} from "@/lib/ai/vip98k-task-invocation";
import { selectVip98kChatInvocation, vip98kChatSupportsVision } from "./vip98k-chat-contract";
@ -145,7 +143,6 @@ const IMAGE_TOOL_MODEL_IDS = new Set([
"id-photo",
"image-expansion",
"image-upscaler",
"ocr",
"photo-cleanup",
"remove-background",
"remove-object",
@ -350,8 +347,7 @@ function getInvocationRequestKeys(model: Vip98kCatalogModel) {
return [
...Object.keys(toRecord(invocation.request_example) || {}),
...Object.keys(schemaProperties || {}),
].filter(key => schemaProperties?.[key] !== false && toRecord(schemaProperties?.[key])?.maxItems !== 0)
.map(normalizeInvocationRequestKey);
].map(normalizeInvocationRequestKey);
});
}
@ -429,10 +425,7 @@ function hasMediaReferenceInput(
// published request body only accepts a text prompt.
if (type === "image" && getInvocationCandidates(model).length > 0) {
return (
getInvocationCandidates(model).some(invocation => getVip98kImageBindingKeys({
requestExample: invocation.request_example || {},
inputSchema: invocation.input_schema,
} as any).length > 0) ||
hasMediaRequestField ||
hasVerifiedVip98kOpenAiImageArrayContract(modelId)
);
}
@ -473,7 +466,6 @@ function hasMultiImageReferenceInput(model: Vip98kCatalogModel) {
return false;
}
const schema = toRecord(schemaProperties[key]);
if (schemaProperties[key] === false || schema?.maxItems === 0) return false;
return (
Array.isArray(requestExample[key]) ||
String(schema?.type || "").trim().toLowerCase() === "array"
@ -513,10 +505,7 @@ export function isVip98kCatalogModelEligible(model: Vip98kCatalogModel) {
if (!getModelId(model) || !isVip98kCatalogModelAvailable(model)) return false;
const type = resolvePresetType(model);
if (type === "image") {
if (VIP98K_MULTI_IMAGE_MODEL_EXCLUSIONS.has(getModelId(model).toLowerCase())) return false;
return isVip98kMultiImageEditCatalogModel(model) ||
(isVip98kTextToImageCatalogModel(model) && getInvocationCandidates(model).some(invocation =>
invocation.path === "/v1/images/generations" || invocation.path === "/extensions/v1/tasks"));
return isVip98kMultiImageEditCatalogModel(model);
}
if (type === "video") return hasMediaReferenceInput(model, type);
return true;
@ -566,9 +555,6 @@ function getSupportedImageSizes(model: Vip98kCatalogModel) {
if (hasVerifiedVip98kGptImage25ResolutionTiers(getModelId(model))) {
return ["1K", "2K", "4K"];
}
const primary = toRecord(toRecord(model.invocation?.input_schema)?.properties) || {};
const resolutionEnum = parseStringArray(toRecord(primary.resolution)?.enum);
if (resolutionEnum.length) return resolutionEnum.map(normalizeImageSize).filter((size): size is string => Boolean(size));
const schemaSizes = getInvocationCandidates(model).flatMap((invocation) => {
const properties =
toRecord(toRecord(invocation.input_schema)?.properties) || {};
@ -715,7 +701,7 @@ function getVip98kMetadata(model: Vip98kCatalogModel, type: string) {
pollIntervalSeconds: parseNumber(
model.pollIntervalSeconds || model.poll_interval_seconds,
) || 8,
maxPollSeconds: parseNumber(model.maxPollSeconds || model.max_poll_seconds) || VIP98K_TASK_POLL_SECONDS,
maxPollSeconds: parseNumber(model.maxPollSeconds || model.max_poll_seconds) || 600,
resultTTLSeconds: parseNumber(
model.resultTTLSeconds || model.result_ttl_seconds,
),
@ -754,11 +740,7 @@ function createImagePreset(
].some((key) => invocationKeys.has(key)) || hasVerifiedVip98kOpenAiImageArrayContract(modelId);
const supportsQuality = invocationKeys.has("quality");
// Flare repeatedly returns 3:4/4:3 for 4:5/5:4, even with aspect_ratio supplied.
const declaredRatios = getInvocationCandidates(model).flatMap(invocation => {
const props = toRecord(toRecord(invocation.input_schema)?.properties) || {};
return ["aspect_ratio", "ratio", "size"].flatMap(key => parseStringArray(toRecord(props[key])?.enum).filter(value => /^\d+:\d+$/.test(value)));
});
const supportedAspectRatios = declaredRatios.length ? ["auto", ...new Set(declaredRatios)] : supportsNativeAspectRatio
const supportedAspectRatios = supportsNativeAspectRatio
? DEFAULT_ASPECT_RATIOS.filter((ratio) => modelId !== "gpt-image-2.5-flare" || !["4:5", "5:4"].includes(ratio))
: ["auto"];
const supportedModes = [
@ -767,14 +749,7 @@ function createImagePreset(
: []),
...(supportsReferenceImages ? ["image-to-image", "reference-images"] : []),
];
const declaredReferenceLimits = getInvocationCandidates(model).flatMap(invocation => {
const properties = toRecord(toRecord(invocation.input_schema)?.properties) || {};
return ["file_urls", "image", "images", "reference_images"].flatMap(key => {
const limit = toRecord(properties[key])?.maxItems;
return typeof limit === "number" && limit > 0 ? [limit] : [];
});
});
const maxReferenceImages = declaredReferenceLimits.length ? Math.max(...declaredReferenceLimits) : supportsMultiImageReference
const maxReferenceImages = supportsMultiImageReference
? 8
: supportsReferenceImages
? 1
@ -786,7 +761,7 @@ function createImagePreset(
return {
modelId,
displayName: supportsReferenceImages ? displayName : `${displayName}(仅文生图)`,
displayName,
description: model.description || `VIP98K image model (${modelId})`,
type: "image",
supportsVision: supportsReferenceImages,
@ -866,27 +841,21 @@ function createVideoPreset(
: getDurations(model));
const defaultDuration =
parseNumber(model.defaultDuration || model.default_duration) ||
parseNumber(invocation?.request_example?.duration_seconds) ||
(Number(invocation?.request_example?.duration) > 0 ? Number(invocation?.request_example?.duration) : 0) ||
durations[0] ||
durations[durations.length - 1] ||
8;
const keys = new Set(getInvocationRequestKeys(model));
const imageModes = parseStringArray(toRecord(schema.mode_image)?.enum);
const contentTypes = vip98kVideoContentTypes(invocation?.input_schema);
const contentRoles = vip98kVideoImageRoles(invocation?.input_schema);
const supportsReferenceImages = contentTypes.length ? contentTypes.includes("image_url") : capabilities.includes("image-to-video") || keys.has("file-urls") || keys.has("image") || keys.has("image-url");
const supportsFirstFrame = supportsReferenceImages && (!contentRoles || contentRoles.includes("first_frame"));
const supportsFramePair = imageModes.includes("frame") || (contentTypes.includes("image_url") && (!contentRoles || contentRoles.includes("last_frame")));
const supportsIngredients = imageModes.includes("ingredient") || (contentTypes.includes("image_url") && (!contentRoles || contentRoles.includes("reference_image")));
const requiresReference = Number(toRecord(schema.file_urls)?.minItems) > 0;
const supportsReferenceImages = capabilities.includes("image-to-video") || keys.has("file-urls") || keys.has("image") || keys.has("image-url");
const supportsFramePair = imageModes.includes("frame");
const supportsIngredients = imageModes.includes("ingredient");
const supportedModes = [
...(!requiresReference && (capabilities.includes("text-to-video") || keys.has("prompt") || (contentTypes.length === 1 && contentTypes[0] === "text")) ? ["text-to-video"] : []),
...(supportsFirstFrame ? ["first-frame"] : []),
...(capabilities.includes("text-to-video") || keys.has("prompt") ? ["text-to-video"] : []),
...(supportsReferenceImages ? ["first-frame"] : []),
...(supportsFramePair ? ["first-last-frame"] : []),
...(supportsIngredients ? ["reference-images"] : []),
];
const ratios = parseStringArray(toRecord(schema.aspect_ratio || schema.ratio)?.enum).map(canonicalVip98kVideoRatio).filter(value => value !== "adaptive");
const maxReferenceImages = Number(toRecord(schema.file_urls)?.maxItems) || (contentTypes.includes("image_url") ? 30 : supportsReferenceImages ? 1 : 0);
const ratios = parseStringArray(toRecord(schema.aspect_ratio)?.enum).map(canonicalVip98kVideoRatio);
const maxReferenceImages = Number(toRecord(schema.file_urls)?.maxItems) || (supportsReferenceImages ? 1 : 0);
return {
modelId,
@ -1072,7 +1041,6 @@ function createToolPreset(
const inputModes = getInputModes(model);
const outputModes = getOutputModes(model);
const isImageTool = type === "image_tool";
const isOcr = modelId.toLowerCase() === "ocr";
const toolOperation = IMAGE_TOOL_OPERATION_BY_MODEL_ID[modelId.toLowerCase()] || type;
return {
@ -1088,7 +1056,7 @@ function createToolPreset(
kind: type.replace(/_/g, "-"),
mediaType: isImageTool ? "image" : type === "audio" ? "audio" : "document",
modelType: type,
outputType: isOcr ? "text" : outputModes[0] || (isImageTool ? "image" : "text"),
outputType: outputModes[0] || (isImageTool ? "image" : "text"),
inputModes,
outputModes,
supportedModes: getCapabilities(model),

View File

@ -1,7 +1,4 @@
export const VIP98K_RUNTIME_CONFIG_KEY = "vip98k_runtime_config";
export const VIP98K_TASK_POLL_SECONDS = 15 * 60;
// Allow submission and result delivery in addition to the accepted task's polling budget.
export const VIP98K_IMAGE_BATCH_TIMEOUT_MS = (VIP98K_TASK_POLL_SECONDS + 5 * 60) * 1000;
export type Vip98kRuntimeConfig = {
submissionTimeoutMs: number;

View File

@ -220,11 +220,9 @@ export function getVip98kImageBindingKeys(invocation: Vip98kTaskInvocation | nul
if (!invocation) return [];
const body = invocation.requestExample || {};
const properties = (invocation.inputSchema?.properties || {}) as Record<string, unknown>;
const accepts = (key: string) => properties[key] !== false &&
(properties[key] as { maxItems?: number } | undefined)?.maxItems !== 0;
return [
...IMAGE_ARRAY_INPUT_KEYS.filter((key) => accepts(key) && (key in body || key in properties)),
...IMAGE_SINGLE_INPUT_KEYS.filter((key) => accepts(key) && (key in body || key in properties)),
...IMAGE_ARRAY_INPUT_KEYS.filter((key) => key in body || key in properties),
...IMAGE_SINGLE_INPUT_KEYS.filter((key) => key in body || key in properties),
...(Array.isArray(body.video_clips) ? ["video_clips" as const] : []),
];
}

View File

@ -12,11 +12,6 @@ export function vip98kVideoDurationBounds(schema: unknown, resolution?: string)
const visit = (value: unknown) => {
const current = object(value), properties = object(current.properties);
const field = object(properties.duration_seconds || properties.duration);
const positiveRange = (Array.isArray(field.anyOf) ? field.anyOf : []).find((x: any) => x.minimum > 0);
if (positiveRange) {
min = Math.max(min, positiveRange.minimum);
max = Math.min(max, positiveRange.maximum ?? Infinity);
}
if (Number.isFinite(field.minimum)) min = Math.max(min, field.minimum);
if (Number.isFinite(field.maximum)) max = Math.min(max, field.maximum);
const allowed = Array.isArray(field.enum) ? field.enum : Number.isFinite(field.const) ? [field.const] : undefined;
@ -41,11 +36,8 @@ export function mapVip98kVideoParameters(body: Record<string, unknown>, schema:
body.aspect_ratio = alias;
}
const resolutions = object(properties.resolution).enum;
if (body.resolution && Array.isArray(resolutions) && !resolutions.includes(body.resolution)) {
const matched = resolutions.find(value => String(value).toLowerCase() === String(body.resolution).toLowerCase());
if (!matched) throw Error("供应商当前线路不支持所选视频清晰度,请同步模型规格后重试");
body.resolution = matched;
}
if (body.resolution && Array.isArray(resolutions) && !resolutions.includes(body.resolution))
throw Error("供应商当前线路不支持所选视频清晰度,请同步模型规格后重试");
const seconds = Number(body.duration_seconds ?? body.duration);
if (seconds) {
const bounds = vip98kVideoDurationBounds(schema, String(body.resolution || ""));
@ -53,45 +45,3 @@ export function mapVip98kVideoParameters(body: Record<string, unknown>, schema:
throw Error("供应商当前清晰度不支持所选视频时长,请调整镜头时长");
}
}
export function vip98kVideoContentTypes(schema: unknown): string[] {
const content = object(object(object(schema).properties).content);
const items = object(content.items);
return (Array.isArray(items.oneOf) ? items.oneOf : []).flatMap((variant: unknown) => {
const type = object(object(object(variant).properties).type).const;
return typeof type === "string" ? [type] : [];
});
}
export function vip98kVideoImageRoles(schema: unknown): string[] | undefined {
const variants = object(object(object(object(schema).properties).content).items).oneOf;
const image = (Array.isArray(variants) ? variants : []).find(value => object(object(object(value).properties).type).const === "image_url");
const roles = object(object(object(image).properties).role).enum;
return Array.isArray(roles) ? roles.map(String) : undefined;
}
export function bindVip98kVideoContent(body: Record<string, unknown>, schema: unknown, input: {
prompt: string; images: string[]; videos: string[]; audios: string[]; mode?: unknown;
}) {
const types = vip98kVideoContentTypes(schema);
if (!types.length) return false;
if (input.images.length && !types.includes("image_url")) throw Error("所选视频模型只支持文字生成,不能添加参考图片");
if (input.videos.length && !types.includes("video_url")) throw Error("所选模型不支持参考视频");
if (input.audios.length && !types.includes("audio_url")) throw Error("所选模型不支持参考音频");
const reference = input.mode === "reference-images";
const roles = vip98kVideoImageRoles(schema);
const role = reference ? "reference_image" : "first_frame";
if (input.images.length && roles && !roles.includes(role)) throw Error("所选视频模型不支持这个参考图模式");
if (!reference && input.images.length > 2) throw Error("首尾帧模式最多支持两张图片");
if (!reference && input.images.length === 2 && roles && !roles.includes("last_frame")) throw Error("所选视频模型不支持尾帧");
if (["first-frame", "first-last-frame", "reference-images"].includes(String(input.mode)) && !input.images.length) throw Error("请先添加视频参考图");
body.content = [
...(input.prompt ? [{ type: "text", text: input.prompt }] : []),
...input.images.map((url, index) => ({ type: "image_url", image_url: { url }, role: reference ? "reference_image" : index ? "last_frame" : "first_frame" })),
...input.videos.map(url => ({ type: "video_url", video_url: { url }, role: "reference_video" })),
...input.audios.map(url => ({ type: "audio_url", audio_url: { url }, role: "reference_audio" })),
];
delete body.prompt;
delete body.file_urls;
return true;
}

View File

@ -5,7 +5,7 @@ import sharp from "sharp";
import { agentImageCircuitStore } from "@/lib/ai/runtime/agent-model-circuit-store";
import { getModelGenerationCreditCost, type DiscountableImageGenConfigLike } from "@/lib/ai/image-model-pricing";
import { agentImageFailurePolicy } from "@/lib/ai/runtime/agent-image-failover";
import { AgentImageGenerationError, agentImageGenerationError, ImageReferenceReadTimeoutError } from "@/lib/ai/runtime/image-generation-error";
import { agentImageGenerationError, ImageReferenceReadTimeoutError } from "@/lib/ai/runtime/image-generation-error";
import { getAiModelById, getEnabledAiModelsWithProvider } from "@/lib/db/queries";
import { fetchImageBufferFromUrl } from "@/lib/ai/rmbg/service";
import { createGeminiImage } from "@/lib/ai/providers/gemini-image";
@ -19,7 +19,6 @@ import { createBananaImage } from "@/lib/ai/providers/bananaimage";
import { createVisionary } from "@/lib/ai/providers/visionary";
import { createAtlasCloud } from "@/lib/ai/providers/atlascloud";
import { createVip98k } from "@/lib/ai/providers/vip98k";
import { VIP98K_IMAGE_BATCH_TIMEOUT_MS } from "@/lib/ai/vip98k-runtime-config";
import { createStepfunImage } from "@/lib/ai/providers/stepfun-image";
import { createMidjourney } from "@/lib/ai/providers/midjourney";
import { createRunway } from "@/lib/ai/providers/runway";
@ -339,7 +338,7 @@ function isCanvasScaleAdjustDebugRequest(
);
}
export function getCanvasProviderBatchTimeoutMs(params: {
function getCanvasProviderBatchTimeoutMs(params: {
debugLabel: string;
debugMeta?: Record<string, unknown>;
providerType: string;
@ -350,7 +349,7 @@ export function getCanvasProviderBatchTimeoutMs(params: {
: CANVAS_SCALE_ADJUST_PROVIDER_BATCH_TIMEOUT_MS;
}
return params.providerType === "vip98k" ? VIP98K_IMAGE_BATCH_TIMEOUT_MS : CANVAS_DEFAULT_PROVIDER_BATCH_TIMEOUT_MS;
return CANVAS_DEFAULT_PROVIDER_BATCH_TIMEOUT_MS;
}
function getCanvasProviderRuntimeParams(params: {
@ -3445,13 +3444,11 @@ async function applyLocalEditCompositeToImages(params: {
const [originalUpload, thumbnailUpload] = await Promise.all([
uploadFile(
`canvas-local-edit-composited-${suffix}.png`,
bufferToArrayBuffer(mergedBuffer),
{ preferQiniuForm: true }
bufferToArrayBuffer(mergedBuffer)
),
uploadFile(
`canvas-local-edit-composited-thumb-${suffix}.png`,
bufferToArrayBuffer(thumbnailBuffer),
{ preferQiniuForm: true }
bufferToArrayBuffer(thumbnailBuffer)
),
]);
mergedImages.push({
@ -4951,7 +4948,7 @@ export async function generateCanvasImage(
if (!selectedModel) throw new Error("当前没有可用的备用图片模型,请稍后重试");
}
if (request.agentImageMode === "pinned" && !isCanvasImageSizeSupported(selectedModel.model.imageGenConfig as CanvasImageGenConfig | null, normalizeCanvasImageSizeValue(request.imageSize)))
throw new AgentImageGenerationError("指定的图片模型不支持所选清晰度,任务尚未提交。请调整清晰度后重试。", true);
throw new Error("指定的图片模型不支持所选尺寸,请调整图片尺寸");
const normalizedReferenceImages = Array.from(
new Set(

View File

@ -217,13 +217,9 @@ export async function convertImageToPhotoshopPng(bytes: Buffer): Promise<Buffer>
throw new Error("无法解析图片尺寸");
}
// RGB/RGBA, 8-bit, single-frame PNG is already compatible; preserve its exact bytes.
const rgb = (metadata.space === "srgb" && metadata.depth === "uchar")
|| (metadata.space === "rgb16" && metadata.depth === "ushort");
if (metadata.format === "png" && rgb
if (metadata.format === "png" && metadata.space === "srgb" && metadata.depth === "uchar"
&& !metadata.isPalette && (metadata.pages || 1) === 1 && (!metadata.orientation || metadata.orientation === 1)) return bytes;
const output = image.rotate().toColorspace("srgb");
if (metadata.icc) output.withIccProfile("srgb");
return output.png({ compressionLevel: 3, adaptiveFiltering: true }).toBuffer();
return image.rotate().toColorspace("srgb").png({ compressionLevel: 3, adaptiveFiltering: true }).toBuffer();
}
function buildCanvasAssetFilename(params: {

View File

@ -1,9 +1,8 @@
import { buildImageProxyUrl, getImageDownloadExtension } from "@/lib/image-delivery";
import { inferOriginalImageUrl } from "@/lib/image-url";
import { formatDownloadFailure, getDownloadFailure, type DownloadFailure } from "@/lib/canvas/download-error";
import { withActivePageDownload } from "@/lib/client/page-refresh";
export type CanvasImageDownloadPhase = "preparing" | "converting" | "downloading" | "saving";
export type CanvasImageDownloadPhase = "preparing" | "downloading" | "saving";
export type CanvasImageDownloadProgress = {
phase: CanvasImageDownloadPhase;
@ -190,19 +189,11 @@ function triggerCdnDownload(result: { downloadUrl: string; filename: string; byt
return { filename: result.filename, bytes: result.bytes || 0 };
}
const PHOTOSHOP_DOWNLOAD_EXTENSIONS = new Set(["jpg", "png", "gif", "bmp", "tiff"]);
/** Preserve compatible originals and prepare a PNG for other stored images. */
export function downloadOriginalImage(params: DownloadCanvasImageParams): Promise<CanvasImageDownloadResult> {
return withActivePageDownload(() => downloadOriginalImageFile(params));
}
async function downloadOriginalImageFile(params: DownloadCanvasImageParams): Promise<CanvasImageDownloadResult> {
const { url, name, signal, onProgress } = params;
/** Keep the source format and bytes for chat, gallery and reference downloads. */
export async function downloadOriginalImage({ url, name, signal, onProgress }: DownloadCanvasImageParams): Promise<CanvasImageDownloadResult> {
const source = String(url || "").trim();
if (!source) throw new Error("图片地址无效");
const sourceUrl = new URL(source, window.location.origin);
const proxy = buildImageProxyUrl(/^https?:$/.test(sourceUrl.protocol) ? sourceUrl.toString() : source, { delivery: "original" });
const proxy = buildImageProxyUrl(source, { delivery: "original" });
const filenameBase = sanitizeDownloadName(name || inferDownloadNameFromUrl(source), "image");
const target = new URL(proxy, window.location.origin);
onProgress?.({ phase: "preparing", message: "正在准备原图..." });
@ -224,43 +215,19 @@ async function downloadOriginalImageFile(params: DownloadCanvasImageParams): Pro
if (target.origin === window.location.origin && target.pathname === "/api/image-proxy") {
target.searchParams.set("download", "resolve");
target.searchParams.set("name", filenameBase);
const deadline = Date.now() + 180_000;
let delivery: any;
for (let poll = 0; ; poll++) {
signal?.throwIfAborted();
const metadata = await checkedFetch(target.pathname + target.search);
delivery = await metadata.json();
if (metadata.status !== 202) break;
if (delivery.delivery !== "preparing") throw new Error("下载准备状态无效");
if (Date.now() >= deadline || poll >= 60) {
throw new CanvasImageDownloadError("原图仍在准备中", { code: "preparation_timeout", requestId: delivery.requestId });
}
onProgress?.({ phase: "preparing", message: delivery.message || "正在准备原图,完成后自动下载" });
await waitForRetry(Math.max(1, Math.min(5, Number(delivery.retryAfter) || 3)) * 1000, signal);
}
const metadata = await checkedFetch(target.pathname + target.search);
const delivery = await metadata.json();
if (delivery.delivery === "cdn") {
// The resolver names the attachment using the stored MIME type.
const extension = delivery.filename.split(".").pop();
if (!PHOTOSHOP_DOWNLOAD_EXTENSIONS.has(extension)) {
return downloadPngFile(params, "converting");
}
const result = triggerCdnDownload(delivery, signal);
onProgress?.({ phase: "downloading", message: "已开始下载,可在浏览器下载列表查看进度" });
return result;
}
throw new CanvasImageDownloadError("原图尚未准备完成", { code: "preparation_timeout", requestId: delivery.requestId });
if (delivery.delivery !== "proxy") throw new Error("下载链接无效");
}
const response = await checkedFetch(proxy);
const contentType = response.headers.get("content-type") || "";
if (!contentType.toLowerCase().startsWith("image/")) throw new Error("Source is not an image");
const extension = getImageDownloadExtension(contentType);
// A local blob can still be downloaded while its upload is in progress.
if (/^https?:$/.test(target.protocol) && !PHOTOSHOP_DOWNLOAD_EXTENSIONS.has(extension)) {
void response.body?.cancel().catch(() => {});
return downloadPngFile(params, "converting");
}
const blob = await readResponseBlobWithProgress(response, onProgress);
signal?.throwIfAborted();
if (!blob.type.toLowerCase().startsWith("image/")) throw new Error("Source is not an image");
const extension = getImageDownloadExtension(blob.type);
const filename = extension ? `${filenameBase}.${extension}` : filenameBase;
triggerBlobDownload(blob, filename);
return { filename, bytes: blob.size };
@ -285,15 +252,14 @@ function toDownloadCandidates(url: string, candidates: string[] = []) {
async function readResponseBlobWithProgress(
response: Response,
onProgress?: (progress: CanvasImageDownloadProgress) => void,
message = "正在下载原图..."
onProgress?: (progress: CanvasImageDownloadProgress) => void
) {
const totalBytes = Number(response.headers.get("content-length") || 0);
if (!response.body) {
const blob = await response.blob();
onProgress?.({
phase: "downloading",
message,
message: "正在下载原图...",
loadedBytes: blob.size,
totalBytes: totalBytes || blob.size,
percent: 100,
@ -313,7 +279,7 @@ async function readResponseBlobWithProgress(
loadedBytes += value.byteLength;
onProgress?.({
phase: "downloading",
message,
message: "正在下载原图...",
loadedBytes,
totalBytes: totalBytes || undefined,
percent: totalBytes > 0 ? Math.min(99, Math.round((loadedBytes / totalBytes) * 100)) : undefined,
@ -325,17 +291,13 @@ async function readResponseBlobWithProgress(
});
}
export function downloadCanvasImageAsPng(params: DownloadCanvasImageParams): Promise<CanvasImageDownloadResult> {
return withActivePageDownload(() => downloadPngFile(params, "preparing"));
}
async function downloadPngFile({
export async function downloadCanvasImageAsPng({
candidates,
name,
onProgress,
signal,
url,
}: DownloadCanvasImageParams, preparationPhase: "preparing" | "converting"): Promise<CanvasImageDownloadResult> {
}: DownloadCanvasImageParams): Promise<CanvasImageDownloadResult> {
const raw = String(url || "").trim();
if (!raw) {
throw new Error("图片地址无效");
@ -348,9 +310,11 @@ async function downloadPngFile({
"canvas-image"
);
const isConverting = preparationPhase === "converting";
const conversionMessage = "正在转换为兼容 PNG,完成后自动下载";
onProgress?.({ phase: preparationPhase, message: isConverting ? conversionMessage : "正在准备原图..." });
onProgress?.({
phase: "preparing",
message: "正在准备原图...",
percent: 8,
});
let response: Response | null = null;
let errorPayload: DownloadErrorPayload | null = null;
@ -389,10 +353,7 @@ async function downloadPngFile({
if (Date.now() >= preparationDeadline || preparationPolls >= 60) {
throw new CanvasImageDownloadError("原图仍在准备中", { code: "preparation_timeout", status: 202, requestId: preparing.requestId });
}
onProgress?.({
phase: preparing.phase || preparationPhase,
message: preparing.message || (isConverting ? conversionMessage : "正在准备原图,完成后将自动下载"),
});
onProgress?.({ phase: "preparing", message: preparing.message || "正在准备原图,完成后将自动下载" });
const delaySeconds = Math.max(preparationPolls > 5 ? 5 : 1, Math.min(5, Number(preparing.retryAfter) || 3));
await waitForRetry(delaySeconds * 1000, signal);
continue;
@ -423,6 +384,7 @@ async function downloadPngFile({
retryAfterSeconds > 0
? `请求较多,${retryAfterSeconds} 秒后自动重试...`
: "请求较多,正在自动重试...",
percent: 8,
});
await waitForRetry(retryAfterSeconds * 1000, signal);
}
@ -451,9 +413,7 @@ async function downloadPngFile({
const filename =
parseAttachmentFilename(response.headers.get("content-disposition")) ||
`${filenameBase}.png`;
const downloadMessage = isConverting ? "正在下载 PNG..." : "正在下载原图...";
onProgress?.({ phase: "downloading", message: downloadMessage });
const blob = await readResponseBlobWithProgress(response, onProgress, downloadMessage);
const blob = await readResponseBlobWithProgress(response, onProgress);
onProgress?.({
phase: "saving",

View File

@ -1,27 +1,11 @@
import type { AgentWorkflowComposerContext } from "@/types/agent";
const settingsCache = new Map<string, { etag: string; data: unknown }>();
export async function fetchWorkflowTemplatePrompts([url, selectionRequest]: readonly [string, string]) {
const response = await fetch(url, {
method: "POST",
headers: { "Content-Type": "application/json" },
body: selectionRequest,
signal: AbortSignal.timeout(15_000),
});
if (!response.ok) throw new Error("风格模板提示词加载失败");
const data = await response.json() as { selections?: AgentWorkflowComposerContext["selections"] };
if (!Array.isArray(data.selections)) throw new Error("风格模板提示词返回异常");
return { selectionRequest, selections: data.selections };
}
export async function fetchCanvasSiteSettings(url: string) {
const cached = settingsCache.get(url);
const controller = new AbortController();
const timeoutId = setTimeout(
() => controller.abort(),
url === "/api/site-settings?scope=agent-canvas" ||
url === "/api/site-settings?scope=agent-workflow-templates" ? 30_000 : 10_000
url === "/api/site-settings?scope=agent-canvas" ? 30_000 : 10_000
);
try {
const response = await fetch(url, {

View File

@ -1,44 +1,10 @@
export const BEFORE_PAGE_REFRESH = "app:before-page-refresh";
export const PAGE_DOWNLOAD_ACTIVE_ATTRIBUTE = "data-page-download-active";
export type PageRefreshRequest = {
save: (action: () => Promise<void>) => void;
block: (message: string) => void;
};
const downloadListeners = new Set<() => void>();
let activePageDownloads = 0;
export function isPageDownloadActive() {
return activePageDownloads > 0;
}
export function subscribeToPageDownloadActivity(listener: () => void) {
downloadListeners.add(listener);
return () => { downloadListeners.delete(listener); };
}
function publishDownloadActivity() {
if (typeof document !== "undefined") {
document.documentElement?.toggleAttribute(PAGE_DOWNLOAD_ACTIVE_ATTRIBUTE, isPageDownloadActive());
}
for (const listener of downloadListeners) listener();
}
export async function withActivePageDownload<T>(download: () => Promise<T>): Promise<T> {
if (++activePageDownloads === 1) publishDownloadActivity();
try {
return await download();
} finally {
if (--activePageDownloads === 0) publishDownloadActivity();
}
}
function assertPageDownloadFinished() {
if (isPageDownloadActive()) throw new Error("文件正在下载,请等下载完成后再刷新。");
}
export async function preparePageRefresh() {
assertPageDownloadFinished();
const actions: Array<() => Promise<void>> = [];
let blocked = "";
window.dispatchEvent(new CustomEvent<PageRefreshRequest>(BEFORE_PAGE_REFRESH, {
@ -46,5 +12,4 @@ export async function preparePageRefresh() {
}));
if (blocked) throw new Error(blocked);
for (const action of actions) await action();
assertPageDownloadFinished();
}

View File

@ -1,15 +1,6 @@
import { normalizeLegacyAliyunStorageUrl } from "./storage/retired-storage";
const IMAGE_PROXY_PATH = "/api/image-proxy";
const CDN_PREVIEW_WIDTHS = [64, 160, 192, 240, 320, 360, 480, 520, 640, 720, 840, 960, 1280, 1600, 2048, 2560, 2600, 3200, 4096];
function getConfiguredCdnUrl(): URL | undefined {
try {
return new URL(process.env.NEXT_PUBLIC_CANVAS_CDN_ORIGIN || "");
} catch {
return undefined;
}
}
/** Error fallbacks must keep unavailable legacy sources behind archive resolution. */
export function buildImageFallbackUrl(value: string | null | undefined): string {
@ -111,7 +102,10 @@ export function isAlibabaModelImageUrl(value: string): boolean {
function isTrustedDirectStorageImageHost(hostname: string): boolean {
const normalized = hostname.trim().toLowerCase();
let configuredCdnHost = "";
try { configuredCdnHost = new URL(process.env.NEXT_PUBLIC_CANVAS_CDN_ORIGIN || "").hostname; } catch { /* optional */ }
return (
(configuredCdnHost !== "" && normalized === configuredCdnHost) ||
normalized === "yybb.top" ||
normalized.endsWith(".qiniucs.com") ||
normalized.endsWith(".qiniudn.com") ||
@ -133,36 +127,20 @@ function resolveTrustedDirectStorageDisplayUrl(
): string | null {
try {
const target = new URL(url);
const configuredCdn = getConfiguredCdnUrl();
const storageOrigin = process.env.NEXT_PUBLIC_CANVAS_STORAGE_ORIGIN;
if (configuredCdn?.protocol === "https:" && storageOrigin &&
target.origin === new URL(storageOrigin).origin &&
!target.searchParams.has("token") && !target.searchParams.has("X-Amz-Signature")) {
target.host = configuredCdn.host;
target.protocol = configuredCdn.protocol;
}
const isConfiguredCdn = target.origin === configuredCdn?.origin;
if (
target.hostname !== configuredCdn?.hostname &&
!isTrustedDirectStorageImageHost(target.hostname) &&
!isFirstPartyQiniuAsset(target)
) {
return null;
}
const requestedWidth = normalizeWidth(options.width);
let width = requestedWidth;
let quality = normalizeQuality(options.quality);
const width = normalizeWidth(options.width);
const quality = normalizeQuality(options.quality);
const format = options.format;
if ((!width && !quality && !format) || target.search) {
return target.toString();
}
if (isConfiguredCdn && format === "webp" && requestedWidth) {
width = CDN_PREVIEW_WIDTHS.find((size) => size >= requestedWidth) ?? requestedWidth;
if (quality && quality >= 84 && quality <= 92) quality = 88;
}
const operations = ["imageView2", "2"];
if (width) operations.push("w", String(width));
if (format) operations.push("format", format === "jpeg" ? "jpg" : format);
@ -222,23 +200,6 @@ function resolveAliyunOssDisplayUrl(
export function buildImageProxyUrl(url: string, options: ImageProxyOptions = {}): string {
let source = String(url || "").trim();
if (options.delivery !== "original" && options.delivery !== "proxy") {
const base = typeof window === "undefined" ? "https://image-proxy.local" : window.location.origin;
try {
const saved = new URL(source, base);
if (saved.origin === base && saved.pathname === IMAGE_PROXY_PATH &&
!saved.searchParams.has("original") && saved.searchParams.get("proxy") !== "1") {
const nested = saved.searchParams.get("url") || "";
const format = options.format || saved.searchParams.get("f") as ImageProxyFormat | undefined;
const direct = resolveTrustedDirectStorageDisplayUrl(nested, {
width: options.width || Number(saved.searchParams.get("w")) || undefined,
quality: options.quality || Number(saved.searchParams.get("q")) || undefined,
format: ["webp", "avif", "jpeg", "png"].includes(format || "") ? format : undefined,
});
if (direct) return direct;
}
} catch { /* Keep non-storage proxies on their existing path. */ }
}
// Some messages retain our preview URL instead of its source URL. Rebuild
// that local proxy request without the preview's resize/format parameters.
if (options.delivery === "original") {

View File

@ -15,77 +15,55 @@ import {
markImageArchiveTaskReplaceFailed,
markImageArchiveTaskReplacing,
markImageArchiveTaskStored,
claimNextImageArchiveTask,
type ImageArchiveTaskRecord,
} from "@/lib/storage/image-archive-db";
import { replaceImageUrlInDatabase } from "@/lib/storage/image-url-replacement";
const DEFAULT_BATCH_SIZE = 10;
async function storeClaimedImage(task: ImageArchiveTaskRecord) {
try {
const metadata = task.metadata as { inlineSource?: string } | null;
const archived = await archiveTemporaryImage(metadata?.inlineSource || task.sourceUrl, task.id);
await markImageArchiveTaskStored({ id: task.id, targetUrl: archived.url, downloadAsset: archived.downloadAsset });
if (!archived.downloadAsset) scheduleImageDownloadPreparation(task.id);
console.log("[ImageArchiveJob] stored", { taskId: task.id, bytes: archived.bytes, targetUrl: archived.url });
return true;
} catch (error) {
await markImageArchiveTaskFailed({ id: task.id, error });
console.error("[ImageArchiveJob] store failed", { taskId: task.id, error: String(error) });
return false;
}
}
export async function storeNextImageArchive(preferredTaskId?: string) {
return trackRuntimeWork(async () => {
const task = await claimNextImageArchiveTask(preferredTaskId);
if (!task) return false;
await storeClaimedImage(task);
return true;
}, { durable: true });
}
export async function replacePendingImageArchives() {
return trackRuntimeWork(async () => {
const tasks = await getImageArchiveTasksToReplace({ limit: 10 });
let claimed = 0;
for (const task of tasks) {
if (!(await markImageArchiveTaskReplacing(task.id))) continue;
claimed++;
try {
if (!task.targetUrl) throw new Error("Missing targetUrl");
const result = await replaceImageUrlInDatabase(task.sourceUrl, task.targetUrl);
await markImageArchiveTaskCompleted({ id: task.id, replacedCount: result.changed });
} catch (error) {
await markImageArchiveTaskReplaceFailed({ id: task.id, error });
}
}
return claimed;
}, { durable: true });
}
function getBatchSize() {
const parsed = Number(process.env.IMAGE_ARCHIVE_BATCH_SIZE || DEFAULT_BATCH_SIZE);
if (!Number.isFinite(parsed)) return DEFAULT_BATCH_SIZE;
return Math.max(1, Math.min(50, Math.round(parsed)));
}
export async function runImageArchiveJob({ preferredTaskId }: { preferredTaskId?: string } = {}) {
export async function runImageArchiveJob() {
return trackRuntimeWork(async () => {
const batchSize = getBatchSize();
console.log(`[ImageArchiveJob] Start image archive job (batchSize=${batchSize})`);
await recoverStaleImageArchiveTasks();
scheduleImageDownloadPreparation();
const storeTasks = await getImageArchiveTasksToStore({ limit: batchSize, preferredTaskId });
const storeTasks = await getImageArchiveTasksToStore({ limit: batchSize });
let storeSucceeded = 0;
let storeFailed = 0;
const storeOne = async (task: (typeof storeTasks)[number]) => {
if (!(await markImageArchiveTaskArchiving(task.id))) return;
if (await storeClaimedImage(task)) storeSucceeded++;
else storeFailed++;
try {
if (!(await markImageArchiveTaskArchiving(task.id))) return;
const metadata = task.metadata as { inlineSource?: string } | null;
const archived = await archiveTemporaryImage(metadata?.inlineSource || task.sourceUrl, task.id);
await markImageArchiveTaskStored({
id: task.id,
targetUrl: archived.url,
downloadAsset: archived.downloadAsset,
});
if (!archived.downloadAsset) scheduleImageDownloadPreparation(task.id);
storeSucceeded += 1;
console.log("[ImageArchiveJob] stored", {
taskId: task.id,
bytes: archived.bytes,
sourceUrl: task.sourceUrl,
targetUrl: archived.url,
});
} catch (error) {
storeFailed += 1;
await markImageArchiveTaskFailed({ id: task.id, error });
console.error("[ImageArchiveJob] store failed", {
taskId: task.id,
sourceUrl: task.sourceUrl,
error: error instanceof Error ? error.message : String(error),
});
}
};
// Bucket work has a small worker pool independent of unrestricted model generation.

View File

@ -1,39 +1,24 @@
import "server-only";
import { getDefaultStorageConfig } from "@/lib/db/queries";
import { ensureStoredImageDownloadTask, findImageArchiveDownloadTask } from "./image-archive-db";
import { findImageArchiveDownloadTask } from "./image-archive-db";
import { extractImageProxySourceUrl, inferOriginalImageUrl } from "@/lib/image-url";
import { prepareOriginalImageArchive } from "./original-image-download";
export async function resolveCanvasCdnDownload(urls: string[], filename: string) {
const sources = Array.from(new Set(urls.flatMap(url => {
const source = extractImageProxySourceUrl(url) || url;
return [source, inferOriginalImageUrl(source) || source];
})));
let task = await findImageArchiveDownloadTask(sources, true);
const task = await findImageArchiveDownloadTask(sources, true);
const asset = (task?.metadata as { downloadAsset?: { status?: string; url?: string; contentType?: string; bytes?: number } } | null)?.downloadAsset;
if (!task) return { task, direct: null, canPrepareDirect: false };
const config = await getDefaultStorageConfig();
if (config?.type !== "qiniu-kodo" || !config.publicUrl || !config.isEnabled) return { task, direct: null, canPrepareDirect: false };
const base = new URL(config.publicUrl);
const origin = process.env.CANVAS_QINIU_ORIGIN_URL;
if (!task && base.protocol === "https:") {
for (const candidate of sources) {
const stored = new URL(candidate);
if (origin && stored.origin === new URL(origin).origin && !stored.search) {
stored.host = base.host;
stored.protocol = base.protocol;
}
if (stored.origin === base.origin && !stored.search && !stored.hash &&
stored.pathname.startsWith(base.pathname.replace(/\/$/, "") + "/uploads/")) {
task = await ensureStoredImageDownloadTask(stored.toString());
break;
}
}
}
if (!task) task = await prepareOriginalImageArchive(sources[0]);
const asset = (task?.metadata as { downloadAsset?: { status?: string; url?: string; contentType?: string; bytes?: number } } | null)?.downloadAsset;
const ready = asset?.status === "ready" && asset.url && asset.contentType === "image/png";
const source = ready ? asset.url : task?.targetUrl;
const source = ready ? asset.url : task.targetUrl;
if (!source) return { task, direct: null, canPrepareDirect: false };
const url = new URL(source);
const base = new URL(config.publicUrl);
const origin = process.env.CANVAS_QINIU_ORIGIN_URL;
if (origin && url.origin === new URL(origin).origin) url.host = base.host;
if (base.protocol !== "https:" || url.origin !== base.origin
|| !(url.pathname.startsWith(base.pathname.replace(/\/$/, "") + "/"))) return { task, direct: null, canPrepareDirect: false };

View File

@ -98,11 +98,8 @@ export async function enqueueImageArchiveTasks(params: {
return tasks;
}
export async function getImageArchiveTasksToStore(params: { limit: number; preferredTaskId?: string }) {
export async function getImageArchiveTasksToStore(params: { limit: number }) {
const now = new Date();
const priority = params.preferredTaskId
? [asc(sql`case when ${imageArchiveTask.id} = ${params.preferredTaskId} then 0 else 1 end`)]
: [];
return await db
.select()
.from(imageArchiveTask)
@ -113,7 +110,7 @@ export async function getImageArchiveTasksToStore(params: { limit: number; prefe
lt(imageArchiveTask.attemptCount, MAX_IMAGE_ARCHIVE_ATTEMPTS),
),
)
.orderBy(...priority, asc(imageArchiveTask.createdAt), asc(imageArchiveTask.id))
.orderBy(asc(imageArchiveTask.createdAt), asc(imageArchiveTask.id))
.limit(Math.max(1, Math.min(50, params.limit)));
}
@ -137,32 +134,6 @@ export async function markImageArchiveTaskArchiving(id: string) {
return claimed.length > 0;
}
export async function claimNextImageArchiveTask(preferredTaskId?: string) {
return db.transaction(async (tx) => {
const priority = preferredTaskId
? [asc(sql`case when ${imageArchiveTask.id} = ${preferredTaskId} then 0 else 1 end`)] : [];
const [task] = await tx.select().from(imageArchiveTask).where(and(
inArray(imageArchiveTask.status, ["pending", "failed"]),
lte(imageArchiveTask.archiveAfterAt, new Date()),
lt(imageArchiveTask.attemptCount, MAX_IMAGE_ARCHIVE_ATTEMPTS),
)).orderBy(...priority, asc(imageArchiveTask.createdAt), asc(imageArchiveTask.id))
.limit(1).for("update", { skipLocked: true });
if (!task) return null;
await tx.update(imageArchiveTask).set({ status: "archiving",
attemptCount: sql`${imageArchiveTask.attemptCount} + 1`, lastError: null, updatedAt: new Date(),
}).where(eq(imageArchiveTask.id, task.id));
return task;
});
}
export async function hasPendingImageArchives() {
const [task] = await db.select({ id: imageArchiveTask.id }).from(imageArchiveTask).where(or(
inArray(imageArchiveTask.status, ["pending", "failed", "archiving", "stored", "replacing"]),
and(eq(imageArchiveTask.status, "completed"), sql`${imageArchiveTask.metadata}->>'replacementPasses' = '1'`),
)).limit(1);
return Boolean(task);
}
export async function markImageArchiveTaskStored(params: {
id: string;
targetUrl: string;
@ -379,17 +350,6 @@ export async function findImageArchiveDownloadTask(urls: string[], prepareOnDema
}
return task || null;
}
/** Reuse the download worker for stored uploads and synchronous tool results. */
export async function ensureStoredImageDownloadTask(url: string) {
const now = new Date();
const [created] = await db.insert(imageArchiveTask).values({
sourceUrl: url, targetUrl: url, status: "completed", archiveAfterAt: now,
replaceAfterAt: now, archivedAt: now, replacedAt: now, updatedAt: now,
metadata: { downloadAsset: { status: "pending" } },
}).onConflictDoNothing({ target: imageArchiveTask.sourceUrl }).returning();
return created || await findImageArchiveDownloadTask([url], true);
}
export async function hasPendingImageDownloads() {
const [task] = await db.select({ id: imageArchiveTask.id }).from(imageArchiveTask).where(
sql`${imageArchiveTask.metadata}->'downloadAsset'->>'status' in ('pending', 'preparing', 'failed')`,

View File

@ -1,88 +1,66 @@
import "server-only";
import { after } from "next/server";
const workerKey = "__generated_image_archive_worker_v2__";
const workerKey = "__generated_image_archive_worker__";
type Worker = {
active: number;
running: boolean;
scheduled: boolean;
priority: Set<string>;
replacing: boolean;
replaceRequested: boolean;
requested: boolean;
retryTimer?: ReturnType<typeof setTimeout>;
};
function getWorker(): Worker {
const root = globalThis as typeof globalThis & { [workerKey]?: Worker };
return (root[workerKey] ??= { active: 0, scheduled: false, priority: new Set(), replacing: false, replaceRequested: false });
return (root[workerKey] ??= { running: false, scheduled: false, requested: false });
}
async function retryIfNeeded() {
export function scheduleImageArchiveWorker(deliveryConfirmed = false) {
const worker = getWorker();
if (worker.active || worker.replacing || worker.retryTimer) return;
const { hasPendingImageArchives, hasPendingImageDownloads } = await import("./image-archive-db");
if (!(await hasPendingImageArchives()) && !(await hasPendingImageDownloads())) return;
if (worker.retryTimer) return;
worker.retryTimer = setTimeout(() => {
worker.retryTimer = undefined;
scheduleImageArchiveWorker();
}, 60_000);
worker.retryTimer.unref?.();
}
function scheduleReplacement() {
const worker = getWorker();
worker.replaceRequested = true;
if (worker.replacing) return;
worker.replacing = true;
void (async () => {
const { replacePendingImageArchives } = await import("@/lib/jobs/image-archive-job");
do {
worker.replaceRequested = false;
while (await replacePendingImageArchives()) { /* Drain references independently of uploads. */ }
} while (worker.replaceRequested);
})().catch(error => console.error("[ImageArchiveWorker] replacement failed", error)).finally(() => {
worker.replacing = false;
void retryIfNeeded().catch(error => console.error("[ImageArchiveWorker] retry failed", error));
});
}
export function scheduleImageArchiveWorker(deliveryConfirmed = false, preferredTaskId?: string) {
const worker = getWorker();
if (preferredTaskId) worker.priority.add(preferredTaskId);
if (worker.scheduled && !deliveryConfirmed) return;
worker.requested = true;
if (worker.running || (worker.scheduled && !deliveryConfirmed)) return;
worker.scheduled = true;
if (worker.retryTimer) {
clearTimeout(worker.retryTimer);
worker.retryTimer = undefined;
}
const run = async () => {
if (!worker.scheduled) return;
if (worker.running) return;
worker.scheduled = false;
if (worker.retryTimer) { clearTimeout(worker.retryTimer); worker.retryTimer = undefined; }
const { storeNextImageArchive } = await import("@/lib/jobs/image-archive-job");
const { recoverStaleImageArchiveTasks } = await import("./image-archive-db");
const { scheduleImageDownloadPreparation } = await import("./image-download-preparation");
await recoverStaleImageArchiveTasks();
scheduleImageDownloadPreparation();
scheduleReplacement();
// Free slots take the next file immediately; slow files and reference updates
// cannot hold an entire batch or delay newly generated images.
while (worker.active < 4) {
worker.active++;
void (async () => {
for (;;) {
const id = worker.priority.values().next().value;
if (id) worker.priority.delete(id);
if (!(await storeNextImageArchive(id))) break;
scheduleReplacement();
}
})().catch(error => console.error("[ImageArchiveWorker] storage failed", error)).finally(() => {
worker.active--;
if (worker.priority.size) scheduleImageArchiveWorker();
else void retryIfNeeded().catch(error => console.error("[ImageArchiveWorker] retry failed", error));
});
worker.running = true;
let retryNeeded = false;
try {
const { runImageArchiveJob } = await import("@/lib/jobs/image-archive-job");
do {
worker.requested = false;
const result = await runImageArchiveJob();
retryNeeded = result.stats.pendingStore > 0 || result.stats.pendingReplace > 0 || result.pendingDownloads === true;
// Stop when only backoff tasks remain; do not spin while storage is down.
if (!worker.requested && result.store.total === 0 && result.replace.total === 0 && result.downloadTasks === 0) break;
} while (true);
} catch (error) {
retryNeeded = true;
console.error("[ImageArchiveWorker] background archive failed", error);
} finally {
worker.running = false;
if (worker.requested) scheduleImageArchiveWorker();
else if (retryNeeded) {
worker.retryTimer = setTimeout(scheduleImageArchiveWorker, 60_000);
worker.retryTimer.unref?.();
}
}
};
const safeRun = () => run().catch(error => {
console.error("[ImageArchiveWorker] scheduling failed", error);
void retryIfNeeded().catch(error => console.error("[ImageArchiveWorker] retry failed", error));
});
const fallback = setTimeout(() => { if (worker.scheduled) void safeRun(); }, 1_000);
fallback.unref?.();
try { after(safeRun); } catch { setImmediate(safeRun); }
// Detached generation tasks may inherit a request that has already closed. Keep
// a Node-server fallback so archiving never depends on the user leaving a tab open.
const deliveryFallback = setTimeout(() => {
if (worker.scheduled && !worker.running) void run();
}, 1_000);
deliveryFallback.unref?.();
try {
// Request handlers deliver first. Durable task rows also allow cron/restart recovery.
after(run);
} catch {
// Durable canvas tasks can run outside Next's request context on the Node server.
setImmediate(() => {
void run();
});
}
}

View File

@ -58,8 +58,7 @@ export async function registerGeneratedImageTemporaryUrls(params: {
displayHoldMs: getImageArchiveDisplayHoldMs(),
},
});
for (const task of tasks) scheduleImageArchiveWorker(false, task.id);
if (!tasks.length) scheduleImageArchiveWorker();
scheduleImageArchiveWorker();
return tasks;
} catch (error) {
logger.warn("enqueue temporary image archive failed", {
@ -200,10 +199,10 @@ export async function archiveTemporaryImage(sourceUrl: string, archiveId?: strin
});
if (direct) return direct;
}
const downloaded = await downloadTemporaryImage({ sourceUrl, retries: 0 });
const downloaded = await downloadTemporaryImage({ sourceUrl });
const objectSuffix = `${Date.now()}-${randomUUID()}`;
const filename = `ai-generated-archive-${objectSuffix}.${downloaded.extension}`;
const uploaded = await uploadFile(filename, toArrayBuffer(downloaded.buffer), { preferQiniuForm: true });
const uploaded = await uploadFile(filename, toArrayBuffer(downloaded.buffer));
await cacheImageBytes(`source::${uploaded.url}`, downloaded);
return {
url: uploaded.url,

View File

@ -4,7 +4,7 @@ import { fetchImageBytes, cacheImageBytes } from "./image-byte-cache";
import { normalizeCanvasDownloadAsset } from "@/lib/canvas/photoshop-safe-download";
import { claimImageDownloadTask, saveImageDownloadAsset, getImageDownloadTasks, hasPendingImageDownloads } from "./image-archive-db";
import { uploadFile } from "./service";
import { getReadyQiniuImageDownload, prepareQiniuWebpDownload } from "./qiniu-image-archive";
import { getReadyQiniuImageDownload } from "./qiniu-image-archive";
import { getDownloadFailure } from "@/lib/canvas/download-error";
import { createLogger } from "@/lib/observability/logger";
import { trackRuntimeWork } from "@/lib/observability/active-work";
@ -21,11 +21,6 @@ export async function prepareImageArchiveDownload(id: string) {
await saveImageDownloadAsset(id, ready);
return;
}
const converted = await prepareQiniuWebpDownload(task.targetUrl, task.id).catch(() => undefined);
if (converted) {
await saveImageDownloadAsset(id, converted);
return;
}
const source = await fetchImageBytes(task.targetUrl);
phase = "convert";
const asset = await normalizeCanvasDownloadAsset({
@ -38,7 +33,7 @@ export async function prepareImageArchiveDownload(id: string) {
phase = "store";
const url = source.buffer.equals(asset.bytes) && asset.contentType === "image/png"
? task.targetUrl
: (await uploadFile(`canvas-download-${randomUUID()}.${asset.filename.split(".").pop() || "png"}`, Uint8Array.from(asset.bytes).buffer, { preferQiniuForm: true })).url;
: (await uploadFile(`canvas-download-${randomUUID()}.${asset.filename.split(".").pop() || "png"}`, Uint8Array.from(asset.bytes).buffer)).url;
await saveImageDownloadAsset(id, { status: "ready", url, bytes: asset.bytes.length,
contentType: asset.contentType, preparedAt: new Date().toISOString() });
await cacheImageBytes(`source::${url}`, { buffer: asset.bytes, contentType: asset.contentType });

View File

@ -1,30 +1,9 @@
import "server-only";
import { getDefaultStorageConfig } from "@/lib/db/queries";
import { enqueueImageArchiveTask, findImageArchiveDownloadTask } from "./image-archive-db";
import { findImageArchiveDownloadTask } from "./image-archive-db";
import { inferOriginalImageUrl } from "@/lib/image-url";
import { getImageDownloadExtension } from "@/lib/image-delivery";
import { sanitizeCanvasDownloadFileName } from "@/lib/canvas/photoshop-safe-download";
import { HeadObjectCommand } from "@aws-sdk/client-s3";
export async function prepareOriginalImageArchive(source: string) {
const original = inferOriginalImageUrl(source) || source;
const task = await findImageArchiveDownloadTask([...new Set([source, original])])
|| await enqueueImageArchiveTask({ sourceUrl: original, metadata: { requestedDownload: true } });
if (!task) throw new Error("下载文件尚未保存到存储桶");
if (!task.targetUrl) {
if (task.status === "abandoned" || (task.status === "failed" && task.archiveAfterAt > new Date())) {
throw new Error(task.lastError || "下载文件保存到存储桶失败");
}
const { scheduleImageArchiveWorker } = await import("./image-archive-worker");
scheduleImageArchiveWorker(false, task.id);
}
return task;
}
export function originalImagePreparing(task: { id: string; status: string }) {
return { delivery: "preparing" as const, phase: "preparing" as const, retryAfter: 3, requestId: task.id,
message: task.status === "archiving" ? "正在保存原图,完成后自动下载" : "正在排队准备原图,完成后自动下载" };
}
/** Resolve the archived original without waiting for a separate PNG conversion. */
export async function resolveOriginalCdnDownload(source: string, name: string, signal: AbortSignal) {
@ -34,9 +13,8 @@ export async function resolveOriginalCdnDownload(source: string, name: string, s
const origin = process.env.CANVAS_QINIU_ORIGIN_URL;
let target = new URL(source);
if (target.origin !== base.origin && (!origin || target.origin !== new URL(origin).origin)) {
const task = await prepareOriginalImageArchive(source);
if (!task.targetUrl) return originalImagePreparing(task);
target = new URL(task.targetUrl);
const task = await findImageArchiveDownloadTask([...new Set([source, inferOriginalImageUrl(source)])]);
target = new URL(task?.targetUrl || source);
}
if (origin && target.origin === new URL(origin).origin && !target.searchParams.has("token")) {
target.host = base.host;
@ -50,32 +28,8 @@ export async function resolveOriginalCdnDownload(source: string, name: string, s
// Only metadata crosses the application server. The browser receives the file
// from the CDN, including when cross-origin fetch is disabled by storage CORS.
const response = await fetch(target, {
method: "HEAD", cache: "default",
signal: AbortSignal.any([signal, AbortSignal.timeout(3_000)]),
}).catch(async (error) => {
signal.throwIfAborted();
if (target.search) throw error;
const { createS3Client, toDbS3UploadConfig } = await import("./service");
const storage = toDbS3UploadConfig(config);
if (!storage) throw error;
const key = decodeURIComponent(target.pathname.slice(base.pathname.replace(/\/$/, "").length + 1));
if (!key) throw error;
const client = createS3Client(storage);
try {
const object = await client.send(new HeadObjectCommand({ Bucket: storage.bucket, Key: key }), {
abortSignal: AbortSignal.any([signal, AbortSignal.timeout(5_000)]),
});
return new Response(null, { headers: {
"content-type": object.ContentType || "",
"content-length": String(object.ContentLength ?? 0),
} });
} catch (storageError) {
const status = (storageError as { $metadata?: { httpStatusCode?: number } })?.$metadata?.httpStatusCode;
if (status === 403 || status === 404) throw new Error(`HTTP ${status}`);
throw error;
} finally {
client.destroy();
}
method: "HEAD", cache: "no-store",
signal: AbortSignal.any([signal, AbortSignal.timeout(10_000)]),
});
if (!response.ok) throw new Error(`HTTP ${response.status}`);
const contentType = response.headers.get("content-type") || "";

View File

@ -29,7 +29,7 @@ function isDownloadReadyPng(prefix: Buffer) {
if (prefix.length < 41 || !prefix.subarray(0, 8).equals(PNG_SIGNATURE)
|| prefix.readUInt32BE(8) !== 13 || prefix.toString("ascii", 12, 16) !== "IHDR"
|| !prefix.readUInt32BE(16) || !prefix.readUInt32BE(20)
|| (prefix[24] !== 8 && prefix[24] !== 16) || (prefix[25] !== 2 && prefix[25] !== 6)) return false;
|| prefix[24] !== 8 || (prefix[25] !== 2 && prefix[25] !== 6)) return false;
// Animation and EXIF orientation need the existing full-image preparation.
// An embedded color profile is fine: the browser gets the exact stored bytes.
@ -48,7 +48,7 @@ export async function getReadyQiniuImageDownload(url: string, target?: Awaited<R
const base = buildS3PublicUrl(config, "");
if (!url.startsWith(base)) return;
const key = url.slice(base.length);
if (!/^uploads\/(?:[\w.-]+\/)*[\w.-]+$/.test(key)) return;
if (!/^uploads\/[\w.-]+$/.test(key)) return;
const client = createS3Client(config);
try {
@ -74,54 +74,17 @@ export async function getReadyQiniuImageDownload(url: string, target?: Awaited<R
}
export async function archiveImageThroughQiniu(sourceUrl: string, archiveId: string) {
return archiveThroughQiniu(sourceUrl, archiveId, "image");
}
export async function archiveMediaThroughQiniu(sourceUrl: string, archiveId: string, kind: "audio" | "video") {
return archiveThroughQiniu(sourceUrl, archiveId, kind);
}
async function archiveThroughQiniu(sourceUrl: string, archiveId: string, kind: "image" | "audio" | "video") {
let source: URL;
try { source = new URL(sourceUrl); } catch { return null; }
if (!/^https?:$/.test(source.protocol) || source.username || source.password) return null;
if (!/^https:\/\/api\.vip98k\.com\/api\/external\/assets\/[A-Za-z0-9_-]+$/.test(sourceUrl)) {
return null;
}
const target = await resolveS3UploadTarget();
const config = target?.config;
if (config?.provider !== "qiniu-kodo" || config.region !== "cn-east-1" || !config.publicUrl) {
return null;
}
// Files already in our bucket and inline previews need no remote copy.
const localOrigins = [config.publicUrl, config.endpoint, process.env.CANVAS_QINIU_ORIGIN_URL,
process.env.NEXT_PUBLIC_APP_URL, process.env.AUTH_URL, process.env.NEXTAUTH_URL];
if (localOrigins.some(value => value && new URL(value).origin === source.origin)
|| source.hostname === "localhost" || source.hostname === "[::1]"
|| /^(?:127\.|10\.|192\.168\.|169\.254\.|172\.(?:1[6-9]|2\d|3[01])\.)/.test(source.hostname)) return null;
// The archive task owns this object key, including retries after a timeout.
const pathname = kind === "image" ? `uploads/ai-generated-archive-${archiveId}` : `uploads/canvas-${kind}-${archiveId}`;
return fetchImageIntoQiniu(sourceUrl, pathname, target!, kind);
}
/** Prepare uploaded WebP images inside Kodo, retaining their embedded colour profile. */
export async function prepareQiniuWebpDownload(url: string, taskId: string) {
const target = await resolveS3UploadTarget();
const config = target?.config;
if (config?.provider !== "qiniu-kodo" || config.region !== "cn-east-1" || !config.publicUrl) return;
const base = buildS3PublicUrl(config, "");
if (!url.startsWith(base) || !/^uploads\/(?:[\w.-]+\/)*[\w.-]+\.webp$/i.test(url.slice(base.length))) return;
// No resizing or lossy re-encoding; apply orientation before removing EXIF.
const source = `${url}?imageMogr2/auto-orient/format/png/strip/meta-keep-list/${encodeQiniu("icc")}`;
const result = await fetchImageIntoQiniu(source, `uploads/canvas-download-${taskId}.png`, target!);
return result.downloadAsset;
}
async function fetchImageIntoQiniu(
sourceUrl: string,
pathname: string,
target: NonNullable<Awaited<ReturnType<typeof resolveS3UploadTarget>>>,
kind: "image" | "audio" | "video" = "image",
) {
const config = target.config;
const pathname = `uploads/ai-generated-archive-${archiveId}`;
const path = `/fetch/${encodeQiniu(sourceUrl)}/to/${encodeQiniu(`${config.bucket}:${pathname}`)}`;
const contentType = "application/x-www-form-urlencoded";
const signingData = `POST ${path}\nHost: ${QINIU_EAST_CHINA_IO}\nContent-Type: ${contentType}\n\n`;
@ -141,8 +104,8 @@ async function fetchImageIntoQiniu(
throw new Error(`Qiniu archive fetch returned HTTP ${response.status}`);
}
const result = await response.json() as { key?: string; fsize?: number; mimeType?: string };
if (result.key !== pathname || !result.fsize || !result.mimeType?.startsWith(`${kind}/`)) {
throw new Error(`Qiniu archive fetch did not return ${kind}`);
if (result.key !== pathname || !result.fsize || !result.mimeType?.startsWith("image/")) {
throw new Error("Qiniu archive fetch did not return an image");
}
const url = buildS3PublicUrl(config, pathname);
return {

View File

@ -3,7 +3,6 @@ import { isRetiredStorageUrl, isLegacyAliyunStorageConfig, RETIRED_STORAGE_MESSA
import { DeleteObjectCommand, PutObjectCommand, S3Client } from "@aws-sdk/client-s3";
import { put } from "@vercel/blob";
import { createHmac } from "node:crypto";
import {
getDefaultStorageConfig,
getStorageConfigById,
@ -240,48 +239,12 @@ export async function maybeEnqueueStorageMigrationTask(params: {
await maybeEnqueueAliyunMigrationTask(params);
}
async function uploadQiniuForm(
config: S3UploadConfig,
key: string,
buffer: ArrayBuffer,
contentType: string
) {
const encode = (value: Buffer) =>
value.toString("base64").replace(/\+/g, "-").replace(/\//g, "_");
const policy = encode(Buffer.from(JSON.stringify({
scope: `${config.bucket}:${key}`,
deadline: Math.floor(Date.now() / 1000) + 120,
insertOnly: 1,
})));
const signature = encode(createHmac("sha1", config.secretAccessKey).update(policy).digest());
const form = new FormData();
form.append("token", `${config.accessKeyId}:${signature}:${policy}`);
form.append("key", key);
form.append("file", new Blob([buffer], { type: contentType }), key.split("/").at(-1));
const startedAt = Date.now();
const response = await fetch("https://upload.qiniup.com/", {
method: "POST",
body: form,
redirect: "error",
signal: AbortSignal.timeout(45_000),
});
if (!response.ok) {
await response.body?.cancel();
throw new Error(`Qiniu form upload returned HTTP ${response.status}`);
}
const result = await response.json() as { key?: string };
if (result.key !== key) throw new Error("Qiniu form upload returned an unexpected key");
logger.info("qiniu_form_upload_completed", { bytes: buffer.byteLength, elapsedMs: Date.now() - startedAt });
}
// S3/MinIO 上传函数(使用 AWS SDK)
async function uploadToS3(
filename: string,
buffer: ArrayBuffer,
config: S3UploadConfig,
s3Client = createS3Client(config),
preferQiniuForm = false
s3Client = createS3Client(config)
) {
const {
endpoint,
@ -297,14 +260,6 @@ async function uploadToS3(
const contentType = getContentType(filename);
try {
if (preferQiniuForm && config.provider === "qiniu-kodo" && config.region === "cn-east-1") {
try {
await uploadQiniuForm(config, key, buffer, contentType);
return { url: buildS3PublicUrl(config, key), pathname: key, contentType };
} catch (error) {
logger.warn("[Upload] Qiniu form upload failed, retrying the same object through S3", error);
}
}
logger.debug(`[S3 Upload] Uploading to: ${normalizedEndpoint}/${bucket}/${key}`);
// 上传文件
@ -596,8 +551,7 @@ async function uploadWithAnyEnabledStorageConfig(
// 上传文件到存储服务
export async function uploadFile(
filename: string,
buffer: ArrayBuffer,
options?: { preferQiniuForm?: boolean }
buffer: ArrayBuffer
): Promise<UploadedFileResult> {
logger.debug(`[Upload] Starting upload for file: ${filename}`);
@ -618,7 +572,7 @@ export async function uploadFile(
logger.debug(`[Upload] Using database S3 config: ${selectedStorageConfig?.name}`);
logger.debug(`[Upload] Endpoint: ${dbS3Config.endpoint}`);
logger.debug(`[Upload] Bucket: ${dbS3Config.bucket}`);
const uploaded = await uploadToS3(filename, buffer, dbS3Config, undefined, options?.preferQiniuForm);
const uploaded = await uploadToS3(filename, buffer, dbS3Config);
lastKnownGoodDbS3Config = dbS3Config;
await maybeEnqueueAliyunMigrationTask({
uploaded,

View File

@ -156,7 +156,6 @@ export function isStyleProImageModel(
entry: StyleProModelEntry | StyleProDisplayModelEntry
) {
if (!entry.model.supportsImageGen) return false;
if ((entry.model.imageGenConfig as Record<string, unknown> | null)?.maxReferenceImages === 0) return false;
if (isExplicitImageGenerationModel(entry)) return true;
return !isVideoLikeModel(entry);
}

View File

@ -5,7 +5,6 @@ import { tmpdir } from "node:os";
import { join } from "node:path";
import { promisify } from "node:util";
import { uploadFile } from "@/lib/storage/service";
import { archiveMediaThroughQiniu } from "@/lib/storage/qiniu-image-archive";
import { downloadCanvasMedia } from "./download-media";
const probe = promisify(execFile);
@ -16,13 +15,6 @@ export async function archiveCanvasVideo(url: string): Promise<string> {
if (existing) return existing;
if (pending.size >= 2) throw new Error("视频保存繁忙,请稍后重试");
const job = (async () => {
const archived = await archiveMediaThroughQiniu(url, randomUUID(), "video");
if (archived) {
const { stdout } = await probe("ffprobe", ["-v", "error", "-rw_timeout", "15000000", "-protocol_whitelist", "http,https,tcp,tls,crypto", "-format_whitelist", "mov,matroska,webm", "-show_streams", "-show_format", "-of", "json", archived.url], { timeout: 20000, maxBuffer: 1024 * 1024 });
const media = JSON.parse(stdout);
if (!media.streams?.some((stream: { codec_type: string }) => stream.codec_type === "video") || !(Number(media.format?.duration) > 0)) throw new Error("视频文件不完整");
return archived.url;
}
const dir = await mkdtemp(join(tmpdir(), "canvas-video-archive-"));
try {
const input = join(dir, "video");

View File

@ -1,5 +1,4 @@
import { z } from "zod";
import { vip98kAudioContract, validateVip98kAudioInput, type AudioModelContract } from "./vip98k-audio-contract";
const qwenVoices = [
{ id: "Cherry", name: "芊悦" },
{ id: "Serena", name: "苏瑶" },
@ -66,8 +65,7 @@ export const audioModelContracts = {
>;
export type AudioModelId = keyof typeof audioModelContracts;
export const audioRequestSchema = z.object({
mode: z.enum(["tts", "music", "asr", "voiceclone", "voicedesign"]),
referenceAudioUrl: z.string().url().refine(value => /^https?:\/\//i.test(value)).optional(),
mode: z.enum(["tts", "music"]),
modelRef: z.string().min(1),
text: z.string().trim().max(2000).default(""),
lyrics: z.string().trim().max(2000).default(""),
@ -96,10 +94,10 @@ export const audioRequestSchema = z.object({
volume: z.number().int().min(0).max(100).default(50),
});
export type AudioRequest = z.infer<typeof audioRequestSchema>;
export function audioContract(id: string): AudioModelContract | undefined {
export function audioContract(id: string) {
return Object.hasOwn(audioModelContracts, id)
? audioModelContracts[id as AudioModelId]
: vip98kAudioContract(id);
: undefined;
}
export function officialAudioBase(base: string, modelId?: string) {
const url = new URL(base);
@ -123,10 +121,6 @@ export function officialAudioBase(base: string, modelId?: string) {
export function buildAudioRequest(value: unknown, modelId: string) {
const p = audioRequestSchema.parse(value),
contract = audioContract(modelId);
if (vip98kAudioContract(modelId)) {
validateVip98kAudioInput(p, modelId);
return { path: "", body: {} };
}
if (!contract || contract.kind !== p.mode) throw Error("音频模式与模型不匹配");
if (!contract.formats.includes(p.format)) throw Error("所选模型不支持这个音频格式");
if (p.mode === "music") {

View File

@ -13,12 +13,9 @@ import {
officialAudioBase,
} from "./audio-contract";
import { ProviderTaskUncertainError } from "./video-task-lifecycle";
import { vip98kAudioContract } from "./vip98k-audio-contract";
import { executeVip98kCanvasAudio } from "./vip98k-audio-generation";
export async function listCanvasAudioModels() {
return (await getEnabledAiModelsWithProvider()).filter(({ model, provider }) => {
try {
if (provider.type === "vip98k") return Boolean(vip98kAudioContract(model.modelId));
return (
provider.type === "alibaba" &&
!!audioContract(model.modelId) &&
@ -38,8 +35,6 @@ export async function executeCanvasAudio(
},
) {
const input = audioRequestSchema.parse(params);
const selected = (await listCanvasAudioModels()).find(item => item.model.id === input.modelRef);
if (selected?.provider.type === "vip98k") return executeVip98kCanvasAudio(input, selected, lifecycle);
let checkpoint = lifecycle.resume ? audioCheckpointSchema.parse(lifecycle.resume) : undefined;
if (checkpoint && checkpoint.modelRef !== input.modelRef) throw Error("音频记录与原模型不匹配");
if (!checkpoint) {

View File

@ -227,9 +227,10 @@ export function reconcileCanvasTasks<
}
if (task.request.kind === "audio")
Object.assign(nextDraft, {
...(data.text ? { text: data.text, content: data.text, prompt: data.text, action: "TEXT_RESOURCE", mediaType: "text" } : {
mediaUrl: data.url, url: data.urls || [data.url], action: "AUDIO_RESOURCE", mediaType: "audio",
}),
mediaUrl: data.url,
url: [data.url],
action: "AUDIO_RESOURCE",
mediaType: "audio",
audioMeta: data.metadata,
audioParams:
task.request.node.draftValues?.audioParams || task.request.params,
@ -242,16 +243,16 @@ export function reconcileCanvasTasks<
});
if (
task.request.kind === "image" ||
task.request.kind === "image-operation" || (task.request.kind === "audio" && !data.text)
task.request.kind === "image-operation"
) {
const urls = task.request.kind === "audio" ? data.urls || [data.url] : (data.images || [])
const urls = (data.images || [])
.map((image: any) => image.originalUrl || image.thumbnailUrl)
.filter(Boolean);
Object.assign(nextDraft, {
mediaUrl: urls[0],
url: urls,
action:
task.request.kind === "audio" ? "AUDIO_RESOURCE" : draft.action === "IMAGE_GENERATE_NINE_GRID"
draft.action === "IMAGE_GENERATE_NINE_GRID"
? draft.action
: "IMAGE_RESOURCE",
});
@ -262,7 +263,6 @@ export function reconcileCanvasTasks<
...result,
{
...node,
...(task.request.kind === "audio" ? { kind: "media", inputType: "audio" } : {}),
id,
title: `${node.title} ${i + 1}`,
y: node.y + i * (node.height + 40),
@ -357,7 +357,7 @@ export function reconcileCanvasTasks<
task.request.kind === "smart-edit"
? "video"
: task.request.kind === "audio"
? task.result?.text ? "text" : "audio"
? "audio"
: "image",
}
: {}),

View File

@ -1,6 +1,5 @@
import type { SmartEditCheckpoint } from "./smart-edit/execute";
import { audioCheckpointSchema } from "./audio-contract";
import { vip98kAudioCheckpointSchema } from "./vip98k-audio-contract";
import { videoCheckpointSchema } from "./video-task-lifecycle";
// Resume only server-recorded provider jobs. A lost request without an upstream ID is never resubmitted.
export type RecoveryTask = {
@ -50,7 +49,7 @@ export function getAudioCheckpoint(
task: Pick<RecoveryTask, "request" | "result">
) {
if (task.request.kind !== "audio") return null;
const parsed = vip98kAudioCheckpointSchema.or(audioCheckpointSchema).safeParse(task.result?.upstreamAudio);
const parsed = audioCheckpointSchema.safeParse(task.result?.upstreamAudio);
return parsed.success && parsed.data.modelRef === task.request.params.modelRef
? parsed.data
: null;

View File

@ -24,9 +24,7 @@ export type VideoTaskLifecycle = {
assertActive: () => Promise<void>;
};
export class ProviderTaskFailedError extends Error {}
export class ProviderTaskUncertainError extends Error {
constructor(message: string, readonly providerTaskId?: string) { super(message); }
}
export class ProviderTaskUncertainError extends Error {}
export function bindVideoTaskLifecycle(
lifecycle: VideoTaskLifecycle | undefined,
selected: any,

View File

@ -1,106 +0,0 @@
import { z } from "zod";
export type AudioModelContract = {
kind: string; label: string; voices: { id: string; name: string }[];
instructions: boolean; controls: boolean; formats: string[]; supportsLanguageControl?: boolean;
supportsGender?: boolean; genderRequiresLyrics?: boolean; descriptionLimit?: number;
};
const voice = (id: string, name = id) => ({ id, name });
const tts = (label: string, voices: { id: string; name: string }[] = [], instructions = false): AudioModelContract =>
({ kind: "tts", label, voices, instructions, controls: false, formats: ["wav"], supportsLanguageControl: false });
const music = (label: string): AudioModelContract =>
({ kind: "music", label, voices: [], instructions: false, controls: false, formats: ["mp3"], supportsGender: false });
export const vip98kAudioContracts: Record<string, AudioModelContract> = {
"mimo-v2.5-asr": { ...tts("MiMo 语音识别"), kind: "asr", formats: [] },
"mimo-v2.5-tts": tts("MiMo 文字配音", [], true),
"mimo-v2.5-tts-voiceclone": { ...tts("MiMo 声音克隆", [], true), kind: "voiceclone" },
"mimo-v2.5-tts-voicedesign": { ...tts("MiMo 声音设计", [], true), kind: "voicedesign" },
"gem-2.5-tts": tts("Gemini 2.5 配音", [voice("Zephyr"), voice("Puck"), voice("Kore"), voice("Charon")]),
"gem-3.1-tts": tts("Gemini 3.1 配音", [voice("Zephyr"), voice("Puck"), voice("Kore"), voice("Charon")]),
"speech-2.8-hd": { ...tts("Speech 2.8 高清", [voice("male-qn-qingse", "青涩男声")]), formats: ["mp3", "wav"], controls: true },
"speech-2.8-turbo": { ...tts("Speech 2.8 快速", [voice("male-qn-qingse", "青涩男声")]), formats: ["mp3", "wav"], controls: true },
"music-2.5": music("Music 2.5"),
"music-2.5+": music("Music 2.5+"),
"suno-v4.5": { ...music("Suno 4.5"), supportsGender: true, descriptionLimit: 1000 },
"suno-v5": { ...music("Suno 5"), supportsGender: true, genderRequiresLyrics: true, descriptionLimit: 500 },
"suno-v5-5": { ...music("Suno 5.5"), supportsGender: true, genderRequiresLyrics: true, descriptionLimit: 500 },
"suno-v6": { ...music("Suno 6"), supportsGender: true, descriptionLimit: 1000 },
};
export function vip98kAudioContract(id: string) {
return Object.hasOwn(vip98kAudioContracts, id) ? vip98kAudioContracts[id] : undefined;
}
export type Vip98kAudioInput = {
mode: string; text: string; lyrics: string; instructions: string; voice?: string;
format: string; instrumental: boolean; gender: string; rate: number; pitch: number;
volume: number; referenceAudioUrl?: string;
};
export function validateVip98kAudioInput(input: Vip98kAudioInput, modelId: string) {
const contract = vip98kAudioContract(modelId);
if (!contract || contract.kind !== input.mode) throw new Error("音频模式与模型不匹配");
if (["asr", "voiceclone"].includes(input.mode) && !input.referenceAudioUrl) throw new Error("请先上传参考音频");
if (input.mode !== "asr" && !input.text.trim() && !input.lyrics.trim()) throw new Error("请输入配音文本或音乐描述");
if (input.mode === "voicedesign" && !input.instructions.trim()) throw new Error("请填写声音风格指令");
if (contract.descriptionLimit && input.text.length > contract.descriptionLimit) throw new Error(`这个模型的音乐描述最多 ${contract.descriptionLimit} 字`);
if (input.mode !== "asr" && !contract.formats.includes(input.format)) throw new Error("所选模型不支持这个音频格式");
}
export function buildVip98kAudioBody(input: Vip98kAudioInput, modelId: string, example: Record<string, any>, audioData?: string) {
validateVip98kAudioInput(input, modelId);
const body = structuredClone(example);
body.model = modelId;
if (modelId.startsWith("mimo-")) {
body.stream = false;
if (input.mode === "asr") {
if (!audioData) throw new Error("参考音频尚未读取");
body.messages = [{ role: "user", content: [{ type: "input_audio", input_audio: { data: audioData, format: audioData.includes("audio/wav") ? "wav" : "mp3" } }] }];
} else {
body.messages = [
{ role: "user", content: input.instructions || "请用自然的中文朗读。" },
{ role: "assistant", content: input.text },
];
if (input.mode === "voiceclone") {
if (!audioData) throw new Error("参考音频尚未读取");
body.audio = { ...body.audio, voice: audioData };
}
}
return body;
}
body.prompt = input.text;
const set = (key: string, value: unknown) => {
if (body.metadata && key in body.metadata) body.metadata[key] = value;
else body[key] = value;
};
if (modelId.startsWith("gem-")) set("voice_id", input.voice || "Zephyr");
if (modelId.startsWith("speech-")) {
set("voice_id", input.voice || "male-qn-qingse");
set("speed", input.rate);
set("pitch", Math.round((input.pitch - 1) * 12));
set("vol", Math.max(0.01, input.volume / 50));
set("format", input.format);
}
if (input.mode === "music") {
if (modelId === "suno-v5" || modelId === "suno-v5-5") {
body.instrumental = input.instrumental;
body.custom_mode = Boolean(input.lyrics && !input.instrumental);
if (body.custom_mode) { body.prompt = input.lyrics; body.style = input.text; body.title = input.text.slice(0, 60) || "歌曲"; }
if (body.custom_mode) set("vocal_gender", input.gender === "male" ? "m" : "f");
else { delete body.vocal_gender; if (body.metadata) delete body.metadata.vocal_gender; }
} else {
set(modelId.startsWith("music-") ? "is_instrumental" : "make_instrumental", input.instrumental ? "instrumental" : "song");
if (!input.instrumental && input.lyrics) set("lyrics", input.lyrics);
if (modelId.startsWith("suno-")) set("vocal_gender", input.gender === "male" ? "m" : "f");
}
}
return body;
}
export const vip98kAudioCheckpointSchema = z.object({
operation: z.literal("audio"), provider: z.literal("vip98k"),
modelRef: z.string(), modelId: z.string(), providerId: z.string(), baseUrl: z.string(),
taskId: z.string().optional(), resultPath: z.string().optional(), requestId: z.string().optional(),
url: z.string().url().optional(), urls: z.array(z.string().url()).optional(), archivedUrls: z.array(z.string().url()).optional(),
data: z.string().optional(), text: z.string().optional(),
format: z.enum(["mp3", "wav"]),
}).refine(value => Boolean(value.taskId || value.url || value.data || value.text));

View File

@ -1,24 +0,0 @@
function format(bytes: Buffer): "mp3" | "wav" | undefined {
if (bytes.length < 12) return;
if (bytes.toString("ascii", 0, 4) === "RIFF" && bytes.toString("ascii", 8, 12) === "WAVE") return "wav";
if (bytes.toString("ascii", 0, 3) === "ID3" || (bytes[0] === 0xff && (bytes[1] & 0xe0) === 0xe0)) return "mp3";
}
export function readVip98kAudioFile(bytes: Buffer) {
const direct = format(bytes);
if (direct) return { bytes, format: direct };
// Speech 2.8 returns a TAR containing audio and captions. Read the audio
// directly from memory; archive member paths are never written to disk.
if (bytes.toString("ascii", 257, 262) === "ustar") {
for (let offset = 0; offset + 512 <= bytes.length;) {
const header = bytes.subarray(offset, offset + 512);
const size = Number.parseInt(header.toString("ascii", 124, 136).replace(/\0.*$/, "").trim(), 8);
if (!Number.isFinite(size) || size < 0 || offset + 512 + size > bytes.length) break;
const data = bytes.subarray(offset + 512, offset + 512 + size);
const memberFormat = format(data);
if ((header[156] === 0 || header[156] === 48) && memberFormat) return { bytes: data, format: memberFormat };
offset += 512 + Math.ceil(size / 512) * 512;
}
}
throw new Error("返回结果不是有效的 MP3 或 WAV 音频文件");
}

View File

@ -1,133 +0,0 @@
import "server-only";
import { mkdtemp, readFile, rm } from "node:fs/promises";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { randomUUID } from "node:crypto";
import { executeVip98kExternalTask } from "@/lib/ai/providers/vip98k";
import { getVip98kInvocationHeaders } from "@/lib/ai/vip98k-task-invocation";
import { uploadFile } from "@/lib/storage/service";
import { archiveMediaThroughQiniu } from "@/lib/storage/qiniu-image-archive";
import { downloadCanvasMedia } from "./download-media";
import { ProviderTaskUncertainError } from "./video-task-lifecycle";
import { buildVip98kAudioBody, vip98kAudioCheckpointSchema } from "./vip98k-audio-contract";
import { readVip98kAudioFile } from "./vip98k-audio-file";
import type { AudioRequest } from "./audio-contract";
import type { AiModel, AiProvider } from "@/lib/db/schema";
export async function executeVip98kCanvasAudio(input: AudioRequest, item: { model: AiModel; provider: AiProvider }, lifecycle: {
resume?: unknown; assertActive: () => Promise<void>; checkpoint: (value: Record<string, unknown>) => Promise<void>;
}) {
const { model, provider } = item;
const metadata = (model.capabilities as any)?.vip98k;
const invocation = metadata?.invocation;
if (!invocation?.path) throw new Error("音频模型缺少调用配置,请同步模型目录");
const identity = { operation: "audio" as const, provider: "vip98k" as const,
modelRef: model.id, modelId: model.modelId, providerId: provider.id,
baseUrl: provider.baseUrl.replace(/\/+$/, "").replace(/\/v1$/i, ""), format: input.format };
let saved = lifecycle.resume ? vip98kAudioCheckpointSchema.parse(lifecycle.resume) : undefined;
if (saved && Object.entries(identity).some(([key, value]) => (saved as any)[key] !== value))
throw new ProviderTaskUncertainError("原音频任务的服务线路或模型已变更,请核对原任务");
const save = async (value: typeof saved) => {
await lifecycle.assertActive();
await lifecycle.checkpoint({ upstreamAudio: value });
saved = value;
};
const dir = await mkdtemp(join(tmpdir(), "canvas-98k-audio-"));
try {
if (!saved?.url && !saved?.data && !saved?.text) {
let audioData: string | undefined;
if (!saved && input.referenceAudioUrl) {
const reference = join(dir, "reference");
await downloadCanvasMedia(input.referenceAudioUrl, reference);
const bytes = await readFile(reference);
if (bytes.length > 20 * 1024 * 1024) throw new Error("参考音频需小于 20 MiB");
const referenceAudio = readVip98kAudioFile(bytes);
audioData = `data:audio/${referenceAudio.format === "mp3" ? "mpeg" : "wav"};base64,${referenceAudio.bytes.toString("base64")}`;
}
const body = saved ? undefined : buildVip98kAudioBody(input, model.modelId, invocation.requestExample || {}, audioData);
if (invocation.path === "/v1/chat/completions") {
await lifecycle.assertActive();
let response: Response;
let payload: any;
try {
response = await fetch(identity.baseUrl + invocation.path, {
method: "POST", redirect: "error", signal: AbortSignal.timeout(180000),
headers: { Authorization: `Bearer ${provider.apiKey}`, "Content-Type": "application/json",
...getVip98kInvocationHeaders(invocation.headers), "Idempotency-Key": randomUUID() },
body: JSON.stringify(body),
});
payload = await response.json();
} catch {
throw new ProviderTaskUncertainError("98K 音频请求结果未确认,请核对原请求,系统不会自动重发");
}
if (!response.ok) {
if (response.status >= 500) throw new ProviderTaskUncertainError(`98K 音频结果未确认(HTTP ${response.status}),未重复提交`);
throw new Error(`98K 音频请求失败(HTTP ${response.status}),请核对模型和输入`);
}
const message = payload.choices?.[0]?.message;
const text = typeof message?.content === "string" ? message.content.trim() : "";
const audio = message?.audio;
const next = input.mode === "asr" ? { text } : { data: audio?.data, url: audio?.url };
if (!next.text && !next.data && !next.url) throw new ProviderTaskUncertainError("98K 未返回音频结果,请核对原请求,勿重复生成");
try { await save({ ...identity, ...next, requestId: payload.id }); }
catch { throw new ProviderTaskUncertainError("音频已生成,但结果保存失败,请核对原请求"); }
} else {
const result = await executeVip98kExternalTask({
apiKey: provider.apiKey, baseURL: identity.baseUrl, modelId: model.modelId, kind: "audio", prompt: String(body?.prompt || input.text),
modelConfig: { capabilities: { ...model.capabilities as any, vip98k: { ...metadata,
invocation: { ...invocation, requestExample: body || invocation.requestExample },
invocations: [],
} } },
lifecycle: { assertActive: lifecycle.assertActive,
resume: saved?.taskId ? { taskId: saved.taskId, resultPath: saved.resultPath } : undefined,
accepted: reference => save({ ...identity, ...reference }),
},
});
const payload = result.payload as any;
const outputs = payload?.result?.outputs || payload?.outputs;
const audioUrls = Array.isArray(outputs) ? outputs.filter(output => output.type === "audio" && typeof output.url === "string").map(output => output.url as string) : [];
const urls: string[] = audioUrls.length ? audioUrls : result.outputUrls.slice(0, 1);
const url = urls[0];
if (!url) throw new ProviderTaskUncertainError("音频任务已完成但未返回文件,请核对原任务");
await save({ ...identity, taskId: result.taskId, url, urls });
}
}
if (saved?.text) return { text: saved.text, modelRef: model.id, modelId: model.modelId, metadata: { outputType: "text", requestId: saved.requestId } };
const sources = saved?.urls?.length ? saved.urls : [saved?.url];
const archivedUrls = [...(saved?.archivedUrls || [])];
let format = saved!.format;
for (let index = archivedUrls.length; index < sources.length; index++) {
if (sources[index] && !model.modelId.startsWith("speech-")) {
const archived = await archiveMediaThroughQiniu(sources[index]!, `${saved!.taskId || saved!.requestId}-${index}`, "audio");
if (archived) {
const response = await fetch(archived.url, { headers: { Range: "bytes=0-1023" }, signal: AbortSignal.timeout(20000) });
if (!response.ok) throw new Error("音频文件尚不可下载");
const reader = response.body!.getReader();
const first = await reader.read(); await reader.cancel();
format = readVip98kAudioFile(Buffer.from(first.value || [])).format;
archivedUrls.push(archived.url);
await save({ ...saved!, archivedUrls });
continue;
}
}
let bytes: Buffer;
if (saved?.data) bytes = Buffer.from(saved.data.replace(/^data:[^,]+,/, ""), "base64");
else {
const output = join(dir, `result-${index}`);
await downloadCanvasMedia(sources[index]!, output);
bytes = await readFile(output);
}
const audio = readVip98kAudioFile(bytes);
format = audio.format;
await lifecycle.assertActive();
const result = await uploadFile(`canvas-audio-${randomUUID()}.${format}`, Uint8Array.from(audio.bytes).buffer);
archivedUrls.push(result.url);
await save({ ...saved!, archivedUrls });
}
return { url: archivedUrls[0], urls: archivedUrls, modelRef: model.id, modelId: model.modelId,
metadata: { storageStatus: "archived", format, requestId: saved?.requestId, taskId: saved?.taskId } };
} catch (error) {
if (saved?.url || saved?.data) throw new ProviderTaskUncertainError("音频已生成,保存文件尚未完成,将继续保存原文件");
throw error;
} finally { await rm(dir, { recursive: true, force: true }); }
}

View File

@ -49,10 +49,7 @@ function resolveDevMediaOrigins(isDev: boolean) {
}
const nextConfig: NextConfig = {
env: {
NEXT_PUBLIC_APP_RELEASE: appRelease,
NEXT_PUBLIC_CANVAS_STORAGE_ORIGIN: process.env.CANVAS_QINIU_ORIGIN_URL || "",
},
env: { NEXT_PUBLIC_APP_RELEASE: appRelease },
distDir: process.env.NEXT_DIST_DIR?.trim() || ".next",
poweredByHeader: false,
allowedDevOrigins: ["127.0.0.1"],

View File

@ -65,7 +65,6 @@
"providers:test-vip98k-images": "pnpm exec tsx scripts/test-vip98k-image-models.ts"
},
"dependencies": {
"@ai-sdk/anthropic": "2.0.13",
"@ai-sdk/gateway": "^1.0.15",
"@ai-sdk/openai": "2.0.13",
"@ai-sdk/provider": "2.0.0",

View File

@ -12,11 +12,9 @@ export default defineConfig({
/routes\/canvas-download-rate-limit\.test\.ts/,
/routes\/canvas-zip-download\.test\.ts/,
/routes\/image-archive-flow\.test\.ts/,
/routes\/image-archive-lanes\.test\.ts/,
/routes\/runtime-active-work\.test\.ts/,
/routes\/canvas-capability-task-recovery\.test\.ts/,
/routes\/canvas-toolbar-capability\.test\.ts/,
/routes\/canvas-text-detect\.test\.ts/,
/routes\/agent-project-recovery\.test\.ts/,
/routes\/admin-media-loading\.test\.ts/,
/routes\/video-canvas-production\.test\.ts/,
@ -72,7 +70,6 @@ export default defineConfig({
/routes\/hicad-manufacturing-extension\.test\.ts/,
/routes\/openapi-access-key\.test\.ts/,
/routes\/vip98k-reference-routing\.test\.ts/,
/routes\/vip98k-model-expansion\.test\.ts/,
/routes\/ordinal-image-references\.test\.ts/,
/routes\/extend-provider-config\.test\.ts/,
],

32
pnpm-lock.yaml generated
View File

@ -33,9 +33,6 @@ importers:
.:
dependencies:
'@ai-sdk/anthropic':
specifier: 2.0.13
version: 2.0.13(zod@3.25.76)
'@ai-sdk/gateway':
specifier: ^1.0.15
version: 1.0.41(zod@3.25.76)
@ -466,20 +463,6 @@ importers:
packages:
'@ai-sdk/anthropic@2.0.13':
resolution: {integrity: sha512-5Kt1sNy80pKJsThe3snL9OajgNfdjH7GiWj/CyDoMNY82+Pb5mHimCwZzMUUoAM77GjfSd3Ico8sE7pPdJOuYQ==}
engines: {node: '>=18'}
peerDependencies:
zod: ^3.25.76 || ^4
'@ai-sdk/provider-utils@3.0.8':
resolution: {integrity: sha512-cDj1iigu7MW2tgAQeBzOiLhjHOUM9vENsgh4oAVitek0d//WdgfPCsKO3euP7m7LyO/j9a1vr/So+BGNdpFXYw==}
engines: {node: '>=18'}
peerDependencies:
zod: ^3.25.76 || ^4
gsap@3.14.2:
resolution: {integrity: sha512-P8/mMxVLU7o4+55+1TCnQrPmgjPKnwkzkXOK1asnR9Jg2lna4tEY5qBJjMmAaOBDDZWtlRjBXjLa0w53G/uBLA==}
@ -6990,21 +6973,6 @@ packages:
snapshots:
'@ai-sdk/anthropic@2.0.13(zod@3.25.76)':
dependencies:
'@ai-sdk/provider': 2.0.0
'@ai-sdk/provider-utils': 3.0.8(zod@3.25.76)
zod: 3.25.76
'@ai-sdk/provider-utils@3.0.8(zod@3.25.76)':
dependencies:
'@ai-sdk/provider': 2.0.0
'@standard-schema/spec': 1.1.0
eventsource-parser: 3.0.6
zod: 3.25.76
gsap@3.14.2: {}
'@ai-sdk/gateway@1.0.15(zod@3.25.76)':

View File

@ -21,9 +21,8 @@ export function agentImageProviderHarness(options: { generate?: (id: string, cou
const text = options.generate?.(id, params.imageParams.imageCount, calls.length) || `![image](https://fixture.invalid/${id}-${calls.length}.png)`;
return { text };
} }) }) };
const canvas = serverLoader(mocks)("lib/canvas/generate-image.ts");
const generate = canvas.generateCanvasImage;
const generate = serverLoader(mocks)("lib/canvas/generate-image.ts").generateCanvasImage;
const request = { prompt: "a cat", model: "primary", imageCount: 1, imageSize: "2K", aspectRatio: "3:4", agentImageMode: "auto", allowFailover: true, referenceImages: ["https://fixture.invalid/source.png"], negativePrompt: "no text", providerImageParams: { seed: 0, watermark: false } };
return { generate, request, calls, paused, providerTimeout: canvas.getCanvasProviderBatchTimeoutMs };
return { generate, request, calls, paused };
}

View File

@ -1,9 +0,0 @@
import { defineConfig } from "@playwright/test";
export default defineConfig({
testDir: "./routes",
testMatch: /(?:qiniu-direct-paths|image-delivery-qiniu|image-archive-flow|original-image-download|canvas-download-speed|canvas-download-recovery)\.test\.ts/,
workers: 1,
reporter: "list",
timeout: 30_000,
});

View File

@ -72,85 +72,6 @@ function projectRoute() {
return { route: load("app/api/agent-projects/route.ts"), projects, setUser: (value: string | null) => { userId = value; } };
}
test("a saved full detail set is queued, while overflow and changed references have distinct errors", async () => {
const references = Array.from({ length: 65 }, (_, index) => ({
id: `detail-${index + 1}`,
imageUrl: `https://example.test/detail-${index + 1}.webp`,
}));
const project = {
id, userId: owner, title: "全套详情", workspaceType: "agent",
canvasData: { agentProjectState: { workflowState: {
agentModeState: { detailReplacement: { references } },
} } },
};
const canvasProject = { id: "id", userId: "userId" };
const created: Array<{ id: string; request: { references: typeof references }; status: string }> = [];
const queued: string[] = [];
const db = {
select: () => ({ from: (table: unknown) => ({
where: () => ({
limit: async () => table === canvasProject ? [project] : [],
orderBy: () => ({ limit: async () => [] }),
}),
}) }),
insert: () => ({ values: () => ({ onConflictDoNothing: async () => {} }) }),
};
const route = loadRuntime({
"@/app/(auth)/auth": { auth: async () => ({ user: { id: owner } }) },
"@/lib/db": { db },
"@/lib/db/schema": { canvasProject, canvasImageTask: { request: "request" }, message: { id: "id" } },
"drizzle-orm": { eq: () => null, and: () => null, inArray: () => null, desc: () => null, sql: () => null },
"@/lib/canvas/image-task-queue": {
createCanvasImageTask: async ({ taskId, request }: { taskId: string; request: { references: typeof references } }) => {
const task = { id: taskId, request, status: "pending" };
created.push(task);
return task;
},
getCanvasImageTaskForUser: async ({ taskId }: { taskId: string }) => created.find((task) => task.id === taskId),
enqueueCanvasImageTask: async (taskId: string) => { queued.push(taskId); },
},
"@/lib/db/queries": {
getEnabledAiModelsWithProvider: async () => [{ model: { id: "fixture-model" } }],
checkUserImageQuota: async () => ({ allowed: true, limit: null }),
getPointsSystemConfig: async () => ({ enabled: false }),
getChatById: async () => ({ userId: owner }),
},
"@/app/(chat)/api/chat/_lib/detail-replacement": { resolveDirectReplacementModelRef: async () => "fixture-model" },
"@/app/(chat)/api/chat/_lib/agent-scene-workflow": {
buildAgentSlotPrompt: ({ workflowPrompt }: { workflowPrompt: string }) => workflowPrompt,
normalizeAgentSupplementPrompt: () => "",
},
})("app/api/agents/detail-replacement/batches/route.ts");
const post = (items: typeof references, replacementStrategy = "product_only", expectedModelId = "fixture-model") => route.POST(
new Request("http://localhost/api/agents/detail-replacement/batches", {
method: "POST",
body: JSON.stringify({
projectId: id, requestId: randomUUID(), references: items, replacementStrategy, expectedModelId,
prompt: "沿用品牌场景", productImageUrls: ["https://example.test/product.webp"],
}),
}),
);
for (const [count, strategy] of [[48, "product_only"], [64, "scene_replace"]] as const) {
const expectedIds = references.slice(0, count).map((ref) => ref.id);
const response = await post(references.slice(0, count), strategy);
expect(response.status).toBe(200);
expect((await response.json()).task.requestedCardIds).toEqual(expectedIds);
expect(created.at(-1)?.request.references.map((ref) => ref.id)).toEqual(expectedIds);
}
const overflow = await post(references);
expect(overflow.status).toBe(400);
expect((await overflow.json()).error).toContain("一次最多替换 64 张");
const changed = await post([{ ...references[0], imageUrl: "https://example.test/changed.webp" }]);
expect(changed.status).toBe(400);
expect((await changed.json()).error).toContain("尚未保存或已发生变化");
const changedModel = await post(references.slice(0, 48), "scene_replace", "outdated-model");
expect(changedModel.status).toBe(409);
expect((await changedModel.json()).code).toBe("DETAIL_REPLACEMENT_MODEL_CHANGED");
expect(queued).toEqual(created.map((task) => task.id));
expect(queued).toHaveLength(2);
});
test("duplicate POSTs return one project without overwriting saved state", async () => {
const { route, projects } = projectRoute();
const post = (title: string) => route.POST(new Request("http://localhost/api/agent-projects", { method: "POST", body: JSON.stringify({ id, title }) }));
@ -293,11 +214,6 @@ test("entry config stays small and unchanged config returns 304 before loading v
const entryData = await entry.json();
expect(entryData.agentWorkflowUiConfig.steps).toEqual([]);
expect(JSON.stringify(entryData).length).toBeLessThan(20_000);
const base = await (await route.GET(request("agent-canvas-base"))).json();
expect(base.agentWorkflowUiConfig.steps).toEqual([]);
const templates = await (await route.GET(request("agent-workflow-templates"))).json();
expect(templates.steps[0].options[0]).toMatchObject({ key: "test", buttonName: "风格一" });
expect(JSON.stringify(templates)).not.toContain("生成提示词");
const full = await route.GET(request("agent-canvas"));
expect((await full.json()).agentWorkflowUiConfig.steps[0].options[0].promptFragment).toBe("生成提示词".repeat(3000).slice(0, 20_000));
const etag = full.headers.get("ETag");
@ -311,25 +227,3 @@ test("entry config stays small and unchanged config returns 304 before loading v
expect(changed.status).toBe(200);
expect(changed.headers.get("ETag")).not.toBe(etag);
});
test("selected template prompts preserve the full path without downloading unrelated prompts", async () => {
const option = (key: string, promptFragment: string, children: unknown[] = []) => ({
key, buttonName: key, enabled: true, sortOrder: 0, promptFragment, children, previewImageUrl: "https://example.com/style.webp",
});
const value = { steps: [{ key: "style", title: "风格", enabled: true, sortOrder: 0, options: [
option("selected", "完整风格提示词", [option("leaf", "选中的子模板提示词")]),
option("unrelated", "不应下载的其他提示词"),
] }] };
const load = loadRuntime({
"@/app/(auth)/auth": { auth: async () => ({ user: { id: owner } }) },
"@/lib/db/queries": { getSystemSetting: async () => ({ value }) },
});
const { serializeAgentWorkflowSelectionPath } = load("lib/agents/workflow-ui-config.ts");
const { POST } = load("app/api/agent-workflow/template-prompts/route.ts");
const result = await POST(new Request("http://localhost/api/agent-workflow/template-prompts", {
method: "POST", body: JSON.stringify({ style: serializeAgentWorkflowSelectionPath(["selected", "leaf"]) }),
}));
expect(result.status).toBe(200);
const { selections } = await result.json();
expect(selections.map((s: { promptFragment: string }) => s.promptFragment)).toEqual(["完整风格提示词", "选中的子模板提示词"]);
});

View File

@ -2,57 +2,9 @@ import { expect, test } from "@playwright/test";
import { serverLoader } from "../helpers/canvas-download-server-loader";
import sharp from "sharp";
test("Qwen uses the public stored original without a second download and reports actual 2K output", async () => {
const png = await sharp({ create: { width: 384, height: 512, channels: 3, background: "blue" } }).png().toBuffer();
const source = "https://origin.example/uploads/fixture.png";
let submitted: any;
const methods: string[] = [];
const loader = serverLoader({
"@/lib/db/queries": { getDefaultStorageConfig: async () => ({ isEnabled: true, type: "qiniu-kodo", publicUrl: "https://cdn.example" }) },
"@/lib/storage/service": {},
"@/lib/storage/image-archive": { createDeferredUploadedImage: async () => ({ thumbnail: "https://cdn.example/thumb.png", original: "https://cdn.example/result.png" }) },
setTimeout: (callback: () => void, ms: number) => setTimeout(callback, ms === 5000 ? 0 : ms),
fetch: async (url: string, init: RequestInit = {}) => {
methods.push(init.method || "GET");
if (init.method === "POST") {
submitted = JSON.parse(String(init.body));
return Response.json({ output: { task_id: "public-reference-task" } });
}
if (!url.includes("/tasks/")) throw new Error("Reference bytes must be reused");
return Response.json({ output: { task_status: "SUCCEEDED", choices: [{ message: { content: [{ image: "https://result.example/output.png" }] } }] }, usage: { width: 1536, height: 2048 } });
},
}, { CANVAS_QINIU_ORIGIN_URL: "https://origin.example" });
const provider = loader("lib/ai/providers/alibaba-image.ts").createAlibabaImage({ apiKey: "fixture-key", baseURL: "https://dashscope.example" });
const result = await provider.chat("qwen-image-3.0").doGenerate({ messages: [{ role: "user", content: [
{ type: "text", text: "fixture" }, { type: "image", image: source },
] }], imageParams: { aspectRatio: "auto", imageSize: "4K" }, referenceImageBuffers: new Map([[source, png]]) });
expect(methods).toEqual(["POST", "GET"]);
expect(submitted.input.messages[0].content.find((part: any) => part.image).image).toBe("https://cdn.example/uploads/fixture.png");
expect(submitted.parameters.size).toBe("1536*2048");
expect(result.text).toContain("|||2K]");
expect(result.text).not.toContain("4K");
});
test("Qwen submission timeout remains unknown and never sends another POST", async () => {
const methods: string[] = [];
const loader = serverLoader({
"@/lib/db/queries": {}, "@/lib/storage/image-archive": {}, "@/lib/storage/service": {},
fetch: async (_url: string, init: RequestInit) => {
methods.push(init.method || "GET");
throw new DOMException("The operation was aborted", "AbortError");
},
});
const provider = loader("lib/ai/providers/alibaba-image.ts").createAlibabaImage({ apiKey: "fixture-key", baseURL: "https://dashscope.example" });
const error = await provider.chat("qwen-image-3.0").doGenerate({ messages: [{ role: "user", content: "fixture" }] }).catch((error: unknown) => error);
expect(methods).toEqual(["POST"]);
expect(error).toMatchObject({ providerOutcomeUnknown: true });
expect(loader("lib/request-error.ts").getRequestFailureDetails(error)).toMatchObject({ code: "RESULT_UNCONFIRMED", outcome: "unknown" });
});
test("Alibaba terminal task errors preserve the nested provider reason and do not resubmit", async () => {
const methods: string[] = [];
const loader = serverLoader({
"@/lib/db/queries": { getDefaultStorageConfig: async () => null },
"@/lib/storage/image-archive": {}, "@/lib/storage/service": {},
setTimeout: (callback: () => void, ms: number) => setTimeout(callback, ms === 5000 ? 0 : ms),
fetch: async (_url: string, init: RequestInit) => {
@ -84,7 +36,6 @@ test("Qwen 3 sends reference bytes directly with the right MIME and keeps auto r
let submitted: any;
let posts = 0;
const loader = serverLoader({
"@/lib/db/queries": { getDefaultStorageConfig: async () => null },
"@/lib/storage/image-archive": {}, "@/lib/storage/service": { uploadFile() { throw new Error("Reference transport must not upload an intermediate file"); } },
setTimeout: (callback: () => void, ms: number) => setTimeout(callback, ms === 5000 ? 0 : ms),
fetch: async (url: string, init: RequestInit = {}) => {
@ -113,7 +64,6 @@ test("Qwen 3 sends reference bytes directly with the right MIME and keeps auto r
test("a timed out reference read is safe to retry because no generation was submitted", async () => {
const methods: string[] = [];
const loader = serverLoader({
"@/lib/db/queries": { getDefaultStorageConfig: async () => null },
"@/lib/storage/image-archive": {}, "@/lib/storage/service": {},
setTimeout: (callback: () => void, ms: number) => setTimeout(callback, ms === 500 ? 0 : ms),
fetch: async (_url: string, init: RequestInit = {}) => {
@ -135,7 +85,6 @@ test("a timed out reference read is safe to retry because no generation was subm
test("a failed status lookup after Alibaba accepts the request keeps its outcome unknown", async () => {
const methods: string[] = [];
const loader = serverLoader({
"@/lib/db/queries": { getDefaultStorageConfig: async () => null },
"@/lib/storage/image-archive": {}, "@/lib/storage/service": {},
setTimeout: (callback: () => void, ms: number) => setTimeout(callback, ms === 5000 ? 0 : ms),
fetch: async (_url: string, init: RequestInit = {}) => {

View File

@ -1,30 +1,10 @@
import { expect, test } from "@playwright/test";
import { VIP98K_TASK_POLL_SECONDS } from "@/lib/ai/vip98k-runtime-config";
import { agentImageProviderHarness as harness } from "../helpers/agent-image-provider-harness";
import { agentImageFailurePolicy } from "@/lib/ai/runtime/agent-image-failover";
import { ImageSubmissionRejectedError, agentImageGenerationError } from "@/lib/ai/runtime/image-generation-error";
import * as generationErrors from "@/lib/ai/runtime/image-generation-error";
import { serverLoader } from "../helpers/canvas-download-server-loader";
test("the canvas deadline leaves room for 98K polling, submission and result delivery", () => {
const h = harness();
const timeout = h.providerTimeout({ debugLabel: "canvas-agent", providerType: "vip98k" });
expect(timeout).toBeGreaterThan(VIP98K_TASK_POLL_SECONDS * 1000);
expect(timeout).toBe(20 * 60_000);
expect(h.providerTimeout({ debugLabel: "canvas-agent", providerType: "alibaba" })).toBe(10 * 60_000);
expect(h.providerTimeout({ debugLabel: "canvas-scale-adjust", providerType: "vip98k" })).toBe(3 * 60_000);
});
test("an unsupported pinned resolution is rejected before submission and can be corrected", async () => {
const models = [{ model: { id: "primary", modelId: "primary", isEnabled: true, supportsImageGen: true,
imageGenConfig: { supportedImageSizes: ["1K", "2K"] } }, provider: { id: "provider", type: "openai-image", isEnabled: true } }];
const h = harness({ models });
await expect(h.generate({ ...h.request, agentImageMode: "pinned", imageSize: "4K" })).rejects.toMatchObject({
confirmedNoResult: true, message: expect.stringMatching(/尚未提交.*调整清晰度后重试/),
});
expect(h.calls).toHaveLength(0);
});
test("a balance rejection skips other models on the same account but permits another account of the same provider type", async () => {
const models = ["primary", "same-account", "backup"].map(id => ({
model: { id, modelId: id, displayName: id, isEnabled: true, supportsImageGen: true, supportsVision: true, imageGenConfig: { maxImages: 1 }, capabilities: { kind: "image" } },

View File

@ -130,34 +130,6 @@ test("actual dimensions override a model's claim that the output passed", async
expect(result.failedNodeIds).toEqual(["result"]);
expect(result.issues.join(" ")).toContain("3:4");
});
test("selected output ratio takes precedence over a stale plan and allows pixel rounding", async () => {
const f = await fixture('{"passed":true,"issues":[]}', { width: 1147, height: 1536 });
f.params.snapshot.requirements!.aspectRatio = "1:1";
f.params.snapshot.imagePreferences = { parameters: { aspectRatio: "3:4", imageSize: "2K" } };
f.params.snapshot.calls[1].output!.appliedImagePreferences = { aspectRatio: "3:4" };
const result = await verifyCanvasAgentResults(f.params);
expect(result.passed).toBe(true);
const prompt = JSON.stringify(f.requests[0].prompt);
expect(prompt).toContain("结果的目标比例为 3:4");
expect(prompt).toContain("不能扩大用户要求");
});
test("a wrong output ratio still fails when the vision model accepts it", async () => {
const f = await fixture('{"passed":true,"issues":[]}', { width: 60, height: 40 });
f.params.snapshot.imagePreferences = { parameters: { aspectRatio: "3:4" } };
const result = await verifyCanvasAgentResults(f.params);
expect(result).toMatchObject({ passed: false, failedNodeIds: ["result"] });
});
test("image inspection returns the text it read and retains real text failures", async () => {
const f = await fixture('{"passed":false,"issues":["结果仍为测试15mm,未改为测试20mm"],"failedNodeIds":["result"],"observations":["result:蓝色杯子,杯身文字为测试15mm"]}');
const inspection = await analyzeRuntimeImages({ ...f.params, nodeIds: ["result"], question: "读出杯身文字" });
expect(inspection.observations).toEqual(["result:蓝色杯子,杯身文字为测试15mm"]);
const result = await verifyCanvasAgentResults(f.params);
expect(result).toMatchObject({ passed: false, failedNodeIds: ["result"] });
expect(result.issues).toContain("结果仍为测试15mm,未改为测试20mm");
});
test("a filtered structured review is a policy rejection, never a reason to switch providers", async () => {
const f = await fixture("");
const model = f.params.model;

View File

@ -124,7 +124,6 @@ test("requested downloads are prioritized with two workers before scanning backg
},
"./image-byte-cache": { fetchImageBytes: async () => { active++; maximum = Math.max(maximum, active); await new Promise<void>(resolve => releases.push(resolve)); active--; return { buffer: bytes, contentType: "image/png" }; }, cacheImageBytes: async () => {} },
"@/lib/canvas/photoshop-safe-download": { normalizeCanvasDownloadAsset: async () => ({ ok: true, bytes, contentType: "image/png" }) },
"./qiniu-image-archive": { getReadyQiniuImageDownload: async () => undefined, prepareQiniuWebpDownload: async () => undefined },
"./service": { uploadFile() { throw new Error("Compatible PNG must retain its object"); } },
})("lib/storage/image-download-preparation.ts");
worker.scheduleImageDownloadPreparation("one"); worker.scheduleImageDownloadPreparation("two"); worker.scheduleImageDownloadPreparation("three");

View File

@ -106,16 +106,10 @@ test("compatible PNG remains byte-identical; JPEG becomes RGB PNG without resizi
const module = serverLoader({})("lib/canvas/photoshop-safe-download.ts");
const bytes = await sharp({ create: { width: 32, height: 48, channels: 4, background: "#12345680" } }).png().toBuffer();
expect((await module.convertImageToPhotoshopPng(bytes)).equals(bytes)).toBe(true);
const rgb16 = await sharp(bytes).toColourspace("rgb16").png().toBuffer();
expect((await module.convertImageToPhotoshopPng(rgb16)).equals(rgb16)).toBe(true);
const jpeg = await sharp(bytes).jpeg().toBuffer();
const converted = await module.convertImageToPhotoshopPng(jpeg);
const metadata = await sharp(converted).metadata();
expect(metadata).toMatchObject({ format: "png", space: "srgb", width: 32, height: 48, depth: "uchar" });
const webp = await sharp(bytes).withIccProfile("p3").webp().toBuffer();
const webpPng = await module.convertImageToPhotoshopPng(webp);
const webpPngMetadata = await sharp(webpPng).metadata();
expect(webpPngMetadata).toMatchObject({ format: "png", width: 32, height: 48, hasAlpha: true, hasProfile: true });
});
test("CDN delivery requires a ready compatible asset and a configured HTTPS storage origin", async () => {
let url = "https://cdn.example/uploads/test.png";
@ -137,7 +131,7 @@ test("PNG preparation failure leaves the original archived and schedules a retry
const module = serverLoader({
"./image-archive-db": { claimImageDownloadTask: async () => ({ id: "task", targetUrl: "https://cdn.example/original.png", metadata: { downloadAsset: { attempts: 2 } } }), saveImageDownloadAsset: async (_id: string, asset: any) => { saved = asset; } },
"./image-byte-cache": { fetchImageBytes: async () => { throw new Error("storage offline"); } },
"./qiniu-image-archive": { getReadyQiniuImageDownload: async () => undefined, prepareQiniuWebpDownload: async () => undefined },
"./qiniu-image-archive": { getReadyQiniuImageDownload: async () => undefined },
"./service": {},
})("lib/storage/image-download-preparation.ts");
await module.prepareImageArchiveDownload("task");

View File

@ -1,75 +0,0 @@
import { expect, test } from "@playwright/test";
import { readFileSync } from "node:fs";
import { createRequire } from "node:module";
import { resolve } from "node:path";
import { runInNewContext } from "node:vm";
import ts from "typescript";
const filename = resolve("app/api/canvas/text-detect/route.ts");
const requireModule = createRequire(filename);
const source = ts.transpileModule(readFileSync(filename, "utf8"), {
compilerOptions: { module: ts.ModuleKind.CommonJS, esModuleInterop: true },
}).outputText;
function createRoute(params: {
enableOcr: boolean;
recognize: () => unknown;
qwen: () => unknown;
fetchResult: () => Response;
}) {
const module = { exports: {} as { POST: (request: Request) => Promise<Response> } };
const mocks: Record<string, unknown> = {
"next/server": { NextResponse: Response },
"drizzle-orm": { and() {}, inArray() {}, eq() {} },
"@/app/(auth)/auth": { auth: async () => ({ user: { id: "signed-in" } }) },
"@/lib/ai/qwen3-vl": { callQwen3Vl: params.qwen },
"@/lib/ai/vip98k-runtime": {
getVip98kRuntimeProviders: async () => [{ id: "98k" }],
executeConfiguredVip98kTask: params.recognize,
},
"@/lib/db": {
db: { query: { aiModel: { findFirst: async () => params.enableOcr ? { providerId: "98k" } : undefined } } },
},
"@/lib/db/schema": { aiModel: {} },
"@/lib/observability/logger": { createLogger: () => ({ debug() {}, warn() {}, error() {} }) },
};
runInNewContext(source, {
exports: module.exports,
require: (id: string) => mocks[id] ?? requireModule(id),
fetch: params.fetchResult,
AbortSignal,
});
return module.exports.POST;
}
const request = () => new Request("http://test/api/canvas/text-detect", {
method: "POST",
body: JSON.stringify({ imageUrl: "https://assets.test/item.png" }),
});
test("configured OCR returns numbered product labels without sending a second model request", async () => {
const post = createRoute({
enableOcr: true,
recognize: () => ({ outputUrls: ["https://assets.test/result"] }),
fetchResult: () => new Response("\uFEFFSKU 731\r\n60 CM", { headers: { "Content-Type": "text/plain" } }),
qwen: () => { throw new Error("The working OCR tool must not call Qwen"); },
});
const response = await post(request());
expect(response.status).toBe(200);
expect(await response.json()).toEqual({
success: true,
data: { model: "ocr", items: [{ id: "1", text: "SKU 731" }, { id: "2", text: "60 CM" }] },
});
});
test("a valid empty OCR response shows no editable text", async () => {
const post = createRoute({
enableOcr: false,
recognize: () => { throw new Error("Disabled OCR must not submit"); },
fetchResult: () => { throw new Error("No OCR file expected"); },
qwen: () => ({ model: "qwen", text: '{"items":[]}' }),
});
const response = await post(request());
expect(response.status).toBe(200);
expect((await response.json()).data.items).toEqual([]);
});

View File

@ -1,62 +1,5 @@
import { expect, test } from "@playwright/test";
import sharp from "sharp";
import { resolveAlibabaExtendApiKey, resolveFalExtendApiKey } from "@/lib/ai/extend/config";
import { composeOutpaint, getOutpaintGeometry } from "@/lib/ai/extend/fal-outpaint";
import { expandWithVip98kOutpaint, getVip98kOutpaintGeometry } from "@/lib/ai/extend/vip98k-outpaint";
import { serverLoader } from "../helpers/canvas-download-server-loader";
test("native expansion sends the original image and never switches models after an upstream failure", async () => {
for (const message of ["HTTP 503 unavailable", "request timed out"]) {
const calls: any[] = [];
const service = serverLoader({
"@/lib/db/queries": { getSystemSetting: async () => ({ value: { provider: "vip98k", modelId: "image-expansion" } }) },
"@/lib/db": {},
"@/lib/db/schema": {},
"@/lib/storage/service": {},
"@/lib/storage/image-archive": {},
"@/lib/ai/vip98k-runtime": {
executeConfiguredVip98kTask: async (params: unknown) => { calls.push(params); throw new Error(message); },
},
})("lib/ai/extend/service.ts");
await expect(service.executeExtendJob({ userId: "test", imageUrl: "https://source.test/original.jpg", xScale: 1.5, yScale: 2 })).rejects.toThrow(message);
expect(calls).toEqual([{ modelId: "image-expansion", kind: "image-tool", imageUrls: ["https://source.test/original.jpg"], imageParams: { xScale: 1.5, yScale: 2 } }]);
}
});
test("native expansion archives the completed image without transferring its bytes through the app", async () => {
const calls: string[] = [];
const service = serverLoader({
"@/lib/db/queries": { getSystemSetting: async () => ({ value: { provider: "vip98k", modelId: "image-expansion" } }) },
"@/lib/db": {},
"@/lib/db/schema": {},
"@/lib/storage/service": {},
"@/lib/ai/vip98k-runtime": { executeConfiguredVip98kTask: async () => ({ outputUrls: ["https://relay.test/result.png"] }) },
"@/lib/storage/image-archive": { archiveTemporaryImage: async (url: string, id: string) => {
calls.push(url, id);
return { url: "https://cdn.test/native.png", thumbnailUrl: "https://cdn.test/native.png", bytes: 12375212 };
} },
})("lib/ai/extend/service.ts");
const result = await service.executeExtendJob({ userId: "test", imageUrl: "https://source.test/original.jpg", requestId: "request-1", skipGallerySave: true });
expect(calls).toEqual(["https://relay.test/result.png", "request-1"]);
expect(result.original_url).toBe("https://cdn.test/native.png");
expect(result.image_base64).toBeUndefined();
});
test("native expansion still returns image bytes to callers requesting base64", async () => {
const image = await sharp({ create: { width: 12, height: 8, channels: 3, background: "red" } }).png().toBuffer();
const service = serverLoader({
"@/lib/db/queries": { getSystemSetting: async () => ({ value: { provider: "vip98k", modelId: "image-expansion" } }) },
"@/lib/db": {},
"@/lib/db/schema": {},
"@/lib/storage/service": { uploadFile: async (name: string) => ({ url: `https://cdn.test/${name}` }) },
"@/lib/storage/image-archive": { archiveTemporaryImage: () => { throw new Error("Base64 callers need the image bytes"); } },
"@/lib/ai/vip98k-runtime": { executeConfiguredVip98kTask: async () => ({ outputUrls: ["https://relay.test/result.png"] }) },
fetch: async () => new Response(new Uint8Array(image)),
})("lib/ai/extend/service.ts");
const result = await service.executeExtendJob({ userId: "test", imageUrl: "https://source.test/original.jpg", includeBase64: true, skipGallerySave: true });
expect(result.image_base64).toBe(image.toString("base64"));
expect(result.original_url).toMatch(/\.png$/);
});
import { resolveAlibabaExtendApiKey } from "@/lib/ai/extend/config";
test.describe("image extension provider configuration", () => {
test("uses the most recently updated Alibaba image provider key", () => {
@ -80,100 +23,4 @@ test.describe("image extension provider configuration", () => {
).toBe("legacy-key");
expect(resolveAlibabaExtendApiKey([], "")).toBeNull();
});
test("uses an official fal provider key, not a key configured for a relay", () => {
expect(resolveFalExtendApiKey([
{ baseUrl: "https://relay.example.test", apiKey: "relay-key" },
{ baseUrl: "https://queue.fal.run", apiKey: "Key official-key" },
])).toBe("official-key");
});
});
test("outpainting restores every original pixel in place and keeps the generated border", async () => {
const geometry = getOutpaintGeometry(13, 9, 1.5, 1.5);
const { paddedWidth, paddedHeight, left, top } = geometry;
const pixel = Buffer.from([42, 93, 190, 255, 30, 80, 20, 75]);
const raw = Buffer.concat(Array.from({ length: 59 }, () => pixel)).subarray(0, 13 * 9 * 4);
const source = await sharp(raw, { raw: { width: 13, height: 9, channels: 4 } }).png().toBuffer();
const expanded = await sharp({ create: { width: paddedWidth, height: paddedHeight, channels: 3, background: "#d8bc9e" } }).png().toBuffer();
const composed = await composeOutpaint(source, expanded, geometry);
const area = await sharp(composed).extract({ left, top, width: 13, height: 9 }).raw().toBuffer();
expect(area.equals(raw)).toBe(true);
expect([...await sharp(composed).extract({ left: 0, top: 0, width: 1, height: 1 }).raw().toBuffer()]).toEqual([216, 188, 158, 255]);
await expect(composeOutpaint(source, source, geometry)).rejects.toThrow("尺寸不正确");
});
test("a 4K source keeps its target output size while the model works within its limit", () => {
const g = getOutpaintGeometry(4096, 4096, 1.5, 1.5);
expect([g.targetWidth, g.targetHeight, g.left, g.top]).toEqual([6144, 6144, 1024, 1024]);
expect([g.paddedWidth, g.paddedHeight]).toEqual([2048, 2048]);
expect(g.expandLeft + g.sourceWidth + g.expandRight).toBe(g.paddedWidth);
expect(g.expandTop + g.sourceHeight + g.expandBottom).toBe(g.paddedHeight);
expect(Math.abs(g.expandLeft - g.expandRight)).toBeLessThanOrEqual(1);
});
test("relay outpainting pads to a supported ratio without cutting the source", () => {
const g = getVip98kOutpaintGeometry(621, 515, 1.5, 1.5);
expect([g.targetWidth, g.targetHeight]).toEqual([932, 773]);
expect(g.aspectRatio).toBe("4:3");
expect(g.modelWidth).toBeGreaterThanOrEqual(g.targetWidth);
expect(g.modelHeight).toBeGreaterThanOrEqual(g.targetHeight);
expect(g.left + g.sourceWidth).toBeLessThanOrEqual(g.modelWidth);
const large = getVip98kOutpaintGeometry(4096, 4096, 1.5, 1.5);
expect([large.targetWidth, large.targetHeight]).toEqual([6144, 6144]);
expect(Math.max(large.modelWidth, large.modelHeight)).toBe(2048);
});
test("relay outpainting uses one image request and keeps the complete generated result", async () => {
const originalFetch = globalThis.fetch;
const source = await sharp({ create: { width: 40, height: 30, channels: 3, background: "red" } }).png().toBuffer();
const generated = await sharp({ create: { width: 80, height: 60, channels: 3, background: "blue" } }).png().toBuffer();
try {
for (const outputUrl of ["https://relay.test/api/external/assets/result", "https://cdn.test/result.png"]) {
let submitted = 0;
globalThis.fetch = async (input, init) => {
const url = String(input);
if (url === "https://source.test/input.png") return new Response(new Uint8Array(source));
if (url === "https://relay.test/v1/images/edits") {
submitted++;
const body = init?.body as FormData;
expect(body.get("model")).toBe("gpt-image-2.5-flare");
expect(body.get("n")).toBe("1");
expect(body.get("size")).toBe("4:3");
expect(body.get("response_format")).toBe("url");
expect(body.get("image[]")).toBeInstanceOf(Blob);
expect(new Headers(init?.headers).get("X-Relay-Route-Option")).toBe("selected-route");
return Response.json({ data: [{ url: outputUrl }] });
}
expect(url).toBe(outputUrl);
expect(new Headers(init?.headers).get("Authorization")).toBe(outputUrl.includes("relay.test") ? "Bearer test-key" : null);
return new Response(new Uint8Array(generated));
};
const result = await expandWithVip98kOutpaint({ imageUrl: "https://source.test/input.png", baseUrl: "https://relay.test/v1", apiKey: "test-key", routeOptionId: "selected-route", xScale: 1.5, yScale: 1.5 });
const metadata = await sharp(result).metadata();
expect([metadata.width, metadata.height]).toEqual([60, 45]);
const pixel = await sharp(result).extract({ left: 30, top: 22, width: 1, height: 1 }).removeAlpha().raw().toBuffer();
expect([...pixel]).toEqual([0, 0, 255]);
expect(submitted).toBe(1);
}
} finally {
globalThis.fetch = originalFetch;
}
});
test("relay outpainting does not resubmit a failed generation", async () => {
const originalFetch = globalThis.fetch;
const source = await sharp({ create: { width: 40, height: 30, channels: 3, background: "red" } }).png().toBuffer();
let submitted = 0;
try {
globalThis.fetch = async (input) => {
if (String(input) === "https://source.test/input.png") return new Response(new Uint8Array(source));
submitted++;
return Response.json({ error: { message: "service unavailable" } }, { status: 503 });
};
await expect(expandWithVip98kOutpaint({ imageUrl: "https://source.test/input.png", baseUrl: "https://relay.test", apiKey: "test-key", routeOptionId: "selected-route", xScale: 1.5, yScale: 1.5 })).rejects.toThrow("service unavailable");
expect(submitted).toBe(1);
} finally {
globalThis.fetch = originalFetch;
}
});

View File

@ -86,7 +86,6 @@ const loggerMock = { createLogger: () => ({ info() {}, warn() {}, error() {} })
test("Qiniu archives 98K originals without relaying full image bytes through the app", async () => {
const image = sharp({ create: { width: 4, height: 4, channels: 3, background: "blue" } });
const rgb = await image.clone().withIccProfile("srgb").png().toBuffer();
const rgb16 = await image.clone().toColourspace("rgb16").png().toBuffer();
const indexed = await image.clone().png({ palette: true }).toBuffer();
const config = { provider: "qiniu-kodo", region: "cn-east-1", bucket: "archive",
accessKeyId: "test-key", secretAccessKey: "test-secret", publicUrl: "https://bucket.example" };
@ -123,13 +122,11 @@ test("Qiniu archives 98K originals without relaying full image bytes through the
})("lib/storage/qiniu-image-archive.ts");
const archived = await load.archiveImageThroughQiniu(source, id);
expect(archived.downloadAsset).toMatchObject({ status: "ready", url: archiveUrl, bytes: rgb.length });
stored = rgb16;
expect((await load.archiveImageThroughQiniu(source, id)).downloadAsset).toMatchObject({ status: "ready", url: archiveUrl, bytes: rgb16.length });
stored = indexed;
expect((await load.archiveImageThroughQiniu(source, id)).downloadAsset).toBeUndefined();
expect(await load.archiveImageThroughQiniu("data:image/png;base64,aW1hZ2U=", id)).toBeNull();
expect(cloudCalls).toHaveLength(3);
expect(reads).toHaveLength(3);
expect(await load.archiveImageThroughQiniu("https://another-provider.example/result.png", id)).toBeNull();
expect(cloudCalls).toHaveLength(2);
expect(reads).toHaveLength(2);
});
test("160 requests from the same user and model start without admission waiting", async () => {
@ -242,23 +239,31 @@ test("inline outputs have short, stable preview identities and durable queue pay
test("background storage starts after delivery and coalesces repeated wakeups", async () => {
const callbacks: Array<() => Promise<void>> = [];
const preferences: Array<string | undefined> = [];
let runs = 0;
const module = serverLoader({
"next/server": { after: (fn: () => Promise<void>) => callbacks.push(fn) },
"./image-archive-db": { recoverStaleImageArchiveTasks: async () => {}, hasPendingImageArchives: async () => false, hasPendingImageDownloads: async () => false },
"./image-download-preparation": { scheduleImageDownloadPreparation() {} },
"next/server": {
after: (fn: () => Promise<void>) => {
callbacks.push(fn);
},
},
"@/lib/jobs/image-archive-job": {
storeNextImageArchive: async (id?: string) => { preferences.push(id); return false; },
replacePendingImageArchives: async () => 0,
runImageArchiveJob: async () => {
runs += 1;
return {
store: { total: runs === 1 ? 1 : 0 },
replace: { total: 0 },
stats: { pendingStore: 0, pendingReplace: 0 },
downloadTasks: 0,
};
},
},
})("lib/storage/image-archive-worker.ts");
module.scheduleImageArchiveWorker();
module.scheduleImageArchiveWorker(false, "requested-image");
module.scheduleImageArchiveWorker();
expect(callbacks).toHaveLength(1);
expect(preferences).toEqual([]);
expect(runs).toBe(0);
await callbacks[0]();
expect(preferences[0]).toBe("requested-image");
expect(preferences).toHaveLength(4);
expect(runs).toBe(2);
});
test("bucket failure retains the provider URL and retry task", async () => {
@ -654,15 +659,21 @@ test("replacement retries reconcile late writes once, without reclaiming complet
test("detached generation still archives when its original request has already closed", async () => {
let runs = 0;
const module = serverLoader({
// A closed request may accept a callback that is never invoked.
"next/server": { after: () => {} },
"./image-archive-db": { recoverStaleImageArchiveTasks: async () => {}, hasPendingImageArchives: async () => false, hasPendingImageDownloads: async () => false },
"./image-download-preparation": { scheduleImageDownloadPreparation() {} },
"@/lib/jobs/image-archive-job": {
storeNextImageArchive: async () => { runs++; return false; },
replacePendingImageArchives: async () => 0,
runImageArchiveJob: async () => {
runs += 1;
return {
store: { total: 0 },
replace: { total: 0 },
stats: { pendingStore: 0, pendingReplace: 0 },
downloadTasks: 0,
};
},
},
})("lib/storage/image-archive-worker.ts");
module.scheduleImageArchiveWorker();
expect(runs).toBe(0);
await expect.poll(() => runs, { timeout: 5_000 }).toBe(4);
await expect.poll(() => runs, { timeout: 5_000 }).toBe(1);
});

View File

@ -1,67 +0,0 @@
import { test, expect } from "@playwright/test";
import { serverLoader } from "../helpers/canvas-download-server-loader";
test("a slow original and slow reference updates do not block later files or new downloads", async () => {
let finishSlow!: () => void;
let finishReplacement!: () => void;
const slow = new Promise<void>(resolve => { finishSlow = resolve; });
const replacement = new Promise<void>(resolve => { finishReplacement = resolve; });
const pending = Array.from({ length: 25 }, (_, i) => `image-${i}`);
const completed: string[] = [];
const callbacks: Array<() => Promise<void>> = [];
let active = 0;
let peak = 0;
let replacing = false;
const module = serverLoader({
"next/server": { after: (callback: () => Promise<void>) => callbacks.push(callback) },
"./image-archive-db": { recoverStaleImageArchiveTasks: async () => {}, hasPendingImageArchives: async () => false, hasPendingImageDownloads: async () => false },
"./image-download-preparation": { scheduleImageDownloadPreparation() {} },
"@/lib/jobs/image-archive-job": {
storeNextImageArchive: async (preferred?: string) => {
const index = preferred ? pending.indexOf(preferred) : -1;
const id = pending.splice(index < 0 ? 0 : index, 1)[0];
if (!id) return false;
active++; peak = Math.max(peak, active);
if (id === "image-0") await slow;
else await new Promise(resolve => setTimeout(resolve, 1));
completed.push(id); active--;
return true;
},
replacePendingImageArchives: async () => { replacing = true; await replacement; return 0; },
},
})("lib/storage/image-archive-worker.ts");
module.scheduleImageArchiveWorker();
await callbacks.shift()!();
await expect.poll(() => completed.length).toBe(24);
expect(completed).not.toContain("image-0");
expect(replacing).toBe(true);
pending.push("new-download");
module.scheduleImageArchiveWorker(false, "new-download");
await callbacks.shift()!();
await expect.poll(() => completed.includes("new-download")).toBe(true);
expect(peak).toBeLessThanOrEqual(4);
finishSlow(); finishReplacement();
await expect.poll(() => completed.length).toBe(26);
expect(new Set(completed).size).toBe(26);
});
test("conversion requests wait for the original archive and never invoke the relay preparation queue", async () => {
const pending = { id: "queued", sourceUrl: "https://model.example/image", status: "pending" };
const route = serverLoader({
"next/server": { NextResponse: Response },
"@/app/(auth)/auth": { auth: async () => ({ user: { id: "test" } }) },
"@/lib/storage/image-download-preparation": { scheduleImageDownloadPreparation() {} },
"@/lib/storage/canvas-cdn-download": { resolveCanvasCdnDownload: async () => ({ task: pending, direct: null, canPrepareDirect: false }) },
"@/lib/storage/original-image-download": {
prepareOriginalImageArchive: async () => pending,
originalImagePreparing: () => ({ delivery: "preparing", phase: "preparing", requestId: pending.id }),
},
"@/lib/canvas/download-preparation": { getDownloadPreparationQueue() { throw new Error("Must not relay image bytes"); } },
})("app/api/canvas/download-image/route.ts");
const response = await route.POST(new Request("https://app.example/api/canvas/download-image", {
method: "POST", headers: { "content-type": "application/json" },
body: JSON.stringify({ url: pending.sourceUrl, preferDirect: true, preparation: "async" }),
}));
expect(response.status).toBe(202);
expect(await response.json()).toMatchObject({ delivery: "preparing", phase: "preparing" });
});

View File

@ -7,177 +7,6 @@ import { serverLoader } from "../helpers/canvas-download-server-loader";
import { NextResponse } from "next/server";
test.describe("Qiniu image delivery", () => {
test("coalesces nearby configured CDN preview sizes and quality while preserving original URLs", () => {
const source = "https://cdn.example/uploads/sample.png";
const { buildImageProxyUrl: build } = serverLoader({}, {
NEXT_PUBLIC_CANVAS_CDN_ORIGIN: "https://cdn.example",
})("lib/image-delivery.ts");
expect(build(source, { width: 329, quality: 86, format: "webp" })).toBe(
`${source}?imageView2/2/w/360/format/webp/q/88`,
);
expect(build(source, { width: 331, quality: 92, format: "webp" })).toBe(
build(source, { width: 360, quality: 88, format: "webp" }),
);
expect(build(source, { width: 640, quality: 76, format: "webp" })).toContain("w/640/format/webp/q/76");
expect(build(source, { width: 960, quality: 92, format: "webp" })).toContain("w/960/format/webp/q/88");
expect(build(`${source}?token=signed`, { width: 331, format: "webp" })).toBe(`${source}?token=signed`);
expect(build(source)).toBe(source);
expect(new URL(build(source, { delivery: "original" }), "https://app.example").searchParams.get("url")).toBe(source);
expect(build("https://yybb.top/uploads/sample.png", { width: 331, quality: 92, format: "webp" })).toContain("w/331/format/webp/q/92");
});
for (const mode of ["cdn", "storage", "signed"] as const) {
test(`98K reference staging reads complete image bytes via ${mode}`, async () => {
const original = await sharp({ create: { width: 64, height: 64, channels: 3, background: "#a45623" } }).png().toBuffer();
const cdn = "https://cdn.example";
const source = `${cdn}/media/uploads/reference.png${mode === "signed" ? "?token=signed" : ""}`;
const calls: string[] = [];
const command = (operation: string) => class {
operation = operation;
constructor(public input: { Key: string; Body?: Buffer }) {}
};
const config = { provider: "qiniu-kodo", bucket: "images", publicUrl: `${cdn}/media` };
const load = serverLoader({
"./vip98k-chat": {},
"@/lib/db/queries": { getDefaultStorageConfig: async () => config, getSystemSetting: async () => null },
"@/lib/storage/image-archive": {},
"@aws-sdk/client-s3": {
GetObjectCommand: command("get"), HeadObjectCommand: command("head"), PutObjectCommand: command("put"),
},
"@/lib/storage/service": {
toDbS3UploadConfig: () => config,
buildS3PublicUrl: (_: unknown, key: string) => `${config.publicUrl}/${key}`,
createS3Client: () => ({ send: async ({ operation, input }: { operation: string; input: { Key: string; Body: Buffer } }) => {
calls.push(operation);
if (operation === "head") return {};
if (operation === "get") {
expect(input.Key).toBe("uploads/reference.png");
return { Body: { transformToByteArray: async () => original }, ContentLength: original.length };
}
expect((await sharp(input.Body).metadata()).format).toBe("jpeg");
return {};
} }),
},
"@/lib/observability/logger": { createLogger: () => ({ debug() {}, info() {}, warn() {}, error() {} }) },
fetch: async (url: string, init: RequestInit) => {
if (url === source) {
calls.push("cdn");
expect(init.redirect).toBe("error");
return mode === "cdn"
? new Response(original, { headers: { "content-type": "image/png", "content-length": String(original.length) } })
: new Response(original.subarray(0, 4), { headers: { "content-type": "image/png", "content-length": String(original.length) } });
}
calls.push("submit");
expect(String(init.body)).toContain("vip98k-cache-v2");
return Response.json({ taskId: "test-task", task_id: "test-task" });
},
}, { NEXT_PUBLIC_CANVAS_CDN_ORIGIN: cdn });
const { submitVip98kExternalTask } = load("lib/ai/providers/vip98k.ts");
await submitVip98kExternalTask({ apiKey: "test", modelId: "google/nano-banana-2", kind: "image", imageUrls: [source], durable: true });
expect(calls).toEqual(["head", ...(mode !== "signed" ? ["cdn"] : []), ...(mode !== "cdn" ? ["get"] : []), "put", "submit"]);
});
}
for (const [source, reusesSource] of [
["https://cdn.example/media/uploads/source.png", true],
["https://cdn.example/media/uploads/direct/1a868070-0d5b-4c99-937d-f10d6dc59612/source.png", true],
["https://cdn.example/media/uploads/source.png?token=temporary", false],
["https://cdn.example/media-other/uploads/source.png", false],
] as const) {
test(`watermark removal handles ${source} according to its storage origin and signature`, async () => {
const storedResult = "https://cdn.example/media/uploads/result.png";
const uploadedInput = "https://cdn.example/media/uploads/staged.png";
const transferred: string[] = [];
const uploaded: string[] = [];
const saved: string[] = [];
const route = serverLoader({
"next/server": { NextResponse: Response },
"@/app/(auth)/auth": { auth: async () => ({ user: { id: "user-1" } }) },
"@/lib/db": { db: {
select: () => ({ from: () => ({ where: () => ({ limit: async () => [{ value: { apiKey: "fixture" } }] }) }) }),
insert: () => ({ values: (row: { originalUrl: string }) => ({
returning: async () => { saved.push(row.originalUrl); return [{ id: "image-1" }]; },
}) }),
} },
"@/lib/db/schema": { systemSettings: {}, generatedImage: {} },
"drizzle-orm": { eq: () => null },
"@/lib/db/queries": {
getDefaultStorageConfig: async () => ({ type: "qiniu-kodo", isEnabled: true, publicUrl: "https://cdn.example/media" }),
getPointsSystemConfig: async () => ({}),
getMediaAssetsByUserAndUrls: async () => [],
upsertMediaAsset: async () => null,
},
"@/lib/storage/service": {
uploadFile: async (filename: string) => { uploaded.push(filename); return { url: uploadedInput }; },
},
"@/lib/points/feature-charge": { prepareFeaturePointsCharge: async () => ({ ok: true, chargeable: false }) },
"@/lib/points/config": { getImageToolCreditCost: () => 0 },
"@/lib/canvas/generate-image": {},
fetch: async (url: string, init?: RequestInit) => {
if (new URL(url).hostname === "techsz.aoscdn.com") {
if (init?.method === "POST") {
expect((init.body as FormData).get("url")).toBe(reusesSource ? source : uploadedInput);
return Response.json({ data: { task_id: "fixture-task" } });
}
return Response.json({ data: { state: 1, file: storedResult } });
}
transferred.push(url);
return new Response(new Uint8Array([1, 2, 3]));
},
})("app/api/watermark-remove/route.ts");
const response = await route.POST(new Request("https://app.example/api/watermark-remove", {
method: "POST",
body: JSON.stringify({ image_url: source }),
}));
expect(await response.json()).toMatchObject({ success: true, original_url: storedResult });
expect(transferred).toEqual(reusesSource ? [] : [source]);
expect(uploaded).toHaveLength(reusesSource ? 0 : 1);
expect(saved).toEqual([storedResult]);
});
}
for (const formWorks of [true, false]) {
test(`local edit storage ${formWorks ? "uses Qiniu form upload" : "reuses the same key on S3 fallback"}`, async () => {
const bytes = new Uint8Array([1, 2, 3]).buffer;
const config = {
id: "fixture", type: "qiniu-kodo", isEnabled: true, region: "cn-east-1",
endpoint: "https://s3.example", publicUrl: "https://cdn.example",
bucket: "images", accessKeyId: "fixture-ak", secretAccessKey: "fixture-sk",
};
let formKey = "";
const s3Keys: string[] = [];
const storage = serverLoader({
"@vercel/blob": {},
"@aws-sdk/client-s3": {
PutObjectCommand: class { constructor(public input: { Key: string }) {} },
S3Client: class {
async send(command: { input: { Key: string } }) { s3Keys.push(command.input.Key); }
},
},
"@/lib/db/queries": {
getDefaultStorageConfig: async () => config,
getSystemSetting: async () => ({ value: { enabled: false } }),
},
"@/lib/storage/migration-db": {},
"@/lib/observability/logger": { createLogger: () => ({ debug() {}, warn() {}, info() {}, error() {} }) },
fetch: async (url: string, init: RequestInit) => {
expect(url).toBe("https://upload.qiniup.com/");
const form = init.body as FormData;
formKey = String(form.get("key"));
const token = String(form.get("token"));
const policy = JSON.parse(Buffer.from(token.split(":")[2], "base64url").toString());
expect(policy).toMatchObject({ scope: `images:${formKey}`, insertOnly: 1 });
expect((form.get("file") as File).size).toBe(3);
return formWorks ? Response.json({ key: formKey }) : new Response(null, { status: 503 });
},
})("lib/storage/service.ts");
const saved = await storage.uploadFile("local-edit.png", bytes, { preferQiniuForm: true });
expect(saved).toMatchObject({ pathname: formKey, url: "https://cdn.example/" + formKey });
expect(s3Keys).toEqual(formWorks ? [] : [formKey]);
});
}
test("model result buckets use our thumbnail endpoint without forbidden OSS transforms", () => {
const source = "https://dashscope-a717.oss-accelerate.aliyuncs.com/output.png";
const preview = new URL(buildImageProxyUrl(source, { width: 960, format: "webp" }), "https://app.example");

View File

@ -105,7 +105,7 @@ test("the provider submits once when an HTTP 524 request cannot be located", asy
function imageRecoveryHarness(
handler: (path: string, method: string, call: number) => Response | Promise<Response>,
maxPollSeconds: number | undefined = 3,
maxPollSeconds = 3,
) {
let now = 1_000;
const calls: { path: string; method: string; headers: Headers }[] = [];
@ -141,42 +141,6 @@ function imageRecoveryHarness(
};
}
test("accepted async tasks can finish after ten minutes using only the original task", async () => {
let polls = 0;
const h = imageRecoveryHarness((_path, method) => {
if (method === "POST") return Response.json({ task_id: "slow-original", result_path: "/extensions/v1/tasks/slow-original/result" }, { status: 202 });
return Response.json(++polls <= 610 ? { status: "running" } : { status: "succeeded", output: { url: "https://image.example/original.png" } });
}, undefined);
// Omit the configured short fixture deadline to exercise the production default.
const result = await h.load("lib/ai/providers/vip98k.ts").executeVip98kExternalTask({
apiKey: "test-only-key", baseURL: "https://provider.test", modelId: "nano-banana-2",
kind: "image", prompt: "A desk", imageUrls: [], modelConfig: { capabilities: { vip98k: { pollIntervalSeconds: 1 } } },
});
expect(result.outputUrls).toEqual(["https://image.example/original.png"]);
expect(h.calls.filter(c => c.method === "POST")).toHaveLength(1);
expect(h.calls.filter(c => c.method === "GET").every(c => c.path.endsWith("/slow-original/result"))).toBe(true);
});
test("an accepted task's deadline and reconciliation status preserve its ID without another submission", async () => {
for (const reply of [
{ status: 202, body: { status: "running" } },
{ status: 202, body: { status: "pending_review", code: "submission_pending_reconciliation" } },
{ status: 409, body: { error: { code: "request_outcome_unknown" } } },
]) {
const h = imageRecoveryHarness((_path, method) => method === "POST"
? Response.json({ task_id: "original-task", result_path: "/extensions/v1/tasks/original-task/result" }, { status: 202 })
: Response.json(reply.body, { status: reply.status }), 2);
const error = await h.run().catch((error: unknown) => error);
expect(error.providerTaskId).toBe("original-task");
expect(h.load("lib/ai/runtime/model-health.ts").shouldFailoverAiModelError(error)).toBe(false);
const visible = h.load("lib/ai/runtime/image-generation-error.ts").agentImageGenerationError(error, "auto");
expect(visible.confirmedNoResult).toBe(false);
expect(visible.message).toContain("original-task");
expect(visible.message).toContain("不要重复提交");
expect(h.calls.filter(c => c.method === "POST")).toHaveLength(1);
}
});
const recoveredImage = { created: 1, data: [{ url: "https://image.example/original.png" }] };
const originalCompleted = { request_id: "original-request", status: "succeeded", result_available: true };

View File

@ -30,12 +30,6 @@ const atlasHunyuan3D = {
tags: ["TEXT-TO-3D", "NEW"],
};
test("syncing the provider catalog keeps OCR out of image generation", () => {
const [ocr] = buildVip98kModelPresets([{ id: "ocr", type: "image", capabilities: ["media.tasks"] }]);
expect(ocr).toMatchObject({ modelId: "ocr", isHidden: true, supportsImageGen: false, capabilities: { outputType: "text" } });
expect(isImageGenerationModelDescriptor({ ...ocr, providerType: "vip98k" })).toBe(false);
});
test.describe("AI model media classification", () => {
test("classifies Qwen Image 3.0 as Alibaba text-to-image and image editing", () => {
expect(isAlibabaImageTextToImageModelId("qwen-image-3.0")).toBe(true);

View File

@ -1,6 +1,5 @@
import { test, expect } from "@playwright/test";
import { serverLoader } from "../helpers/canvas-download-server-loader";
import type { CanvasImageDownloadProgress } from "@/lib/client/canvas-image-download";
const config = { type: "qiniu-kodo", isEnabled: true, publicUrl: "https://cdn.example" };
@ -11,8 +10,7 @@ test("original downloads use the archived JPEG rather than the prepared PNG and
"./image-archive-db": { findImageArchiveDownloadTask: async () => ({ targetUrl: "https://cdn.example/original.jpg", metadata: {
downloadAsset: { status: "ready", url: "https://cdn.example/converted.png", contentType: "image/png" },
} }) },
fetch: async (url: URL, options: { method: string; cache: string }) => {
expect(options.cache).toBe("default");
fetch: async (url: URL, options: { method: string }) => {
calls.push({ url: url.toString(), method: options.method });
return { ok: true, headers: new Headers({ "content-type": "image/jpeg", "content-length": "12345" }),
arrayBuffer() { throw new Error("Image bytes must bypass the application"); } };
@ -24,7 +22,7 @@ test("original downloads use the archived JPEG rather than the prepared PNG and
expect(new URL(result.downloadUrl).pathname).toBe("/original.jpg");
});
test("signed original URLs cannot silently fall back to the application server", async () => {
test("signed original URLs retain the byte-preserving proxy without changing their signature", async () => {
const module = serverLoader({
"@/lib/db/queries": { getDefaultStorageConfig: async () => config },
"./image-archive-db": { findImageArchiveDownloadTask: async () => null },
@ -45,48 +43,13 @@ test("existing CDN objects bypass the archive scan and retain the MIME-derived f
expect(new URL(result.downloadUrl).pathname).toBe("/source.png");
});
test("temporary third-party originals enqueue storage without reading their body", async () => {
test("temporary third-party URLs are never checked with HEAD when no archive is ready", async () => {
const module = serverLoader({
"@/lib/db/queries": { getDefaultStorageConfig: async () => config },
"./image-archive-db": { findImageArchiveDownloadTask: async () => null, enqueueImageArchiveTask: async () => ({ id: "new", status: "pending" }) },
"./image-archive-worker": { scheduleImageArchiveWorker() {} },
"./image-archive-db": { findImageArchiveDownloadTask: async () => null },
fetch() { throw new Error("The upstream file service does not support HEAD"); },
})("lib/storage/original-image-download.ts");
expect(await module.resolveOriginalCdnDownload("https://upstream.example/image.png", "image", new AbortController().signal)).toMatchObject({ delivery: "preparing" });
});
test("downloading a pending original prioritizes storage and reports preparation", async () => {
const preferred: string[] = [];
const module = serverLoader({
"@/lib/db/queries": { getDefaultStorageConfig: async () => config },
"./image-archive-db": { findImageArchiveDownloadTask: async () => ({ id: "pending-image", status: "pending", targetUrl: null }) },
"./image-archive-worker": { scheduleImageArchiveWorker: (_delivery: boolean, id: string) => preferred.push(id) },
fetch() { throw new Error("The original must remain available through the proxy while it is queued"); },
})("lib/storage/original-image-download.ts");
expect(await module.resolveOriginalCdnDownload("https://upstream.example/queued.png", "image", new AbortController().signal)).toMatchObject({ delivery: "preparing" });
expect(preferred).toEqual(["pending-image"]);
});
test("a CDN metadata timeout falls back to the original Kodo object without reading its body", async () => {
let closed = false;
const module = serverLoader({
"@/lib/db/queries": { getDefaultStorageConfig: async () => config },
"./image-archive-db": {},
"./service": {
toDbS3UploadConfig: () => ({ bucket: "images" }),
createS3Client: () => ({
send: async (command: { input: { Bucket: string; Key: string } }) => {
expect(command.input).toEqual({ Bucket: "images", Key: "uploads/source.png" });
return { ContentType: "image/jpeg", ContentLength: 12345 };
},
destroy: () => { closed = true; },
}),
},
fetch: async () => { throw new DOMException("Timed out", "TimeoutError"); },
})("lib/storage/original-image-download.ts");
const result = await module.resolveOriginalCdnDownload("https://cdn.example/uploads/source.png", "图片.png", new AbortController().signal);
expect(result).toMatchObject({ delivery: "cdn", filename: "图片.jpg", bytes: 12345 });
expect(closed).toBe(true);
expect(await module.resolveOriginalCdnDownload("https://upstream.example/image.png", "image", new AbortController().signal)).toBeNull();
});
test("original download metadata reports missing sources with cause, advice and a feedback ID", async () => {
@ -103,30 +66,6 @@ test("original download metadata reports missing sources with cause, advice and
expect(data.error).toContain(data.requestId);
});
test("the original proxy returns the first bytes while the upstream is still sending the file", async () => {
const head = Uint8Array.from([255, 216, 255, 224]);
const tail = Uint8Array.from([4, 8, 255, 217]);
let upstream!: ReadableStreamDefaultController<Uint8Array>;
const body = new ReadableStream<Uint8Array>({
start(controller) { upstream = controller; controller.enqueue(head); },
});
const route = serverLoader({
"next/server": { NextResponse: Response },
fetch: async () => new Response(body, { headers: { "content-type": "image/jpeg", "content-length": "8" } }),
})("app/api/image-proxy/route.ts");
const response = await route.GET({
nextUrl: new URL("https://app.example/api/image-proxy?url=https%3A%2F%2Fimages.example%2Foriginal.jpg&original=1"),
signal: new AbortController().signal, headers: new Headers(),
});
expect(response.headers.get("content-length")).toBe("8");
const reader = response.body.getReader();
expect((await reader.read()).value).toEqual(head);
upstream.enqueue(tail);
upstream.close();
expect((await reader.read()).value).toEqual(tail);
expect((await reader.read()).done).toBe(true);
});
function browserMocks() {
const frames: any[] = []; const links: any[] = [];
return { frames, links,
@ -138,71 +77,26 @@ function browserMocks() {
test("chat original downloads use a native CDN download without fetching the image through CORS", async () => {
const dom = browserMocks(); const calls: string[] = [];
const progress: CanvasImageDownloadProgress[] = [];
const client = serverLoader({ ...dom, fetch: async (url: string) => {
calls.push(url);
return Response.json({ delivery: "cdn", downloadUrl: "https://cdn.example/image.jpg?attname=original.jpg", filename: "original.jpg", bytes: 5000000 });
} })("lib/client/canvas-image-download.ts");
const result = await client.downloadOriginalImage({ url: "https://cdn.example/image.jpg", onProgress: (event: CanvasImageDownloadProgress) => progress.push(event) });
const result = await client.downloadOriginalImage({ url: "https://cdn.example/image.jpg" });
expect(result).toEqual({ filename: "original.jpg", bytes: 5000000 });
expect(calls).toHaveLength(1);
expect(new URL(calls[0], "https://app.example").searchParams.get("download")).toBe("resolve");
expect(dom.frames[0].src).toBe("https://cdn.example/image.jpg?attname=original.jpg");
expect(dom.links).toHaveLength(0);
expect(progress.map(event => event.phase)).toEqual(["preparing", "downloading"]);
});
test("a legacy proxy response does not start a slow original download", async () => {
const dom = browserMocks(); let calls = 0;
const client = serverLoader({ ...dom, fetch: async () => { calls++; return Response.json({ delivery: "proxy" }); } })("lib/client/canvas-image-download.ts");
await expect(client.downloadOriginalImage({ url: "https://external.example/image.png" })).rejects.toThrow("原图尚未准备完成");
expect(calls).toBe(1);
expect(dom.links).toHaveLength(0);
expect(dom.frames).toHaveLength(0);
});
test("one click prepares a compatible PNG when the CDN original is WebP", async () => {
const dom = browserMocks();
const calls: string[] = [];
const progress: CanvasImageDownloadProgress[] = [];
const url = "https://cdn.example/image.png";
const client = serverLoader({ ...dom, fetch: async (path: string, init?: RequestInit) => {
calls.push(path);
if (calls.length === 1) {
return Response.json({ delivery: "cdn", downloadUrl: url, filename: "商品.webp", bytes: 500 });
}
expect(init?.method).toBe("POST");
expect(JSON.parse(String(init?.body))).toMatchObject({ url, name: "商品", preparation: "async" });
if (calls.length === 2) {
return Response.json({ delivery: "preparing", phase: "converting", retryAfter: 1, message: "正在转换为兼容 PNG,完成后自动下载" }, { status: 202 });
}
return Response.json({ delivery: "cdn", downloadUrl: "https://cdn.example/prepared.png", filename: "商品.png", bytes: 900 });
} })("lib/client/canvas-image-download.ts");
expect(await client.downloadOriginalImage({ url, name: "商品", onProgress: (event: CanvasImageDownloadProgress) => progress.push(event) }))
.toEqual({ filename: "商品.png", bytes: 900 });
expect(calls.slice(1)).toEqual(["/api/canvas/download-image", "/api/canvas/download-image"]);
expect(progress.map(event => event.phase)).toEqual(["preparing", "converting", "converting", "downloading"]);
for (const event of progress.filter(event => event.phase === "converting")) {
expect(event.message).toContain("正在转换为兼容 PNG");
expect(event.percent).toBeUndefined();
}
expect(dom.frames.map(frame => frame.src)).toEqual(["https://cdn.example/prepared.png"]);
expect(dom.links).toHaveLength(0);
});
test("queued originals show preparation then download directly without a proxy body", async () => {
const dom = browserMocks(); const calls: string[] = []; const progress: CanvasImageDownloadProgress[] = [];
const client = serverLoader({ ...dom, fetch: async (url: string) => {
calls.push(url);
if (calls.length === 1) return Response.json({ delivery: "preparing", retryAfter: 1, message: "正在保存原图,完成后自动下载" }, { status: 202 });
return Response.json({ delivery: "cdn", downloadUrl: "https://cdn.example/image.png", filename: "image.png", bytes: 900 });
} })("lib/client/canvas-image-download.ts");
await client.downloadOriginalImage({ url: "https://external.example/image", onProgress: (event: CanvasImageDownloadProgress) => progress.push(event) });
expect(calls).toHaveLength(2);
expect(calls.every(url => url.includes("download=resolve"))).toBe(true);
expect(progress.map(p => p.phase)).toEqual(["preparing", "preparing", "downloading"]);
expect(dom.frames[0].src).toBe("https://cdn.example/image.png");
expect(dom.links).toHaveLength(0);
test("original fallback preserves JPEG bytes and the MIME-derived filename", async () => {
const dom = browserMocks(); const bytes = Buffer.from([255, 216, 255, 224, 0, 16, 74, 70, 73, 70, 255, 217]); let calls = 0;
const client = serverLoader({ ...dom, fetch: async () => ++calls === 1 ? Response.json({ delivery: "proxy" }) : new Response(bytes, { headers: { "content-type": "image/jpeg" } }) })("lib/client/canvas-image-download.ts");
expect(await client.downloadOriginalImage({ url: "https://external.example/image.png", name: "original.png" })).toEqual({ filename: "original.jpg", bytes: bytes.length });
expect(calls).toBe(2);
const actual = await fetch(dom.links[0].href).then(r=>r.arrayBuffer());
expect(Buffer.from(actual).equals(bytes)).toBe(true);
URL.revokeObjectURL(dom.links[0].href);
});
test("original downloads reject processed references before network access", async () => {

View File

@ -1,166 +0,0 @@
import { test, expect } from "@playwright/test";
import sharp from "sharp";
import { NextRequest, NextResponse } from "next/server";
import { serverLoader } from "../helpers/canvas-download-server-loader";
const config = { type: "qiniu-kodo", provider: "qiniu-kodo", isEnabled: true,
publicUrl: "https://cdn.example", endpoint: "https://s3.example", region: "cn-east-1",
bucket: "images", accessKeyId: "test-ak", secretAccessKey: "test-sk" };
test("external model results including signed OSS URLs are fetched by Qiniu without app image reads", async () => {
let source = "";
let calls = 0;
const load = serverLoader({
"@/lib/storage/service": { resolveS3UploadTarget: async () => ({ config }),
buildS3PublicUrl: (_: unknown, key: string) => `${config.publicUrl}/${key}` },
fetch: async (url: string, init: RequestInit) => {
calls++;
expect(new URL(url).hostname).toBe("iovip-z0.qiniuio.com");
expect(init.method).toBe("POST");
const encoded = new URL(url).pathname.split("/fetch/")[1].split("/to/")[0];
expect(Buffer.from(encoded, "base64url").toString()).toBe(source);
return Response.json({ key: "uploads/ai-generated-archive-task-1", fsize: 5000, mimeType: "image/jpeg" });
},
}, { NEXT_PUBLIC_APP_URL: "https://app.example" });
const { archiveImageThroughQiniu } = load("lib/storage/qiniu-image-archive.ts");
for (source of ["https://api.vip98k.com/api/external/assets/image",
"https://dashscope-a717.oss-accelerate.aliyuncs.com/result.png?Expires=123&Signature=a%2Bb%3D",
"https://images.provider.example/result.jpg"]) {
expect(await archiveImageThroughQiniu(source, "task-1")).toMatchObject({ bytes: 5000, contentType: "image/jpeg" });
}
for (const local of ["https://cdn.example/uploads/a.png", "https://app.example/api/generated-image-preview/id",
"http://127.0.0.1/a.png", "data:image/png;base64,abcd"]) {
expect(await archiveImageThroughQiniu(local, "task-1")).toBeNull();
}
expect(calls).toBe(3);
});
test("stored direct uploads prepare once and then download from CDN", async () => {
let task: any = null;
const ensured: string[] = [];
const url = "https://cdn.example/uploads/direct/user-1/image.webp";
const module = serverLoader({
"@/lib/db/queries": { getDefaultStorageConfig: async () => config },
"./image-archive-db": {
findImageArchiveDownloadTask: async () => task,
ensureStoredImageDownloadTask: async (stored: string) => {
ensured.push(stored); return task = { id: "stored", targetUrl: stored, metadata: { downloadAsset: { status: "pending" } } };
},
},
})("lib/storage/canvas-cdn-download.ts");
const pending = await module.resolveCanvasCdnDownload([url], "图片.png");
expect(pending).toMatchObject({ direct: null, canPrepareDirect: true });
task.metadata.downloadAsset = { status: "ready", url: "https://cdn.example/uploads/converted.png", contentType: "image/png", bytes: 1234 };
const ready = await module.resolveCanvasCdnDownload([url], "图片.png");
expect(ready.direct).toMatchObject({ delivery: "cdn", bytes: 1234 });
expect(new URL(ready.direct.downloadUrl).searchParams.get("attname")).toBe("图片.png");
expect(ensured).toEqual([url]);
});
test("download preparation only registers unsigned files in the configured bucket", async () => {
const stored: string[] = [];
const module = serverLoader({
"@/lib/db/queries": { getDefaultStorageConfig: async () => config },
"./image-archive-db": { findImageArchiveDownloadTask: async () => null,
ensureStoredImageDownloadTask: async (url: string) => { stored.push(url); return { id: "1", targetUrl: url }; } },
}, { CANVAS_QINIU_ORIGIN_URL: "https://origin.example" })("lib/storage/canvas-cdn-download.ts");
for (const url of ["https://other.example/uploads/a.png", "https://cdn.example/uploads/a.png?token=signed",
"https://cdn.example/uploads/a.png?imageView2/2/w/160", "https://cdn.example/private/a.png"]) {
expect((await module.resolveCanvasCdnDownload([url], "a.png")).canPrepareDirect).toBe(false);
}
expect((await module.resolveCanvasCdnDownload(["https://origin.example/uploads/direct/user/a.png"], "a.png")).canPrepareDirect).toBe(true);
expect(stored).toEqual(["https://cdn.example/uploads/direct/user/a.png"]);
});
test("nested uploaded PNGs use a bounded header read without stripping their colour profile", async () => {
const bytes = await sharp({ create: { width: 32, height: 24, channels: 4, background: "#1d785c80" } }).withIccProfile("p3").png().toBuffer();
let reads = 0;
const module = serverLoader({
"@/lib/storage/service": { resolveS3UploadTarget: async () => ({ config }),
buildS3PublicUrl: (_: unknown, key: string) => `${config.publicUrl}/${key}`,
createS3Client: () => ({ destroy() {}, send: async (cmd: any) => {
reads++; expect(cmd.input.Key).toBe("uploads/direct/user/a.png");
expect(cmd.input.Range).toBe("bytes=0-65535");
return { $metadata: { httpStatusCode: 206 }, ContentType: "image/png", ContentLength: bytes.length,
ContentRange: `bytes 0-${bytes.length - 1}/${bytes.length}`, Body: { transformToByteArray: async () => bytes } };
} }) },
})("lib/storage/qiniu-image-archive.ts");
const url = "https://cdn.example/uploads/direct/user/a.png";
expect(await module.getReadyQiniuImageDownload(url)).toMatchObject({ status: "ready", url, bytes: bytes.length });
expect(reads).toBe(1);
});
test("preview aliases use the configured CDN and retain processing and signed URL semantics", async () => {
const module = serverLoader({}, { NEXT_PUBLIC_CANVAS_CDN_ORIGIN: "https://cdn.example",
NEXT_PUBLIC_CANVAS_STORAGE_ORIGIN: "https://origin.example" })("lib/image-delivery.ts");
const source = "https://origin.example/uploads/a.png";
const options = { width: 331, quality: 86, format: "webp" };
const direct = "https://cdn.example/uploads/a.png?imageView2/2/w/360/format/webp/q/88";
expect(module.buildImageProxyUrl(source, options)).toBe(direct);
expect(module.buildImageProxyUrl(`/api/image-proxy?url=${encodeURIComponent(source)}&w=331&q=86&f=webp`)).toBe(direct);
expect(module.buildImageProxyUrl(source + "?token=signed", options)).toBe(source + "?token=signed");
expect(module.buildImageProxyUrl(`/api/image-proxy?url=${encodeURIComponent(source)}&proxy=1&w=331`)).toContain("proxy=1");
});
test("saved preview URLs redirect to an archived CDN thumbnail without reading the upstream image", async () => {
const source = "https://images.provider.example/result.png";
const route = serverLoader({
"next/server": { NextResponse },
"@/lib/storage/image-archive-db": { getArchivedImageUrlMappings: async () => ({ [source]: "https://cdn.example/uploads/a.png" }) },
fetch: () => { throw Error("No image bytes should pass through the app"); },
}, { NEXT_PUBLIC_CANVAS_CDN_ORIGIN: "https://cdn.example" })("app/api/image-proxy/route.ts");
const response = await route.GET(new NextRequest(`https://app.example/api/image-proxy?url=${encodeURIComponent(source)}&w=331&q=86&f=webp`, { headers: { "sec-fetch-dest": "image" } }));
expect(response.status).toBe(307);
expect(response.headers.get("location")).toBe("https://cdn.example/uploads/a.png?imageView2/2/w/360/format/webp/q/88");
});
test("uploaded WebP is converted inside Qiniu with orientation and ICC retention", async () => {
const png = await sharp({ create: { width: 20, height: 12, channels: 4, background: "#22887780" } }).withIccProfile("p3").png().toBuffer();
let calls = 0;
const module = serverLoader({
"@/lib/storage/service": { resolveS3UploadTarget: async () => ({ config }),
buildS3PublicUrl: (_: unknown, key: string) => `${config.publicUrl}/${key}`,
createS3Client: () => ({ destroy() {}, send: async (cmd: any) => {
expect(cmd.input.Key).toBe("uploads/canvas-download-task-1.png");
expect(cmd.input.Range).toBe("bytes=0-65535");
return { $metadata: { httpStatusCode: 206 }, ContentType: "image/png", ContentLength: png.length,
ContentRange: `bytes 0-${png.length - 1}/${png.length}`, Body: { transformToByteArray: async () => png } };
} }) },
fetch: async (url: string) => {
calls++;
const encoded = new URL(url).pathname.split("/fetch/")[1].split("/to/")[0];
const source = Buffer.from(encoded, "base64url").toString();
expect(source).toBe("https://cdn.example/uploads/direct/user/source.webp?imageMogr2/auto-orient/format/png/strip/meta-keep-list/aWNj");
return Response.json({ key: "uploads/canvas-download-task-1.png", fsize: png.length, mimeType: "image/png" });
},
})("lib/storage/qiniu-image-archive.ts");
const source = "https://cdn.example/uploads/direct/user/source.webp";
const ready = await module.prepareQiniuWebpDownload(source, "task-1");
expect(ready).toMatchObject({ status: "ready", url: "https://cdn.example/uploads/canvas-download-task-1.png", bytes: png.length });
for (const excluded of [source + "?token=signed", source.replace("cdn.example", "other.example"), source.replace(".webp", ".png")]) {
expect(await module.prepareQiniuWebpDownload(excluded, "task-1")).toBeUndefined();
}
expect(calls).toBe(1);
});
test("download worker uses a cloud-prepared PNG and retains local conversion on cloud failure", async () => {
const bytes = await sharp({ create: { width: 4, height: 4, channels: 4, background: "#bb442280" } }).png().toBuffer();
let cloudFails = false, reads = 0;
const saved: any[] = [];
const task = { id: "webp", targetUrl: "https://cdn.example/uploads/a.webp", metadata: {} };
const module = serverLoader({
"./image-archive-db": { claimImageDownloadTask: async () => task, saveImageDownloadAsset: async (_: string, asset: any) => saved.push(asset) },
"./qiniu-image-archive": { getReadyQiniuImageDownload: async () => undefined,
prepareQiniuWebpDownload: async () => { if (cloudFails) throw Error("cloud temporarily unavailable"); return { status: "ready", url: "https://cdn.example/uploads/converted.png", bytes: bytes.length, contentType: "image/png" }; } },
"./image-byte-cache": { fetchImageBytes: async () => { reads++; return { buffer: bytes, contentType: "image/png" }; }, cacheImageBytes: async () => undefined },
"@/lib/storage/image-byte-cache": { onceImageBytes: async (_: string, fn: any) => fn() },
"./service": { uploadFile: async () => ({ url: "https://cdn.example/uploads/fallback.png" }) },
})("lib/storage/image-download-preparation.ts");
await module.prepareImageArchiveDownload("webp");
expect(reads).toBe(0);
expect(saved[0]).toMatchObject({ status: "ready", url: "https://cdn.example/uploads/converted.png" });
cloudFails = true;
await module.prepareImageArchiveDownload("webp");
expect(reads).toBe(1);
expect(saved[1].status).toBe("ready");
});

View File

@ -55,13 +55,6 @@ test("restores accepted tasks missing from a pre-submit canvas snapshot, includi
expect(result[0].draftValues?.url).toHaveLength(2);
expect(reconcileCanvasTasks<TaskNode>(result, [task], "2026-09-17T01:00:00Z")).toBe(result);
});
test("music variations become separate playable resources without duplicate cards on polling", () => {
const music:CanvasGenerationTask={...task,request:{...task.request,kind:"audio"},result:{url:"https://example.com/one.mp3",urls:["https://example.com/one.mp3","https://example.com/two.mp3"]}};
const result=reconcileCanvasTasks<TaskNode>([],[music],"2026-09-17T01:00:00Z");
expect(result).toHaveLength(2);
expect(result[1]).toMatchObject({inputType:"audio",draftValues:{action:"AUDIO_RESOURCE",mediaUrl:"https://example.com/two.mp3"}});
expect(reconcileCanvasTasks(result,[music],"2026-09-17T01:00:00Z")).toBe(result);
});
test("does not resurrect nodes removed after task creation or hidden on the server", () => {
expect(reconcileCanvasTasks<TaskNode>([], [task], "2026-09-17T01:02:00Z")).toEqual([]);
expect(

View File

@ -1,106 +0,0 @@
import { test, expect } from "@playwright/test";
import { createVip98kChatModel } from "@/lib/ai/providers/vip98k-chat";
import { buildVip98kModelPresets } from "@/lib/ai/vip98k-models";
import { buildTaskBody } from "@/lib/ai/providers/vip98k";
import { getVip98kImageBindingKeys } from "@/lib/ai/vip98k-task-invocation";
import { getAudioCheckpoint } from "@/lib/video-canvas/task-recovery";
import { audioRequestSchema } from "@/lib/video-canvas/audio-contract";
import { buildVip98kAudioBody, vip98kAudioContracts } from "@/lib/video-canvas/vip98k-audio-contract";
import { vip98kVideoDurationBounds } from "@/lib/ai/vip98k-video-parameters";
import { readVip98kAudioFile } from "@/lib/video-canvas/vip98k-audio-file";
test("Anthropic-only routes preserve tool calls and relay routing", async () => {
let sent: any;
const model = createVip98kChatModel({ apiKey:"fixture", baseURL:"https://relay.example", modelId:"claude-haiku-5-5",
metadata:{invocation:{kind:"chat",path:"/v1/messages",headers:{"X-Relay-Route-Option":"native_route"}}},
fetch:async (url, init) => {
expect(String(url)).toBe("https://relay.example/v1/messages");
const headers = new Headers(init?.headers);
expect(headers.get("x-relay-route-option")).toBe("native_route");
expect(headers.get("authorization")).toBe("Bearer fixture");
sent=JSON.parse(String(init?.body));
return Response.json({id:"message_test",type:"message",role:"assistant",model:"claude-haiku-5-5",
content:[{type:"tool_use",id:"call_test",name:"record_result",input:{message:"ok"}}],
stop_reason:"tool_use",stop_sequence:null,usage:{input_tokens:10,output_tokens:8}});
},
});
const result = await model.doGenerate({ prompt:[{role:"user",content:[{type:"text",text:"Run the test tool"}]}],
tools:[{type:"function",name:"record_result",inputSchema:{type:"object",properties:{message:{type:"string"}},required:["message"]}}],toolChoice:{type:"auto"},maxOutputTokens:128 });
expect(sent.messages[0].content[0].text).toBe("Run the test tool");
expect(result.content).toContainEqual(expect.objectContaining({type:"tool-call",toolName:"record_result"}));
});
test("zero image slots and forbidden fields do not become reference support", () => {
const invocation = {kind:"tool",path:"/v1/images/generations",request_example:{model:"text_image",prompt:"a cup"},
input_schema:{properties:{file_urls:{type:"array",maxItems:0},image:false,partial_images:{type:"integer"}}}};
const [model] = buildVip98kModelPresets([{id:"text_image",type:"image",capabilities:["text_to_image"],invocation}]);
expect(model.capabilities).toMatchObject({maxReferenceImages:0,supportedModes:["text-to-image"]});
expect(model.displayName).toContain("仅文生图");
expect(getVip98kImageBindingKeys({requestExample:invocation.request_example,inputSchema:invocation.input_schema} as any)).toEqual([]);
});
const params = {apiKey:"fixture",modelId:"image",kind:"image",prompt:"a blue cup",imageUrls:[],videoUrls:[],modelConfig:{},imageParams:{aspectRatio:"16:9",imageSize:"2K"}};
const invocation = (properties: Record<string, unknown>, requestExample: Record<string, unknown> = {}) => ({kind:"tool",method:"POST",path:"/v1/images/generations",contentType:"application/json",headers:{},requestExample:{model:"image",prompt:"example",...requestExample},inputSchema:{properties},resultMethod:"GET",resultPath:""});
test("ratio-sized image contracts bind size and resolution without stale square examples", () => {
const result = buildTaskBody(params,invocation({size:{enum:["1:1","16:9"]},resolution:{enum:["1K","2K"]}},{size:"1:1",resolution:"1K"}));
expect(result.body).toMatchObject({size:"16:9",resolution:"2K",prompt:"a blue cup"});
});
test("pixel-only image contracts use a supported size in the requested tier", () => {
const result = buildTaskBody(params,invocation({size:{enum:["1024x1024","1280x720","2048x1152","3840x2160"]}},{size:"1024x1024"}));
expect(result.body.size).toBe("2048x1152");
});
test("OpenAI image size fields receive pixel dimensions instead of a resolution label", () => {
const result = buildTaskBody({...params,modelId:"gpt-image-2"},invocation({size:{type:["string","null"]}}));
expect(result.body.size).toMatch(/^\d+x\d+$/);
});
test("task size patterns take precedence over ratio aliases in a catalog enum", () => {
const result = buildTaskBody({...params,imageParams:{imageSize:"1K",aspectRatio:"1:1"}},invocation({size:{enum:["1:1","1024x1024"],pattern:"^(auto|[1-9][0-9]*x[1-9][0-9]*)$"},resolution:{enum:["1K","2K"]}}));
expect(result.body.size).toBe("1024x1024");
});
test("image reference limits reject excess inputs before submission", () => {
expect(() => buildTaskBody({...params,imageUrls:["https://example.com/1.png","https://example.com/2.png"]},invocation({image:{type:"array",maxItems:1}},{image:[]}))).toThrow("最多支持 1 张");
});
test("Seedance content binds prompts and reference roles", () => {
const i=invocation({content:{items:{oneOf:[{properties:{type:{const:"text"}}},{properties:{type:{const:"image_url"}}}]}},duration:{anyOf:[{const:-1},{minimum:4,maximum:30}]},resolution:{enum:["480P","720P"]},ratio:{enum:["16:9","9:16"]}});
const result=buildTaskBody({...params,kind:"video",imageUrls:["https://example.com/one.png","https://example.com/two.png"],videoParams:{mode:"first-last-frame",resolution:"480p",duration:4,ratio:"16:9"}},i);
expect(result.body).toMatchObject({resolution:"480P",duration:4,content:[{type:"text",text:"a blue cup"},{type:"image_url",role:"first_frame"},{type:"image_url",role:"last_frame"}]});
expect(result.imageBindingKeys).toContain("content");
expect(vip98kVideoDurationBounds(i.inputSchema)).toMatchObject({min:4,max:30});
});
test("all fourteen audio entries expose distinct supported modes", () => {
expect(Object.keys(vip98kAudioContracts)).toHaveLength(14);
expect(vip98kAudioContracts["mimo-v2.5-asr"].kind).toBe("asr");
expect(vip98kAudioContracts["mimo-v2.5-tts-voiceclone"].kind).toBe("voiceclone");
expect(vip98kAudioContracts["suno-v6"].kind).toBe("music");
});
test("reference-only video routes reject an empty image list before submission", () => {
expect(()=>buildTaskBody({...params,kind:"video"},invocation({file_urls:{type:"array",minItems:1,maxItems:1}}))).toThrow("参考图");
});
test("Speech archives return the audio member instead of the TAR bytes", () => {
const audio=Buffer.from("RIFF1234WAVEfmt fixture audio");
const header=Buffer.alloc(512);header.write("output.wav");header.write(audio.length.toString(8).padStart(11,"0"),124);header[156]=48;header.write("ustar",257);
const file=readVip98kAudioFile(Buffer.concat([header,audio,Buffer.alloc(512-audio.length),Buffer.alloc(1024)]));
expect(file.format).toBe("wav");expect(file.bytes).toEqual(audio);
expect(()=>readVip98kAudioFile(Buffer.from('{"error":"unavailable"}'))).toThrow("音频文件");
});
test("audio input requires a reference for cloning and maps the user's audio", () => {
const input=audioRequestSchema.parse({modelRef:"test",mode:"voiceclone",text:"你好"});
expect(()=>buildVip98kAudioBody(input,"mimo-v2.5-tts-voiceclone",{})).toThrow("参考音频");
const body=buildVip98kAudioBody({...input,referenceAudioUrl:"https://example.com/audio.wav"},"mimo-v2.5-tts-voiceclone",{},"data:audio/wav;base64,fixture");
expect(body.audio.voice).toBe("data:audio/wav;base64,fixture");
expect(body.messages[1]).toEqual({role:"assistant",content:"你好"});
});
test("Suno automatic music omits the gender parameter that requires custom lyrics mode", () => {
const input=audioRequestSchema.parse({modelRef:"test",mode:"music",text:"gentle piano",format:"mp3",instrumental:true});
const body=buildVip98kAudioBody(input,"suno-v5",{custom_mode:false,metadata:{vocal_gender:"m"}});
expect(body.custom_mode).toBe(false);expect(body.metadata.vocal_gender).toBeUndefined();
const song=buildVip98kAudioBody({...input,instrumental:false,lyrics:"阳光照进窗台"},"suno-v5",{custom_mode:false,metadata:{vocal_gender:"m"}});
expect(song).toMatchObject({custom_mode:true,prompt:"阳光照进窗台",style:"gentle piano",metadata:{vocal_gender:"f"}});
});
test("completed audio checkpoints retain the original provider and resumable task", () => {
const checkpoint={operation:"audio",provider:"vip98k",modelRef:"test",modelId:"gem-2.5-tts",providerId:"source",baseUrl:"https://relay.example",taskId:"original",url:"https://example.com/audio.wav",format:"wav"};
expect(getAudioCheckpoint({request:{kind:"audio",params:{modelRef:"test"}},result:{upstreamAudio:checkpoint}})).toEqual(checkpoint);
});

View File

@ -42,70 +42,6 @@ import { BANANAIMAGE_MODEL_PRESETS } from "@/lib/ai/bananaimage-models";
import { buildTaskBody } from "@/lib/ai/providers/vip98k";
import { getSceneRunResult } from "@/lib/agents/scene-run-recovery";
import { extractImageUrlsFromText } from "@/lib/image-url";
import { serverLoader } from "../helpers/canvas-download-server-loader";
for (const status of ["failed", "unresolved", "unknown", "missing"]) {
test(`a synchronous 502 reconciles ${status} without repeating submission`, async () => {
const methods: string[] = [];
const loader = serverLoader({
"@/lib/db/queries": { getSystemSetting: async () => null },
"@/lib/storage/image-archive": {},
"@/lib/storage/service": {},
"@/lib/observability/logger": { createLogger: () => ({ info() {}, warn() {}, error() {} }) },
fetch: async (url: string, init: RequestInit) => {
methods.push(init.method || "GET");
if (init.method === "POST") return Response.json({ error: { message: "generate failed" } }, { status: 502 });
expect(url).toContain("/api/external/requests/by-idempotency-key");
return status === "missing" ? new Response(null, { status: 404 }) : Response.json({ status, request_id: "original-request", result_available: false });
},
});
const provider = loader("lib/ai/providers/vip98k.ts").createVip98k({ apiKey: "fixture", baseURL: "https://provider.test" });
const error = await provider.chat("gpt-image-2.5").doGenerate({ messages: [{ role: "user", content: "a blue cup" }] }).catch((error: unknown) => error);
expect(methods).toEqual(["POST", "GET"]);
if (status === "failed") {
expect(error).toMatchObject({ confirmedNoResult: true });
expect(loader("lib/ai/runtime/image-generation-error.ts").agentImageGenerationError(error, "pinned")).toBe(error);
expect(loader("lib/request-error.ts").getRequestFailureDetails(error).outcome).toBe("failed");
} else {
expect(loader("lib/request-error.ts").getRequestFailureDetails(error).outcome).toBe("unknown");
}
});
}
test("catalog defaults allow async failover time while retaining an explicit polling limit", () => {
const models = [{ id: "nano-banana-2", type: "image", invocation: {
kind: "task", method: "POST", path: "/extensions/v1/tasks", content_type: "application/json",
request_example: { file_urls: ["https://image.example/source.png"], model: "nano-banana-2", prompt: "Edit" },
} }];
const [normal] = buildVip98kModelPresets(models);
expect((normal.capabilities.vip98k as any).maxPollSeconds).toBe(900);
expect((normal.imageGenConfig!.vip98k as any).maxPollSeconds).toBe(900);
const [configured] = buildVip98kModelPresets([{ ...models[0], max_poll_seconds: 1200 }]);
expect((configured.capabilities.vip98k as any).maxPollSeconds).toBe(1200);
});
test("a synchronous 502 recovers the original completed image through GET only", async () => {
const calls: string[] = [];
let lookups = 0;
const loader = serverLoader({
"@/lib/db/queries": { getSystemSetting: async () => null },
"@/lib/storage/image-archive": { createDeferredUploadedImage: async (url: string) => ({ original: url, thumbnail: url }) },
"@/lib/storage/service": {},
"@/lib/observability/logger": { createLogger: () => ({ info() {}, warn() {}, error() {} }) },
setTimeout: (callback: () => void) => setTimeout(callback, 0),
fetch: async (url: string, init: RequestInit) => {
calls.push(init.method || "GET");
if (init.method === "POST") return Response.json({ error: { message: "bad gateway" } }, { status: 502 });
if (url.endsWith("/by-idempotency-key")) return Response.json({ status: ++lookups === 1 ? "processing" : "succeeded", request_id: "original-request", result_available: true });
expect(url).toContain("/original-request/result");
return Response.json({ data: [{ url: "https://assets.test/original.png" }] });
},
});
const provider = loader("lib/ai/providers/vip98k.ts").createVip98k({ apiKey: "fixture", baseURL: "https://provider.test" });
const result = await provider.chat("gpt-image-2.5").doGenerate({ messages: [{ role: "user", content: "a blue cup" }] });
expect(calls).toEqual(["POST", "GET", "GET", "GET"]);
expect(result.text).toContain("https://assets.test/original.png");
});
const textToImageInvocation: Vip98kTaskInvocation = {
kind: "tool",
@ -118,20 +54,6 @@ const textToImageInvocation: Vip98kTaskInvocation = {
"/api/external/tools/result?tool_id=google%2Fnano-banana-2%2Ftext-to-image&taskId={task_id}",
};
test("native expansion maps final canvas scales to per-side ratios and requests PNG", () => {
const invocation: Vip98kTaskInvocation = {
kind: "task", method: "POST", path: "/extensions/v1/tasks", contentType: "application/json",
resultMethod: "GET", resultPath: "/extensions/v1/tasks/{task_id}/result",
requestExample: { model: "image-expansion", metadata: { top: 0.1, bottom: 0.1, left: 0.1, right: 0.1 }, output_format: "" },
inputSchema: { properties: { model: { type: "string" }, file_urls: { type: "array" }, metadata: { type: "object" }, output_format: { type: "string" } } },
};
const { body } = buildTaskBody({ apiKey: "test", modelId: "image-expansion", kind: "image-tool", prompt: "", imageUrls: ["https://source.test/original.jpg"], videoUrls: [], modelConfig: {}, imageParams: { xScale: 1.5, yScale: 2 } }, invocation);
expect(body).toMatchObject({ model: "image-expansion", file_urls: ["https://source.test/original.jpg"], metadata: { left: 0.25, right: 0.25, top: 0.5, bottom: 0.5 }, output_format: "png" });
expect(body).not.toHaveProperty("mask");
expect(body).not.toHaveProperty("prompt");
expect(body).not.toHaveProperty("x_scale");
});
test("text-to-image uses the advertised task contract with native size and ratio, without example reference images", () => {
const configured: Vip98kTaskInvocation = { ...textToImageInvocation, path: "/v1/images/generations", requestExample: { model: "nano-banana-pro", prompt: "sample" } };
const task: Vip98kTaskInvocation = { ...configured, kind: "task", path: "/extensions/v1/tasks",
@ -167,26 +89,6 @@ test("does not inject output count into a task contract without n", () => {
expect(body).not.toHaveProperty("n");
});
test("OCR submits a text request even with a stale synced example", () => {
const invocation: Vip98kTaskInvocation = {
kind: "task", method: "POST", path: "/extensions/v1/tasks",
contentType: "application/json", resultMethod: "GET",
resultPath: "/extensions/v1/tasks/{task_id}/result",
requestExample: {
model: "ocr", size: "auto", language: "", file_urls: [""],
output_format: "txt", metadata: { language: "English,ChinesePRC,Digits" },
},
};
const { body } = buildTaskBody({
apiKey: "test", modelId: "ocr", kind: "image-tool", prompt: "",
imageUrls: ["https://assets.test/item.png"], videoUrls: [], modelConfig: {},
}, invocation);
expect(body).toEqual({
model: "ocr", file_urls: ["https://assets.test/item.png"],
output_format: "txt", metadata: { language: "English,ChinesePRC,Digits" },
});
});
test("scene completion counts the current run and preserves partial results", () => {
const user = { id: "run", role: "user", parts: [] };
const result = (count: number) => ({ id: "result", role: "assistant", parts: [{ type: "text", text:
@ -755,7 +657,7 @@ test.describe("VIP98K reference-image routing", () => {
).toBe(false);
});
test("imports published text-only models without advertising image editing", () => {
test("excludes unverified text-only VIP98K models from the image picker", () => {
const presets = buildVip98kModelPresets([
{
id: "unverified-image-model",
@ -771,9 +673,7 @@ test.describe("VIP98K reference-image routing", () => {
},
]);
expect(presets).toHaveLength(1);
expect(presets[0]).toMatchObject({ supportsVision: false,
capabilities: { supportedModes: ["text-to-image"], maxReferenceImages: 0 } });
expect(presets).toEqual([]);
});
test("keeps gpt-image-2-vip when its published image field is an array", () => {