Add more error handling

mlc-ai · May 15, 2024 · a775fff · a775fff
1 parent 8c2933b
commit a775fff
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/app/client/webllm.ts b/app/client/webllm.ts
@@ -73,6 +73,7 @@ export class WebLLMApi implements LLMApi {
       } catch (err) {
         console.error("Error in streaming chatCompletion", err);
         options.onError?.(err as Error);
+        return;
       }
     } else {
       try {
@@ -84,6 +85,7 @@ export class WebLLMApi implements LLMApi {
       } catch (err) {
         console.error("Error in non-streaming chatCompletion", err);
         options.onError?.(err as Error);
+        return;
       }
     }
 

diff --git a/app/store/chat.ts b/app/store/chat.ts
@@ -608,7 +608,7 @@ export const useChatStore = createPersistStore(
            * this param is just shit
            **/
           const { max_tokens, ...modelcfg } = modelConfig;
-          // System prompt has to be the first message
+          // The first message must be from system
           if (toBeSummarizedMsgs[0]?.role === "system") {
             // Merge system prompts
             toBeSummarizedMsgs[0].content =
@@ -623,6 +623,19 @@ export const useChatStore = createPersistStore(
               ...toBeSummarizedMsgs,
             ];
           }
+          // The last message must be from user
+          if (
+            toBeSummarizedMsgs[toBeSummarizedMsgs.length - 1].role === "system"
+          ) {
+            toBeSummarizedMsgs = toBeSummarizedMsgs.concat([
+              createMessage({
+                role: "user",
+                content: "",
+                date: "",
+              }),
+            ]);
+          }
+
           console.log("summarizeSession", messages);
           webllm.chat({
             messages: toBeSummarizedMsgs,