fix: forward canvas detail imageSize and harden ruxa task parsing
Some checks failed
Lint / build (20) (push) Has been cancelled
Playwright Tests / test (push) Has been cancelled

This commit is contained in:
Your Name 2026-02-24 20:59:58 +08:00
parent 365174ffc5
commit d89e8590a9
4 changed files with 58 additions and 16 deletions

View File

@ -26,6 +26,10 @@ function toGenerateImagePayload(body: GenerateImageRequest): CanvasGenerateImage
typeof body.aspectRatio === "string" && body.aspectRatio.trim() typeof body.aspectRatio === "string" && body.aspectRatio.trim()
? body.aspectRatio.trim() ? body.aspectRatio.trim()
: "1:1", : "1:1",
imageSize:
typeof body.imageSize === "string" && body.imageSize.trim()
? body.imageSize.trim()
: undefined,
imageCount: imageCount:
typeof body.imageCount === "number" && Number.isFinite(body.imageCount) typeof body.imageCount === "number" && Number.isFinite(body.imageCount)
? body.imageCount ? body.imageCount

View File

@ -343,6 +343,7 @@ type CanvasImageGenerationRequest = {
prompt: string; prompt: string;
model?: string; model?: string;
aspectRatio?: string; aspectRatio?: string;
imageSize?: string;
imageCount?: number; imageCount?: number;
negativePrompt?: string; negativePrompt?: string;
referenceImage?: string; referenceImage?: string;
@ -4162,6 +4163,7 @@ export function CanvasChatPanel({ chatId, initialMessages = [], onClose, onOpenF
prompt: promptOverride, prompt: promptOverride,
model: modelForGeneration, model: modelForGeneration,
aspectRatio: "9:16", aspectRatio: "9:16",
imageSize: imageParams.imageSize,
imageCount: 1, imageCount: 1,
negativePrompt: imageParams.negativePrompt, negativePrompt: imageParams.negativePrompt,
referenceImage: productAttachments[0]?.url, referenceImage: productAttachments[0]?.url,
@ -4421,6 +4423,7 @@ export function CanvasChatPanel({ chatId, initialMessages = [], onClose, onOpenF
prompt: reviewPrompt, prompt: reviewPrompt,
model: modelForGeneration, model: modelForGeneration,
aspectRatio: "1:1", aspectRatio: "1:1",
imageSize: imageParams.imageSize,
imageCount: DETAIL_REVIEW_IMAGE_COUNT, imageCount: DETAIL_REVIEW_IMAGE_COUNT,
negativePrompt: imageParams.negativePrompt, negativePrompt: imageParams.negativePrompt,
referenceImage: productAttachments[0]?.url, referenceImage: productAttachments[0]?.url,
@ -4770,6 +4773,7 @@ export function CanvasChatPanel({ chatId, initialMessages = [], onClose, onOpenF
prompt: reviewPrompt, prompt: reviewPrompt,
model: modelForGeneration, model: modelForGeneration,
aspectRatio: "1:1", aspectRatio: "1:1",
imageSize: imageParams.imageSize,
imageCount: DETAIL_REVIEW_IMAGE_COUNT, imageCount: DETAIL_REVIEW_IMAGE_COUNT,
negativePrompt: imageParams.negativePrompt, negativePrompt: imageParams.negativePrompt,
referenceImage: productAttachments[0]?.url, referenceImage: productAttachments[0]?.url,

View File

@ -75,13 +75,21 @@ function normalizeOutputFormat(outputFormat?: string): "png" | "jpg" {
} }
function extractTaskId(payload: any): string | undefined { function extractTaskId(payload: any): string | undefined {
if (typeof payload === "string" && payload.trim()) {
return payload.trim();
}
if (typeof payload?.data === "string" && payload.data.trim()) {
return payload.data.trim();
}
return ( return (
payload?.taskId || payload?.taskId ||
payload?.task_id || payload?.task_id ||
payload?.id || payload?.id ||
payload?.task?.id ||
payload?.data?.taskId || payload?.data?.taskId ||
payload?.data?.task_id || payload?.data?.task_id ||
payload?.data?.id payload?.data?.id ||
payload?.data?.task?.id
); );
} }
@ -110,6 +118,15 @@ function extractErrorMessage(payload: any): string {
); );
} }
function compactPayloadSnippet(payload: any): string {
try {
const json = JSON.stringify(payload);
return json.length > 320 ? `${json.slice(0, 320)}...` : json;
} catch {
return String(payload || "");
}
}
function extractPromptAndImages(messages: Array<{ role: string; content: any }>) { function extractPromptAndImages(messages: Array<{ role: string; content: any }>) {
const lastUserMessage = messages.filter((message) => message.role === "user").pop(); const lastUserMessage = messages.filter((message) => message.role === "user").pop();
if (!lastUserMessage) { if (!lastUserMessage) {
@ -347,34 +364,46 @@ export function createRuxaImage({ apiKey, baseURL }: RuxaImageConfig) {
const activeModelId = options.overrideModelId || modelId; const activeModelId = options.overrideModelId || modelId;
const createEndpoint = joinApiPath(baseURL, "/api/v1/tasks/create"); const createEndpoint = joinApiPath(baseURL, "/api/v1/tasks/create");
const callbackUrl = process.env.RUXA_CALLBACK_URL?.trim();
const requestBody = {
input: {
prompt,
image_input: imageUrls,
aspect_ratio: aspectRatio,
resolution,
output_format: outputFormat,
},
model: activeModelId,
...(callbackUrl ? { callBackUrl: callbackUrl } : {}),
};
const createResponse = await fetch(createEndpoint, { const createResponse = await fetch(createEndpoint, {
method: "POST", method: "POST",
headers: { headers: {
Authorization: `Bearer ${apiKey}`, Authorization: `Bearer ${apiKey}`,
"Content-Type": "application/json", "Content-Type": "application/json",
}, },
body: JSON.stringify({ body: JSON.stringify(requestBody),
input: {
prompt,
image_input: imageUrls,
aspect_ratio: aspectRatio,
resolution,
output_format: outputFormat,
},
model: activeModelId,
}),
}); });
const createRawText = await createResponse.text();
const createPayload = await createResponse.json(); let createPayload: any = null;
try {
createPayload = JSON.parse(createRawText);
} catch {
createPayload = createRawText;
}
if (!createResponse.ok) { if (!createResponse.ok) {
throw new Error(extractErrorMessage(createPayload)); throw new Error(
`${extractErrorMessage(createPayload)} (HTTP ${createResponse.status})`
);
} }
let outputUrls = filterSourceImages(collectImageUrls(createPayload), imageUrls); let outputUrls = filterSourceImages(collectImageUrls(createPayload), imageUrls);
if (outputUrls.length === 0) { if (outputUrls.length === 0) {
const taskId = extractTaskId(createPayload); const taskId = extractTaskId(createPayload);
if (!taskId) { if (!taskId) {
throw new Error("RUXA 创建任务成功,但未返回 taskId"); throw new Error(
`RUXA 创建任务成功,但未返回 taskId,响应片段: ${compactPayloadSnippet(createPayload)}`
);
} }
outputUrls = await waitForTaskResult(baseURL, apiKey, taskId, imageUrls); outputUrls = await waitForTaskResult(baseURL, apiKey, taskId, imageUrls);
} }

View File

@ -12,6 +12,7 @@ export interface CanvasGenerateImageRequest {
negativePrompt?: string; negativePrompt?: string;
model?: string; model?: string;
aspectRatio?: string; aspectRatio?: string;
imageSize?: string;
imageCount?: number; imageCount?: number;
referenceImage?: string; referenceImage?: string;
referenceImages?: string[]; referenceImages?: string[];
@ -80,6 +81,10 @@ export async function generateCanvasImage(
typeof request.aspectRatio === "string" && request.aspectRatio.trim() typeof request.aspectRatio === "string" && request.aspectRatio.trim()
? request.aspectRatio.trim() ? request.aspectRatio.trim()
: "1:1"; : "1:1";
const imageSize =
typeof request.imageSize === "string" && request.imageSize.trim()
? request.imageSize.trim()
: "2K";
const imageCount = const imageCount =
typeof request.imageCount === "number" && Number.isFinite(request.imageCount) typeof request.imageCount === "number" && Number.isFinite(request.imageCount)
? Math.max(1, Math.min(8, Math.floor(request.imageCount))) ? Math.max(1, Math.min(8, Math.floor(request.imageCount)))
@ -180,7 +185,7 @@ export async function generateCanvasImage(
const imageParams = { const imageParams = {
aspectRatio, aspectRatio,
imageSize: "2K", imageSize,
imageCount, imageCount,
negativePrompt, negativePrompt,
}; };