fix: should not attach error messages to the completion request (#2258)

extensions/inference-openai-extension/src/helpers/sse.ts

@@ -43,7 +43,7 @@ export function requestInference(
         if (!response.ok) {
           const data = await response.json()
           const error = {
-            message: data.error?.message ?? 'Error occurred.',
+            message: data.error?.message ?? 'An error occurred.',
             code: data.error?.code ?? ErrorCode.Unknown,
           }
           subscriber.error(error)

extensions/inference-openai-extension/src/index.ts

@@ -210,7 +210,7 @@ export default class JanInferenceOpenAIExtension extends BaseExtension {
         const messageContent: ThreadContent = {
           type: ContentType.Text,
           text: {
-            value: 'Error occurred: ' + err.message,
+            value: 'An error occurred. ' + err.message,
             annotations: [],
           },
         }

extensions/inference-triton-trtllm-extension/src/index.ts

@@ -205,7 +205,7 @@ export default class JanInferenceTritonTrtLLMExtension extends BaseExtension {
         const messageContent: ThreadContent = {
           type: ContentType.Text,
           text: {
-            value: 'Error occurred: ' + err.message,
+            value: 'An error occurred. ' + err.message,
             annotations: [],
           },
         }

web/helpers/atoms/ChatMessage.atom.ts

@@ -110,7 +110,10 @@ export const deleteMessageAtom = atom(null, (get, set, id: string) => {
   }
   const threadId = get(getActiveThreadIdAtom)
   if (threadId) {
-    newData[threadId] = newData[threadId].filter((e) => e.id !== id)
+    // Should also delete error messages to clear out the error state
+    newData[threadId] = newData[threadId].filter(
+      (e) => e.id !== id && e.status !== MessageStatus.Error
+    )
     set(chatMessages, newData)
   }
 })

web/hooks/useSendChatMessage.ts

@@ -109,8 +109,9 @@ export default function useSendChatMessage() {
         currentMessages
           .filter(
             (e) =>
-              currentMessage.role === ChatCompletionRole.User ||
+              (currentMessage.role === ChatCompletionRole.User ||
-              e.id !== currentMessage.id
+                e.id !== currentMessage.id) &&
+              e.status !== MessageStatus.Error
           )
           .map<ChatCompletionMessage>((msg) => ({
             role: msg.role,
@@ -198,6 +199,7 @@ export default function useSendChatMessage() {
       })
       .concat(
         currentMessages
+          .filter((e) => e.status !== MessageStatus.Error)
           .map<ChatCompletionMessage>((msg) => ({
             role: msg.role,
             content: msg.content[0]?.text.value ?? '',

web/screens/Chat/ErrorMessage/index.tsx

@@ -27,7 +27,10 @@ const ErrorMessage = ({ message }: { message: ThreadMessage }) => {
     resendChatMessage(message)
   }
 
-  const errorTitle = getErrorTitle(message.error_code ?? ErrorCode.Unknown)
+  const errorTitle = getErrorTitle(
+    message.error_code ?? ErrorCode.Unknown,
+    message.content[0]?.text?.value
+  )
 
   return (
     <div className="mt-10">

web/screens/Chat/MessageToolbar/index.tsx

@@ -39,11 +39,14 @@ const MessageToolbar = ({ message }: { message: ThreadMessage }) => {
   const onDeleteClick = async () => {
     deleteMessage(message.id ?? '')
     if (thread) {
+      // Should also delete error messages to clear out the error state
       await extensionManager
         .get<ConversationalExtension>(ExtensionTypeEnum.Conversational)
         ?.writeMessages(
           thread.id,
-          messages.filter((msg) => msg.id !== message.id)
+          messages.filter(
+            (msg) => msg.id !== message.id && msg.status !== MessageStatus.Error
+          )
         )
     }
   }

web/screens/Settings/Advanced/DataFolder/ModalErrorSetDestGlobal.tsx

@@ -21,7 +21,7 @@ const ModalErrorSetDestGlobal = () => {
       <ModalPortal />
       <ModalContent>
         <ModalHeader>
-          <ModalTitle>Error Occurred</ModalTitle>
+          <ModalTitle>An Error Occurred</ModalTitle>
         </ModalHeader>
         <p className="text-muted-foreground">
           Oops! Something went wrong. Jan data folder remains the same. Please

web/utils/errorMessage.ts

@@ -1,11 +1,15 @@
 import { ErrorCode } from '@janhq/core'
 
-export const getErrorTitle = (errorCode: ErrorCode) => {
+export const getErrorTitle = (
-  if (errorCode === ErrorCode.Unknown) {
+  errorCode: ErrorCode,
-    return 'Apologies, something’s amiss!'
+  errorMessage: string | undefined
-  }
+) => {
-
+  switch (errorCode) {
-  if (errorCode === ErrorCode.InvalidApiKey) {
+    case ErrorCode.Unknown:
-    return 'Invalid API key. Please check your API key and try again.'
+      return 'Apologies, something’s amiss!'
+    case ErrorCode.InvalidApiKey:
+      return 'Invalid API key. Please check your API key and try again.'
+    default:
+      return errorMessage
   }
 }