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

fix canvas agent image generation status

Browse Source
This commit is contained in:
134 2026-07-07 21:07:18 +08:00
parent 5923149dd6
commit 4ac4ac26cf
2 changed files with 45 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/(chat)/api/chat/route.ts
View File

@ -7896,6 +7896,32 @@ export async function POST(request: Request) {
operationLabel: "agent-generate-image",
resultType: "image",
});
const directImageStatusPayload = {
providerType: requestedModelProviderType,
modelName: finalModelId,
imageCount:
effectiveImageParams?.imageCount ||
defaultImageQualityParams.imageCount ||
1,
};
const stopDirectImageKeepalive = startStreamKeepalive(
writer,
"agent:generate_image",
DEFAULT_STREAM_KEEPALIVE_INTERVAL_MS,
);
const stopDirectImageStatus =
contextPayload?.source === "canvas"
? setInterval(() => {
writeImageGenerationStatusChunk(
writer,
{
phase: "processing",
...directImageStatusPayload,
},
"agent:generate_image:status-processing-keepalive",
);
}, DEFAULT_STREAM_KEEPALIVE_INTERVAL_MS)
: null;
try {
const directImageResult = await executeDirectAgentImageGeneration({
requestTextContent,
@ -8037,6 +8063,11 @@ export async function POST(request: Request) {
"<!-- IMAGE_GENERATION_END -->",
"agent:generate_image:end-error",
);
} finally {
stopDirectImageKeepalive();
if (stopDirectImageStatus) {
clearInterval(stopDirectImageStatus);
}
}
},
});

22
components/canvas/CanvasChatPanel.tsx
View File

@ -11006,16 +11006,20 @@ export function CanvasChatPanel({
metadata: optimisticUserMetadata,
} as ChatMessage;
setMessages((previousMessages) =>
sortCanvasMessagesByCreatedAt([
...previousMessages.filter((message) => message.id !== userMessageId),
optimisticUserMessage,
])
);
// 使用与 multimodal-input 相同的格式发送消息
try {
sendMessage(optimisticUserMessage as any);
setMessages((previousMessages) =>
sortCanvasMessagesByCreatedAt([
...previousMessages.filter((message) => message.id !== userMessageId),
optimisticUserMessage,
])
);
} catch (error) {
setMessages((previousMessages) =>
previousMessages.filter((message) => message.id !== userMessageId)
);
releaseSendGuard(activeChatId);
if (shouldShowOptimisticImageGeneration) {
clearStreamImageGenerationStateForChat(activeChatId);
@ -12010,8 +12014,10 @@ export function CanvasChatPanel({
)
);
const shouldShowImageLoading =
((hasGenerationStart && !hasGenerationEnd) || Boolean(streamImageGenerationState)) &&
!!currentModel;
Boolean(streamImageGenerationState) ||
(hasGenerationStart &&
!hasGenerationEnd &&
Boolean(currentModel || activeComposerMode === "agent"));
const hasActiveTypewriter = Object.keys(activeTypingSections).length > 0;
const shouldRenderImageLoading = shouldShowImageLoading && !hasActiveTypewriter;
const loadingImageCount = streamImageGenerationState?.imageCount || imageParams.imageCount || 1;