Compare commits

..

No commits in common. "main" and "codex/canvas-background-save-update-notice" have entirely different histories.

124 changed files with 867 additions and 4684 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";
@ -623,7 +623,7 @@ async function resolveReplacementProductIdentityProfile(params: {
system:
"你是高精度商品结构分析器。多张图片属于同一商品;请跨视角还原唯一结构身份,并明确每个视角最清楚的构件。",
temperature: params.planningRuntime.kind === "local_moonshot" ? 1 : 0.1,
maxOutputTokens: 1800,
maxTokens: 1800,
abortSignal: AbortSignal.timeout(
params.planningRuntime.kind === "local_moonshot" ? 90_000 : 60_000,
),
@ -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")) ||
@ -2376,7 +2387,7 @@ export async function analyzeReplacementReferenceImage(params: {
},
],
temperature: 0,
maxOutputTokens: 160,
maxTokens: 160,
abortSignal: AbortSignal.timeout(45_000),
} as any);
@ -2679,7 +2690,7 @@ export async function analyzeReplacementExecutionPlan(params: {
system:
"你是高精度商品详情图场景规划器。你只分析当前参考图本身,负责理解这一屏的场景、机位、主体位置和人物需求,不要臆测或依赖其他输入图片。",
temperature: params.planningRuntime.kind === "local_moonshot" ? 1 : 0.1,
maxOutputTokens: 1600,
maxTokens: 1600,
abortSignal: AbortSignal.timeout(replacementScenePlanningTimeoutMs),
} as any);

View File

