chore: rolled back to clear the impact

cifshanghai · Mar 28, 2023 · 07123b7 · 07123b7
1 parent b579d24
commit 07123b7
Show file tree

Hide file tree

Showing 2 changed files with 90 additions and 100 deletions.
diff --git a/service/src/index.ts b/service/src/index.ts
@@ -29,16 +29,8 @@ router.post('/chat-process', [auth, limiter], async (req, res) => {
  message: prompt,
  lastContext: options,
  process: (chat: ChatMessage) => {
- if (firstChunk) {
- res.write(`${JSON.stringify(chat)}t1h1i4s5i1s4a1s9i1l9l8y1s0plit`)
- firstChunk = false
- }
- else {
- let tmp = chat.delta
- if (!(chat.delta))
- tmp = ''
- res.write(tmp)
- }
+ res.write(firstChunk ? JSON.stringify(chat) : `\n${JSON.stringify(chat)}`)
+ firstChunk = false
  },
  systemMessage,
  })

diff --git a/src/views/chat/index.vue b/src/views/chat/index.vue
@@ -107,9 +107,7 @@ async function onConversation() {
  scrollToBottom()
 
  try {
- const magicSplit = 't1h1i4s5i1s4a1s9i1l9l8y1s0plit'
- let renderText = ''
- let firstTime = true
+ let lastText = ''
  const fetchChatAPIOnce = async () => {
  await fetchChatAPIProcess<Chat.ConversationResponse>({
  prompt: message,
@@ -119,49 +117,42 @@ async function onConversation() {
  const xhr = event.target
  const { responseText } = xhr
  // Always process the final line
-
- const splitIndexBegin = responseText.search(magicSplit)
- if (splitIndexBegin !== -1) {
- const splitIndexEnd = splitIndexBegin + magicSplit.length
-
- const firstChunk = responseText.substring(0, splitIndexBegin)
- const deltaText = responseText.substring(splitIndexEnd)
- try {
- const data = JSON.parse(firstChunk)
- if (firstTime) {
- firstTime = false
- renderText = data.text ?? ''
- }
- else {
- renderText = deltaText ?? ''
- }
- updateChat(
- +uuid,
- dataSources.value.length - 1,
- {
- dateTime: new Date().toLocaleString(),
- text: renderText,
- inversion: false,
- error: false,
- loading: false,
- conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
- requestOptions: { prompt: message, ...options },
- },
- )
-
- if (openLongReply && data.detail.choices[0].finish_reason === 'length') {
- options.parentMessageId = data.id
- message = ''
- return fetchChatAPIOnce()
- }
- }
- catch (error) {
- //
+ const lastIndex = responseText.lastIndexOf('\n', responseText.length - 2)
+ let chunk = responseText
+ if (lastIndex !== -1)
+ chunk = responseText.substring(lastIndex)
+ try {
+ const data = JSON.parse(chunk)
+ updateChat(
+ +uuid,
+ dataSources.value.length - 1,
+ {
+ dateTime: new Date().toLocaleString(),
+ text: lastText + data.text ?? '',
+ inversion: false,
+ error: false,
+ loading: false,
+ conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
+ requestOptions: { prompt: message, options: { ...options } },
+ },
+ )
+
+ if (openLongReply && data.detail.choices[0].finish_reason === 'length') {
+ options.parentMessageId = data.id
+ lastText = data.text
+ message = ''
+ return fetchChatAPIOnce()
  }
+
+ scrollToBottomIfAtBottom()
+ }
+ catch (error) {
+ //
  }
  },
  })
  }
+
  await fetchChatAPIOnce()
  }
  catch (error: any) {
@@ -246,9 +237,7 @@ async function onRegenerate(index: number) {
  )
 
  try {
- const magicSplit = 't1h1i4s5i1s4a1s9i1l9l8y1s0plit'
- let renderText = ''
- let firstTime = true
+ let lastText = ''
  const fetchChatAPIOnce = async () => {
  await fetchChatAPIProcess<Chat.ConversationResponse>({
  prompt: message,
@@ -258,46 +247,36 @@ async function onRegenerate(index: number) {
  const xhr = event.target
  const { responseText } = xhr
  // Always process the final line
-
- const splitIndexBegin = responseText.search(magicSplit)
- if (splitIndexBegin !== -1) {
- const splitIndexEnd = splitIndexBegin + magicSplit.length
-
- const firstChunk = responseText.substring(0, splitIndexBegin)
- const deltaText = responseText.substring(splitIndexEnd)
- try {
- const data = JSON.parse(firstChunk)
- if (firstTime) {
- firstTime = false
- renderText = data.text ?? ''
- }
- else {
- renderText = deltaText ?? ''
- }
- updateChat(
- +uuid,
- index,
- {
- dateTime: new Date().toLocaleString(),
- text: renderText,
- inversion: false,
- error: false,
- loading: false,
- conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
- requestOptions: { prompt: message, ...options },
- },
- )
-
- if (openLongReply && data.detail.choices[0].finish_reason === 'length') {
- options.parentMessageId = data.id
- message = ''
- return fetchChatAPIOnce()
- }
- }
- catch (error) {
- //
+ const lastIndex = responseText.lastIndexOf('\n', responseText.length - 2)
+ let chunk = responseText
+ if (lastIndex !== -1)
+ chunk = responseText.substring(lastIndex)
+ try {
+ const data = JSON.parse(chunk)
+ updateChat(
+ +uuid,
+ index,
+ {
+ dateTime: new Date().toLocaleString(),
+ text: lastText + data.text ?? '',
+ inversion: false,
+ error: false,
+ loading: false,
+ conversationOptions: { conversationId: data.conversationId, parentMessageId: data.id },
+ requestOptions: { prompt: message, ...options },
+ },
+ )
+
+ if (openLongReply && data.detail.choices[0].finish_reason === 'length') {
+ options.parentMessageId = data.id
+ lastText = data.text
+ message = ''
+ return fetchChatAPIOnce()
  }
  }
+ catch (error) {
+ //
+ }
  },
  })
  }
@@ -488,13 +467,20 @@ onUnmounted(() => {
 <template>
  <div class="flex flex-col w-full h-full">
  <HeaderComponent
- v-if="isMobile" :using-context="usingContext" @export="handleExport"
+ v-if="isMobile"
+ :using-context="usingContext"
+ @export="handleExport"
  @toggle-using-context="toggleUsingContext"
  />
  <main class="flex-1 overflow-hidden">
- <div id="scrollRef" ref="scrollRef" class="h-full overflow-hidden overflow-y-auto">
+ <div
+ id="scrollRef"
+ ref="scrollRef"
+ class="h-full overflow-hidden overflow-y-auto"
+ >
  <div
- id="image-wrapper" class="w-full max-w-screen-xl m-auto dark:bg-[#101014]"
+ id="image-wrapper"
+ class="w-full max-w-screen-xl m-auto dark:bg-[#101014]"
  :class="[isMobile ? 'p-2' : 'p-4']"
  >
  <template v-if="!dataSources.length">
@@ -506,8 +492,14 @@ onUnmounted(() => {
  <template v-else>
  <div>
  <Message
- v-for="(item, index) of dataSources" :key="index" :date-time="item.dateTime" :text="item.text"
- :inversion="item.inversion" :error="item.error" :loading="item.loading" @regenerate="onRegenerate(index)"
+ v-for="(item, index) of dataSources"
+ :key="index"
+ :date-time="item.dateTime"
+ :text="item.text"
+ :inversion="item.inversion"
+ :error="item.error"
+ :loading="item.loading"
+ @regenerate="onRegenerate(index)"
  @delete="handleDelete(index)"
  />
  <div class="sticky bottom-0 left-0 flex justify-center">
@@ -544,9 +536,15 @@ onUnmounted(() => {
  <NAutoComplete v-model:value="prompt" :options="searchOptions" :render-label="renderOption">
  <template #default="{ handleInput, handleBlur, handleFocus }">
  <NInput
- ref="inputRef" v-model:value="prompt" type="textarea" :placeholder="placeholder"
- :autosize="{ minRows: 1, maxRows: isMobile ? 4 : 8 }" @input="handleInput" @focus="handleFocus"
- @blur="handleBlur" @keypress="handleEnter"
+ ref="inputRef"
+ v-model:value="prompt"
+ type="textarea"
+ :placeholder="placeholder"
+ :autosize="{ minRows: 1, maxRows: isMobile ? 4 : 8 }"
+ @input="handleInput"
+ @focus="handleFocus"
+ @blur="handleBlur"
+ @keypress="handleEnter"
  />
  </template>
  </NAutoComplete>