admin/infinite-canvas
1
0
Fork 0
mirror of https://github.com/basketikun/infinite-canvas.git synced 2026-08-05 00:34:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve issue with Gemini image format not passing aspect ratio configuration

Browse Source
This commit is contained in:
HouYunFei
2026-07-08 15:11:18 +08:00
parent 3080d6da10
commit 81144ea009
3 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
web/src/services/api/image.ts
+40 -1
View File
@@ -112,6 +112,9 @@ const IMAGE_MAX_EDGE = 3840;
const IMAGE_MAX_RATIO = 3;
const IMAGE_OUTPUT_FORMAT = "png";
const GEMINI_SUPPORTED_RATIOS = ["1:1", "1:4", "1:8", "2:3", "3:2", "3:4", "4:1", "4:3", "4:5", "5:4", "8:1", "9:16", "16:9", "21:9"];
const GEMINI_IMAGE_SIZE_BY_QUALITY: Record<string, string> = { low: "1K", medium: "2K", high: "4K", standard: "1K", hd: "2K" };
function normalizeQuality(quality: string) {
const value = quality.trim().toLowerCase();
const normalized = QUALITY_ALIASES[value] || value;
@@ -180,6 +183,42 @@ function resolveRequestSize(quality: string | undefined, size: string) {
throw new Error("图像尺寸格式不支持，请使用 auto、9:16 或 1024x1024");
}
function resolveGeminiImageConfig(config: AiConfig) {
const value = config.size.trim();
const dimensions = parseImageDimensions(value);
const ratio = dimensions ? `${dimensions.width}:${dimensions.height}` : value;
const aspectRatio = value && value.toLowerCase() !== "auto" ? closestGeminiAspectRatio(ratio) : undefined;
const imageSize = supportsGeminiImageSize(config.model) ? resolveGeminiImageSize(config.quality, dimensions) : undefined;
const image = { ...(aspectRatio ? { aspectRatio } : {}), ...(imageSize ? { imageSize } : {}) };
return Object.keys(image).length ? { responseFormat: { image } } : {};
}
function closestGeminiAspectRatio(value: string) {
const ratio = parseImageRatio(value);
const target = ratio.width / ratio.height;
return GEMINI_SUPPORTED_RATIOS.reduce((best, item) => {
const current = parseImageRatio(item);
const bestRatio = parseImageRatio(best);
return Math.abs(current.width / current.height - target) < Math.abs(bestRatio.width / bestRatio.height - target) ? item : best;
});
}
function resolveGeminiImageSize(quality: string, dimensions: { width: number; height: number } | null) {
const normalizedQuality = normalizeQuality(quality);
if (normalizedQuality) return GEMINI_IMAGE_SIZE_BY_QUALITY[normalizedQuality];
if (!dimensions) return undefined;
const edge = Math.max(dimensions.width, dimensions.height);
if (edge <= 768) return "512";
if (edge <= 1536) return "1K";
if (edge <= 3072) return "2K";
return "4K";
}
function supportsGeminiImageSize(model: string) {
const value = model.toLowerCase();
return value.includes("gemini-3") || value.includes("3.1") || value.includes("3-pro");
}
function resolveImageDataUrl(item: Record<string, unknown>) {
if (typeof item.b64_json === "string" && item.b64_json) {
return `data:image/png;base64,${item.b64_json}`;
@@ -585,7 +624,7 @@ async function requestGeminiImagesOnce(config: AiConfig, prompt: string, referen
const response = await axios.post<GeminiPayload>(
geminiApiUrl(config, "generateContent"),
{
...toGeminiBody(config, [{ role: "user", content: prompt }], { generationConfig: { responseModalities: ["TEXT", "IMAGE"] } }),
...toGeminiBody(config, [{ role: "user", content: prompt }], { generationConfig: { responseModalities: ["TEXT", "IMAGE"], ...resolveGeminiImageConfig(config) } }),
contents: [{ role: "user", parts }],
},
{ headers: geminiHeaders(config), signal: options?.signal },