Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-08 22:35:50 +01:00
Code Issues Packages Projects Releases Activity

refactor(llm): update chat saving logic to prevent race conditions between client and server

Browse Source
This commit is contained in:
perf3ct
2025-06-02 22:30:59 +00:00
parent ed64a5b4f7
commit 7b498cf384
2 changed files with 54 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
apps/server/src/services/llm/chat/rest_chat_service.ts
View File

@@ -150,7 +150,7 @@ class RestChatService {
// Import WebSocket service for streaming
const wsService = await import('../../ws.js');
let accumulatedContent = '';
const accumulatedContentRef = { value: '' };
const pipelineInput: ChatPipelineInput = {
messages: chat.messages.map(msg => ({
@@ -162,8 +162,7 @@ class RestChatService {
showThinking: showThinking,
options: pipelineOptions,
streamCallback: req.method === 'GET' ? (data, done, rawChunk) => {
this.handleStreamCallback(data, done, rawChunk, wsService.default, chatNoteId, res);
if (data) accumulatedContent += data;
this.handleStreamCallback(data, done, rawChunk, wsService.default, chatNoteId, res, accumulatedContentRef);
} : undefined
};
@@ -194,13 +193,15 @@ class RestChatService {
};
} else {
// For streaming, response is already sent via WebSocket/SSE
// Save the accumulated content
if (accumulatedContent) {
// Save the accumulated content - prefer accumulated content over response.text
const finalContent = accumulatedContentRef.value || response.text || '';
if (finalContent) {
chat.messages.push({
role: 'assistant',
content: accumulatedContent
content: finalContent
});
await chatStorageService.updateChat(chat.id, chat.messages, chat.title);
log.info(`Saved accumulated streaming content: ${finalContent.length} characters`);
}
return null;
}
@@ -219,7 +220,8 @@ class RestChatService {
rawChunk: any,
wsService: any,
chatNoteId: string,
res: Response
res: Response,
accumulatedContentRef: { value: string }
) {
const message: LLMStreamMessage = {
type: 'llm-stream',
@@ -229,6 +231,15 @@ class RestChatService {
if (data) {
message.content = data;
// Handle accumulation carefully - if this appears to be a complete response
// (done=true and data is much longer than current accumulated), replace rather than append
if (done && data.length > accumulatedContentRef.value.length && data.includes(accumulatedContentRef.value)) {
// This looks like a complete final response that includes what we've accumulated
accumulatedContentRef.value = data;
} else {
// Normal incremental accumulation
accumulatedContentRef.value += data;
}
}
if (rawChunk && 'thinking' in rawChunk && rawChunk.thinking) {