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

fix: preserve Agnes image edit aspect ratio

Browse Source
This commit is contained in:
134 2026-06-22 02:28:47 +08:00
parent eb2153818d
commit 9e8817f89e
1 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,13 @@ const OPENAI_IMAGE_DIMENSION_MULTIPLE = 16;
const COMFLY_GPT_IMAGE_STABLE_EDIT_EDGE = 1536;
const COMFLY_GPT_IMAGE_MAX_EDGE = 3840;
const COMFLY_GPT_IMAGE_MAX_TOTAL_PIXELS = 8_294_400;
const AGNES_IMAGE_LONG_EDGE_BY_SIZE: Record<"1K" | "2K" | "4K", number> = {
"1K": 1024,
"2K": 1536,
"4K": 2048,
};
const AGNES_IMAGE_MAX_EDGE = 2048;
const AGNES_IMAGE_MAX_TOTAL_PIXELS = 4_194_304;
const BLTCY_HOST_REGEX = /(^|\.)bltcy\.ai$/i;
const COMFLY_HOST_REGEX = /(^|\.)ai\.comfly\.org$/i;
const AGNES_HOST_REGEX = /(^|\.)agnes-ai\.com$/i;
@ -240,6 +247,20 @@ function resolveComflyGptImageSize(aspectRatio: string, imageSize: "1K" | "2K" |
return `${width}x${height}`;
}
function resolveAgnesImageSize(aspectRatio: string, imageSize: "1K" | "2K" | "4K") {
const { width, height } = resolveLongestEdgeDimensions({
aspectRatio,
longestEdge: AGNES_IMAGE_LONG_EDGE_BY_SIZE[imageSize] || AGNES_IMAGE_LONG_EDGE_BY_SIZE["2K"],
constraints: {
maxEdge: AGNES_IMAGE_MAX_EDGE,
maxPixels: AGNES_IMAGE_MAX_TOTAL_PIXELS,
multiple: 8,
},
});
return `${width}x${height}`;
}
function resolveProviderImageSize(
baseURL: string,
aspectRatio: string,
@ -248,6 +269,9 @@ function resolveProviderImageSize(
if (isComflyBaseURL(baseURL)) {
return resolveComflyGptImageSize(aspectRatio, imageSize);
}
if (isAgnesBaseURL(baseURL)) {
return resolveAgnesImageSize(aspectRatio, imageSize);
}
return resolveOpenAISize(aspectRatio, imageSize);
}
@ -785,9 +809,17 @@ export function createOpenAIImage({ apiKey, baseURL }: OpenAIImageConfig) {
const activeModelId = options.overrideModelId || modelId;
const normalizedAspectRatio = normalizeAspectRatio(options.imageParams?.aspectRatio);
const promptAspectRatio = inferAspectRatioFromPrompt(prompt);
const referenceAspectRatio =
imageUrls.length > 0
? await inferAspectRatioFromImageUrl(imageUrls[0] || "")
: null;
const shouldPreferReferenceAspectRatio =
imageUrls.length > 0 && isAgnesImageModel(baseURL, activeModelId);
const aspectRatio =
normalizedAspectRatio === "auto"
? promptAspectRatio || (await inferAspectRatioFromImageUrl(imageUrls[0] || ""))
shouldPreferReferenceAspectRatio
? referenceAspectRatio || promptAspectRatio || normalizedAspectRatio
: normalizedAspectRatio === "auto"
? promptAspectRatio || referenceAspectRatio
: normalizedAspectRatio;
const requestedImageSize = normalizeImageSizeLabel(options.imageParams?.imageSize);
const modelImageSize = isComflyBaseURL(baseURL)
@ -808,11 +840,17 @@ export function createOpenAIImage({ apiKey, baseURL }: OpenAIImageConfig) {
apiModel: resolveProviderApiModelId(baseURL, activeModelId),
size,
aspectRatio: aspectRatio || "auto",
referenceAspectRatio: referenceAspectRatio || undefined,
preferReferenceAspectRatio: shouldPreferReferenceAspectRatio,
promptAspectRatio: promptAspectRatio || undefined,
imageSize,
requestedImageSize,
modelImageSize,
resolutionMode: isComflyBaseURL(baseURL) ? "comfly-gpt-image-constraints" : "pixel-area",
resolutionMode: isComflyBaseURL(baseURL)
? "comfly-gpt-image-constraints"
: isAgnesBaseURL(baseURL)
? "agnes-long-edge-constraints"
: "pixel-area",
timeoutMs: resolveRequestTimeoutMs(baseURL, imageSize, activeModelId),
useBltcyImageCompatParams: shouldUseBltcyImageCompatParams(baseURL),
imageCount: imageUrls.length,