Do not fetch history if the function is not provided

jupyterlab · Mar 7, 2024 · 99559bd · 99559bd
1 parent 4adc59d
commit 99559bd
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/src/components/chat.tsx b/src/components/chat.tsx
@@ -31,20 +31,25 @@ function ChatBody({
    * Effect: fetch history and config on initial render
    */
   useEffect(() => {
+    async function getConfig() {
+      ChatService.getConfig()
+        .then(config =>
+          setSendWithShiftEnter(config.send_with_shift_enter ?? false)
+        )
+        .catch(e => console.error(e));
+    }
+
     async function fetchHistory() {
-      try {
-        const [history, config] = await Promise.all([
-          chatModel.getHistory?.() ??
-            new Promise<ChatService.ChatHistory>(r => r({ messages: [] })),
-          ChatService.getConfig()
-        ]);
-        setSendWithShiftEnter(config.send_with_shift_enter ?? false);
-        setMessages(history.messages);
-      } catch (e) {
-        console.error(e);
+      if (!chatModel.getHistory) {
+        return;
       }
+      chatModel
+        .getHistory()
+        .then(history => setMessages(history.messages))
+        .catch(e => console.error(e));
     }
 
+    getConfig();
     fetchHistory();
   }, [chatModel]);
 
@@ -59,7 +64,6 @@ function ChatBody({
         setMessages([]);
         return;
       }
-
       setMessages(messageGroups => [...messageGroups, message]);
     }