@ -264,29 +264,6 @@ export function chatMessagesHaveImageInput(messages: ChatMessage[]) {
return countChatMessageImageInputs(messages) > 0;
}
export function canUseImageFallback(
candidate: { model: any; provider: any },
imageParams: { imageSize?: unknown; aspectRatio?: unknown; imageCount?: number },
messages: ChatMessage[],
balanceBlockedProviders: ReadonlySet<string>,
) {
if (balanceBlockedProviders.has(candidate.provider?.id)) return false;
const config = candidate.model?.imageGenConfig;
const size = String(imageParams.imageSize || "").toUpperCase();
const ratio = String(imageParams.aspectRatio || "");
if (size && Array.isArray(config?.supportedImageSizes) &&
!config.supportedImageSizes.includes(size)) return false;
if (ratio && ratio !== "auto" && Array.isArray(config?.supportedAspectRatios) &&
!config.supportedAspectRatios.includes(ratio)) return false;
if (imageParams.imageCount && typeof config?.maxImages === "number" &&
imageParams.imageCount > config.maxImages) return false;
const referenceCount = countChatMessageImageInputs(messages);
if (referenceCount && modelLacksReferenceImageInputSupport(candidate.model, candidate.provider)) return false;
if (referenceCount && typeof config?.maxReferenceImages === "number" &&
referenceCount > config.maxReferenceImages) return false;
return true;
}
export function getImageFailoverConvertProvider(providerType?: string | null) {
switch (providerType) {
case "bfl-image":

View File

@ -1,11 +1,8 @@
import { saveMessages } from "@/lib/db/queries";
import type { ImageGenerationStatusStreamPayload } from "@/lib/canvas/image-generation-status";
import { formatRequestFailure, getRequestFailureDetails } from "@/lib/request-error";
import { createLogger } from "@/lib/observability/logger";
import { safeWriteStreamChunk, type StreamWriter, writeAssistantTextChunk, writeStructuredDataChunk } from "./stream";
const logger = createLogger("chat.imageGenerationFailure");
export async function reportImageGenerationFailure(params: {
writer: StreamWriter;
chatId: string;
@ -15,12 +12,6 @@ export async function reportImageGenerationFailure(params: {
label: string;
}) {
const failure = getRequestFailureDetails(params.error, "图片生成失败");
logger.warn("Image request failed", {
requestId: params.messageId,
userMessageId: params.userMessageId,
providerRequestId: (params.error as { providerRequestId?: string } | null)?.providerRequestId,
code: failure.code,
});
const status: ImageGenerationStatusStreamPayload = {
phase: "failed",
userMessageId: params.userMessageId,

View File

@ -337,7 +337,6 @@ import {
} from "./_lib/image-media";
import {
buildImageFallbackCandidates,
canUseImageFallback,
countChatMessageImageInputs,
generateImageWithFailoverCandidate,
getImageCrossProviderCandidates,
@ -9217,11 +9216,8 @@ export async function POST(request: Request) {
// 🆕 尝试备用模型(支持跨服务商切换)
let fallbackSuccess = false;
const balanceBlockedProviders = new Set<string>();
if (isProviderBalanceError(primaryError) && currentModelConfig?.providerId) balanceBlockedProviders.add(currentModelConfig.providerId);
const triedFallbackModelIds = new Set<string>();
for (const candidate of fallbackCandidates) {
if (!canUseImageFallback(candidate, effectiveImageGenerationParams, buildMessagesForGemini(), balanceBlockedProviders)) continue;
try {
triedFallbackModelIds.add(String(candidate.model.id || ""));
chatApiLogger.info(`[Chat API] 🔄 Trying fallback model: ${candidate.model.displayName} (${candidate.provider.type})`);
@ -9243,7 +9239,6 @@ export async function POST(request: Request) {
chatApiLogger.info(`[Chat API] ✅ Fallback model ${fallbackResult.displayName} succeeded!`);
break;
} catch (fallbackError) {
if (isProviderBalanceError(fallbackError)) balanceBlockedProviders.add(candidate.provider.id);
const fallbackErrorMessage = normalizeFailoverErrorMessage(fallbackError);
if (shouldCooldownImageFallbackModel(fallbackErrorMessage)) {
setImageFallbackModelCooldown(candidate.model.id, fallbackErrorMessage);
@ -9297,7 +9292,6 @@ export async function POST(request: Request) {
}).filter((candidate) => !triedFallbackModelIds.has(String(candidate.model.id || "")));
for (const candidate of crossProviderCandidates) {
if (!canUseImageFallback(candidate, effectiveImageGenerationParams, buildMessagesForGemini(), balanceBlockedProviders)) continue;
try {
triedFallbackModelIds.add(String(candidate.model.id || ""));
chatApiLogger.info(`[Chat API] 🔁 Gemini cross-provider failover: ${candidate.model.displayName} (${candidate.provider.type})`);
@ -9320,7 +9314,6 @@ export async function POST(request: Request) {
chatApiLogger.info(`[Chat API] ✅ Gemini cross-provider fallback model ${fallbackResult.displayName} succeeded!`);
break;
} catch (fallbackError) {
if (isProviderBalanceError(fallbackError)) balanceBlockedProviders.add(candidate.provider.id);
const fallbackErrorMessage = normalizeFailoverErrorMessage(fallbackError);
if (shouldCooldownImageFallbackModel(fallbackErrorMessage)) {
setImageFallbackModelCooldown(candidate.model.id, fallbackErrorMessage);
@ -9991,7 +9984,7 @@ export async function POST(request: Request) {
const balanceBlockedProviders = new Set<string>();
if (isProviderBalanceError(primaryError) && currentModelEntry?.provider.id) balanceBlockedProviders.add(currentModelEntry.provider.id);
for (const candidate of fallbackCandidates) {
if (!canUseImageFallback(candidate, effectiveImageGenerationParams, messagesForAlibaba, balanceBlockedProviders)) continue;
if (balanceBlockedProviders.has(candidate.provider.id)) continue;
try {
triedFallbackModelIds.add(String(candidate.model.id || ""));
chatApiLogger.info(`[Chat API] 🔄 Alibaba fallback model: ${candidate.model.displayName} (${candidate.provider.type})`);
@ -10067,7 +10060,7 @@ export async function POST(request: Request) {
}).filter((candidate) => !triedFallbackModelIds.has(String(candidate.model.id || "")) && !balanceBlockedProviders.has(candidate.provider.id));
for (const candidate of crossProviderCandidates) {
if (!canUseImageFallback(candidate, effectiveImageGenerationParams, messagesForAlibaba, balanceBlockedProviders)) continue;
if (balanceBlockedProviders.has(candidate.provider.id)) continue;
try {
triedFallbackModelIds.add(String(candidate.model.id || ""));
chatApiLogger.info(`[Chat API] 🔁 Cross-provider failover attempt: ${candidate.model.displayName} (${candidate.provider.type})`);
@ -10455,10 +10448,7 @@ export async function POST(request: Request) {
throw primaryError;
}
let fallbackSuccess = false;
const balanceBlockedProviders = new Set<string>();
if (isProviderBalanceError(primaryError) && volcanoModelConfig?.providerId) balanceBlockedProviders.add(volcanoModelConfig.providerId);
for (const candidate of fallbackCandidates) {
if (!canUseImageFallback(candidate, effectiveImageGenerationParams, messagesForVolcano, balanceBlockedProviders)) continue;
try {
chatApiLogger.info(`[Chat API] 🔄 Volcano fallback model: ${candidate.model.displayName} (${candidate.provider.type})`);
const fallbackResult = await generateImageWithFailoverCandidate({
@ -10480,7 +10470,6 @@ export async function POST(request: Request) {
chatApiLogger.info(`[Chat API] ✅ Volcano fallback model ${fallbackResult.displayName} succeeded!`);
break;
} catch (fallbackError) {
if (isProviderBalanceError(fallbackError)) balanceBlockedProviders.add(candidate.provider.id);
const fallbackErrorMessage = normalizeFailoverErrorMessage(fallbackError);
if (shouldCooldownImageFallbackModel(fallbackErrorMessage)) {
setImageFallbackModelCooldown(candidate.model.id, fallbackErrorMessage);
@ -10516,7 +10505,6 @@ export async function POST(request: Request) {
});
for (const candidate of crossProviderCandidates) {
if (!canUseImageFallback(candidate, effectiveImageGenerationParams, messagesForVolcano, balanceBlockedProviders)) continue;
try {
chatApiLogger.info(`[Chat API] 🔁 Volcano cross-provider failover attempt: ${candidate.model.displayName} (${candidate.provider.type})`);
if (
@ -10597,7 +10585,6 @@ export async function POST(request: Request) {
chatApiLogger.info(`[Chat API] ✅ Volcano cross-provider failover succeeded: ${candidate.model.displayName} (${candidate.provider.type})`);
break;
} catch (crossError) {
if (isProviderBalanceError(crossError)) balanceBlockedProviders.add(candidate.provider.id);
const crossErrorMessage = normalizeFailoverErrorMessage(crossError);
if (shouldCooldownImageFallbackModel(crossErrorMessage)) {
setImageFallbackModelCooldown(candidate.model.id, crossErrorMessage);
@ -11341,10 +11328,7 @@ export async function POST(request: Request) {
}
let fallbackSuccess = false;
const balanceBlockedProviders = new Set<string>();
if (isProviderBalanceError(primaryError) && currentModelConfig?.providerId) balanceBlockedProviders.add(currentModelConfig.providerId);
for (const candidate of fallbackCandidates) {
if (!canUseImageFallback(candidate, effectiveImageGenerationParams, messagesForCrossProvider, balanceBlockedProviders)) continue;
try {
chatApiLogger.info(`[Chat API] 🔄 OpenAI-compatible fallback model: ${candidate.model.displayName} (${candidate.provider.type})`);
const shouldUseOpenAICompatFallback =
@ -11386,7 +11370,6 @@ export async function POST(request: Request) {
chatApiLogger.info(`[Chat API] ✅ OpenAI-compatible fallback model ${candidate.model.displayName} succeeded!`);
break;
} catch (fallbackError) {
if (isProviderBalanceError(fallbackError)) balanceBlockedProviders.add(candidate.provider.id);
const fallbackErrorMessage = normalizeFailoverErrorMessage(fallbackError);
if (shouldCooldownImageFallbackModel(fallbackErrorMessage)) {
setImageFallbackModelCooldown(candidate.model.id, fallbackErrorMessage);
@ -11423,7 +11406,6 @@ export async function POST(request: Request) {
});
for (const candidate of crossProviderCandidates) {
if (!canUseImageFallback(candidate, effectiveImageGenerationParams, messagesForCrossProvider, balanceBlockedProviders)) continue;
try {
chatApiLogger.info(`[Chat API] 🔁 OpenAI-compatible cross-provider failover: ${candidate.model.displayName} (${candidate.provider.type})`);
if (
@ -11507,7 +11489,6 @@ export async function POST(request: Request) {
chatApiLogger.info(`[Chat API] ✅ OpenAI-compatible cross-provider failover succeeded: ${candidate.model.displayName} (${candidate.provider.type})`);
break;
} catch (crossError) {
if (isProviderBalanceError(crossError)) balanceBlockedProviders.add(candidate.provider.id);
const crossErrorMessage = normalizeFailoverErrorMessage(crossError);
if (shouldCooldownImageFallbackModel(crossErrorMessage)) {
setImageFallbackModelCooldown(candidate.model.id, crossErrorMessage);

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

@ -450,7 +450,7 @@ async function analyzeFunctionalShowcaseImage(params: {
},
],
temperature: 0,
maxOutputTokens: 120,
maxTokens: 120,
abortSignal: AbortSignal.timeout(25_000),
} as any);

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

@ -329,7 +329,6 @@ export async function POST(request: Request) {
withModel,
imageSize: snapshot.imagePreferences?.parameters?.imageSize,
imagePreferences: snapshot.imagePreferences,
priorCalls: snapshot.calls,
preferredModelId: snapshot.imagePreferences?.modelId || (preset?.type === "image" ? preset.defaultModelId || undefined : undefined),
operationSelectedNodeIds: selectedNodeIds,
objective: [snapshot.objective, ...snapshot.inputs.map((input) => input.text)].join(

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

@ -1804,7 +1804,7 @@ async function runDualDirectorPlanPreflight(params: {
? "You are both an art director and a marketing director for high-conversion e-commerce detail pages. Output JSON only."
: "你同时扮演高转化电商详情页的平面设计总监与营销总监。仅输出JSON。",
temperature: params.isLocalMoonshot ? 1 : 0.1,
maxOutputTokens: 2000,
maxTokens: 2000,
...(params.kimiOptions || {}),
}, params.timeoutMs || DETAIL_PLAN_PREFLIGHT_TIMEOUT_MS);
@ -2040,7 +2040,7 @@ export async function POST(request: Request) {
kimiDetailProfile: plannerKimiOptions.headers
? {
thinking: plannerKimiOptions.headers["x-detail-agent-kimi-thinking"],
maxOutputTokens: plannerKimiOptions.maxOutputTokens,
maxTokens: plannerKimiOptions.maxTokens,
}
: null,
});
@ -2177,7 +2177,7 @@ export async function POST(request: Request) {
`{"summary":"简述","globalStyle":{"designLanguage":"一句话风格方向","typography":{"fontFamily":"字体家族","title":"主标题规范","subtitle":"副标题规范","body":"正文规范"},"layout":{"grid":"栅格","safeArea":"安全区","rhythm":"留白节奏"},"palette":"配色规范"},"screens":[{"index":1,"screenType":"B","objective":"本屏目标","title":"首屏示例:甩甩杆,自拍不手抖(6-20字)","subtitle":"一句副标题","copy":"正文文案","layoutNote":"排版说明","useModel":false,"modelReason":"是否需要人物及原因","bundleShowcase":false,"bundleReason":"是否为搭配展示页及原因","fabe":{"b":"利益","f":"特征","a":"优势","e":"证据"},"visualPrompt":"用于生图的完整提示词,必须包含790x1300与统一字体排版"}],"dslV2Screens":[{"version":"detail-ui-dsl/v2","screenIndex":1,"layoutVariant":"hero-left-panel","region":{"x":0.06,"y":0.05,"width":0.88,"height":0.46},"nodes":[{"kind":"panel","id":"hero-panel","variant":"glass","tone":"light","direction":"column","gap":18,"children":[{"kind":"badge","id":"screen-badge","icon":"sparkle","text":"核心升级","tone":"primary"},{"kind":"heading","id":"hero-title","text":"护腰椅,久坐不腰酸","level":1,"emphasis":"hero"},{"kind":"body","id":"hero-subtitle","text":"在家里加班,也能护腰/舒适","emphasis":"strong"}]}]}]}`,
temperature: 0.25,
...(localDetailAgentResolved ? { temperature: 1 } : {}),
maxOutputTokens: 1800,
maxTokens: 1800,
...plannerKimiOptions,
});

View File

@ -323,7 +323,7 @@ export async function POST(request: Request) {
kimiDetailProfile: reviewKimiOptions.headers
? {
thinking: reviewKimiOptions.headers["x-detail-agent-kimi-thinking"],
maxOutputTokens: reviewKimiOptions.maxOutputTokens,
maxTokens: reviewKimiOptions.maxTokens,
}
: null,
});
@ -438,7 +438,7 @@ export async function POST(request: Request) {
? "You are both an Art Director and a Marketing Director for high-conversion e-commerce detail pages. Evaluate with strict professional standards and output JSON only."
: "你同时是高转化电商详情页的平面设计总监与营销总监。按严格专业标准评估,仅输出JSON。",
temperature: localDetailAgentResolved ? 1 : 0.1,
maxOutputTokens: 800,
maxTokens: 800,
...reviewKimiOptions,
} as any);
text = String(result?.text || "");

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

@ -114,7 +114,7 @@ export async function POST(request: NextRequest) {
},
],
temperature: 0.2,
maxOutputTokens: 1200,
maxTokens: 1200,
} as any);
return NextResponse.json({

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

@ -5,7 +5,6 @@ import { readCanvasDraft, writeCanvasDraft, clearCanvasDraft } from "@/lib/clien
import { mergeCanvasSnapshots } from "@/lib/video-canvas/merge-snapshot";
import { BEFORE_PAGE_REFRESH, type PageRefreshRequest } from "@/lib/client/page-refresh";
import { CanvasRemoteOperationContext, type CanvasRemoteOperation, type CanvasRemoteOperationResult } from "@/components/canvas/CanvasRemoteOperationContext";
import equal from "fast-deep-equal";
import {
AlertCircle,
AlertTriangle,
@ -172,7 +171,6 @@ import {
type VideoCanvasSymbolMarkerId,
} from "@/lib/canvas/video-canvas-markers";
import {
isCanvasImageUploadPending,
LOCAL_UPLOAD_PENDING_METADATA_KEY,
LOCAL_UPLOAD_PREVIEW_METADATA_KEY,
} from "@/lib/canvas/local-upload-state";
@ -233,8 +231,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 +271,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 +2174,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 +2211,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 +2277,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 +2328,7 @@ export default function CanvasEditorLegacyPage({
});
const sanitizedWorkflowSelections = useMemo(
() =>
requestedAgentMode && !workflowTemplates
requestedAgentMode && !siteSettingsData?.agentWorkflowUiConfig
? workflowSelections
: sanitizeAgentWorkflowSelections({
config: resolvedWorkflowUiConfig || defaultAgentWorkflowUiConfig,
@ -2376,7 +2336,7 @@ export default function CanvasEditorLegacyPage({
}),
[
requestedAgentMode,
workflowTemplates,
siteSettingsData?.agentWorkflowUiConfig,
resolvedWorkflowUiConfig,
workflowSelections,
]
@ -2384,14 +2344,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(
@ -5175,14 +5127,13 @@ export default function CanvasEditorLegacyPage({
canvasPersistenceScope.current = id;
const hasUnsavedCanvasChanges = useCallback(() => {
if (!canvasReadyRef.current || useCanvasStore.getState().projectId !== id || savedCanvasSnapshotRef.current?.id !== id) return false;
if (useCanvasStore.getState().nodes.some(isCanvasImageUploadPending)) return true;
const saved = JSON.parse(savedCanvasSnapshotRef.current.snapshot).canvasData as CanvasState;
const current = JSON.parse(JSON.stringify(buildPersistedCanvasData())) as CanvasState;
const current = buildPersistedCanvasData();
const content = (value: CanvasState) => [value.nodes.map(node => {
const { updatedAt: _updatedAt, ...nodeData } = node;
return { ...nodeData, connections: node.connections || [] };
}), value.edges || [], value.suppressedMediaKeys || [], normalizeStyleProPersistedState(value.styleProState)];
return !equal(content(saved), content(current));
}), value.edges, value.suppressedMediaKeys || [], normalizeStyleProPersistedState(value.styleProState)];
return JSON.stringify(content(saved)) !== JSON.stringify(content(current));
}, [buildPersistedCanvasData, id]);
const requestCanvasLeave = useCallback((url: string) => {
if (hasUnsavedCanvasChanges()) {
@ -5225,7 +5176,7 @@ export default function CanvasEditorLegacyPage({
try {
let canvasData = buildPersistedCanvasData();
let snapshot = JSON.stringify({ canvasData });
if (savedCanvasSnapshotRef.current?.id === id && equal(JSON.parse(savedCanvasSnapshotRef.current.snapshot), JSON.parse(snapshot))) {
if (savedCanvasSnapshotRef.current?.id === id && savedCanvasSnapshotRef.current.snapshot === snapshot) {
clearCanvasDraft(id);
return true;
}
@ -5273,8 +5224,8 @@ export default function CanvasEditorLegacyPage({
snapshot: JSON.stringify({ canvasData: buildPersistedCanvasData() }),
});
canvasSyncErrorRef.current = result.status === 409
? "画布同步发生冲突,改动已保留。请在画布上方选择保留本页或云端的冲突内容,再继续操作。"
: `画布自动同步失败${result.status ? `(HTTP ${result.status})` : "(网络连接失败)"}。${retained ? "本地草稿已保留,系统会继续自动同步,也可稍后重试。" : "请保留当前页面,检查网络后重试同步,暂勿刷新。"}`;
? "画布同步发生冲突,本次任务未提交,改动已保留。请在画布上方选择保留本页或云端的冲突内容,再继续操作。"
: `画布自动同步失败${result.status ? `(HTTP ${result.status})` : "(网络连接失败)"},本次任务未提交。${retained ? "本地草稿已保留,请检查网络后再次发送。" : "请保留当前页面,检查网络后再次发送,暂勿刷新。"}`;
console.error(`[Canvas] ${reason} save failed:`, result.error);
} else {
canvasSyncErrorRef.current = "";
@ -5307,10 +5258,6 @@ export default function CanvasEditorLegacyPage({
const finishCanvasLeave = useCallback(async (save: boolean) => {
if (!canvasLeaveUrl || isSavingBeforeLeave) return;
setCanvasLeaveError("");
if (save && useCanvasStore.getState().nodes.some(isCanvasImageUploadPending)) {
setCanvasLeaveError("还有图片未上传成功。请等待上传完成;若上传失败,请重新上传或移除该图片后再保存并离开。");
return;
}
if (canvasAutosaveTimer.current) {
clearTimeout(canvasAutosaveTimer.current);
canvasAutosaveTimer.current = null;
@ -5374,7 +5321,7 @@ export default function CanvasEditorLegacyPage({
return canvasSaveQueue.current!.enqueueOperation(
async () => {
const saved = await persistCanvasStateNow("autosave");
if (!saved) throw new Error(canvasSyncErrorRef.current ? `${canvasSyncErrorRef.current} 本次处理未提交。` : "画布尚未完成加载,本次处理未提交,请等待加载完成后重试。");
if (!saved) throw new Error(canvasSyncErrorRef.current || "画布尚未完成加载,本次处理未提交,请等待加载完成后重试。");
return true;
},
async () => {
@ -5396,18 +5343,20 @@ export default function CanvasEditorLegacyPage({
const persistCanvasBeforeAgent = useCallback(async () => {
if (!canvasReadyRef.current || useCanvasStore.getState().projectId !== id || externalCanvasConflictRef.current)
throw new Error(canvasSyncErrorRef.current ? `${canvasSyncErrorRef.current} 本次任务未提交。` : "画布尚未完成同步,本次任务未提交,请保留当前页面并重试同步。");
throw new Error(canvasSyncErrorRef.current || "画布尚未完成同步,本次任务未提交,请保留当前页面并重试同步。");
if (savedCanvasSnapshotRef.current?.id === id) {
if (!hasUnsavedCanvasChanges()) return true;
const saved = JSON.parse(savedCanvasSnapshotRef.current.snapshot).canvasData;
const current = buildPersistedCanvasData();
if (JSON.stringify(saved.nodes) === JSON.stringify(current.nodes) && JSON.stringify(saved.edges) === JSON.stringify(current.edges)) return true;
}
// Flush the pending local edit once instead of racing its scheduled autosave.
if (canvasAutosaveTimer.current) {
clearTimeout(canvasAutosaveTimer.current);
canvasAutosaveTimer.current = null;
}
if (!(await persistCanvasState("autosave"))) throw new Error(canvasSyncErrorRef.current ? `${canvasSyncErrorRef.current} 本次任务未提交。` : "画布尚未完成加载,本次任务未提交;请等待加载完成后再次发送。");
if (!(await persistCanvasState("autosave"))) throw new Error(canvasSyncErrorRef.current || "画布尚未完成加载,本次任务未提交;请等待加载完成后再次发送。");
return true;
}, [persistCanvasState, hasUnsavedCanvasChanges, id]);
}, [persistCanvasState, buildPersistedCanvasData, id]);
const canvasRemoteOperationContext = useMemo(() => ({
run: runCanvasRemoteOperation,
@ -5418,10 +5367,6 @@ export default function CanvasEditorLegacyPage({
if (isVideoMode) return;
const beforeRefresh = (event: Event) => {
const request = (event as CustomEvent<PageRefreshRequest>).detail;
if (!isAgentMode && useCanvasStore.getState().nodes.some(isCanvasImageUploadPending)) {
request.block("还有图片未上传成功。请等待上传完成;若上传失败,请重新上传或移除该图片后再刷新。");
return;
}
if (useCanvasStore.getState().isGenerating) {
request.block("当前图片任务仍在处理中,请等待结果返回后再刷新。");
return;
@ -5468,6 +5413,7 @@ export default function CanvasEditorLegacyPage({
const onVisibilityChange = () => {
if (!canvasLeaveApprovedRef.current && document.visibilityState === "hidden" && hasUnsavedCanvasChanges()) {
writeCanvasDraft(id, { base: savedCanvasSnapshotRef.current!.snapshot, snapshot: JSON.stringify({ canvasData: buildPersistedCanvasData() }) });
retrySync();
}
};
const retryTimer = window.setInterval(() => {
@ -5598,7 +5544,7 @@ export default function CanvasEditorLegacyPage({
const handleBeforeUnload = (event: BeforeUnloadEvent) => {
if (!retainDraft()) return;
event.preventDefault();
event.returnValue = "true";
event.returnValue = "";
};
const handlePageHide = () => {
try {
@ -9967,8 +9913,6 @@ export default function CanvasEditorLegacyPage({
selectedBrandModel,
appearanceRecognitionEnabled,
selections: deferredSanitizedWorkflowSelections,
resolvedSelections: workflowPromptData?.selectionRequest === getWorkflowSelectionsRequest(deferredSanitizedWorkflowSelections)
? workflowPromptData?.selections : undefined,
});
if (canceled) {
@ -9991,7 +9935,6 @@ export default function CanvasEditorLegacyPage({
selectedBrandModel,
workflowInputs,
workflowMaterials,
workflowPromptData,
]);
useEffect(() => {
workflowInputsRef.current = workflowInputs;
@ -10113,23 +10056,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 +10439,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 +10505,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>
@ -69,7 +68,6 @@ export function AppUpdateNotice() {
</AlertDialogHeader>
{error ? <p role="alert" className="text-sm text-destructive">{error}</p> : null}
<AlertDialogFooter>
{error ? <Button variant="outline" disabled={refreshing} onClick={() => { setAvailableVersion(""); setError(""); }}>返回处理</Button> : null}
<Button disabled={refreshing} onClick={() => void refresh()}>{refreshing ? "正在同步内容…" : "同步并刷新"}</Button>
</AlertDialogFooter>
</AlertDialogContent>

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,
@ -8970,10 +8972,6 @@ export function CanvasChatPanel({
useEffect(() => {
const beforeRefresh = (event: Event) => {
const request = (event as CustomEvent<PageRefreshRequest>).detail;
if (composerUploadProgress) {
request.block("素材仍在上传,请等待上传完成后再刷新。当前页面和输入已保留。");
return;
}
if (isCanvasAgentRunning || isClawdSubmitting || isDetailGenerating || status === "streaming" || status === "submitted" || Object.values(sendGuardRef.current).some(guard => guard.inFlight)) {
request.block("当前对话任务仍在处理中,请等待结果返回后再刷新。原任务会继续执行,无需重新提交。");
return;
@ -8983,17 +8981,9 @@ export function CanvasChatPanel({
throw new Error("浏览器无法保存当前输入,请保留此页并检查浏览器存储空间后重试。");
});
};
const beforeUnload = (event: BeforeUnloadEvent) => {
event.preventDefault();
event.returnValue = "true";
};
window.addEventListener(BEFORE_PAGE_REFRESH, beforeRefresh);
if (composerUploadProgress) window.addEventListener("beforeunload", beforeUnload);
return () => {
window.removeEventListener(BEFORE_PAGE_REFRESH, beforeRefresh);
window.removeEventListener("beforeunload", beforeUnload);
};
}, [activeChatId, input, attachments, composerUploadProgress, isCanvasAgentRunning, isClawdSubmitting, isDetailGenerating, status]);
return () => window.removeEventListener(BEFORE_PAGE_REFRESH, beforeRefresh);
}, [activeChatId, input, attachments, isCanvasAgentRunning, isClawdSubmitting, isDetailGenerating, status]);
const restorePendingClawdRequestToComposer = useCallback(
(snapshot: PendingClawdRequestRestoreSnapshot) => {
@ -9581,6 +9571,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 +9604,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 +9636,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 +10364,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 +10442,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 +13728,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 +14917,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,8 +1,6 @@
"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 { restoreTextResourceContent } from "@/lib/video-canvas/text-resource";
import { GroupStoryboardPreview } from "./GroupStoryboardPreview";
import { CanvasGroupToolbar } from "./CanvasGroupToolbar";
import { isCanvasGroup, groupMembers, makeCanvasGroup, ungroupCanvasNodes, moveCanvasSelection, layoutCanvasGroup, migrateLegacyGroups, exportCanvasGroup, instantiateCanvasGroup, groupBounds, assignGroupMembers } from "@/lib/video-canvas/groups";
@ -4146,7 +4144,7 @@ function normalizeTextResourceNode(node: CloneNode, fallbackIndex: number): Clon
draftValues: {
...(node.draftValues || {}),
action: "TEXT_RESOURCE",
content: restoreTextResourceContent(node.draftValues),
content: Array.isArray(node.draftValues?.content) ? node.draftValues?.content : [],
nodeType: "text",
scriptRole: "resource",
viewMode: undefined,
@ -15106,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)});
@ -15627,8 +15625,7 @@ function VideoTargetModuleComposer({
const ratio = supported.ratios.length && !supported.ratios.includes(normalizeVideoRatioValue(current.ratio)) ? supported.ratios[0] : current.ratio;
const executableResolutions = supported.resolutions.filter(value => ["480p", "720p", "1080p"].includes(value.toLowerCase()));
const resolution = executableResolutions.length && !executableResolutions.includes(normalizeVideoResolutionValue(current.resolution)) ? executableResolutions[0].toUpperCase() : current.resolution;
const durations = getCanvasVideoParameters(target, activeMode, resolution || "720P").durations;
const duration = durations.length && !durations.includes(normalizeVideoDurationValue(current.duration)) ? `${durations[0]}s` : current.duration;
const duration = supported.durations.length && !supported.durations.includes(normalizeVideoDurationValue(current.duration)) ? `${supported.durations[0]}s` : current.duration;
const audio = supported.supportsAudio ? current.audio : "关闭";
return ratio === current.ratio && resolution === current.resolution && duration === current.duration && audio === current.audio ? current : {...current, ratio, resolution, duration, audio};
});
@ -17931,7 +17928,7 @@ function VideoParameterEditor({
const candidates = filterCanvasModels(modelOptions, audioRequired ? "audio-video" : "video", mode);
const model = candidates.find(item => item.id === settings.model || item.modelId === settings.model) ||
(!normalizeModelRef(settings.model) || settings.model === "auto" ? candidates[0] : undefined);
const options = getCanvasVideoParameters(model, mode, settings.resolution || "720P");
const options = getCanvasVideoParameters(model, mode);
const executableResolutions = options.resolutions.filter(value => ["480p", "720p", "1080p"].includes(value.toLowerCase())).map(value => value.toUpperCase());
const durationIndex = Math.max(0, options.durations.indexOf(normalizeVideoDurationValue(settings.duration)));
return (
@ -20841,18 +20838,8 @@ function PresetMediaCanvasNode({
</div>
) : mediaType === "audio" ? (
<div className="relative h-[calc(100%-32px)]">
{isGenerating || isGenerationFailed ? (
<GenerationPendingPreview
errorMessage={getDraftString(node, "generationError")}
onCancel={onCancelGeneration}
progress={getDraftNumber(node, "generationProgress", 0)}
status={generationStatus}
statusLabel={getDraftString(node, "pendingLabel") || "生成中"}
/>
) : (
<OfficialAudioCard durationSeconds={getDraftNumber(node, "durationSeconds", 0)} mediaUrl={mediaUrl} selected={selected} />
)}
{!generated && !isGenerating && !isGenerationFailed ? (
<OfficialAudioCard durationSeconds={getDraftNumber(node, "durationSeconds", 3)} mediaUrl={mediaUrl} selected={selected} />
{!generated ? (
<button
aria-label={mediaUrl ? "替换音频" : "上传音频"}
className="absolute right-3 top-3 flex h-9 w-9 items-center justify-center rounded-[8px] bg-black/56 text-white/90"
@ -21398,14 +21385,12 @@ function GenerationPendingPreview({
previewUrl,
progress,
status,
statusLabel,
}: {
errorMessage?: string;
onCancel: () => void;
previewUrl?: string;
progress: number;
status: string;
statusLabel?: string;
}) {
const displayProgress = Math.max(2, Math.min(99, Math.round(progress)));
const failed = status === "failed";
@ -21451,7 +21436,7 @@ function GenerationPendingPreview({
</>
) : (
<>
<span>{statusLabel || `生成中 ${displayProgress}%...`}</span>
<span>生成中 {displayProgress}%...</span>
<button
className="font-medium text-white/42 transition hover:text-white/80"
onClick={(event) => {
@ -21479,7 +21464,11 @@ function PureTextResourceCanvasNode({
onTextResourceChange: (content: string) => void;
selected: boolean;
}) {
const textContent = restoreTextResourceContent(node.draftValues)[0] || "";
const contentValues = node.draftValues?.content;
const textContent =
Array.isArray(contentValues) && typeof contentValues[0] === "string"
? contentValues[0]
: "";
return (
<div className="h-full w-full">

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

@ -5,7 +5,7 @@ import { useEffect, useState } from "react";
import { Button } from "@/components/ui/button";
import { ChevronDown, ChevronUp, Link2, Scan, SlidersHorizontal, Sparkles } from "lucide-react";
import { getGrsaiGptImageOutputSize } from "@/lib/ai/grsai-gpt-image-sizes";
import { getVip98kQualityOptions, resolveVip98kImageTaskSize, type Vip98kTaskInvocation } from "@/lib/ai/vip98k-task-invocation";
import { resolveVip98kImageTaskSize } from "@/lib/ai/vip98k-task-invocation";
import { cn } from "@/lib/utils";
import { Input } from "@/components/ui/input";
import { Switch } from "@/components/ui/switch";
@ -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;
@ -268,17 +267,6 @@ export function ImageParamsBar({
availableAspectRatioOptions[0]?.value ||
"1:1";
const declaredQualityOptions = providerType === "vip98k"
? getVip98kQualityOptions((imageGenConfig?.vip98k?.invocation as Vip98kTaskInvocation | undefined)?.inputSchema)
: undefined;
const qualityOptions = ([
{ label: "自动", value: "auto" },
{ label: "高", value: "high" },
{ label: "中", value: "medium" },
{ label: "低", value: "low" },
] as const).filter(option => declaredQualityOptions === undefined ||
(declaredQualityOptions.length ? declaredQualityOptions.includes(option.value) : option.value === "auto"));
const clampParamsByProvider = (raw: ImageGenerationParams): ImageGenerationParams => {
const options = getImageCountOptions();
const fallbackCount = options[0] ?? 1;
@ -297,7 +285,6 @@ export function ImageParamsBar({
aspectRatio,
imageSize,
imageCount,
quality: qualityOptions.some(option => option.value === raw.quality) ? raw.quality : qualityOptions[0]?.value || "auto",
};
};
@ -334,6 +321,12 @@ export function ImageParamsBar({
...buildBaseParams(initialParams),
});
const [minimalParamsOpen, setMinimalParamsOpen] = useState(false);
const qualityOptions = [
{ label: "自动", value: "auto" },
{ label: "高", value: "high" },
{ label: "中", value: "medium" },
{ label: "低", value: "low" },
] as const;
const qualityLabel =
qualityOptions.find((option) => option.value === params.quality)?.label || "中";

View File

@ -1,175 +0,0 @@
# 生效模型参数核对(2026-11-16)
核对对象为模型和所属上游同时启用的 76 条配置,包括隐藏但仍可被功能调用的模型。依据生产配置快照、实际请求构建代码、98K 当前账户公布的接口契约以及阿里云、AtlasCloud、Anthropic 官方资料。
## 修复范围
| 问题 | 影响与处理 |
| --- | --- |
| 图片尺寸与比例 | 删除仅允许正方形的错误约束;有独立比例与清晰度字段时按上游契约组合,固定 2K/4K 模型使用对应档位。 |
| 请求路线 | 显式选定的标准接口优先于通用任务示例,保留路线与参数约束的对应关系。 |
| 参考图数量 | 读取嵌套约束并采用当前实际调用接口的上限,GPT Image 2 的上限由 16 校正为 14。 |
| 图片质量与负面提示词 | 质量和负面提示词只写入一个有效位置;固定质量模型不再发送旧的其他档位,页面只提供接口接受的质量选项。 |
| 可选生成控制 | 修复水印、提示词扩展、随机种子、尾帧和固定镜头的已支持字段漏传,保留 false 和 0 的原值;上游未声明的字段不发送。 |
| 视频时长 | Veo 使用当前接口的 duration 字段;Minimax 的 1080p 时长选项限制在接口允许范围内。 |
| 文字输出长度 | AI SDK 调用统一使用 maxOutputTokens,原生厂商接口保留各自标准字段。 |
| Claude 采样参数 | 对固定采样协议移除 temperature、top_p、top_k,保留工具调用和输出长度。Haiku 5.5 已实测。 |
| 世界生成分类 | world-generation 的类型及任务调用配置按现有世界生成接口校正,避免作为聊天模型使用。 |
| 聊天生图备用模型 | 按原请求的清晰度、比例、张数和参考图数量筛选,不把 1K/4K 请求传给固定 2K 模型;额度不足时跳过同一账户的其他模型。 |
| 额度错误与请求追踪 | 98K 的英文可用额度不足归类为服务商余额/额度问题,保留上游请求号并关联网页请求号。 |
## 验证
- 图片、视频、音频及工具参数组成 12,135 个离线请求用例,采用实际请求构建函数,并核对当前接口约束与字段值。
- 阿里云图片另外覆盖 80 个尺寸、数量、参考图、随机种子和开关组合;7 个 AtlasCloud 三维模型按各自 OpenAPI 请求规范核对。
- 19 个聊天/文字模型捕获官方 SDK 生成的请求,覆盖输出长度、采样、停止词以及适用的图片和工具调用。13 个 98K 模型同时通过当前路线契约校验;其余 6 个根据接入代码和 SDK 请求核对。
- 自动回归 118 项通过,TypeScript 检查通过。
- 聊天回退与失败提示另通过 49 项针对性回归,覆盖固定清晰度、比例、张数、参考图上限、同账户额度隔离、未知结果不重提,以及网页提示和历史记录一致。
- 独立实测:Nano Banana 2 带参考图生成 16:9 图片,返回 1376×768 PNG;固定 4K 编辑返回 4096×4096 JPEG;Claude Haiku 5.5 返回有效工具调用。两张图片均完成七牛保存和下载验证。每项只有一次提交。
## 生效模型清单
| 模型 | 上游 | 本次核对 |
| --- | --- | --- |
| `grok-4.7` | 98K | SDK 请求、输出长度、采样、停止词、视觉及工具调用 |
| `gpt-image-2` | 98K | 126 组请求字段与接口约束 |
| `gpt-image-2-vip` | 98K | 360 组请求字段与接口约束 |
| `nano-banana-2` | 98K | 90 组请求字段与接口约束 |
| `nano-banana-pro` | 98K | 90 组请求字段与接口约束 |
| `gpt-image-2.5` | 98K | 30 组请求字段与接口约束 |
| `gpt-image-2.5-flare` | 98K | 288 组请求字段与接口约束 |
| `ocr` | 98K | 3 组请求字段与接口约束 |
| `gpt-image-2.5-sunburst` | 98K | 504 组请求字段与接口约束 |
| `nano-banana-2-2k-cl` | 98K | 12 组请求字段与接口约束 |
| `nano-banana-2-4k-cl` | 98K | 12 组请求字段与接口约束 |
| `nano-banana-2-cl` | 98K | 12 组请求字段与接口约束 |
| `nano-banana-pro-4k-vip` | 98K | 12 组请求字段与接口约束 |
| `nano-banana-pro-cl` | 98K | 12 组请求字段与接口约束 |
| `nano-banana-pro-vip` | 98K | 12 组请求字段与接口约束 |
| `doubao-seedream-5-0-pro` | 98K | 240 组请求字段与接口约束 |
| `flux-2-pro` | 98K | 48 组请求字段与接口约束 |
| `gpt-image-2.6` | 98K | 84 组请求字段与接口约束 |
| `gpt-image-2.6-flare` | 98K | 360 组请求字段与接口约束 |
| `gpt-image-2.6-sunburst` | 98K | 36 组请求字段与接口约束 |
| `nano-banana-2-plus` | 98K | 360 组请求字段与接口约束 |
| `nano-banana-pro-plus` | 98K | 360 组请求字段与接口约束 |
| `qwen-image-3.0` | 98K | 48 组请求字段与接口约束 |
| `qwen-image-3.0-pro` | 98K | 48 组请求字段与接口约束 |
| `minimax-h3` | 98K | 320 组请求字段与接口约束 |
| `veo-3.1-fast` | 98K | 16 组请求字段与接口约束 |
| `seedance-2.5` | 98K | 1296 组请求字段与接口约束 |
| `seedance-2.5-image-to-video` | 98K | 1458 组请求字段与接口约束 |
| `seedance-2.5-reference-to-video` | 98K | 1458 组请求字段与接口约束 |
| `seedance-2.5-text-to-video` | 98K | 1134 组请求字段与接口约束 |
| `gemini-omni-1.1-flash-preview` | 98K | 8 组请求字段与接口约束 |
| `grok-imagine-video` | 98K | 2500 组请求字段与接口约束 |
| `grok-imagine-video-1.5` | 98K | 750 组请求字段与接口约束 |
| `gemini-3.8-flash` | 98K | SDK 请求、输出长度、采样、停止词、视觉及工具调用 |
| `gpt-6-astra` | 98K | SDK 请求、输出长度、采样、停止词 |
| `gpt-6-sol` | 98K | SDK 请求、输出长度、采样、停止词 |
| `gpt-6.1-sol` | 98K | SDK 请求、输出长度、采样、停止词 |
| `world-generation` | 98K | 世界生成类型、任务提交与结果查询配置 |
| `claude-haiku-5-5` | 98K | SDK 请求、输出长度、采样、停止词、视觉及工具调用 |
| `claude-sonnet-4-6` | 98K | SDK 请求、输出长度、采样、停止词、视觉及工具调用 |
| `image-expansion` | 98K | 3 组请求字段与接口约束 |
| `gem-3.1-tts` | 98K | 4 组请求字段与接口约束 |
| `mimo-v2.5-asr` | 98K | 1 组请求字段与接口约束 |
| `mimo-v2.5-tts` | 98K | 1 组请求字段与接口约束 |
| `mimo-v2.5-tts-voiceclone` | 98K | 1 组请求字段与接口约束 |
| `mimo-v2.5-tts-voicedesign` | 98K | 1 组请求字段与接口约束 |
| `music-2.5` | 98K | 3 组请求字段与接口约束 |
| `music-2.5+` | 98K | 3 组请求字段与接口约束 |
| `speech-2.8-hd` | 98K | 6 组请求字段与接口约束 |
| `speech-2.8-turbo` | 98K | 6 组请求字段与接口约束 |
| `suno-v4.5` | 98K | 3 组请求字段与接口约束 |
| `suno-v6` | 98K | 3 组请求字段与接口约束 |
| `suno-v5` | 98K | 3 组请求字段与接口约束 |
| `suno-v5-5` | 98K | 3 组请求字段与接口约束 |
| `claude-fable-5-1` | 98K | SDK 请求、输出长度、采样、停止词、视觉及工具调用 |
| `claude-opus-5-5` | 98K | SDK 请求、输出长度、采样、停止词、视觉及工具调用 |
| `claude-sonnet-5-5` | 98K | SDK 请求、输出长度、采样、停止词、视觉及工具调用 |
| `gemini-4-argon` | 98K | SDK 请求、输出长度、采样、停止词、视觉及工具调用 |
| `grok-4.5` | 98K | SDK 请求、输出长度、采样、停止词、视觉及工具调用 |
| `grok-4.6` | 98K | SDK 请求、输出长度、采样、停止词、视觉及工具调用 |
| `tripo-h3.1/image-to-3d` | AtlasCloud | 提示词/参考图、三维输出参数及官方 OpenAPI |
| `tripo-h3.1/text-to-3d` | AtlasCloud | 提示词/参考图、三维输出参数及官方 OpenAPI |
| `tencent/hunyuan3d-pro/text-to-3d` | AtlasCloud | 提示词/参考图、三维输出参数及官方 OpenAPI |
| `tencent/hunyuan3d-pro/image-to-3d` | AtlasCloud | 提示词/参考图、三维输出参数及官方 OpenAPI |
| `tencent/hunyuan3d-rapid/text-to-3d` | AtlasCloud | 提示词/参考图、三维输出参数及官方 OpenAPI |
| `tencent/hunyuan3d-rapid/image-to-3d` | AtlasCloud | 提示词/参考图、三维输出参数及官方 OpenAPI |
| `bytedance/seed3d-v2.0/image-to-3d` | AtlasCloud | 提示词/参考图、三维输出参数及官方 OpenAPI |
| `qwen-image-3.0` | 阿里云图片 | 80 组图片参数及原生请求字段 |
| `qwen3-vl-plus` | 阿里云 | SDK 请求、输出长度、采样、停止词、视觉及工具调用 |
| `qwen3.8-max` | 阿里云 | SDK 请求、输出长度、采样、停止词、视觉及工具调用 |
| `qwen3.8-omni-flash` | 阿里云 | SDK 请求、输出长度、采样、停止词、视觉及工具调用 |
| `qwen3-tts-instruct-flash` | 阿里云 | 官方语音请求、音色、语言与指令 |
| `qwen3-tts-flash` | 阿里云 | 官方语音请求、音色、语言与指令 |
| `deepseek-flash` | 自定义标准接口 | SDK 请求、输出长度、采样、停止词、视觉及工具调用 |
| `agnes-1.5-flash` | 自定义标准接口 | SDK 请求、输出长度、采样、停止词、视觉及工具调用 |
| `agnes-2.0-flash` | 自定义标准接口 | SDK 请求、输出长度、采样、停止词、视觉及工具调用 |
## 线上核对
11 月 16 日 15:14–15:23(新加坡时间)98K 只读核查确认账户可用余额不足以预留生成费用,相关拒绝未派发上游;相同的额度错误及备用模型规格不匹配在本轮发布激活前已出现,与网页是否刷新无关。15:43 确认充值到账,“风骚”账号 15:34–15:44 已有 6 笔成功新图片记录,包含 1K 和 4K 请求;历史失败请求未重放。
32 条模型参数配置已更新并回读核对。聊天回退与额度提示修复已上线,公开入口与正式进程版本一致;切换在旧进程工作归零后完成,未修改历史任务状态。
场景融合的无效视频首选项已清除,恢复为“不指定首选”,与原先实际采用的图片候选池一致;其余设置保持不变。该配置即时生效,无需重启服务。
## 当日需求收尾
| 需求 | 核对结果 |
| --- | --- |
| 下载慢与图片归档 | 原图七牛直连、准备及转换状态、取消自动转传回生产机的修复已上线。16:21 归档完成数持续增加,队列中的新图片正在保存或更新画布引用,没有新的失败记录。 |
| 旧 BananaImage 入口 | 旧供应商与五个旧模型已停用、隐藏;98K 对应入口保留。线上回读与网页列表一致。 |
| 后台历史缺图 | 11 月 13 日有 108 张涉及 24 位用户的原图未成功归档;上游文件 404、七牛及本地缓存无副本。Relay 隔离核验三个备份后找回 10 张的原请求号,其余 98 张没有匹配的保留响应,原文件恢复数为 0;未重新生成。 |
| 98K 缺失模型接入 | 本次原定的 48 个型号已开放 40 个:对话 5、图片 15、视频 7、语音及音乐 13。剩余 8 个仍受上游型号授权或能力限制。 |
| 六款 CL/VIP 参考图编辑 | 六款已完成独立参考图生成、尺寸及七牛保存验证并上线;网页已核对六款均可选择,已移除“仅文生图”标记。 |
| “风骚”首次规格错误 | 4K 尺寸映射修复已上线,独立参考图结果为 4096×4096;网页选择固定 4K 型号时自动切换到 4K,参数面板只提供该型号支持的选项。 |
| 全部生效模型参数核对 | 已覆盖当时生效的 76 条模型记录,修复与配置调整已上线,包含分辨率、比例、数量、参考图、质量、采样、视频时长等字段。 |
| “风骚”再次报错 | 已确认额度不足引发不兼容备用模型回退,非旧网页引起;额度识别、同供应商回退阻止及规格筛选已上线。充值后该账号已有新的成功结果,旧请求未重放。 |
### 网页操作验收
- 在独立图片测试画布核对模型列表及固定 4K 参数。测试画布:`97aca1be-6bdb-485e-945e-00cc21691d84`。
- 在独立音频测试画布选择 `mimo-v2.5-tts`,提交中文短句一次,19.42 秒完成;WAV 文件保存至七牛,网页显示约 4 秒并播放到结尾。任务记录为成功、尝试一次。测试画布:`8b76a09a-f24f-42ff-9f1e-f3809909dd84`。
- 上述测试不等于 40 个新型号的每一种网页流程均完成验收;参考图、视频和其他音频型号的实际调用及存储验证沿用已有独立测试记录。
17:46 起在 Codex 内置浏览器补充验收,所有操作均在独立测试画布完成:语音识别 6.88 秒返回文字,声音克隆 93.27 秒、声音设计 15.07 秒返回已存入七牛的 WAV,均只提交一次。识别文字存在同音字误差,需要人工校对。
本轮修复语音识别成功后画布结果为空的问题:新结果采用画布文本结构,已保存的字符串结果也可直接显示和编辑;重复查询不会覆盖人工修改。音频生成节点显示排队、处理中及失败信息,不再以空播放器及默认三秒时长表示未完成任务。相关回归 72 项和 TypeScript 检查通过;内置浏览器独立页面已验证新旧文字显示、中文与尺寸编辑、空格保留及等待/失败状态,修复已上线。
画布恢复时统一读取字符串和数组格式的文本,保留中文、尺寸及空格;人工编辑和主动清空按画布保存内容显示。恢复与任务相关回归 46 项、TypeScript 检查及内置浏览器的实际恢复组件验收通过。18:53(新加坡时间)在原测试画布完成正式网页验收:旧文字正常读取,中文和 `15mm` 修改保存后刷新仍保留,主动清空保存后刷新保持空白,末尾空格正常保留。
音乐原任务已成功完成并保存七牛,网页解码时长约 150 秒并可播放。供应商核对确认只受理及扣费一次;本项目工作进程续查一次原任务,没有重新派发。声音克隆与声音设计在内置浏览器均播放到结尾。
正式运行版本为 `20261116T103955Z-582667dd05a1`,源码提交 `582667dd05a1a629850937aa46b506897998576d`,构建编号 `9nLxMnP463njtm-3FO694`;生产进程目录、构建编号、公开版本接口与发布回执一致。发布等待后台工作结束后再停止旧进程,历史挂起任务记录保持不变。原测试画布仍为五笔成功任务,没有新增生成请求。18:50 复核当日图片归档均已完成,没有等待归档或下载准备积压。
验收截图:`.qa/production-audio-acceptance.png`。临时本地验收服务已结束,测试画布保留供复核。
### 剩余上游事项
| 型号 | 当前阻塞 | 处理方 |
| --- | --- | --- |
| `gemini-3-pro-image-preview-vip`、`gemini-3.1-flash-image-preview-vip`、`gemini-nano-banana-2.1-vip`、`nano_banana`、`nano_banana_2`、`nano_banana_pro` | 实际账户目录未提供精确型号,原请求返回无执行权限 | ToAPIs 开通对应账户分组型号 |
| `gpt-6.1-terra` | 标准工具字段已传递,原响应没有工具调用 | ToAPIs 确认该线路工具调用能力 |
| `gem-2.5-tts` | 原异步任务终态服务不可用,已退款并释放预留 | ZZY 恢复该音频服务 |
以上 8 个仍未开放。Relay 于 16:25 回读确认尚无恢复证据,本轮未新增已知失败的付费探测。
### 历史原图恢复
Relay 已只读核验 11 月 13 日 15:13、16:00 以及 11 月 16 日 12:03 的独立备份。10 张可匹配原请求的图片均由 Grsai 同步返回,备份只保留已失效的图片链接,没有原文件或可查询的上游任务号;需要供应商按原型号、受理时间和账号查找原交付记录。其余 98 张没有可匹配的保留响应。此核验未覆盖生产数据、未重新生成图片或产生新的生成扣费。
## 已知问题与验证边界
- 生产机可用磁盘约 1.09 GiB,接近发布与批量打包下载的保留线。本轮已回收一个未启用候选副本及一个更早退役版本的构建产物;构建机完整包和源码、当前与最近回滚版本、业务数据均保留。
- 离线参数核对不等于 76 个模型逐个完成付费生成,也不证明上游持续可用、效果或速度;实际生成验证范围为上述三项。
- 自动选模时页面尚未确定最终模型,接入层仍须依据实际选中接口规范化固定参数。模型清单和接口约束会随上游调整,本报告对应本次核对时点。
## 资料
- [Anthropic Haiku 5.5 采样参数迁移说明](https://platform.claude.com/docs/en/models/haiku-5-5/migration-guide#remove-sampling-parameters)
- [阿里云图片生成及编辑接口](https://www.alibabacloud.com/help/en/model-studio/qwen-image-generation-and-editing-api-reference)
- [阿里云语音合成接口](https://www.alibabacloud.com/help/en/model-studio/qwen-tts-api)

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

@ -185,7 +185,7 @@ async function optimizeWithConfiguredQwenVisionModel(params: {
},
],
temperature: 0,
maxOutputTokens: 320,
maxTokens: 320,
abortSignal: AbortSignal.timeout(30_000),
} as any);

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

@ -124,7 +124,7 @@ async function analyzeWithConfiguredQwenVisionModel(params: {
},
],
temperature: 0,
maxOutputTokens: 220,
maxTokens: 220,
abortSignal: AbortSignal.timeout(25_000),
} as any);

View File

@ -1737,7 +1737,7 @@ async function buildExecutionPlanWithAgent(
.filter(Boolean)
.join("\n\n"),
temperature: getCompatibleTextGenerationTemperature(plannerModelConfig, 0.1),
maxOutputTokens: 420,
maxTokens: 420,
abortSignal: AbortSignal.timeout(AGENT_OPERATION_TIMEOUT_MS),
} as any);
@ -1858,7 +1858,7 @@ async function generateAgentConversation(
},
],
temperature: getCompatibleTextGenerationTemperature(visionModelConfig, 0.2),
maxOutputTokens: 360,
maxTokens: 360,
abortSignal: AbortSignal.timeout(AGENT_OPERATION_TIMEOUT_MS),
} as any);
@ -1920,7 +1920,7 @@ async function generateAgentConversation(
system: systemPrompt,
prompt,
temperature: getCompatibleTextGenerationTemperature(reasoningModelConfig, 0.35),
maxOutputTokens: 520,
maxTokens: 520,
abortSignal: AbortSignal.timeout(AGENT_OPERATION_TIMEOUT_MS),
} as any);
@ -2002,7 +2002,7 @@ async function recommendImageParamsWithAgent(
- negativePrompt 仅在明显需要避坑时填写。`,
prompt: requestText,
temperature: getCompatibleTextGenerationTemperature(plannerModelConfig, 0.15),
maxOutputTokens: 220,
maxTokens: 220,
abortSignal: AbortSignal.timeout(AGENT_OPERATION_TIMEOUT_MS),
} as any);
@ -2095,7 +2095,7 @@ async function recommendVideoPlanWithAgent(
- 避免抽象空话,必须可执行。`,
prompt,
temperature: getCompatibleTextGenerationTemperature(plannerModelConfig, 0.2),
maxOutputTokens: 720,
maxTokens: 720,
abortSignal: AbortSignal.timeout(AGENT_OPERATION_TIMEOUT_MS),
} as any);
@ -2175,7 +2175,7 @@ async function refineRouteWithAgent(
候选模型:
${candidatesText}`,
temperature: getCompatibleTextGenerationTemperature(plannerModelConfig, 0.1),
maxOutputTokens: 120,
maxTokens: 120,
abortSignal: AbortSignal.timeout(AGENT_OPERATION_TIMEOUT_MS),
} as any);

View File

@ -13,18 +13,13 @@ export type AgentImageParameters = {
};
export type AgentImagePreferences = { modelId?: string; parameters?: AgentImageParameters };
export function selectedAgentImageCount(preferences?: AgentImagePreferences) {
const count = preferences?.parameters?.imageCount ?? preferences?.parameters?.n;
return count === undefined ? undefined : Math.floor(count);
}
export function applyAgentImagePreferences<T extends Record<string, unknown>>(
input: T,
preferences?: AgentImagePreferences,
): T & AgentImageParameters & { modelId?: string } {
const parameters = Object.fromEntries(Object.entries(preferences?.parameters || {})
.filter(([, value]) => value !== undefined));
const count = selectedAgentImageCount(preferences);
const count = preferences?.parameters?.imageCount ?? preferences?.parameters?.n;
return {
...input,
...parameters,

View File

@ -1,14 +1,5 @@
import type { AgentCallRecord, AgentRunSnapshot } from "./protocol";
export function countAgentGeneratedImages(calls: AgentCallRecord[]) {
return calls.reduce((count, call) => {
const output = call.output;
if (call.status !== "succeeded" || !output?.appliedImagePreferences ||
!Array.isArray(output.createdNodeIds)) return count;
return count + output.createdNodeIds.length;
}, 0);
}
// A spontaneous download command is not an unfinished image edit. Keep genuine
// download requests and all editor panels waiting for their actual interaction.
export function isAncillaryDownload(snapshot: AgentRunSnapshot, call: AgentCallRecord) {

View File

@ -5,8 +5,7 @@ import sharp from "sharp";
import { z } from "zod";
import { readCanvasImages, readOwnedCanvas, type RuntimeImageNode } from "./canvas";
import type { AgentRunSnapshot } from "./protocol";
import { countAgentGeneratedImages, finalResultNodeIds, originalSourceNodeIds, requiresCanvasInteraction } from "./results";
import { selectedAgentImageCount } from "./image-preferences";
import { finalResultNodeIds, originalSourceNodeIds, requiresCanvasInteraction } from "./results";
import { isCompletedSimpleCutout } from "./cutout-completion";
export async function inspectImageAlpha(source: Buffer) {
@ -29,7 +28,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 +66,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",
@ -126,16 +124,14 @@ export async function verifyCanvasAgentResults(params: {
(call) =>
call.status !== "succeeded" ||
requiresCanvasInteraction(snapshot, call) ||
(typeof call.output?.status === "string" && call.output.status !== "succeeded" &&
!(call.output.status === "partial" && call.output.appliedImagePreferences)),
(typeof call.output?.status === "string" && call.output.status !== "succeeded"),
);
if (incomplete.length) return { passed: false, issues: ["部分操作仍在等待交互或未完成"] };
const plan = calls.filter((call) => call.name === "planCanvasTask").at(-1)?.output;
if (!plan) return { passed: false, issues: ["缺少明确的任务验收计划"] };
// Intermediate images consumed by later write tools do not count as final deliverables.
const finalIds = finalResultNodeIds(snapshot);
const expectedCount = snapshot.requirements?.expectedImageCount ?? plan.expectedImageCount ??
(countAgentGeneratedImages(calls) > 0 ? selectedAgentImageCount(snapshot.imagePreferences) : undefined);
const expectedCount = snapshot.requirements?.expectedImageCount ?? plan.expectedImageCount;
if (expectedCount && finalIds.length !== expectedCount) {
return {
passed: false,
@ -194,13 +190,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 +198,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,11 +1,5 @@
import type { AgentVisionExecutor } from "../runtime/agent-vision-failover";
import {
agentProviderImageParameters,
applyAgentImagePreferences,
resolveUserImageModel,
selectedAgentImageCount,
type AgentImagePreferences,
} from "./image-preferences";
import { resolveUserImageModel, applyAgentImagePreferences, agentProviderImageParameters, type AgentImagePreferences } from "./image-preferences";
import { tool, type LanguageModel, type ToolSet } from "ai";
import { z } from "zod";
import { createCanvasCapabilityTools } from "@/lib/canvas/capabilities/ai-sdk-tools";
@ -24,8 +18,6 @@ import {
sortStyleProImageModelEntries,
} from "@/lib/style-pro/model-options";
import type { CanvasAgentLoopPorts, CanvasAgentTool } from "./loop";
import { AgentToolRejectedError, type AgentCallRecord } from "./protocol";
import { countAgentGeneratedImages } from "./results";
import { readCanvasImages, readOwnedCanvas } from "./canvas";
import { analyzeRuntimeImages } from "./review";
import { isExplicitDestructiveIntent } from "./capability-access";
@ -45,13 +37,11 @@ export async function buildCanvasRuntimeTools(params: {
imageSize?: string;
preferredModelId?: string;
imagePreferences?: AgentImagePreferences;
priorCalls?: AgentCallRecord[];
emit: (type: string, data: unknown) => void;
objective?: string;
operationSelectedNodeIds?: string[];
}) {
const { nodes } = await readOwnedCanvas(params.userId, params.projectId);
const selectedImageCount = selectedAgentImageCount(params.imagePreferences);
const imageNodeIds = nodes.filter((node) => node.type === "image").map((node) => node.id);
const defaults = params.selectedNodeIds.filter((id) => imageNodeIds.includes(id));
const sdk = await createCanvasCapabilityTools({
@ -138,8 +128,8 @@ export async function buildCanvasRuntimeTools(params: {
visualCriteria: z.array(z.string().max(200)).max(10),
}),
async (input) => ({ ...input,
...(input.expectedImageCount !== undefined && selectedImageCount !== undefined
? { expectedImageCount: selectedImageCount } : {}),
...(input.expectedImageCount !== undefined && params.imagePreferences?.parameters?.imageCount !== undefined
? { expectedImageCount: params.imagePreferences.parameters.imageCount } : {}),
...(params.imagePreferences?.parameters?.aspectRatio && params.imagePreferences.parameters.aspectRatio !== "auto"
? { aspectRatio: params.imagePreferences.parameters.aspectRatio } : {}),
}),
@ -173,8 +163,6 @@ export async function buildCanvasRuntimeTools(params: {
};
},
);
const inspectedImages = new Map<string, Buffer>();
let inspectedImageBytes = 0;
register(
"analyzeCanvasImages",
"检查图片",
@ -183,28 +171,10 @@ export async function buildCanvasRuntimeTools(params: {
nodeIds: z.array(z.string().min(1).max(180)).min(1).max(4),
question: z.string().min(1).max(2000),
}),
async (input) => analyzeRuntimeImages({
...params,
...input,
reviewPorts: {
readImage: async (url) => {
const cached = inspectedImages.get(url);
if (cached) return cached;
const { fetchImageBufferFromUrl } = await import("@/lib/ai/rmbg/service");
const original = await fetchImageBufferFromUrl(url);
if (!inspectedImages.has(url) && inspectedImageBytes + original.length <= 32 * 1024 * 1024) {
inspectedImages.set(url, original);
inspectedImageBytes += original.length;
}
return original;
},
},
}),
async (input) => analyzeRuntimeImages({ ...params, ...input }),
);
let submittedCount = 0;
let occupiedImageSlots = countAgentGeneratedImages(params.priorCalls ?? []);
const countLimitMessage = "本次设定的生成张数已占满,请先查看正在生成或已经生成的结果。";
let generatedCount = 0;
register(
"generateCanvasImages",
"生成图片",
@ -219,8 +189,9 @@ export async function buildCanvasRuntimeTools(params: {
}),
async (toolInput, callId) => {
const input = applyAgentImagePreferences(toolInput, params.imagePreferences);
if (selectedImageCount !== undefined && occupiedImageSlots >= selectedImageCount)
throw new AgentToolRejectedError(countLimitMessage);
// Bound per-task spend without introducing any global/model concurrency queue.
if (generatedCount + input.imageCount > 24)
throw new Error("本次任务已达到 24 张生成预算,请检查结果后继续。");
const sources = await readCanvasImages(
params.userId,
params.projectId,
@ -243,17 +214,10 @@ export async function buildCanvasRuntimeTools(params: {
if (!chosen) throw new Error("系统未配置可用的图片生成模型");
const imageSize = input.imageSize || params.imageSize || "2K";
const quota = await checkUserImageQuota(params.userId);
const points = await getPointsSystemConfig();
const user = await getUserById({ id: params.userId });
// Reserve the remaining slots before dispatch, including calls still in flight.
if (selectedImageCount !== undefined) {
input.imageCount = Math.min(input.imageCount, selectedImageCount - occupiedImageSlots);
if (input.imageCount < 1) throw new AgentToolRejectedError(countLimitMessage);
}
if (submittedCount + input.imageCount > 24)
throw new AgentToolRejectedError("本次任务已达到 24 张生成预算,请检查结果后继续。");
if (!quota.allowed || (quota.remaining !== null && input.imageCount > quota.remaining))
throw new Error("本月图片生成配额不足。");
const points = await getPointsSystemConfig();
const user = await getUserById({ id: params.userId });
const cost =
getModelGenerationCreditCost(
{ imageGenConfig: chosen.model.imageGenConfig as DiscountableImageGenConfigLike | null },
@ -267,8 +231,7 @@ export async function buildCanvasRuntimeTools(params: {
(user?.pointsBalance ?? 0) < cost
)
throw new Error("积分不足,请充值或联系管理员。");
submittedCount += input.imageCount;
occupiedImageSlots += input.imageCount;
generatedCount += input.imageCount;
const result = await generateCanvasImage({
prompt: input.prompt,
model: chosen.model.id,
@ -284,7 +247,6 @@ export async function buildCanvasRuntimeTools(params: {
? Math.max(0, user?.pointsBalance ?? 0) / input.imageCount : undefined,
ownerKey: params.userId,
referenceImages: sources.map((node) => node.data.src || node.data.url!),
referenceImageBuffers: inspectedImages,
debugLabel: "canvas-agent-runtime",
debugMeta: { runId: params.runId, callId },
});
@ -349,7 +311,6 @@ export async function buildCanvasRuntimeTools(params: {
},
);
}
occupiedImageSlots += result.images.length - input.imageCount;
return {
status: result.images.length < input.imageCount ? "partial" : "succeeded",
appliedImagePreferences: { modelId: result.modelRef, imageSize, aspectRatio: input.aspectRatio, imageCount: input.imageCount },

View File

@ -7,7 +7,7 @@ export type DetailKimiPurpose = "plan" | "preflight" | "review" | "repair";
export type DetailKimiGenerateOptions = {
temperature?: number;
topP?: number;
maxOutputTokens?: number;
maxTokens?: number;
headers?: Record<string, string>;
};
@ -80,7 +80,7 @@ export function buildDetailKimiGenerateOptions(params: {
return {
temperature: thinking === "enabled" ? 1 : 0.6,
topP: 0.95,
maxOutputTokens: getPurposeMaxTokens(params),
maxTokens: getPurposeMaxTokens(params),
headers: {
[DETAIL_KIMI_THINKING_HEADER]: thinking,
[DETAIL_KIMI_PROFILE_HEADER]: `detail-ui-${params.purpose}`,

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

@ -687,7 +687,7 @@ export async function optimizePromptWithLLM(params: {
system: optimizerSystemPrompt,
prompt: finalUserMessage,
temperature: getCompatibleTextGenerationTemperature(selectedOptimizerModel, 0.2),
maxOutputTokens: 200,
maxTokens: 200,
abortSignal: AbortSignal.timeout(12_000),
} as any);

View File

@ -12,8 +12,6 @@ import sharp from "sharp";
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 +69,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 +90,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";
}
@ -167,7 +165,7 @@ async function fetchImageBufferWithRetry(
}
}
throw lastError ?? new Error("下载图片失败");
throw lastError instanceof Error ? lastError : new Error(String(lastError || "下载图片失败"));
}
function calculateAlibabaSizeByAspect(aspectValue: number, baseSize: number): string {
@ -291,21 +289,12 @@ async function prepareAlibabaInputImageUrl(
imageUrl: string,
modelId: string,
inputRole?: AlibabaImageInputRole,
original?: Buffer,
preparedBuffers?: Map<string, Buffer>,
): Promise<string> {
const normalizedUrl = String(imageUrl || "").trim();
if (!/^https?:\/\//i.test(normalizedUrl)) return normalizedUrl;
const maxInputBytes = getAlibabaMaxInputBytes(modelId);
const { buffer, contentType } = original
? { buffer: original, contentType: null }
: await fetchImageBufferWithRetry(normalizedUrl).catch((error) => {
if (["AbortError", "TimeoutError"].includes(error?.name)) {
throw new ImageReferenceReadTimeoutError();
}
throw error;
});
const { buffer, contentType } = await fetchImageBufferWithRetry(normalizedUrl);
let metadata: sharp.Metadata;
try {
metadata = await sharp(buffer, { failOn: "none" }).metadata();
@ -326,27 +315,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 +552,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,22 +559,14 @@ 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,结果尚未确认");
if (!taskId) throw new Error("阿里图片异步任务未返回 task_id");
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) =>
@ -622,7 +585,7 @@ async function sendAlibabaImageAsyncRequest(params: {
console.log("[Alibaba Image] Async task completed:", taskId);
return task;
}
if (["FAILED", "CANCELED"].includes(taskStatus)) {
if (["FAILED", "CANCELED", "UNKNOWN"].includes(taskStatus)) {
const reason = task.output?.message || task.message || `阿里图片任务${taskStatus || "失败"}`;
const code = task.output?.code || task.code;
throw new AlibabaImageTerminalTaskError(
@ -638,7 +601,7 @@ async function sendAlibabaImageAsyncRequest(params: {
error.status < 500 &&
![408, 425, 429].includes(error.status)
) {
throw new Error(`阿里图片任务已提交,结果尚未确认(task_id: ${taskId})`, { cause: error });
throw error;
}
lastPollError = error;
console.warn("[Alibaba Image] Async task poll failed; retrying:", {
@ -700,13 +663,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 +694,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 +703,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";
}
@ -753,7 +723,6 @@ export function createAlibabaImage({ apiKey, baseURL }: AlibabaImageConfig) {
doGenerate: async (options: {
messages: Array<{ role: string; content: string | Array<{ type: string; text?: string; image?: string }> }>;
imageParams?: AlibabaImageParams & { aspectRatio?: string; imageSize?: string; imageCount?: number };
referenceImageBuffers?: ReadonlyMap<string, Buffer>;
modelDisplayName?: string; // 🆕 模型显示名称,用于错误提示
overrideModelId?: string; // 🆕 备用模型 ID
}) => {
@ -823,15 +792,12 @@ 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(
imageUrl,
activeModelId,
options.imageParams?.inputImageRoleByUrl?.[imageUrl],
options.referenceImageBuffers?.get(imageUrl),
preparedBuffers,
),
),
);
@ -863,6 +829,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 +865,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 +874,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,
@ -974,12 +938,8 @@ 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 images = await processResponse(response);
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,34 +140,31 @@ 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, contract: invocation };
if (!needsDiscovery) return model;
const models = await awaitWithAbort(discoverContracts(root, baseFetch), signal);
const contract = selectVip98kChatInvocation(models.get(params.modelId));
if (!contract) throw new Error("VIP98K 此模型未公布兼容的对话接口,请核对模型类型和接口配置。");
return { model: createModel(contract), contract };
return createModel(contract);
};
const callOptions = (options: LanguageModelV2CallOptions, contract: typeof invocation) =>
contract?.omitSampling ? { ...options, temperature: undefined, topP: undefined, topK: undefined } : options;
return {
specificationVersion: model.specificationVersion,
provider: model.provider,
modelId: model.modelId,
supportedUrls: model.supportedUrls,
async doGenerate(options) {
const active = await resolveModel(options.abortSignal);
const result = await active.model.doGenerate(callOptions(options, active.contract));
const activeModel = await resolveModel(options.abortSignal);
const result = await activeModel.doGenerate(options);
if (requiresToolCall(options) && !result.content.some((part) => part.type === "tool-call")) throw missingToolError();
if (!result.content.some((part) => part.type === "tool-call" ||
(part.type === "text" && part.text.trim()))) throw emptyResponseError();
return result;
},
async doStream(options) {
const active = await resolveModel(options.abortSignal);
const result = await active.model.doStream(callOptions(options, active.contract));
const activeModel = await resolveModel(options.abortSignal);
const result = await activeModel.doStream(options);
let usable = false;
let toolCalled = false;
let failed = false;

View File

@ -1,4 +1,4 @@
import { mapVip98kVideoParameters, bindVip98kVideoContent } from "../vip98k-video-parameters";
import { mapVip98kVideoParameters } from "../vip98k-video-parameters";
import {
ProviderTaskFailedError,
ProviderTaskUncertainError,
@ -22,14 +22,11 @@ import { getDefaultStorageConfig, getSystemSetting } from "@/lib/db/queries";
import {
bindVip98kImages,
bindVip98kExpansionParams,
encodeVip98kTaskBody,
getVip98kImageBindingKeys,
hasVerifiedVip98kOpenAiImageArrayContract,
normalizeVip98kInvocationHeaders,
resolveVip98kImageTaskSize,
selectVip98kTaskInvocation,
vip98kReferenceLimit,
getVip98kQualityOptions,
type Vip98kTaskInvocation,
} from "@/lib/ai/vip98k-task-invocation";
import { VIP98K_BASE_URL, normalizeVip98kBaseUrl } from "@/lib/ai/vip98k-models";
@ -39,7 +36,6 @@ import {
normalizeVip98kRuntimeConfig,
resolveVip98kSubmissionTimeoutMs,
VIP98K_RUNTIME_CONFIG_KEY,
VIP98K_TASK_POLL_SECONDS,
type Vip98kRuntimeConfig,
} from "@/lib/ai/vip98k-runtime-config";
import {
@ -53,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,
@ -101,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;
@ -208,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);
}
@ -424,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,
@ -695,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;
@ -752,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,
@ -882,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(
@ -903,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,
@ -1087,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;
@ -1124,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())));
}
@ -1155,7 +1115,6 @@ async function submitTask(params: {
if (!path.startsWith("/")) throw new Error("VIP98K invocation path is invalid");
const stagedReferenceKeys = [
"file_urls",
"image[]",
"images",
"image",
"imageUrls",
@ -1201,16 +1160,15 @@ async function submitTask(params: {
: params.body;
let response: Response;
try {
const encoded = encodeVip98kTaskBody(requestBody, params.contentType);
response = await fetch(`${baseURL}${path}`, {
method: String(params.method || "POST").toUpperCase(),
headers: {
...normalizeVip98kInvocationHeaders(params.headers),
Authorization: `Bearer ${params.apiKey}`,
...encoded.headers,
"Content-Type": params.contentType || "application/json",
"Idempotency-Key": idempotencyKey,
},
body: encoded.body,
body: JSON.stringify(requestBody),
signal: AbortSignal.timeout(params.submissionTimeoutMs),
});
} catch (error) {
@ -1317,10 +1275,7 @@ async function submitTask(params: {
|| [502, 504, 524].includes(response.status)
|| /pending\s+safe\s+reconciliation|request\s+outcome\s+(?:is\s+)?unknown|final\s+outcome\s+could\s+not\s+be\s+confirmed/i.test(errorMessage))
throw new ProviderTaskUncertainError(`供应商提交结果未确认,可能仍在处理,请勿重复生成:${getUserFacingImageGenerationErrorMessage({ message: errorMessage, status: response.status })} (HTTP ${response.status})`);
throw Object.assign(new Error(`${errorMessage} (HTTP ${response.status})`), {
status: response.status,
providerRequestId: response.headers.get("x-request-id"),
});
throw new Error(`${errorMessage} (HTTP ${response.status})`);
}
throw new Error("VIP98K request failed after media readiness retries");
@ -1560,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) {
@ -1579,19 +1534,11 @@ export function buildTaskBody(params: Vip98kTaskParams, invocation: Vip98kInvoca
const imageParams = params.imageParams || {};
const promptTitle = params.prompt.split(/\s+/).slice(0, 8).join(" ").slice(0, 80);
const body: Record<string, unknown> = { ...(invocation?.requestExample || {}) };
if (toRecord(body.metadata)) body.metadata = { ...toRecord(body.metadata)! };
const setField = (key: string, value: unknown) => {
const metadata = toRecord(body.metadata);
if (metadata && key in metadata) {
metadata[key] = value;
delete body[key];
} else body[key] = value;
};
if ("model" in body || !invocation) body.model = params.modelId;
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;
}
@ -1644,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,31 +1612,11 @@ export function buildTaskBody(params: Vip98kTaskParams, invocation: Vip98kInvoca
}
}
if (negativePrompt) {
const key = ["negative_prompt", "negativePrompt"].find(key =>
invocationSupportsBodyField(invocation, key));
if (key) {
const other = key === "negative_prompt" ? "negativePrompt" : "negative_prompt";
delete body[other];
if (toRecord(body.metadata)) delete (body.metadata as Record<string, unknown>)[other];
setField(key, negativePrompt);
}
if ("negativePrompt" in body || !invocation) body.negativePrompt = negativePrompt;
if ("negative_prompt" in body || !invocation) body.negative_prompt = negativePrompt;
}
if (quality && invocationSupportsBodyField(invocation, "quality")) {
const options = getVip98kQualityOptions(invocation?.inputSchema);
const effectiveQuality = options?.length === 1 ? options[0] : quality;
if (options?.length && !options.includes(effectiveQuality)) throw Error("当前模型不支持所选图片质量,请重新选择");
setField("quality", effectiveQuality);
}
const generationParamAliases = [
["seed", "seed"],
["watermark", "watermark"],
["promptExtend", "prompt_extend"],
["cameraFixed", "camera_fixed"],
["returnLastFrame", "return_last_frame"],
] as const;
for (const [sourceKey, targetKey] of generationParamAliases) {
const value = params.kind === "video" ? videoParams[sourceKey] : imageParams[sourceKey];
if (value !== undefined && invocationSupportsBodyField(invocation, targetKey)) setField(targetKey, value);
body.quality = quality;
}
const imageToolParamAliases = [
["scaleFactor", "scale_factor"],
@ -1701,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.
@ -1719,22 +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, invocation?.inputSchema);
for (const key of imageBindingKeys) {
const limit = vip98kReferenceLimit(invocation?.inputSchema, key);
if (typeof limit === "number" && params.imageUrls.length > limit) throw Error(`当前模型最多支持 ${limit} 张参考图`);
}
const imageBindingKeys = bindVip98kImages(body, params.imageUrls);
if (params.imageUrls.length > 0 && !invocation && imageBindingKeys.length === 0) {
body.images = params.imageUrls;
imageBindingKeys.push("images");
@ -1769,51 +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 (sizes?.includes(resolution) && hasNativeAspectRatio) body.size = resolution;
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 && sizes?.includes("auto") && hasNativeAspectRatio && hasNativeResolution) {
body.size = "auto";
} else {
if (!matching.length) throw Error("当前模型不支持所选图片比例");
const area = resolution === "4K" ? 4096 ** 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

@ -55,7 +55,7 @@ export async function buildDirectAgentImageAnalysisAnswer(params: {
"请用中文直接回答,不要复述“根据摘要/根据图片”,也不要输出多余寒暄。",
].join("\n\n"),
temperature: 0.2,
maxOutputTokens: 320,
maxTokens: 320,
abortSignal: AbortSignal.timeout(20_000),
} as any);

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 {
@ -10,17 +8,8 @@ export class AgentImageGenerationError extends Error {
constructor(message: string, readonly confirmedNoResult: boolean) { super(message); }
}
export class ImageReferenceReadTimeoutError extends AgentImageGenerationError {
constructor() {
super("提交生图前读取参考图超时,任务尚未提交,可以稍后重试。", true);
}
}
/** 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

@ -1624,7 +1624,7 @@ export async function summarizeImageForExecutionReport(params: {
...(compatibleTemperature !== undefined
? { temperature: compatibleTemperature }
: {}),
maxOutputTokens: 120,
maxTokens: 120,
abortSignal: AbortSignal.timeout(attemptTimeoutMs),
} as any);
@ -2251,7 +2251,7 @@ ${historyText}
},
],
...(analyzerTemperature !== undefined ? { temperature: analyzerTemperature } : {}),
maxOutputTokens: 360,
maxTokens: 360,
abortSignal: AbortSignal.timeout(ANALYZER_TIMEOUT_MS),
}
: {
@ -2259,7 +2259,7 @@ ${historyText}
system: ANALYZER_SYSTEM_PROMPT,
prompt: userMessage,
...(analyzerTemperature !== undefined ? { temperature: analyzerTemperature } : {}),
maxOutputTokens: 300,
maxTokens: 300,
abortSignal: AbortSignal.timeout(ANALYZER_TIMEOUT_MS),
};

View File

@ -2,10 +2,9 @@ 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>;
omitSampling?: boolean;
};
function record(value: unknown): RecordValue | null {
@ -44,31 +43,23 @@ 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;
const selectedRoute = getVip98kInvocationHeaders(selected.headers)["X-Relay-Route-Option"];
const schemaSource = candidates.find(candidate => candidate.path === selected.path &&
getVip98kInvocationHeaders(candidate.headers)["X-Relay-Route-Option"] === selectedRoute &&
(candidate.input_schema || candidate.inputSchema));
const properties = record(record(schemaSource?.input_schema || schemaSource?.inputSchema)?.properties);
const fixedSampling = selected.omitSampling === true || ["temperature", "top_p"].some(key =>
record(properties?.[key])?.const !== undefined);
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),
...(fixedSampling ? { omitSampling: true } : {}),
};
}

View File

@ -1,12 +1,8 @@
import { canonicalVip98kVideoRatio, vip98kVideoDurationBounds, vip98kVideoContentTypes, vip98kVideoImageRoles, vip98kFirstFrameRatio } 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,
vip98kReferenceLimit,
selectVip98kTaskInvocation,
} from "@/lib/ai/vip98k-task-invocation";
import { selectVip98kChatInvocation, vip98kChatSupportsVision } from "./vip98k-chat-contract";
@ -147,7 +143,6 @@ const IMAGE_TOOL_MODEL_IDS = new Set([
"id-photo",
"image-expansion",
"image-upscaler",
"ocr",
"photo-cleanup",
"remove-background",
"remove-object",
@ -352,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);
});
}
@ -431,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)
);
}
@ -475,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"
@ -515,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;
@ -568,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 [...new Set(resolutionEnum.map(normalizeImageSize).filter((size): size is string => Boolean(size)))];
const schemaSizes = getInvocationCandidates(model).flatMap((invocation) => {
const properties =
toRecord(toRecord(invocation.input_schema)?.properties) || {};
@ -717,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,17 +738,9 @@ function createImagePreset(
"ratio",
"aspect-ratio",
].some((key) => invocationKeys.has(key)) || hasVerifiedVip98kOpenAiImageArrayContract(modelId);
const supportsQuality = getInvocationCandidates(model).some(invocation => {
const field = toRecord(toRecord(invocation.input_schema)?.properties)?.quality;
return field !== false && Boolean(field || invocation.request_example?.quality !== undefined) &&
!toRecord(field)?.const;
});
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 = [
@ -773,17 +749,7 @@ function createImagePreset(
: []),
...(supportsReferenceImages ? ["image-to-image", "reference-images"] : []),
];
const metadata = getVip98kMetadata(model, "image");
const referenceInvocation = selectVip98kTaskInvocation({
modelId, kind: "image", imageCount: 1,
configuredInvocation: metadata.invocation,
configuredInvocations: metadata.invocations,
});
const declaredReferenceLimits = getVip98kImageBindingKeys(referenceInvocation).flatMap(key => {
const limit = vip98kReferenceLimit(referenceInvocation?.inputSchema, key);
return typeof limit === "number" && limit > 0 ? [limit] : [];
});
const maxReferenceImages = declaredReferenceLimits.length ? Math.min(...declaredReferenceLimits) : supportsMultiImageReference
const maxReferenceImages = supportsMultiImageReference
? 8
: supportsReferenceImages
? 1
@ -795,7 +761,7 @@ function createImagePreset(
return {
modelId,
displayName: supportsReferenceImages ? displayName : `${displayName}(仅文生图)`,
displayName,
description: model.description || `VIP98K image model (${modelId})`,
type: "image",
supportsVision: supportsReferenceImages,
@ -814,7 +780,7 @@ function createImagePreset(
supportedAspectRatios,
supportsMultiImageReference,
maxReferenceImages,
vip98k: metadata,
vip98k: getVip98kMetadata(model, "image"),
},
defaultParams: {
provider: "vip98k",
@ -850,7 +816,7 @@ function createImagePreset(
},
enableLoadingPlaceholder: true,
loadingColor: "yellow",
vip98k: metadata,
vip98k: getVip98kMetadata(model, "image"),
},
sortOrder: TYPE_SORT_ORDER.image + index,
};
@ -875,28 +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);
const firstFrameRatio = vip98kFirstFrameRatio(invocation?.input_schema);
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,
@ -917,10 +876,6 @@ function createVideoPreset(
outputModes,
supportedResolutions,
supportedRatios: ratios.length ? ratios : [...DEFAULT_VIDEO_RATIOS],
...(firstFrameRatio ? { modeConstraints: {
"first-frame": { ratioOptions: [firstFrameRatio] },
"first-last-frame": { ratioOptions: [firstFrameRatio] },
} } : {}),
durationOptions: durations,
durationRange: durations.length
? { min: durations[0], max: durations[durations.length - 1] }
@ -1086,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 {
@ -1102,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

@ -122,7 +122,6 @@ export function resolveVip98kImageTaskSize(params: {
const IMAGE_ARRAY_INPUT_KEYS = [
"file_urls",
"image[]",
"images",
"imageUrls",
"referenceImages",
@ -221,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] : []),
];
}
@ -239,7 +236,6 @@ export function invocationSupportsVip98kImages(
export function bindVip98kImages(
body: Record<string, unknown>,
imageUrls: string[],
inputSchema?: Record<string, unknown> | null,
) {
const bindingKeys: string[] = [];
if (imageUrls.length === 0) {
@ -249,12 +245,7 @@ export function bindVip98kImages(
for (const key of IMAGE_ARRAY_INPUT_KEYS) {
if (!(key in body)) continue;
const example = Array.isArray(body[key]) ? body[key][0] : undefined;
const properties = inputSchema?.properties as Record<string, { items?: { properties?: Record<string, unknown> } }> | undefined;
const objectReference = example && typeof example === "object" && "image_url" in example;
body[key] = objectReference || properties?.[key]?.items?.properties?.image_url
? imageUrls.map(image_url => ({ image_url }))
: imageUrls;
body[key] = imageUrls;
bindingKeys.push(key);
}
for (const key of IMAGE_SINGLE_INPUT_KEYS) {
@ -312,52 +303,9 @@ function scoreReferenceInvocation(invocation: Vip98kTaskInvocation) {
if (IMAGE_SINGLE_INPUT_KEYS.some((key) => key in body)) score += 15;
if (invocation.kind === "task") score += 10;
if (invocation.path === "/extensions/v1/tasks") score += 10;
if (invocation.contentType === "application/json") score += 5;
return score;
}
export function vip98kReferenceLimit(schema: unknown, key: string): number | undefined {
if (!schema || typeof schema !== "object" || Array.isArray(schema)) return;
const current = schema as Record<string, any>;
const limits: number[] = [];
const visitField = (field: any) => {
if (!field || typeof field !== "object") return;
if (typeof field.maxItems === "number") limits.push(field.maxItems);
for (const child of Array.isArray(field.allOf) ? field.allOf : []) visitField(child);
};
visitField(current.properties?.[key]);
for (const child of Array.isArray(current.allOf) ? current.allOf : []) {
const limit = vip98kReferenceLimit(child, key);
if (limit !== undefined) limits.push(limit);
}
return limits.length ? Math.min(...limits) : undefined;
}
export function getVip98kQualityOptions(schema: Record<string, unknown> | null | undefined): string[] | undefined {
const field = (schema?.properties as Record<string, unknown> | undefined)?.quality;
if (field === false) return [];
if (!field || typeof field !== "object") return undefined;
const quality = field as Record<string, unknown>;
if (typeof quality.const === "string") return [quality.const];
return Array.isArray(quality.enum) ? quality.enum.filter((value): value is string => typeof value === "string") : undefined;
}
export function encodeVip98kTaskBody(body: Record<string, unknown>, contentType?: string | null): { body: string | FormData; headers: Record<string, string> } {
if (contentType?.split(";", 1)[0].trim() !== "multipart/form-data") {
return { body: JSON.stringify(body), headers: { "Content-Type": contentType || "application/json" } };
}
const form = new FormData();
for (const [key, value] of Object.entries(body)) {
if (value === undefined || value === null) continue;
if (key === "image[]" && Array.isArray(value)) {
for (const image of value) form.append(key, String(image));
} else {
form.append(key, typeof value === "object" ? JSON.stringify(value) : String(value));
}
}
return { body: form, headers: {} };
}
export function selectVip98kTaskInvocation(params: {
modelId: string;
kind?: string;
@ -382,22 +330,14 @@ export function selectVip98kTaskInvocation(params: {
);
if ((params.imageCount || 0) > 0) {
const references = candidates.filter(invocationSupportsVip98kImages);
const routedReferences = references.filter(candidate =>
getVip98kInvocationHeaders(candidate.headers)["X-Relay-Route-Option"]);
const referenceInvocation = (routedReferences.length ? routedReferences : references)
const referenceInvocation = candidates
.filter(invocationSupportsVip98kImages)
.sort((a, b) => scoreReferenceInvocation(b) - scoreReferenceInvocation(a))[0];
if (referenceInvocation) {
return resolveVip98kTaskInvocation(params.modelId, referenceInvocation);
}
}
if (params.configuredInvocation &&
getVip98kInvocationHeaders(params.configuredInvocation.headers)["X-Relay-Route-Option"] &&
!params.configuredInvocation.path.includes(":generateContent")) {
return resolveVip98kTaskInvocation(params.modelId, params.configuredInvocation);
}
if (params.kind === "image" && !params.imageCount) {
const textImageTask = candidates.find(candidate => {
const properties = candidate.inputSchema?.properties as Record<string, unknown> | undefined;
@ -483,6 +423,7 @@ function createVerifiedOpenAiImageInvocation(modelId: string) {
function addVerifiedOpenAiImageFields(
invocation: Vip98kTaskInvocation,
modelId: string,
): Vip98kTaskInvocation {
const inputSchema = invocation.inputSchema || {};
const properties =
@ -501,8 +442,16 @@ function addVerifiedOpenAiImageFields(
...inputSchema,
properties: {
...properties,
image: properties.image ?? { items: { type: "string" }, type: "array" },
aspect_ratio: properties.aspect_ratio ?? { type: "string" },
image: { items: { type: "string" }, type: "array" },
aspect_ratio: { type: "string" },
...(hasVerifiedVip98kGptImage25ResolutionTiers(modelId)
? {
size: {
enum: ["1024x1024", "2048x2048", "2880x2880"],
type: "string",
},
}
: {}),
},
},
};
@ -524,7 +473,7 @@ export function resolveVip98kTaskInvocation(
invocationTargetsModel(configuredInvocation, normalizedModelId)
? configuredInvocation
: createVerifiedOpenAiImageInvocation(modelId);
return addVerifiedOpenAiImageFields(invocation);
return addVerifiedOpenAiImageFields(invocation, normalizedModelId);
}
const processingRequest = KNOWN_IMAGE_PROCESSING_TOOL_REQUESTS[normalizedModelId];
if (processingRequest) {

View File

@ -6,30 +6,12 @@ export function canonicalVip98kVideoRatio(value: string) {
return value === "landscape" ? "16:9" : value === "portrait" ? "9:16" : value;
}
export function vip98kFirstFrameRatio(schema: unknown): string | undefined {
const current = object(schema);
const content = object(object(object(current.if).properties).content);
const role = object(object(object(content.contains).properties).role).const;
const properties = object(object(current.then).properties);
const ratio = object(properties.ratio || properties.aspect_ratio).const;
if (role === "first_frame" && typeof ratio === "string") return ratio;
for (const child of Array.isArray(current.allOf) ? current.allOf : []) {
const value = vip98kFirstFrameRatio(child);
if (value) return value;
}
}
export function vip98kVideoDurationBounds(schema: unknown, resolution?: string) {
let min = 0, max = Infinity;
let durations: number[] | undefined;
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;
@ -47,13 +29,6 @@ export function vip98kVideoDurationBounds(schema: unknown, resolution?: string)
export function mapVip98kVideoParameters(body: Record<string, unknown>, schema: unknown) {
const properties = object(object(schema).properties);
const frameRatio = vip98kFirstFrameRatio(schema);
if (frameRatio && Array.isArray(body.content) && body.content.some(item => object(item).role === "first_frame")) {
const field = properties.ratio ? "ratio" : "aspect_ratio";
if (body[field] && body[field] !== "auto" && body[field] !== frameRatio)
throw Error("当前首帧模式沿用原图比例,请选择自动比例");
body[field] = frameRatio;
}
const ratios = object(properties.aspect_ratio).enum;
if (Array.isArray(ratios) && !ratios.includes(body.aspect_ratio)) {
const alias = body.aspect_ratio === "16:9" ? "landscape" : body.aspect_ratio === "9:16" ? "portrait" : undefined;
@ -61,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 || ""));
@ -73,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

@ -7,8 +7,7 @@ import type { CanvasAgentTool } from "@/lib/ai/canvas-agent-runtime/loop";
import { AgentToolRejectedError, publicAgentError, type AgentCallRecord, type AgentRunSnapshot, type CanvasAgentRunStatus } from "@/lib/ai/canvas-agent-runtime/protocol";
import { formatRequestFailure, getRequestFailureDetails } from "@/lib/request-error";
import { isCompletedSimpleCutout } from "@/lib/ai/canvas-agent-runtime/cutout-completion";
import { countAgentGeneratedImages, requiresCanvasInteraction } from "@/lib/ai/canvas-agent-runtime/results";
import { selectedAgentImageCount } from "@/lib/ai/canvas-agent-runtime/image-preferences";
import { requiresCanvasInteraction } from "@/lib/ai/canvas-agent-runtime/results";
import { AgentImageGenerationError } from "@/lib/ai/runtime/image-generation-error";
import { publicAssistantText } from "./assistant-output";
@ -50,16 +49,6 @@ export async function runZcodeCanvasTask(ports: Ports): Promise<CanvasAgentRunSt
if (!details.recommendation) details.recommendation = "请联系管理员并提供请求编号,核对该步骤的错误。";
return `${call.title || "创作工具"}:${formatRequestFailure(details, ports.runId)}`;
}
function imageCountReached() {
const count = snapshot.workspace === "video" ? undefined : selectedAgentImageCount(snapshot.imagePreferences);
return count !== undefined && countAgentGeneratedImages(snapshot.calls) >= count;
}
function reviewMessage(issues: string[]) {
const summary = `结果待核对:${issues.join(";")}`;
return imageCountReached()
? `${summary}\n\n已保留本次生成的图片。如需再生成,请发送新指令。`
: summary;
}
let modelError = "";
let toolFailure = "";
let nativeFailed = false;
@ -95,7 +84,6 @@ export async function runZcodeCanvasTask(ports: Ports): Promise<CanvasAgentRunSt
`可用业务工具:${tools.join("、")}。工具名称带 mcp__canvas__ 前缀。`,
"原生文件、Bash、记忆及子任务能力仅作用于此任务的私有工作区,不能通过 shell 直接访问模型服务商或本站后台;业务操作使用 MCP。",
"用户只要求生图或改图时,把结果写入画布并验收即可。除非用户明确要求下载或导出,不要主动调用 image_download,也不要为收尾打开交互面板。",
"用户设置的生成张数是本次任务的总数,包括验收未通过的已生成图片。达到张数后,保留结果并说明问题;如需再次生成,等待用户发送新指令。",
"用户指定的生图模型被明确拒绝时,停止本轮收费操作,询问用户希望切换生图模型还是稍后重试。切换需用户确认并更新模型选择;结果未知的超时必须先核对原任务,不可直接换模型重发。不要为普通图片编辑调用 appearance.post 或其他无关业务接口。",
"imagePreferences 是用户在输入框选择的生图模型和图片参数,与当前规划模型不同。生成和编辑图片优先用 generateCanvasImages;用户选定的模型不得被技能默认值、你选的其他模型或重试覆盖。自动选择生图模型时,图片工具内部会在明确失败后切换备用模型并补齐结果,不要自行重放付费操作;用户明确指定模型时禁止故障切换。比例、尺寸、数量、反向提示词等控件必须传入;不要通过其他生成接口绕过用户选择。分析、问答、排版等不需要出图的任务无需生成图片。",
"转正面、换角度、旋转主体视角时,直接用 generateCanvasImages,referenceNodeIds 指向要编辑的真实图片,提示词描述目标视角并保留产品结构和未要求修改的细节。旧多视角功能、angleEditImage 和 image.multi_angle 已废弃,即使历史对话用过也不得再调用或打开旧面板。",
@ -289,12 +277,12 @@ export async function runZcodeCanvasTask(ports: Ports): Promise<CanvasAgentRunSt
const verification = await ports.verify(reviewSnapshot); snapshot.verification = verification;
snapshot.inputTokens = reviewSnapshot.inputTokens; snapshot.outputTokens = reviewSnapshot.outputTokens;
if (verification.passed) return await save(result.response || "任务完成,结果已写入画布。", "completed");
if (verification.retryable && snapshot.repairs < 2 && !imageCountReached()) {
if (verification.retryable && snapshot.repairs < 2) {
snapshot.repairs++;
prompt = `验收需要定点修复:${JSON.stringify(verification)}。只处理失败结果,禁止整批重新生成;保留所有通过结果。`;
continue;
}
return await save(reviewMessage(verification.issues), "needs_review");
return await save(`结果待核对:${verification.issues.join(";")}`, "needs_review");
}
} catch (error) {
if (snapshot.nativeRuntime) snapshot.nativeRuntime.state = "stopped";
@ -318,7 +306,7 @@ export async function runZcodeCanvasTask(ports: Ports): Promise<CanvasAgentRunSt
if (control.cancelled || ports.signal.aborted) return await save("已停止后续步骤,完成的结果保留在画布。", "cancelled");
if (inputs !== JSON.stringify(snapshot.inputs)) return await save("已收到新的补充要求,图片已保留,请继续处理。", "needs_review");
return await save(verification.passed ? "图片已完成并通过检查,结果已保留在画布。"
: `图片已返回画布,${reviewMessage(verification.issues)}`, verification.passed ? "completed" : "needs_review");
: `图片已返回画布,结果待核对:${verification.issues.join(";")}`, verification.passed ? "completed" : "needs_review");
} catch { /* Keep the original interruption if independent inspection also fails. */ }
}
return await save(cancelled ? "已停止后续步骤,完成的结果保留在画布。" : toolFailure || modelError || publicAgentError(error), cancelled ? "cancelled" : "needs_review");

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 } 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";
@ -182,7 +181,6 @@ export interface CanvasGenerateImageRequest {
providerImageParams?: Record<string, unknown>;
referenceImage?: string;
referenceImages?: string[];
referenceImageBuffers?: ReadonlyMap<string, Buffer>;
billingFeature?: "multi-view" | "repaint";
requiredReferenceImageCount?: number;
ownerKey?: string;
@ -339,7 +337,7 @@ function isCanvasScaleAdjustDebugRequest(
);
}
export function getCanvasProviderBatchTimeoutMs(params: {
function getCanvasProviderBatchTimeoutMs(params: {
debugLabel: string;
debugMeta?: Record<string, unknown>;
providerType: string;
@ -350,7 +348,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 +3443,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 +4947,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(
@ -5125,11 +5121,8 @@ export async function generateCanvasImage(
});
}
const referenceImageBuffers = provider.type === "alibaba-image" ? request.referenceImageBuffers : undefined;
const referencesToCheck = normalizedReferenceImages.filter(url => !referenceImageBuffers?.has(url));
const { kept, dropped: unreachableReferenceImages } =
await filterReachableRemoteUrls(referencesToCheck, { timeoutMs: 3000 });
const reachableReferenceImages = normalizedReferenceImages.filter(url => referenceImageBuffers?.has(url) || kept.includes(url));
const { kept: reachableReferenceImages, dropped: unreachableReferenceImages } =
await filterReachableRemoteUrls(normalizedReferenceImages, { timeoutMs: 3000 });
const effectiveReferenceImages = selectCanvasReferenceImages({
requested: normalizedReferenceImages, reachable: reachableReferenceImages,
requiredCount: request.requiredReferenceImageCount,
@ -5240,7 +5233,6 @@ export async function generateCanvasImage(
executeGenerateBatch = async (batchImageCount) => {
const result = await modelInstance.doGenerate({
messages,
referenceImageBuffers,
imageParams: {
...imageParams,
imageCount: batchImageCount,
@ -5670,11 +5662,6 @@ export async function generateCanvasImage(
await slot.release();
}
if (caughtError instanceof ImageReferenceReadTimeoutError) {
if (!collectedImages.length) throw caughtError;
return { images: collectedImages, model: selectedModel.model.displayName, modelRef: selectedModel.model.id, prompt: resultPrompt };
}
// An accepted or uncertain request must not start another paid model/variant.
if (caughtError && (
caughtError instanceof ProviderTaskUncertainError ||

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,54 @@ 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);
await markImageArchiveTaskStored({
id: task.id,
targetUrl: archived.url,
});
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

@ -18,7 +18,6 @@ const PROVIDER_BALANCE_PATTERNS = [
/\b(?:exceeded_current_quota|pre_consume_token_quota_failed)\b/i,
/\btoken quota is not enough\b/i,
/\bquota is not enough\b/i,
/\bdoes not have enough available quota\b/i,
/\b(?:not enough credits?|credits? is not enough)\b/i,
/\b(?:billing_hard_limit_reached|payment_required)\b/i,
];
@ -294,9 +293,6 @@ export function getRequestFailureDetails(
if (/AOS结果下载超时/.test(text)) {
return detail("RMBG_RESULT_DOWNLOAD_TIMEOUT", "抠图已完成,但结果图片下载超时。", "请联系管理员按请求编号取回原任务结果,避免重复抠图。", "unknown");
}
if (/提交生图前读取参考图超时/.test(text)) {
return detail("IMAGE_REFERENCE_READ_TIMEOUT", "提交生图前读取参考图超时,任务尚未提交。", "可以稍后重试。");
}
const errorName = isRecord(error) ? String(error.name || "") : "";
if (["AbortError", "TimeoutError"].includes(errorName) || /operation was aborted/i.test(text)) {
return detail("RESULT_UNCONFIRMED", errorName === "TimeoutError" ? "请求等待超时,任务结果尚未确认。" : "本次请求连接已中止,任务结果尚未确认。", "请先核对原任务或历史记录;持续没有结果时联系管理员,避免重复生成。", "unknown");

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,37 +134,10 @@ 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;
targetStorageConfigId?: string | null;
downloadAsset?: import("./qiniu-image-archive").ReadyImageDownload;
}) {
await db
.update(imageArchiveTask)
@ -175,7 +145,7 @@ export async function markImageArchiveTaskStored(params: {
status: "stored",
targetUrl: params.targetUrl,
targetStorageConfigId: params.targetStorageConfigId || null,
metadata: sql`coalesce(${imageArchiveTask.metadata}, '{}'::jsonb) || jsonb_build_object('downloadAsset', ${JSON.stringify(params.downloadAsset ?? { status: "pending" })}::jsonb)`,
metadata: sql`coalesce(${imageArchiveTask.metadata}, '{}'::jsonb) || jsonb_build_object('downloadAsset', jsonb_build_object('status', 'pending'))`,
archivedAt: new Date(),
replaceAfterAt: new Date(),
lastError: null,
@ -379,17 +349,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

@ -12,7 +12,6 @@ import {
imageArchiveSourceKey,
} from "@/lib/storage/image-archive-db";
import { uploadFile } from "@/lib/storage/service";
import { archiveImageThroughQiniu } from "./qiniu-image-archive";
const logger = createLogger("image-archive");
@ -58,8 +57,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", {
@ -184,7 +182,7 @@ export async function downloadTemporaryImage(params: { sourceUrl: string; retrie
});
return { ...data, extension: getImageExtension(data.contentType, params.sourceUrl) };
} catch (error) {
if (attempt >= retries || /\bHTTP (?:404|410)\b/.test(String(error))) throw error;
if (attempt >= retries) throw error;
await new Promise((resolve) => setTimeout(resolve, 1000 * (attempt + 1)));
}
}
@ -192,18 +190,11 @@ export async function downloadTemporaryImage(params: { sourceUrl: string; retrie
throw new Error("Image download failed");
}
export async function archiveTemporaryImage(sourceUrl: string, archiveId?: string) {
if (archiveId) {
const direct = await archiveImageThroughQiniu(sourceUrl, archiveId).catch(error => {
logger.warn("cloud_archive_fallback", error, { archiveId });
return null;
});
if (direct) return direct;
}
const downloaded = await downloadTemporaryImage({ sourceUrl, retries: 0 });
export async function archiveTemporaryImage(sourceUrl: string) {
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,
@ -211,6 +202,5 @@ export async function archiveTemporaryImage(sourceUrl: string, archiveId?: strin
pathname: uploaded.pathname,
contentType: uploaded.contentType,
bytes: downloaded.buffer.length,
downloadAsset: undefined,
};
}

View File

@ -4,7 +4,6 @@ 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 { getDownloadFailure } from "@/lib/canvas/download-error";
import { createLogger } from "@/lib/observability/logger";
import { trackRuntimeWork } from "@/lib/observability/active-work";
@ -16,16 +15,6 @@ export async function prepareImageArchiveDownload(id: string) {
if (!task?.targetUrl) return;
let phase: "read" | "convert" | "store" = "read";
try {
const ready = await getReadyQiniuImageDownload(task.targetUrl).catch(() => undefined);
if (ready) {
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 +27,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

@ -1,158 +0,0 @@
import "server-only";
import { GetObjectCommand } from "@aws-sdk/client-s3";
import { createHmac } from "node:crypto";
import {
buildS3PublicUrl,
createS3Client,
resolveS3UploadTarget,
} from "@/lib/storage/service";
const QINIU_EAST_CHINA_IO = "iovip-z0.qiniuio.com";
const PNG_HEADER_LIMIT = 64 * 1024;
const PNG_SIGNATURE = Buffer.from("89504e470d0a1a0a", "hex");
export type ReadyImageDownload = {
status: "ready";
url: string;
contentType: "image/png";
bytes: number;
preparedAt: string;
};
function encodeQiniu(value: string | Buffer) {
return (typeof value === "string" ? Buffer.from(value) : value)
.toString("base64").replace(/\+/g, "-").replace(/\//g, "_");
}
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;
// Animation and EXIF orientation need the existing full-image preparation.
// An embedded color profile is fine: the browser gets the exact stored bytes.
for (let offset = 33; offset + 8 <= prefix.length;) {
const type = prefix.toString("ascii", offset + 4, offset + 8);
if (type === "IDAT") return true;
if (type === "acTL" || type === "eXIf" || type === "IEND") return false;
offset += prefix.readUInt32BE(offset) + 12;
}
return false;
}
export async function getReadyQiniuImageDownload(url: string, target?: Awaited<ReturnType<typeof resolveS3UploadTarget>>) {
const config = (target ?? await resolveS3UploadTarget())?.config;
if (config?.provider !== "qiniu-kodo" || !config.publicUrl) return;
const base = buildS3PublicUrl(config, "");
if (!url.startsWith(base)) return;
const key = url.slice(base.length);
if (!/^uploads\/(?:[\w.-]+\/)*[\w.-]+$/.test(key)) return;
const client = createS3Client(config);
try {
const response = await client.send(new GetObjectCommand({
Bucket: config.bucket, Key: key, Range: `bytes=0-${PNG_HEADER_LIMIT - 1}`,
}), { abortSignal: AbortSignal.timeout(10_000) });
const range = response.ContentRange?.match(/^bytes 0-(\d+)\/(\d+)$/);
const length = response.ContentLength ?? 0;
const bytes = Number(range?.[2]);
if (response.$metadata.httpStatusCode !== 206 || response.ContentType !== "image/png"
|| !range || !response.Body || length <= 0 || length > PNG_HEADER_LIMIT
|| Number(range[1]) + 1 !== length || bytes < length) {
(response.Body as NodeJS.ReadableStream & { destroy?: () => void } | undefined)?.destroy?.();
return;
}
const prefix = Buffer.from(await response.Body.transformToByteArray());
if (prefix.length === length && isDownloadReadyPng(prefix)) {
return { status: "ready", url, contentType: "image/png", bytes, preparedAt: new Date().toISOString() } satisfies ReadyImageDownload;
}
} finally {
client.destroy();
}
}
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;
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 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`;
const signature = encodeQiniu(createHmac("sha1", config.secretAccessKey).update(signingData).digest());
const response = await fetch(`https://${QINIU_EAST_CHINA_IO}${path}`, {
method: "POST",
headers: {
Authorization: `Qiniu ${config.accessKeyId}:${signature}`,
"Content-Type": contentType,
},
body: "",
redirect: "error",
signal: AbortSignal.timeout(40_000),
});
if (!response.ok) {
await response.body?.cancel();
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}`);
}
const url = buildS3PublicUrl(config, pathname);
return {
url,
thumbnailUrl: url,
pathname,
contentType: result.mimeType,
bytes: result.fsize,
downloadAsset: result.mimeType === "image/png"
? await getReadyQiniuImageDownload(url, target).catch(() => undefined)
: undefined,
};
}

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

@ -259,7 +259,7 @@ async function interpretStoryboardCommandWithLLM(params: {
.filter(Boolean)
.join("\n\n"),
temperature: 0.1,
maxOutputTokens: 200,
maxTokens: 200,
abortSignal: AbortSignal.timeout(12000),
} as any);

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

@ -86,7 +86,7 @@ export function filterCanvasModels<T extends CanvasModelDescriptor>(
});
}
export function getCanvasVideoParameters(model: CanvasModelDescriptor | undefined, mode?: VideoGenerationMode, resolution?: string) {
export function getCanvasVideoParameters(model: CanvasModelDescriptor | undefined, mode?: VideoGenerationMode) {
const caps = record(model?.capabilities);
const scoped = record(record(caps.modeConstraints || caps.constraints)[mode || ""]);
const strings = (value: unknown) => Array.isArray(value) ? [...new Set(value.map(String).filter(Boolean))] : [];
@ -94,15 +94,11 @@ export function getCanvasVideoParameters(model: CanvasModelDescriptor | undefine
const min = Number(durationRange.min), max = Number(durationRange.max);
const configured = record((model as CanvasModelDescriptor & {imageGenConfig?: unknown})?.imageGenConfig).videoDurationOptions;
const durations = Array.isArray(scoped.durationOptions) ? scoped.durationOptions : Array.isArray(configured) && configured.length ? configured : caps.durationOptions;
const durationValues = Array.isArray(durations) ? [...new Set(durations.map(Number).filter(n => Number.isFinite(n) && n > 0))].sort((a,b) => a-b) :
min > 0 && max >= min && max-min <= 120 ? Array.from({length: max-min+1}, (_,i) => min+i) : [];
const bounds = model?.providerType === "vip98k" && resolution
? vip98kVideoDurationBounds(record(caps.vip98k).invocation?.inputSchema, resolution.toLowerCase())
: { min: 0, max: Infinity, durations: undefined };
return {
ratios: strings(scoped.ratioOptions || caps.supportedRatios),
resolutions: strings(scoped.resolutionOptions || caps.supportedResolutions),
durations: durationValues.filter(value => value >= bounds.min && value <= bounds.max && (!bounds.durations || bounds.durations.includes(value))),
durations: Array.isArray(durations) ? [...new Set(durations.map(Number).filter(n => Number.isFinite(n) && n > 0))].sort((a,b) => a-b) :
min > 0 && max >= min && max-min <= 120 ? Array.from({length: max-min+1}, (_,i) => min+i) : [],
supportsAudio: caps.supportGenerateAudio === true || caps.supportsAudio === true || caps.generateAudio === true || strings(record(record(model?.imageGenConfig).atlasCloud).propertyNames).includes("generate_audio"),
};
}

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

@ -1,7 +0,0 @@
export function restoreTextResourceContent(draft?: Record<string, any>): string[] {
const content = draft?.content;
if (typeof content === "string") return [content];
// Empty arrays and strings both represent an intentional edit.
if (Array.isArray(content)) return content;
return [];
}

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,18 +12,15 @@ 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/,
/routes\/video-canvas-media-import\.test\.ts/,
/routes\/video-canvas-toolbar-jobs\.test\.ts/,
/routes\/image-provider-error-classification\.test\.ts/,
/routes\/chat-image-fallback-contract\.test\.ts/,
/routes\/image-generation-status\.test\.ts/,
/routes\/canvas-agent-runtime-image-failover\.test\.ts/,
/routes\/video-canvas-audio-remote\.test\.ts/,
@ -73,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

@ -13,13 +13,9 @@ async function setup(page: Page, failRead = false) {
writes: [] as any[], metadataWrites: 0, submissions: [] as any[], capabilitySubmissions: [] as any[],
appVersion: "development", holdRequest: false, finishRequest: null as (() => void) | null,
nativeResultNext: false,
holdUpload: false, uploadStarted: 0, finishUpload: null as (() => void) | null,
};
const revision = () => new Date(Date.UTC(2026, 10, 6, 0, 0, state.revision)).toISOString();
const project = () => ({ id: projectId, title: "同步验证", canvasData: JSON.parse(JSON.stringify(state.canvasData, (_key, value) =>
value && typeof value === "object" && !Array.isArray(value)
? Object.fromEntries(Object.entries(value).sort(([a], [b]) => a.localeCompare(b)))
: value)), updatedAt: revision() });
const project = () => ({ id: projectId, title: "同步验证", canvasData: state.canvasData, updatedAt: revision() });
const errors: string[] = [];
page.on("pageerror", error => errors.push(error.message));
await page.context().addInitScript(() => localStorage.setItem("theme", "light"));
@ -28,10 +24,6 @@ async function setup(page: Page, failRead = false) {
const path = new URL(request.url()).pathname;
let data: unknown = {};
let status = 200;
if (path.startsWith("/api/files/") && request.method() === "POST" && state.holdUpload) {
state.uploadStarted++;
await new Promise<void>(resolve => { state.finishUpload = resolve; });
}
if (path === `/api/canvas/${projectId}`) {
if (request.method() === "GET") {
status = state.failRead ? 500 : 200;
@ -116,9 +108,8 @@ async function moveImage(page: Page) {
const unloadWouldBeBlocked = (page: Page) => page.evaluate(() => {
const event = new Event("beforeunload", { cancelable: true });
Object.defineProperty(event, "returnValue", { value: "", writable: true });
window.dispatchEvent(event);
return event.defaultPrevented && Boolean(event.returnValue);
return event.defaultPrevented;
});
test("background saving recovers when the network returns without a manual save", async ({ page }) => {
@ -136,18 +127,6 @@ test("background saving recovers when the network returns without a manual save"
expect(errors).toEqual([]);
});
test("selecting a saved image does not require another save before an Agent message", async ({ page }) => {
const { state, errors } = await setup(page);
await page.locator('[data-canvas-node-id="source"]').click();
state.failSave = true;
const editor = page.getByLabel("描述你的设计需求", { exact: true });
await editor.fill("分析这张已经保存的图片");
await editor.press("Enter");
await expect.poll(() => state.submissions.length).toBe(1);
expect(state.canvasData.nodes.map(node => node.id)).toEqual(["source"]);
expect(errors).toEqual([]);
});
test("only unsaved content blocks closing and beforeunload does not issue duplicate saves", async ({ page }) => {
const { state, errors } = await setup(page);
expect(await unloadWouldBeBlocked(page)).toBe(false);
@ -164,21 +143,6 @@ test("only unsaved content blocks closing and beforeunload does not issue duplic
expect(errors).toEqual([]);
});
test("pagehide and visibilitychange issue only one closing save", async ({ page }) => {
const { state, errors } = await setup(page);
state.failSave = true;
await moveImage(page);
const writes = state.writes.length;
await page.evaluate(() => {
window.dispatchEvent(new Event("pagehide"));
Object.defineProperty(document, "visibilityState", { value: "hidden", configurable: true });
document.dispatchEvent(new Event("visibilitychange"));
});
await expect.poll(() => state.writes.length).toBe(writes + 1);
expect(state.submissions).toHaveLength(0);
expect(errors).toEqual([]);
});
test("leaving with pending changes can continue editing or save before navigating", async ({ page }) => {
const { state, errors } = await setup(page);
await page.route(url => url.pathname === "/", route => route.fulfill({ contentType: "text/html; charset=utf-8", body: "<p>已返回首页</p>" }));
@ -280,7 +244,6 @@ test("toolbar save failures show the cause and recover without a paid submission
state.failSave = true;
await page.locator('[data-tool-key="enhance"]').click();
await expect(page.getByText(/画布自动同步失败(HTTP 503)/)).toBeVisible();
await expect(page.getByText(/本次处理未提交/)).toBeVisible();
expect(state.capabilitySubmissions).toHaveLength(0);
state.failSave = false;
await page.locator('[data-tool-key="enhance"]').click();
@ -452,70 +415,6 @@ async function countRefreshes(page: Page, state: { appVersion: string }) {
return () => navigations;
}
test("unfinished image uploads remain on the page even after their canvas placeholder was saved", async ({ page }) => {
const { state, errors } = await setup(page);
const refreshes = await countRefreshes(page, state);
state.holdUpload = true;
await page.mouse.click(100, 90);
await page.evaluate(() => {
const bytes = Uint8Array.from(atob("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+j2d0AAAAASUVORK5CYII="), c => c.charCodeAt(0));
const transfer = new DataTransfer();
transfer.items.add(new File([bytes], "上传保护.png", { type: "image/png" }));
window.dispatchEvent(new ClipboardEvent("paste", { clipboardData: transfer, bubbles: true, cancelable: true }));
});
await expect.poll(() => state.uploadStarted).toBeGreaterThan(0);
await expect.poll(() => state.canvasData.nodes.filter(node => node.data.src === "").length).toBe(1);
expect(await unloadWouldBeBlocked(page)).toBe(true);
await page.getByRole("button", { name: "返回首页", exact: true }).click();
const dialog = page.getByRole("dialog", { name: "离开前保存画布?" });
await dialog.getByRole("button", { name: "保存并离开", exact: true }).click();
await expect(dialog.getByRole("alert")).toContainText("还有图片未上传成功");
await dialog.getByRole("button", { name: "继续编辑", exact: true }).click();
await showUpdate(page, state);
await page.getByRole("button", { name: "同步并刷新", exact: true }).click();
await expect(page.getByRole("alertdialog")).toContainText("还有图片未上传成功");
expect(refreshes()).toBe(0);
state.holdUpload = false;
state.finishUpload?.();
await expect.poll(() => state.canvasData.nodes.some(node => node.data.src.includes("uploaded.png"))).toBe(true);
await page.getByRole("button", { name: "同步并刷新", exact: true }).click();
await expect.poll(refreshes).toBe(1);
expect(state.canvasData.nodes).toHaveLength(2);
expect(state.submissions).toHaveLength(0);
expect(errors).toEqual([]);
});
test("a composer upload blocks release refresh and closing until the image and input are retained", async ({ page }) => {
const { state, errors } = await setup(page);
const refreshes = await countRefreshes(page, state);
state.holdUpload = true;
const editor = page.getByLabel("描述你的设计需求", { exact: true });
await editor.fill("上传后保留这条输入");
await editor.evaluate(element => {
const transfer = new DataTransfer();
transfer.items.add(new File([new Uint8Array([137, 80, 78, 71])], "聊天上传保护.png", { type: "image/png" }));
element.dispatchEvent(new ClipboardEvent("paste", { clipboardData: transfer, bubbles: true, cancelable: true }));
});
await expect.poll(() => state.uploadStarted).toBeGreaterThan(0);
await expect(page.getByText("聊天上传保护.png", { exact: true })).toBeVisible();
expect(await unloadWouldBeBlocked(page)).toBe(true);
await showUpdate(page, state);
await page.getByRole("button", { name: "同步并刷新", exact: true }).click();
await expect(page.getByRole("alertdialog")).toContainText("素材仍在上传");
expect(refreshes()).toBe(0);
state.holdUpload = false;
state.finishUpload?.();
await expect.poll(() => state.canvasData.nodes.some(node => node.data.src.includes("uploaded.png"))).toBe(true);
await expect(page.getByText("聊天上传保护.png", { exact: true })).toHaveCount(1);
await page.getByRole("button", { name: "同步并刷新", exact: true }).click();
await expect.poll(refreshes).toBe(1);
await expect(editor).toContainText("上传后保留这条输入");
await expect(editor.getByText("聊天上传保护.png", { exact: true })).toBeVisible();
expect(state.canvasData.nodes).toHaveLength(2);
expect(state.submissions).toHaveLength(0);
expect(errors).toEqual([]);
});
test("an older browser without AbortSignal static helpers receives the release notice", async ({ page }) => {
await page.context().addInitScript(() => {
Object.defineProperty(AbortSignal, "any", { value: undefined, configurable: true });
@ -590,19 +489,9 @@ test("an update keeps the current page when automatic synchronization fails", as
await showUpdate(page, state);
await page.getByRole("button", { name: "同步并刷新", exact: true }).click();
await expect(page.getByRole("alertdialog")).toContainText("HTTP 503");
await expect(page.getByRole("alertdialog")).not.toContainText("本次任务未提交");
await expect(page.getByRole("alertdialog")).not.toContainText("再次发送");
expect(refreshes()).toBe(0);
expect(state.submissions).toHaveLength(0);
await page.screenshot({ path: test.info().outputPath("update-error-desktop.png"), animations: "disabled" });
await page.setViewportSize({ width: 390, height: 844 });
await page.screenshot({ path: test.info().outputPath("update-error-mobile.png"), animations: "disabled" });
await page.setViewportSize({ width: 1440, height: 900 });
await page.getByRole("button", { name: "返回处理", exact: true }).click();
await expect(page.getByRole("alertdialog")).toHaveCount(0);
await expect(page.locator('[data-canvas-node-id="source"]')).toBeVisible();
state.failSave = false;
await showUpdate(page, state);
await page.getByRole("button", { name: "同步并刷新", exact: true }).click();
await expect.poll(refreshes).toBe(1);
expect(state.canvasData.nodes[0].position.x).toBeGreaterThan(160);

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 };
}

Some files were not shown because too many files have changed in this diff Show More