fix /clear during pending message

jupyterlab · Aug 12, 2024 · 9436967 · 9436967
1 parent 4351ad9
commit 9436967
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/packages/jupyter-ai/jupyter_ai/handlers.py b/packages/jupyter-ai/jupyter_ai/handlers.py
@@ -201,6 +201,15 @@ def broadcast_message(self, message: Message):
         """Broadcasts message to all connected clients.
         Appends message to chat history.
         """
+        # do not broadcast agent messages that are replying to cleared human message
+        if (
+            isinstance(message, (AgentChatMessage, AgentStreamMessage))
+            and message.reply_to
+        ):
+            if message.reply_to not in [
+                m.id for m in self.chat_history if isinstance(m, HumanChatMessage)
+            ]:
+                return
 
         self.log.debug("Broadcasting message: %s to all clients...", message)
         client_ids = self.root_chat_handlers.keys()

diff --git a/packages/jupyter-ai/src/chat_handler.ts b/packages/jupyter-ai/src/chat_handler.ts
@@ -133,6 +133,7 @@ export class ChatHandler implements IDisposable {
         break;
       case 'clear':
         this._messages = [];
+        this._pendingMessages = [];
         break;
       case 'pending':
         this._pendingMessages = [...this._pendingMessages, newMessage];