fix: stabilize detail replacement result images
This commit is contained in:
parent
537a9d10c2
commit
fa4b4183cf
@ -118,42 +118,48 @@ export async function normalizeReplacementResultImage(params: {
|
|||||||
const generatedBuffer = await fetchImageBufferFromUrl(params.generatedImageUrl);
|
const generatedBuffer = await fetchImageBufferFromUrl(params.generatedImageUrl);
|
||||||
let targetWidth = params.referenceGeometry?.width;
|
let targetWidth = params.referenceGeometry?.width;
|
||||||
let targetHeight = params.referenceGeometry?.height;
|
let targetHeight = params.referenceGeometry?.height;
|
||||||
|
|
||||||
if (!targetWidth || !targetHeight) {
|
|
||||||
const referenceBuffer = await fetchImageBufferFromUrl(params.referenceImageUrl);
|
|
||||||
const referenceMetadata = await sharp(referenceBuffer, { failOn: "none" })
|
|
||||||
.rotate()
|
|
||||||
.metadata();
|
|
||||||
targetWidth = referenceMetadata.width;
|
|
||||||
targetHeight = referenceMetadata.height;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!targetWidth || !targetHeight) {
|
|
||||||
throw new Error("无法读取参考图尺寸");
|
|
||||||
}
|
|
||||||
|
|
||||||
const generatedMetadata = await sharp(generatedBuffer, { failOn: "none" })
|
const generatedMetadata = await sharp(generatedBuffer, { failOn: "none" })
|
||||||
.rotate()
|
.rotate()
|
||||||
.metadata();
|
.metadata();
|
||||||
if (generatedMetadata.width === targetWidth && generatedMetadata.height === targetHeight) {
|
|
||||||
return {
|
if (!targetWidth || !targetHeight) {
|
||||||
originalUrl: params.generatedImageUrl,
|
try {
|
||||||
thumbnailUrl: params.generatedThumbnailUrl || params.generatedImageUrl,
|
const referenceBuffer = await fetchImageBufferFromUrl(params.referenceImageUrl);
|
||||||
imageSize: `${targetWidth}x${targetHeight}`,
|
const referenceMetadata = await sharp(referenceBuffer, { failOn: "none" })
|
||||||
};
|
.rotate()
|
||||||
|
.metadata();
|
||||||
|
targetWidth = referenceMetadata.width;
|
||||||
|
targetHeight = referenceMetadata.height;
|
||||||
|
} catch (error) {
|
||||||
|
chatApiLogger.warn("[Chat API] Failed to read replacement reference size, hosting generated output as-is:", {
|
||||||
|
referenceImageUrl: params.referenceImageUrl,
|
||||||
|
generatedImageUrl: params.generatedImageUrl,
|
||||||
|
error: error instanceof Error ? error.message : "unknown",
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const normalizedBuffer = await sharp(generatedBuffer, { failOn: "none" })
|
const outputWidth = targetWidth || generatedMetadata.width;
|
||||||
.rotate()
|
const outputHeight = targetHeight || generatedMetadata.height;
|
||||||
.resize(targetWidth, targetHeight, {
|
|
||||||
// Keep the model output proportional when adapting it back to the reference page.
|
if (!outputWidth || !outputHeight) {
|
||||||
// `fill` stretches the picture and can squash products; `cover` behaves like a screenshot crop.
|
throw new Error("无法读取结果图尺寸");
|
||||||
fit: "cover",
|
}
|
||||||
position: "centre",
|
|
||||||
withoutEnlargement: false,
|
const imagePipeline = sharp(generatedBuffer, { failOn: "none" }).rotate();
|
||||||
})
|
const normalizedBuffer =
|
||||||
.png()
|
targetWidth && targetHeight
|
||||||
.toBuffer();
|
? await imagePipeline
|
||||||
|
.resize(targetWidth, targetHeight, {
|
||||||
|
// Keep the model output proportional when adapting it back to the reference page.
|
||||||
|
// `fill` stretches the picture and can squash products; `cover` behaves like a screenshot crop.
|
||||||
|
fit: "cover",
|
||||||
|
position: "centre",
|
||||||
|
withoutEnlargement: false,
|
||||||
|
})
|
||||||
|
.png()
|
||||||
|
.toBuffer()
|
||||||
|
: await imagePipeline.png().toBuffer();
|
||||||
const thumbnailBuffer = await createAgentImageThumbnailBuffer(normalizedBuffer);
|
const thumbnailBuffer = await createAgentImageThumbnailBuffer(normalizedBuffer);
|
||||||
|
|
||||||
const uniqueSuffix = `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
|
const uniqueSuffix = `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
|
||||||
@ -167,7 +173,7 @@ export async function normalizeReplacementResultImage(params: {
|
|||||||
return {
|
return {
|
||||||
originalUrl: originalUpload.url,
|
originalUrl: originalUpload.url,
|
||||||
thumbnailUrl: thumbnailUpload.url,
|
thumbnailUrl: thumbnailUpload.url,
|
||||||
imageSize: `${targetWidth}x${targetHeight}`,
|
imageSize: `${outputWidth}x${outputHeight}`,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -249,6 +249,7 @@ import {
|
|||||||
ensureStructuredAgentFriendlyMessage,
|
ensureStructuredAgentFriendlyMessage,
|
||||||
extractMessageImageAssetIds,
|
extractMessageImageAssetIds,
|
||||||
extractMessageImageUrls,
|
extractMessageImageUrls,
|
||||||
|
isRemoteImageAccessible,
|
||||||
injectHistoryImagesToLastUserMessage,
|
injectHistoryImagesToLastUserMessage,
|
||||||
normalizeAssistantImageMarkdown,
|
normalizeAssistantImageMarkdown,
|
||||||
normalizeResolvedTargetImageUrls,
|
normalizeResolvedTargetImageUrls,
|
||||||
@ -3544,6 +3545,12 @@ export async function POST(request: Request) {
|
|||||||
? normalizeError.message
|
? normalizeError.message
|
||||||
: "unknown",
|
: "unknown",
|
||||||
});
|
});
|
||||||
|
const rawResultAccessible = await isRemoteImageAccessible(
|
||||||
|
firstImage.originalUrl
|
||||||
|
).catch(() => false);
|
||||||
|
if (!rawResultAccessible) {
|
||||||
|
throw normalizeError;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
await emitReplacementResultMessage({
|
await emitReplacementResultMessage({
|
||||||
@ -4341,6 +4348,12 @@ export async function POST(request: Request) {
|
|||||||
? normalizeError.message
|
? normalizeError.message
|
||||||
: "unknown",
|
: "unknown",
|
||||||
});
|
});
|
||||||
|
const rawResultAccessible = await isRemoteImageAccessible(
|
||||||
|
firstImage.originalUrl
|
||||||
|
).catch(() => false);
|
||||||
|
if (!rawResultAccessible) {
|
||||||
|
throw normalizeError;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
chatApiLogger.info("[Chat API] Replacement image generation completed:", {
|
chatApiLogger.info("[Chat API] Replacement image generation completed:", {
|
||||||
mode: replacementSourceType,
|
mode: replacementSourceType,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user