Add type definition in message store

aiqlcom · aiqlcom · commit c63eedea0ea0 · 2025-06-10T22:39:45.000+08:00
diff --git a/src/renderer/components/common/SamplingCard.vue b/src/renderer/components/common/SamplingCard.vue
@@ -3,8 +3,8 @@ import { ref, computed, watch } from 'vue'
 import { listenSampling, sendResponse } from '@/renderer/utils'
 import { useSnackbarStore } from '@/renderer/store/snackbar'
 import { useChatbotStore } from '@/renderer/store/chatbot'
-import { MessageEntry } from '@/renderer/store/history'
 import { createCompletion } from '@/renderer/composables/chatCompletions'
+import type { ChatCompletionResponseMessage } from '@/renderer/types/message'
 
 const snackbarStore = useSnackbarStore()
 
@@ -16,7 +16,7 @@ const samplingDialog = ref(false)
 
 const samplingParams = ref({})
 
-const samplingResults = ref<MessageEntry[]>([])
+const samplingResults = ref<ChatCompletionResponseMessage[]>([])
 
 const samplingChannel = ref('')
 
@@ -79,7 +79,10 @@ const finishSampling = (index: number) => {
     role: bestResponse?.role || 'assistant',
     content: {
       type: 'text',
-      text: bestResponse?.content || `No response from model ${chatbotStore.model}`
+      text:
+        bestResponse?.content ||
+        bestResponse?.reasoning_content ||
+        `No response from model ${chatbotStore.model}`
     }
   }
   sendResponse(samplingChannel.value, response)
