update loading before answer

SchneeHertz · Nov 10, 2023 · c14e658 · c14e658
1 parent 487f375
commit c14e658
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 4 deletions.
diff --git a/components.d.ts b/components.d.ts
@@ -29,6 +29,7 @@ declare module 'vue' {
     NPopover: typeof import('naive-ui')['NPopover']
     NSelect: typeof import('naive-ui')['NSelect']
     NSpace: typeof import('naive-ui')['NSpace']
+    NSpin: typeof import('naive-ui')['NSpin']
     NSwitch: typeof import('naive-ui')['NSwitch']
     NThing: typeof import('naive-ui')['NThing']
     NUpload: typeof import('naive-ui')['NUpload']

diff --git a/index.js b/index.js
@@ -297,7 +297,7 @@ const resolveMessages = async ({ resToolCalls, resText, resTextTemp, messages, f
   let speakIndex = STATUS.speakIndex
   STATUS.speakIndex += 1
 
-  if (!resText && !_.isEmpty(resToolCalls)) {
+  if (!_.isEmpty(resToolCalls)) {
     messageLogAndSend({
       id: nanoid(),
       from,
@@ -346,6 +346,13 @@ const resolveMessages = async ({ resToolCalls, resText, resTextTemp, messages, f
     prepareChatOption.tool_choice = 'auto'
   }
 
+  // alert chat
+  messageSend({
+    id: clientMessageId,
+    from,
+    content: ''
+  })
+
   for await (const { token, f_token } of useOpenaiChatStreamFunction(prepareChatOption)) {
     if (token) {
       resTextTemp += token
@@ -372,7 +379,6 @@ const resolveMessages = async ({ resToolCalls, resText, resTextTemp, messages, f
         }
       }
     }
-    if (!_.isEmpty(f_token)) console.log(f_token)
     let [{ index, id, type, function: { name, arguments: arg} } = { function: {} }] = f_token
     if (index !== undefined ) {
       if (resToolCalls[index]) {
@@ -397,7 +403,13 @@ const resolveMessages = async ({ resToolCalls, resText, resTextTemp, messages, f
       })
     }
   }
-  if (resText) {
+  if (_.isEmpty(resText)) {
+    messageSend({
+      id: clientMessageId,
+      from,
+      action: 'revoke'
+    })
+  } else {
     messageSend({
       id: clientMessageId,
       from,

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "chat-xiuliu",
   "private": true,
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "ChatGPT Client with Function Calling",
   "author": "SchneeHertz",
   "scripts": {

diff --git a/src/App.vue b/src/App.vue
@@ -37,6 +37,10 @@ const escapeHtml = (unsafe) => {
 
 onMounted(() => {
   ipcRenderer.on('send-message', (event, arg) => {
+    if (arg.action === 'revoke') {
+      messageHistory.value = _.filter(messageHistory.value, m => m.id !== arg.id)
+      return
+    }
     if (typeof arg.content === 'string') {
       arg.text = renderCodeBlocks(escapeHtml(arg.content))
     } else {
@@ -155,6 +159,7 @@ const switchAudio = () => {
 }
 const emptyHistory = () => {
   ipcRenderer.invoke('empty-history')
+  messageHistory.value = []
 }
 const saveCapture = async () => {
   const screenshotTarget = document.querySelector('#message-list')
@@ -203,6 +208,7 @@ const resolveImage = async ({ file }) => {
               {{message.from}}
             </template>
             <pre v-html="message.text"></pre>
+            <n-spin size="small" v-if="!message.text" />
             <p v-if="message.countToken" class="token-count">Used {{ message.tokenCount }} tokens</p>
           </n-thing>
         </n-card>