lunanting/ai-chatbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Comfly 4K image failover timing

Browse Source
This commit is contained in:
134 2026-06-12 22:20:50 +08:00
parent 686111628e
commit 9e52e1844f
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/ai/providers/openai-image.ts
View File

@ -217,8 +217,17 @@ function resolveProviderImageSize(
return resolveOpenAISize(aspectRatio, imageSize);
}
function resolveRequestTimeoutMs(baseURL: string, imageSize?: "1K" | "2K" | "4K") {
if (isComflyBaseURL(baseURL) && imageSize === "4K") {
function isLongRunningComflyModel(modelId?: string) {
const normalized = String(modelId || "").trim().toLowerCase();
return normalized.includes("gpt-image-2") && normalized.includes("4k");
}
function resolveRequestTimeoutMs(
baseURL: string,
imageSize?: "1K" | "2K" | "4K",
modelId?: string
) {
if (isComflyBaseURL(baseURL) && (imageSize === "4K" || isLongRunningComflyModel(modelId))) {
return LONG_RUNNING_COMFLY_TIMEOUT_MS;
}
return DEFAULT_TIMEOUT_MS;
@ -461,7 +470,7 @@ async function requestOpenAIImageGeneration(params: {
typeof aspectRatio === "string" && aspectRatio.trim() && aspectRatio !== "auto"
? aspectRatio.trim()
: undefined;
const timeoutMs = resolveRequestTimeoutMs(baseURL, imageSizeLabel);
const timeoutMs = resolveRequestTimeoutMs(baseURL, imageSizeLabel, model);
const controller = new AbortController();
const timeoutId = setTimeout(() => controller.abort(), timeoutMs);
@ -597,7 +606,7 @@ export function createOpenAIImage({ apiKey, baseURL }: OpenAIImageConfig) {
promptAspectRatio: promptAspectRatio || undefined,
imageSize,
resolutionMode: isComflyBaseURL(baseURL) ? "longest-edge" : "pixel-area",
timeoutMs: resolveRequestTimeoutMs(baseURL, imageSize),
timeoutMs: resolveRequestTimeoutMs(baseURL, imageSize, activeModelId),
useBltcyImageCompatParams: shouldUseBltcyImageCompatParams(baseURL),
imageCount: imageUrls.length,
baseURL: normalizeBaseURL(baseURL),

1
lib/ai/runtime/model-health.ts
View File

@ -142,6 +142,7 @@ export function classifyAiModelHealthFailure(error: unknown): {
if (
normalized.includes("timeout") ||
normalized.includes("超时") ||
normalized.includes("524") ||
normalized.includes("terminated") ||
normalized.includes("timed out") ||
normalized.includes("body timeout") ||