klbr/khoj
1
0
Fork 0
mirror of https://github.com/khoaliber/khoj.git synced 2026-03-02 21:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix to indicate ws disconnect on web app & save interrupted research

Browse Source 
- A regression had stopped indicating to user that the websocket
connection had broken. Now the interrupt has some visual indication.

- Websocket disconnects from client didn't trigger the partial
research to be saved. Now we use an interrupt signal to save partial
research before closing task.
This commit is contained in:
Debanjum
2025-08-15 12:48:28 -07:00
parent 3eb8cce984
commit 59bfaf9698
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/interface/web/app/chat/page.tsx
View File

@@ -260,6 +260,34 @@ export default function Chat() {
if (idleTimerRef.current) {
clearTimeout(idleTimerRef.current);
}
// Mark any in-progress streamed message as completed so UI updates (stop spinner, show send icon)
setMessages((prev) => {
if (!prev || prev.length === 0) return prev;
const newMessages = [...prev];
const last = newMessages[newMessages.length - 1];
if (last && !last.completed) {
last.completed = true;
}
return newMessages;
});
// Reset processing state so ChatInputArea send button reappears
setProcessQuerySignal(false);
setQueryToProcess("");
},
onError: (event) => {
console.error("WebSocket error", event);
// Perform same cleanup as onClose to avoid stuck UI
setMessages((prev) => {
if (!prev || prev.length === 0) return prev;
const newMessages = [...prev];
const last = newMessages[newMessages.length - 1];
if (last && !last.completed) {
last.completed = true;
}
return newMessages;
});
setProcessQuerySignal(false);
setQueryToProcess("");
},
});

5
src/khoj/routers/api_chat.py
View File

@@ -786,6 +786,9 @@ async def event_generator(
if interrupt_query == ChatEvent.END_EVENT.value:
cancellation_event.set()
logger.debug(f"Chat cancelled by user {user} via interrupt queue.")
elif interrupt_query == ChatEvent.INTERRUPT.value:
cancellation_event.set()
logger.debug("Chat interrupted.")
else:
# Pass the interrupt query to child tasks
logger.info(f"Continuing chat with the new instruction: {interrupt_query}")
@@ -1556,7 +1559,7 @@ async def chat_ws(
except WebSocketDisconnect:
logger.info(f"WebSocket disconnected for user {websocket.scope['user'].object.id}")
if current_task and not current_task.done():
current_task.cancel()
interrupt_queue.put_nowait(ChatEvent.INTERRUPT.value)
except Exception as e:
logger.error(f"Error in websocket chat: {e}", exc_info=True)
if current_task and not current_task.done():