Preserve auto ratio in OpenAI and RUXA image providers
This commit is contained in:
parent
232f634cc6
commit
b75dfa9295
@ -23,7 +23,6 @@ interface UploadedImage {
|
|||||||
original: string;
|
original: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const DEFAULT_ASPECT_RATIO = "1:1";
|
|
||||||
const DEFAULT_IMAGE_SIZE = "2K";
|
const DEFAULT_IMAGE_SIZE = "2K";
|
||||||
const DEFAULT_TIMEOUT_MS = 300000;
|
const DEFAULT_TIMEOUT_MS = 300000;
|
||||||
const SUPPORTED_ASPECT_RATIOS = [
|
const SUPPORTED_ASPECT_RATIOS = [
|
||||||
@ -65,7 +64,7 @@ function normalizeAspectRatio(value?: string) {
|
|||||||
const normalized = String(value || "").trim();
|
const normalized = String(value || "").trim();
|
||||||
if (!normalized || normalized.toLowerCase() === "auto") return "auto";
|
if (!normalized || normalized.toLowerCase() === "auto") return "auto";
|
||||||
if ((SUPPORTED_ASPECT_RATIOS as readonly string[]).includes(normalized)) return normalized;
|
if ((SUPPORTED_ASPECT_RATIOS as readonly string[]).includes(normalized)) return normalized;
|
||||||
return DEFAULT_ASPECT_RATIO;
|
return undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
function parseAspectRatioValue(ratio: string) {
|
function parseAspectRatioValue(ratio: string) {
|
||||||
@ -81,8 +80,8 @@ function roundEven(value: number) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function inferClosestAspectRatio(aspectValue: number) {
|
function inferClosestAspectRatio(aspectValue: number) {
|
||||||
if (!Number.isFinite(aspectValue) || aspectValue <= 0) return DEFAULT_ASPECT_RATIO;
|
if (!Number.isFinite(aspectValue) || aspectValue <= 0) return "1:1";
|
||||||
let closest = DEFAULT_ASPECT_RATIO;
|
let closest = "1:1";
|
||||||
let minDiff = Number.POSITIVE_INFINITY;
|
let minDiff = Number.POSITIVE_INFINITY;
|
||||||
for (const candidate of SUPPORTED_ASPECT_RATIOS) {
|
for (const candidate of SUPPORTED_ASPECT_RATIOS) {
|
||||||
const diff = Math.abs(parseAspectRatioValue(candidate) - aspectValue);
|
const diff = Math.abs(parseAspectRatioValue(candidate) - aspectValue);
|
||||||
@ -361,7 +360,7 @@ async function requestOpenAIImageGeneration(params: {
|
|||||||
apiKey: string;
|
apiKey: string;
|
||||||
model: string;
|
model: string;
|
||||||
prompt: string;
|
prompt: string;
|
||||||
size: string;
|
size?: string;
|
||||||
imageUrls: string[];
|
imageUrls: string[];
|
||||||
quality?: string;
|
quality?: string;
|
||||||
background?: string;
|
background?: string;
|
||||||
@ -378,7 +377,7 @@ async function requestOpenAIImageGeneration(params: {
|
|||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
formData.append("model", model);
|
formData.append("model", model);
|
||||||
formData.append("prompt", prompt);
|
formData.append("prompt", prompt);
|
||||||
formData.append("size", size);
|
if (size) formData.append("size", size);
|
||||||
formData.append("response_format", "url");
|
formData.append("response_format", "url");
|
||||||
|
|
||||||
if (quality) formData.append("quality", quality);
|
if (quality) formData.append("quality", quality);
|
||||||
@ -420,7 +419,7 @@ async function requestOpenAIImageGeneration(params: {
|
|||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
model,
|
model,
|
||||||
prompt,
|
prompt,
|
||||||
size,
|
...(size ? { size } : {}),
|
||||||
response_format: "url",
|
response_format: "url",
|
||||||
...(quality ? { quality } : {}),
|
...(quality ? { quality } : {}),
|
||||||
...(background ? { background } : {}),
|
...(background ? { background } : {}),
|
||||||
@ -474,15 +473,15 @@ export function createOpenAIImage({ apiKey, baseURL }: OpenAIImageConfig) {
|
|||||||
}) => {
|
}) => {
|
||||||
const { prompt, imageUrls } = extractPromptAndImages(options.messages);
|
const { prompt, imageUrls } = extractPromptAndImages(options.messages);
|
||||||
const activeModelId = options.overrideModelId || modelId;
|
const activeModelId = options.overrideModelId || modelId;
|
||||||
|
const normalizedAspectRatio = normalizeAspectRatio(options.imageParams?.aspectRatio);
|
||||||
const aspectRatio =
|
const aspectRatio =
|
||||||
normalizeAspectRatio(options.imageParams?.aspectRatio) === "auto"
|
normalizedAspectRatio === "auto"
|
||||||
? await inferAspectRatioFromImageUrl(imageUrls[0] || "")
|
? await inferAspectRatioFromImageUrl(imageUrls[0] || "")
|
||||||
: normalizeAspectRatio(options.imageParams?.aspectRatio);
|
: normalizedAspectRatio;
|
||||||
const imageSize = normalizeImageSizeLabel(options.imageParams?.imageSize);
|
const imageSize = normalizeImageSizeLabel(options.imageParams?.imageSize);
|
||||||
const effectiveAspectRatio = aspectRatio || DEFAULT_ASPECT_RATIO;
|
|
||||||
const size =
|
const size =
|
||||||
options.imageParams?.size ||
|
options.imageParams?.size ||
|
||||||
resolveOpenAISize(effectiveAspectRatio, imageSize);
|
(aspectRatio ? resolveOpenAISize(aspectRatio, imageSize) : undefined);
|
||||||
const quality = normalizeQuality(options.imageParams?.quality);
|
const quality = normalizeQuality(options.imageParams?.quality);
|
||||||
const background = normalizeBackground(options.imageParams?.background);
|
const background = normalizeBackground(options.imageParams?.background);
|
||||||
const outputFormat = normalizeOutputFormat(options.imageParams?.outputFormat);
|
const outputFormat = normalizeOutputFormat(options.imageParams?.outputFormat);
|
||||||
@ -490,7 +489,7 @@ export function createOpenAIImage({ apiKey, baseURL }: OpenAIImageConfig) {
|
|||||||
console.log("[OpenAI Image] Submitting request", {
|
console.log("[OpenAI Image] Submitting request", {
|
||||||
model: activeModelId,
|
model: activeModelId,
|
||||||
size,
|
size,
|
||||||
aspectRatio: effectiveAspectRatio,
|
aspectRatio: aspectRatio || "auto",
|
||||||
imageCount: imageUrls.length,
|
imageCount: imageUrls.length,
|
||||||
baseURL: normalizeBaseURL(baseURL),
|
baseURL: normalizeBaseURL(baseURL),
|
||||||
});
|
});
|
||||||
|
|||||||
@ -20,7 +20,6 @@ interface UploadedImage {
|
|||||||
original: string;
|
original: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const DEFAULT_SIZE = "1:1";
|
|
||||||
const DEFAULT_RESOLUTION = "1k";
|
const DEFAULT_RESOLUTION = "1k";
|
||||||
const DEFAULT_OUTPUT_FORMAT = "png";
|
const DEFAULT_OUTPUT_FORMAT = "png";
|
||||||
const POLL_INTERVAL_MS = 2000;
|
const POLL_INTERVAL_MS = 2000;
|
||||||
@ -50,14 +49,14 @@ function joinApiPath(baseURL: string, path: string) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function normalizeAspectRatio(aspectRatio?: string) {
|
function normalizeAspectRatio(aspectRatio?: string) {
|
||||||
if (!aspectRatio) return DEFAULT_SIZE;
|
if (!aspectRatio) return undefined;
|
||||||
const normalized = aspectRatio.trim().toLowerCase();
|
const normalized = aspectRatio.trim().toLowerCase();
|
||||||
if (normalized === "auto") return DEFAULT_SIZE;
|
if (normalized === "auto") return undefined;
|
||||||
const ratio = aspectRatio.trim();
|
const ratio = aspectRatio.trim();
|
||||||
if (["1:1", "16:9", "9:16", "4:3", "3:4", "2:3", "3:2"].includes(ratio)) {
|
if (["1:1", "16:9", "9:16", "4:3", "3:4", "2:3", "3:2"].includes(ratio)) {
|
||||||
return ratio;
|
return ratio;
|
||||||
}
|
}
|
||||||
return DEFAULT_SIZE;
|
return undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeResolution(imageSize?: string) {
|
function normalizeResolution(imageSize?: string) {
|
||||||
@ -378,11 +377,13 @@ export function createRuxaImage({ apiKey, baseURL }: RuxaImageConfig) {
|
|||||||
const callbackUrl = process.env.RUXA_CALLBACK_URL?.trim();
|
const callbackUrl = process.env.RUXA_CALLBACK_URL?.trim();
|
||||||
const input: Record<string, unknown> = {
|
const input: Record<string, unknown> = {
|
||||||
prompt,
|
prompt,
|
||||||
size: aspectRatio,
|
|
||||||
aspect_ratio: aspectRatio,
|
|
||||||
resolution,
|
resolution,
|
||||||
output_format: outputFormat,
|
output_format: outputFormat,
|
||||||
};
|
};
|
||||||
|
if (aspectRatio) {
|
||||||
|
input.size = aspectRatio;
|
||||||
|
input.aspect_ratio = aspectRatio;
|
||||||
|
}
|
||||||
if (imageUrls[0]) {
|
if (imageUrls[0]) {
|
||||||
input.image = imageUrls[0];
|
input.image = imageUrls[0];
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user