diff --git a/src/renderer/components/pages/ChatPage.vue b/src/renderer/components/pages/ChatPage.vue
@@ -37,7 +37,6 @@ config({
 })
 
 interface Message {
-  index: number
   role: 'user' | 'assistant' | 'tool'
   content: any
   tool_calls?: any[]
@@ -221,15 +220,11 @@ const groupMessages = computed<Group[]>(() => {
             :show-copy="false"
             :index="group.index"
             :range="group.messages!.length"
+            @delete-messages="handleDeleteMessages"
           >
-            <v-tabs
-              v-model="dialogs[group.tab!]"
-              :items="group.messages"
-              show-arrows
-              @delete-messages="handleDeleteMessages"
-            >
+            <v-tabs v-model="dialogs[group.tab!]" :items="group.messages" show-arrows>
               <template #tab="{ item }">
-                <v-tab :text="item.index" :value="item.index">
+                <v-tab :text="item.role" :value="item">
                   <v-icon
                     v-if="item.role === 'tool'"
                     icon="mdi-arrow-left-bold-circle"
@@ -243,7 +238,7 @@ const groupMessages = computed<Group[]>(() => {
                 </v-tab>
               </template>
               <template #item="{ item }">
-                <v-tabs-window-item :value="item.index">
+                <v-tabs-window-item :value="item">
                   <v-card v-if="item.role === 'tool'" class="mt-1" variant="flat">
                     <v-card-item prepend-icon="mdi-chevron-left">
                       <v-card-subtitle>
diff --git a/src/renderer/components/pages/McpResourcePage.vue b/src/renderer/components/pages/McpResourcePage.vue
@@ -44,9 +44,16 @@ const resourceStore = useResourceStore()
           <v-expansion-panel
             v-for="item in items as any"
             :key="item.raw.uri + ':' + item.raw.name"
-            :text="JSON.stringify(item.raw)"
             :title="item.raw.name + ' - ' + item.raw.uri"
           >
+            <v-expansion-panel-text>
+              <v-textarea
+                :model-value="JSON.stringify(item.raw, null, 2)"
+                variant="plain"
+                auto-grow
+                readonly
+              ></v-textarea>
+            </v-expansion-panel-text>
           </v-expansion-panel>
         </v-expansion-panels>
       </v-container>
diff --git a/src/renderer/composables/chatCompletions.ts b/src/renderer/composables/chatCompletions.ts
@@ -9,10 +9,11 @@ import type {
   ToolCall,
   McpSamplingMessage,
   ChatCompletionRequestMessage,
-  ChatCompletionResponseMessage
+  ChatCompletionMessage,
+  ChatConversationMessage
 } from '@/renderer/types/message'
 
-type ChatCompletionMessage = ChatCompletionRequestMessage | McpSamplingMessage
+type RequestMessageType = ChatCompletionRequestMessage | McpSamplingMessage
 
 const isObjectEmpty = (obj?: Record<string, unknown>): boolean => {
   return !!obj && Object.keys(obj).length === 0
@@ -35,7 +36,7 @@ export const isEmptyTools = (tools: any): boolean => {
 const promptMessage = (
   conversation: ChatCompletionRequestMessage[],
   systemPrompt: string | null
-): ChatCompletionRequestMessage[] => {
+): ChatCompletionMessage[] => {
   if (systemPrompt) {
     return [{ content: systemPrompt, role: 'system' }, ...conversation]
   } else {
@@ -44,7 +45,7 @@ const promptMessage = (
 }
 
 export const createCompletion = async (
-  rawconversation: ChatCompletionMessage[],
+  rawconversation: RequestMessageType[],
   sampling: any = null
 ) => {
   const snackbarStore = useSnackbarStore()
@@ -73,7 +74,7 @@ export const createCompletion = async (
       newConversation.push(item)
     }
     return newConversation
-  }, [] as ChatCompletionMessage[])
+  }, [] as RequestMessageType[])
   // const conversation = rawconversation
   try {
     messageStore.generating = true
@@ -91,7 +92,7 @@ export const createCompletion = async (
       stream: chatbotStore.stream
     }
 
-    let target: ChatCompletionResponseMessage[]
+    let target: ChatConversationMessage[]
 
     if (!sampling) {
       target = messageStore.conversation
diff --git a/src/renderer/store/history.ts b/src/renderer/store/history.ts
@@ -3,22 +3,22 @@ import localForage from 'localforage'
 import { v4 as uuidv4 } from 'uuid'
 import { useMessageStore } from '@/renderer/store/message'
 
-type ConversationID = string
+import type { ChatConversationMessage } from '@/renderer/types/message'
 
-export type MessageEntry = {
-  role: string
-  content: any
-  reasoning_content?: string
-  [key: string]: any
-}
+type ConversationID = string
 
 type ConversationEntry = {
   id: ConversationID
-  messages: MessageEntry[]
+  messages: ChatConversationMessage[]
+}
+
+interface HistoryStoreState {
+  selected: ConversationID[] | undefined
+  conversation: ConversationEntry[]
 }
 
 export const useHistoryStore = defineStore('historyStore', {
-  state: () => ({
+  state: (): HistoryStoreState => ({
     selected: undefined as ConversationID[] | undefined,
     conversation: [] as ConversationEntry[]
   }),
@@ -38,7 +38,7 @@ export const useHistoryStore = defineStore('historyStore', {
     deleteById(index: number) {
       this.conversation.splice(index, 1)
     },
-    init(conversation: MessageEntry[]) {
+    init(conversation: ChatConversationMessage[]) {
       const newId = this.getDate()
       this.conversation.unshift({
         id: newId,
@@ -76,7 +76,7 @@ export const useHistoryStore = defineStore('historyStore', {
     downloadHistory() {
       this.download(this.conversation, 'history.json')
     },
-    download(json, filename) {
+    download(json: ChatConversationMessage[] | ConversationEntry[], filename: string) {
       const blob = new Blob([JSON.stringify(json, null, 2)], { type: 'application/json' })
       const url = URL.createObjectURL(blob)
       const a = document.createElement('a')
diff --git a/src/renderer/store/message.ts b/src/renderer/store/message.ts
@@ -4,13 +4,26 @@ import { useMcpStore } from '@/renderer/store/mcp'
 import { useHistoryStore } from '@/renderer/store/history'
 import { createCompletion, isEmptyTools } from '@/renderer/composables/chatCompletions'
 
+import type {
+  ToolCall,
+  ToolMessage,
+  UserMessage,
+  ChatConversationMessage
+} from '@/renderer/types/message'
+
+interface MessageStoreState {
+  userMessage: string
+  conversation: ChatConversationMessage[]
+  historyId: string
+  base64: string
+  generating: boolean
+}
+
 export const useMessageStore = defineStore('messageStore', {
-  // TODO: fix any to type
-  state: (): any => ({
+  state: (): MessageStoreState => ({
     userMessage: '',
     conversation: [],
     historyId: '',
-    images: [],
     base64: '',
     generating: false
   }),
@@ -35,7 +48,6 @@ export const useMessageStore = defineStore('messageStore', {
     },
     clear() {
       this.userMessage = ''
-      this.images = []
     },
     handleKeydown(e) {
       if (e.key === 'Enter' && e.shiftKey) {
@@ -105,48 +117,50 @@ export const useMessageStore = defineStore('messageStore', {
     postToolCall: async function () {
       const mcpStore = useMcpStore()
       const last = this.conversation.at(-1)
-      if (!last || !last.tool_calls) {
+
+      if (!last || !('tool_calls' in last) || !last.tool_calls) {
         return
       }
+
       if (isEmptyTools(last.tool_calls)) {
         delete last.tool_calls
-        //   return
-      } else {
-        let toolCalled = false
-        console.log(last.tool_calls)
+        return
+      }
 
-        const callNextTool = async (toolCalls, index) => {
-          if (index >= toolCalls.length) {
-            return
-          }
+      let toolCalled = false
+      console.log(last.tool_calls)
 
-          const toolCall = toolCalls[index]
+      const callNextTool = async (toolCalls: ToolCall[], index: number) => {
+        if (index >= toolCalls.length) {
+          return
+        }
 
-          let result
+        const toolCall = toolCalls[index]
 
-          try {
-            result = await mcpStore.callTool(toolCall.function.name, toolCall.function.arguments)
-            console.log(result)
-          } catch (error) {
-            result = mcpStore.packReturn(`Error calling tool: ${error}`)
-          }
+        let result
 
-          if (result.content) {
-            this.contentConvert(result.content, toolCall.id).forEach((item) => {
-              this.conversation.push(item)
-            })
-            toolCalled = true
-          }
+        try {
+          result = await mcpStore.callTool(toolCall.function.name, toolCall.function.arguments)
+          console.log(result)
+        } catch (error) {
+          result = mcpStore.packReturn(`Error calling tool: ${error}`)
         }
 
-        await callNextTool(last.tool_calls, 0)
-
-        if (toolCalled) {
-          this.startInference()
+        if (result.content) {
+          this.contentConvert(result.content, toolCall.id).forEach((item) => {
+            this.conversation.push(item)
+          })
+          toolCalled = true
         }
       }
+
+      await callNextTool(last.tool_calls, 0)
+
+      if (toolCalled) {
+        this.startInference()
+      }
     },
-    contentConvert: function (content, toolCallId) {
+    contentConvert: function (content, toolCallId): Array<UserMessage | ToolMessage> {
       const mcpStore = useMcpStore()
       const msg = content.map((item) => mcpStore.convertItem(item))
       console.log(msg)
diff --git a/src/renderer/types/message.ts b/src/renderer/types/message.ts
@@ -60,16 +60,18 @@ const SystemMessageSchema = z.object({
 })
 
 const UserMessageSchema = z.object({
-  content: z.union([TextContent, z.array(TextContentPartSchema), z.array(ImageContentPartSchema)]),
+  content: z.union([
+    TextContent,
+    z.array(z.union([TextContentPartSchema, ImageContentPartSchema]))
+  ]),
   role: z.literal('user'),
   name: z.string().optional()
 })
 
 const AssistantMessageSchema = z.object({
   content: z.union([
     TextContent,
-    z.array(TextContentPartSchema),
-    z.array(RefusalContentPartSchema)
+    z.array(z.union([TextContentPartSchema, RefusalContentPartSchema]))
   ]),
   reasoning_content: z.string().optional(),
   tool_calls: z.array(ToolCallSchema).optional(),
@@ -84,6 +86,12 @@ const ToolMessageSchema = z.object({
 })
 
 const ChatCompletionRequestMessageSchema = z.union([
+  UserMessageSchema,
+  AssistantMessageSchema,
+  ToolMessageSchema
+])
+
+const ChatCompletionMessageSchema = z.union([
   SystemMessageSchema,
   UserMessageSchema,
   AssistantMessageSchema,
@@ -101,9 +109,9 @@ const ChatCompletionResponseMessageSchema = z.object({
 
 export type ToolCall = Infer<typeof ToolCallSchema>
 // type SystemMessage = Infer<typeof SystemMessageSchema>
-// type UserMessage = Infer<typeof UserMessageSchema>
+export type UserMessage = Infer<typeof UserMessageSchema>
 export type AssistantMessage = Infer<typeof AssistantMessageSchema>
-// type ToolMessage = Infer<typeof ToolMessageSchema>
+export type ToolMessage = Infer<typeof ToolMessageSchema>
 
 type TextContentPart = Infer<typeof TextContentPartSchema>
 // type RefusalContentPart = Infer<typeof RefusalContentPartSchema>
@@ -128,3 +136,7 @@ export type ChatCompletionRequestMessage = Infer<typeof ChatCompletionRequestMes
 export type ChatCompletionPromptMessage = PromptMessage
 
 export type ChatCompletionResponseMessage = Infer<typeof ChatCompletionResponseMessageSchema>
+
+export type ChatCompletionMessage = Infer<typeof ChatCompletionMessageSchema>
+
+export type ChatConversationMessage = ChatCompletionRequestMessage | ChatCompletionResponseMessage
