fix: 4165 - Refactor message builder to avoid sending empty messages

web/hooks/useSendChatMessage.ts

@@ -10,7 +10,6 @@
   ConversationalExtension,
   EngineManager,
   ToolManager,
-  ChatCompletionMessage,
 } from '@janhq/core'
 import { extractInferenceParams, extractModelLoadParams } from '@janhq/core'
 import { atom, useAtom, useAtomValue, useSetAtom } from 'jotai'
@@ -21,7 +20,6 @@
   fileUploadAtom,
 } from '@/containers/Providers/Jotai'
 
-import { Stack } from '@/utils/Stack'
 import { compressImage, getBase64 } from '@/utils/base64'
 import { MessageRequestBuilder } from '@/utils/messageRequestBuilder'
 
@@ -86,77 +84,50 @@
     selectedModelRef.current = selectedModel
   }, [selectedModel])
 
-  const normalizeMessages = (
-    messages: ChatCompletionMessage[]
-  ): ChatCompletionMessage[] => {
-    const stack = new Stack<ChatCompletionMessage>()
-    for (const message of messages) {
-      if (stack.isEmpty()) {
-        stack.push(message)
-        continue
-      }
-      const topMessage = stack.peek()
-
-      if (message.role === topMessage.role) {
-        // add an empty message
-        stack.push({
-          role:
-            topMessage.role === ChatCompletionRole.User
-              ? ChatCompletionRole.Assistant
-              : ChatCompletionRole.User,
-          content: '.', // some model requires not empty message
-        })
-      }
-      stack.push(message)
-    }
-
-    return stack.reverseOutput()
-  }
-
   const resendChatMessage = async (currentMessage: ThreadMessage) => {
     // Delete last response before regenerating
     const newConvoData = currentMessages
     let toSendMessage = currentMessage
 
     do {
       deleteMessage(currentMessage.id)
       const msg = newConvoData.pop()
       if (!msg) break
       toSendMessage = msg
       deleteMessage(toSendMessage.id ?? '')
     } while (toSendMessage.role !== ChatCompletionRole.User)
 
     if (activeThreadRef.current) {
       await extensionManager
         .get<ConversationalExtension>(ExtensionTypeEnum.Conversational)
         ?.writeMessages(activeThreadRef.current.id, newConvoData)
     }
 
     sendChatMessage(toSendMessage.content[0]?.text.value)
   }
 
   const sendChatMessage = async (
     message: string,
     messages?: ThreadMessage[]
   ) => {
     if (!message || message.trim().length === 0) return
 
     if (!activeThreadRef.current) {
       console.error('No active thread')
       return
     }
 
     if (engineParamsUpdate) setReloadModel(true)
     setTokenSpeed(undefined)
 
     const runtimeParams = extractInferenceParams(activeModelParams)
     const settingParams = extractModelLoadParams(activeModelParams)
 
     const prompt = message.trim()
 
     updateThreadWaiting(activeThreadRef.current.id, true)
     setCurrentPrompt('')
     setEditPrompt('')
 
     let base64Blob = fileUpload[0]
       ? await getBase64(fileUpload[0].file)
@@ -247,7 +218,6 @@
         (assistant) => assistant.tools ?? []
       ) ?? []
     )
-    request.messages = normalizeMessages(request.messages ?? [])
 
     // Request for inference
     EngineManager.instance()

web/utils/messageRequestBuilder.ts

@@ -15,6 +15,8 @@ import { ulid } from 'ulidx'
 
 import { FileType } from '@/containers/Providers/Jotai'
 
+import { Stack } from '@/utils/Stack'
+
 export class MessageRequestBuilder {
   msgId: string
   type: MessageRequestType
@@ -36,7 +38,7 @@ export class MessageRequestBuilder {
       .filter((e) => e.status !== MessageStatus.Error)
       .map<ChatCompletionMessage>((msg) => ({
         role: msg.role,
-        content: msg.content[0]?.text.value ?? '',
+        content: msg.content[0]?.text.value ?? '.',
       }))
   }
 
@@ -130,12 +132,39 @@ export class MessageRequestBuilder {
     return this
   }
 
+  normalizeMessages = (
+    messages: ChatCompletionMessage[]
+  ): ChatCompletionMessage[] => {
+    const stack = new Stack<ChatCompletionMessage>()
+    for (const message of messages) {
+      if (stack.isEmpty()) {
+        stack.push(message)
+        continue
+      }
+      const topMessage = stack.peek()
+
+      if (message.role === topMessage.role) {
+        // add an empty message
+        stack.push({
+          role:
+            topMessage.role === ChatCompletionRole.User
+              ? ChatCompletionRole.Assistant
+              : ChatCompletionRole.User,
+          content: '.', // some model requires not empty message
+        })
+      }
+      stack.push(message)
+    }
+
+    return stack.reverseOutput()
+  }
+
   build(): MessageRequest {
     return {
       id: this.msgId,
       type: this.type,
       threadId: this.thread.id,
-      messages: this.messages,
+      messages: this.normalizeMessages(this.messages),
       model: this.model,
       thread: this.thread,
     }