fix: 如果超时导致聊天无法正常记录

README.en.md

@@ -233,7 +233,7 @@ services:
       # reverse proxy, optional
       API_REVERSE_PROXY: xxx
       # timeout, in milliseconds, optional
-      TIMEOUT_MS: 60000
+      TIMEOUT_MS: 600000
       # socks proxy, optional, effective with SOCKS_PROXY_PORT
       SOCKS_PROXY_HOST: xxxx
       # socks proxy port, optional, effective with SOCKS_PROXY_HOST

README.md

@@ -241,7 +241,7 @@ services:
       # 每小时最大请求次数，可选，默认无限
       MAX_REQUEST_PER_HOUR: 0
       # 超时，单位毫秒，可选
-      TIMEOUT_MS: 60000
+      TIMEOUT_MS: 600000
       # Socks代理，可选，和 SOCKS_PROXY_PORT 一起时生效
       SOCKS_PROXY_HOST: xxx
       # Socks代理端口，可选，和 SOCKS_PROXY_HOST 一起时生效

docker-compose/docker-compose.yml

@@ -26,7 +26,7 @@ services:
       # 每小时最大请求次数，可选，默认无限
       MAX_REQUEST_PER_HOUR: 0
       # 超时，单位毫秒，可选
-      TIMEOUT_MS: 60000
+      TIMEOUT_MS: 600000
       # Socks代理，可选，和 SOCKS_PROXY_PORT 一起时生效
       SOCKS_PROXY_HOST: 
       # Socks代理端口，可选，和 SOCKS_PROXY_HOST 一起时生效

kubernetes/deploy.yaml

@@ -34,7 +34,7 @@ spec:
             - name: AUTH_SECRET_KEY
               value: '123456'
             - name: TIMEOUT_MS
-              value: '60000'
+              value: '600000'
             - name: SOCKS_PROXY_HOST
               value: ''
             - name: SOCKS_PROXY_PORT

service/src/index.ts

@@ -6,7 +6,7 @@ import type { ChatContext, ChatMessage } from './chatgpt'
 import { chatConfig, chatReplyProcess, currentModel, initApi } from './chatgpt'
 import { auth } from './middleware/auth'
 import { clearConfigCache, getCacheConfig, getOriginConfig } from './storage/config'
-import type { ChatOptions, Config, MailConfig, SiteConfig, UsageResponse, UserInfo } from './storage/model'
+import type { ChatInfo, ChatOptions, Config, MailConfig, SiteConfig, UsageResponse, UserInfo } from './storage/model'
 import { Status } from './storage/model'
 import {
   clearChat,
@@ -271,16 +271,21 @@ router.post('/chat', auth, async (req, res) => {
 router.post('/chat-process', [auth, limiter], async (req, res) => {
   res.setHeader('Content-type', 'application/octet-stream')
 
+  const { roomId, uuid, regenerate, prompt, options = {}, systemMessage, temperature, top_p } = req.body as RequestProps
+
+  let lastResponse
+  let result
+  let message: ChatInfo
   try {
-    const { roomId, uuid, regenerate, prompt, options = {}, systemMessage, temperature, top_p } = req.body as RequestProps
-    const message = regenerate
+    message = regenerate
       ? await getChat(roomId, uuid)
       : await insertChat(uuid, prompt, roomId, options as ChatOptions)
     let firstChunk = true
-    const result = await chatReplyProcess({
+    result = await chatReplyProcess({
       message: prompt,
       lastContext: options,
       process: (chat: ChatMessage) => {
+        lastResponse = chat
         const chuck = {
           id: chat.id,
           conversationId: chat.conversationId,
@@ -300,7 +305,22 @@ router.post('/chat-process', [auth, limiter], async (req, res) => {
       temperature,
       top_p,
     })
-    if (result.status === 'Success') {
+    // return the whole response including usage
+    res.write(`\n${JSON.stringify(result.data)}`)
+  }
+  catch (error) {
+    res.write(JSON.stringify(error))
+  }
+  finally {
+    res.end()
+    try {
+      if (result == null || result === undefined || result.status !== 'Success')
+        result = { data: lastResponse }
+
+      if (result.data === undefined)
+        // eslint-disable-next-line no-unsafe-finally
+        return
+
       if (regenerate && message.options.messageId) {
         const previousResponse = message.previousResponse || []
         previousResponse.push({ response: message.response, options: message.options })
@@ -325,15 +345,9 @@ router.post('/chat-process', [auth, limiter], async (req, res) => {
           result.data.detail.usage as UsageResponse)
       }
     }
-
-    // return the whole response including usage
-    res.write(`\n${JSON.stringify(result.data)}`)
-  }
-  catch (error) {
-    res.write(JSON.stringify(error))
-  }
-  finally {
-    res.end()
+    catch (error) {
+      global.console.log(error)
+    }
   }
 })
 

service/src/storage/model.ts

@@ -104,10 +104,12 @@ export class ChatUsage {
     this.roomId = roomId
     this.chatId = chatId
     this.messageId = messageId
-    this.promptTokens = usage.prompt_tokens
-    this.completionTokens = usage.completion_tokens
-    this.totalTokens = usage.total_tokens
-    this.estimated = usage.estimated
+    if (usage) {
+      this.promptTokens = usage.prompt_tokens
+      this.completionTokens = usage.completion_tokens
+      this.totalTokens = usage.total_tokens
+      this.estimated = usage.estimated
+    }
     this.dateTime = new Date().getTime()
   }
 }

service/src/storage/mongo.ts

@@ -27,7 +27,7 @@ export async function insertChat(uuid: number, text: string, roomId: number, opt
 }
 
 export async function getChat(roomId: number, uuid: number) {
-  return await chatCol.findOne({ roomId, uuid })
+  return await chatCol.findOne({ roomId, uuid }) as ChatInfo
 }
 
 export async function updateChat(chatId: string, response: string, messageId: string, usage: UsageResponse, previousResponse?: []) {
@@ -36,10 +36,10 @@ export async function updateChat(chatId: string, response: string, messageId: st
     $set: {
       'response': response,
       'options.messageId': messageId,
-      'options.prompt_tokens': usage.prompt_tokens,
-      'options.completion_tokens': usage.completion_tokens,
-      'options.total_tokens': usage.total_tokens,
-      'options.estimated': usage.estimated,
+      'options.prompt_tokens': usage?.prompt_tokens,
+      'options.completion_tokens': usage?.completion_tokens,
+      'options.total_tokens': usage?.total_tokens,
+      'options.estimated': usage?.estimated,
     },
   }