MurasameNoa/chatgpt-plugin
1
0
Fork 0
mirror of https://github.com/ikechan8370/chatgpt-plugin.git synced 2025-12-16 21:37:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: 加入重试机制

Browse source
This commit is contained in:
ikechan8370 2023-02-10 10:46:31 +08:00
parent 233fc7417c
commit b0738c6db6
4 changed files with 39 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

42
apps/chat.js
View file

@ -6,7 +6,7 @@ import mjAPI from 'mathjax-node'
import { uuid } from 'oicq/lib/common.js'
import delay from 'delay'
import { ChatGPTAPI } from 'chatgpt'
import { getMessageById, upsertMessage } from '../utils/common.js'
import {getMessageById, tryTimes, upsertMessage} from '../utils/common.js'
// import puppeteer from '../utils/browser.js'
// import showdownKatex from 'showdown-katex'
const blockWords = Config.blockWords
@ -28,7 +28,7 @@ const converter = new showdown.Converter({
* @type {number}
*/
const CONVERSATION_PRESERVE_TIME = Config.conversationPreserveTime
const defaultPropmtPrefix = 'You answer as concisely as possible for each response (e.g. don’t be verbose). It is very important that you answer as concisely as possible, so please remember this. If you are generating a list, do not have too many items. Keep the number of items short.'
mjAPI.config({
MathJax: {
// traditional MathJax configuration
@ -51,7 +51,7 @@ export class chatgpt extends plugin {
rule: [
{
/** 命令正则匹配 */
reg: toggleMode === 'at' ? '^[^#][sS]*' : '#chat[sS]*',
reg: toggleMode === 'at' ? '^[^#][sS]*' : '#chat[^gpt][sS]*',
/** 执行方法 */
fnc: 'chatgpt'
},
@ -256,20 +256,9 @@ export class chatgpt extends plugin {
parentMessageId: previousConversation.conversation.parentMessageId
}
}
const currentDate = new Date().toISOString().split('T')[0]
let defaultPropmtPrefix = 'You answer as concisely as possible for each response (e.g. don’t be verbose). It is very important that you answer as concisely as possible, so please remember this. If you are generating a list, do not have too many items. Keep the number of items short.'
let promptPrefix = `You are ${Config.assistantLabel}, a large language model trained by OpenAI. ${Config.promptPrefixOverride || defaultPropmtPrefix}
Knowledge cutoff: 2021-09
Current date: ${currentDate}`
try {
let option = {
timeoutMs: 120000,
promptPrefix
}
if (conversation) {
option = Object.assign(option, conversation)
}
let chatMessage = await this.chatGPTApi.sendMessage(prompt, option)
let chatMessage = await this.sendMessage(prompt, conversation, this.chatGPTApi)
previousConversation.conversation = {
conversationId: chatMessage.conversationId,
parentMessageId: chatMessage.id
@ -300,12 +289,7 @@ export class chatgpt extends plugin {
// !response.trimEnd().endsWith('！') && !response.trimEnd().endsWith('!') && !response.trimEnd().endsWith(']') && !response.trimEnd().endsWith('】')
// ) {
await this.reply('内容有点多，我正在奋笔疾书，请再等一会', true, { recallMsg: 5 })
option = {
timeoutMs: 120000,
promptPrefix
}
option = Object.assign(option, previousConversation.conversation)
const responseAppend = await this.chatGPTApi.sendMessage('Continue', option)
let responseAppend = await this.sendMessage('Continue', conversation, this.chatGPTApi)
previousConversation.conversation = {
conversationId: responseAppend.conversationId,
parentMessageId: responseAppend.id
@ -346,6 +330,20 @@ export class chatgpt extends plugin {
}
}
async sendMessage (prompt, conversation, api) {
const currentDate = new Date().toISOString().split('T')[0]
let promptPrefix = `You are ${Config.assistantLabel}, a large language model trained by OpenAI. ${Config.promptPrefixOverride || defaultPropmtPrefix}
Current date: ${currentDate}`
let option = {
timeoutMs: 120000,
promptPrefix
}
if (conversation) {
option = Object.assign(option, conversation)
}
return await tryTimes(async () => await api.sendMessage(prompt, option), 5)
}
async emptyQueue (e) {
await redis.lTrim('CHATGPT:CHAT_QUEUE', 1, 0)
await this.reply('已清空当前等待队列')