From 719a522512f3dd6c6fa54acc52595798f5ee7870 Mon Sep 17 00:00:00 2001
From: ChenZhaoYu <790348264@qq.com>
Date: Thu, 23 Feb 2023 10:36:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E6=B5=81=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=E4=B8=BA=E5=AE=9E=E9=AA=8C=E6=80=A7=E8=B4=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 service/src/chatgpt.ts                      |  1 +
 service/src/index.ts                        |  1 +
 src/api/index.ts                            |  1 +
 src/views/chat/components/Message/Text.vue  |  2 +-
 src/views/chat/components/Message/index.vue |  2 +-
 src/views/chat/index.vue                    | 94 +++++++--------------
 6 files changed, 34 insertions(+), 67 deletions(-)

diff --git a/service/src/chatgpt.ts b/service/src/chatgpt.ts
index 0057be4..d2142c3 100644
--- a/service/src/chatgpt.ts
+++ b/service/src/chatgpt.ts
@@ -65,6 +65,7 @@ async function chatReply(
   }
 }
 
+/**  实验性质的函数，用于处理聊天过程中的中间结果 */
 async function chatReplyProcess(
   message: string,
   lastContext?: { conversationId?: string; parentMessageId?: string },
diff --git a/service/src/index.ts b/service/src/index.ts
index e623a75..b56ee58 100644
--- a/service/src/index.ts
+++ b/service/src/index.ts
@@ -26,6 +26,7 @@ router.post('/chat', async (req, res) => {
   }
 })
 
+/**  实验性质的函数，用于处理聊天过程中的中间结果 */
 router.post('/chat-process', async (req, res) => {
   res.setHeader('Content-type', 'application/octet-stream')
 
diff --git a/src/api/index.ts b/src/api/index.ts
index 1183666..19189bf 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -13,6 +13,7 @@ export function fetchChatAPI<T = any>(
   })
 }
 
+/**  实验性质的函数，用于处理聊天过程中的中间结果 */
 export function fetchChatAPIProcess<T = any>(
   params: {
     prompt: string
diff --git a/src/views/chat/components/Message/Text.vue b/src/views/chat/components/Message/Text.vue
index 2e039d0..23a2ed8 100644
--- a/src/views/chat/components/Message/Text.vue
+++ b/src/views/chat/components/Message/Text.vue
@@ -36,7 +36,7 @@ const text = computed(() => {
 <template>
   <div :class="wrapClass">
     <template v-if="loading">
-      <span class="w-[3px] h-[20px] block animate-blink" />
+      <span class="w-[5px] h-[20px] block animate-blink" />
     </template>
     <template v-else>
       <code v-if="includeCode(text)" v-highlight class="leading-relaxed" v-text="text" />
diff --git a/src/views/chat/components/Message/index.vue b/src/views/chat/components/Message/index.vue
index cb5471c..898ed52 100644
--- a/src/views/chat/components/Message/index.vue
+++ b/src/views/chat/components/Message/index.vue
@@ -39,7 +39,7 @@ function handleRegenerate() {
       <div class="flex items-end mt-2">
         <Text :inversion="inversion" :error="error" :text="text" :loading="loading" />
         <button
-          v-if="!inversion && !loading"
+          v-if="!inversion"
           class="mb-2 ml-2 transition text-neutral-400 hover:text-neutral-800"
           @click="handleRegenerate"
         >
diff --git a/src/views/chat/index.vue b/src/views/chat/index.vue
index a28d8b0..eeaa92b 100644
--- a/src/views/chat/index.vue
+++ b/src/views/chat/index.vue
@@ -8,7 +8,7 @@ import { useChat } from './hooks/useChat'
 import { HoverButton, SvgIcon } from '@/components/common'
 import { useBasicLayout } from '@/hooks/useBasicLayout'
 import { useChatStore } from '@/store'
-import { fetchChatAPIProcess } from '@/api'
+import { fetchChatAPI } from '@/api'
 
 let controller = new AbortController()
 
@@ -80,39 +80,22 @@ async function onConversation() {
   )
   scrollToBottom()
 
-  let offset = 0
   try {
-    await fetchChatAPIProcess<Chat.ConversationResponse>({
-      prompt: message,
-      options,
-      signal: controller.signal,
-      onDownloadProgress: ({ event }) => {
-        const xhr = event.target
-        const { responseText } = xhr
-        const chunk = responseText.substring(offset)
-        offset = responseText.length
-        try {
-          const data = JSON.parse(chunk)
-          updateChat(
-            +uuid,
-            dataSources.value.length - 1,
-            {
-              dateTime: new Date().toLocaleString(),
-              text: data.text ?? '',
-              inversion: false,
-              error: false,
-              loading: false,
-              conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
-              requestOptions: { prompt: message, options: { ...options } },
-            },
-          )
-          scrollToBottom()
-        }
-        catch (error) {
-          //
-        }
+    const { data } = await fetchChatAPI<Chat.ConversationResponse>(message, options, controller.signal)
+    updateChat(
+      +uuid,
+      dataSources.value.length - 1,
+      {
+        dateTime: new Date().toLocaleString(),
+        text: data.text ?? '',
+        inversion: false,
+        error: false,
+        loading: false,
+        conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
+        requestOptions: { prompt: message, options: { ...options } },
       },
-    })
+    )
+    scrollToBottom()
   }
   catch (error: any) {
     let errorMessage = error?.message ?? 'Something went wrong, please try again later.'
@@ -136,7 +119,6 @@ async function onConversation() {
     scrollToBottom()
   }
   finally {
-    offset = 0
     loading.value = false
   }
 }
@@ -172,41 +154,24 @@ async function onRegenerate(index: number) {
     },
   )
 
-  let offset = 0
   try {
-    await fetchChatAPIProcess<Chat.ConversationResponse>({
-      prompt: message,
-      options,
-      signal: controller.signal,
-      onDownloadProgress: ({ event }) => {
-        const xhr = event.target
-        const { responseText } = xhr
-        const chunk = responseText.substring(offset)
-        offset = responseText.length
-        try {
-          const data = JSON.parse(chunk)
-          updateChat(
-            +uuid,
-            index,
-            {
-              dateTime: new Date().toLocaleString(),
-              text: data.text ?? '',
-              inversion: false,
-              error: false,
-              loading: false,
-              conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
-              requestOptions: { prompt: message, ...options },
-            },
-          )
-        }
-        catch (error) {
-          //
-        }
+    const { data } = await fetchChatAPI<Chat.ConversationResponse>(message, options, controller.signal)
+    updateChat(
+      +uuid,
+      index,
+      {
+        dateTime: new Date().toLocaleString(),
+        text: data.text ?? '',
+        inversion: false,
+        error: false,
+        loading: false,
+        conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
+        requestOptions: { prompt: message, ...options },
       },
-    })
+    )
   }
   catch (error: any) {
-    let errorMessage = error?.message ?? 'Something went wrong, please try again later.'
+    let errorMessage = 'Something went wrong, please try again later.'
 
     if (error.message === 'canceled')
       errorMessage = 'Request canceled. Please try again.'
@@ -227,7 +192,6 @@ async function onRegenerate(index: number) {
   }
   finally {
     loading.value = false
-    offset = 0
   }
 }