mirror of
https://github.com/ikechan8370/chatgpt-plugin.git
synced 2025-12-17 05:47:11 +00:00
新的图片模式页面缓存和配套的API系统 (#315)
* 修复引用转发，默认bing模式并发 * 开启stream增加稳定性 * fix: remove queue element only in non-bing mode * 使用chatgpt-api自带的超时逻辑，文字过多时启动切换到图片输出防止被吞 * Update chat.js * 添加Bing专用的图片输出样式 * 添加chatgpt的新图片模式，临时处理切换api导致的对话异常 * 修改bing样式表 * 为图片添加外部页面缓存 * 为图片模式添加MathJax * feat: add switch for qrcode * 防止script攻击 * 修复网页模板错误 * 修复bing页面引用错误 * 缓存服务器异常时处理 * 添加默认配置加载 * 修复配置文件路径错误 * 删除重复的模板文件，修复二维码地址错误 * 修正图片渲染错误 * 修复引用渲染错误 * 二维码网址统一改为使用本地配置 * 添加关闭思考提示的配置项 * 修复在Windows上无法载入配置文件的问题 * 修复关闭qr的情况下渲染错误 * 改为使用base64传递返回数据 * 当异常过多时使用图片输出 * 添加锅巴面板配置支持 * 补充遗漏的默认配置 * 修复qr模式下引用未被传递的问题 * 修复未将引用数据传输给缓存服务器的问题 * 删除无用的bingTimeoutMs配置项 * 添加消息队列超时弹出 * 优化图片模式处理，解决对话队列卡住的问题 * 添加对图片ocr的支持 * 添加图片识别配置项 * 添加黑名单配置项 * 修复一些bug * 修改锅巴配置格式和描述 * 传入数据也使用markdown * 图片识别换行改为marked兼容 * 添加绘图CD配置项 * 独立render模块，添加图片回复引用 * 添加必应风格 * 修复上下文，修改bing样式 * 修复上下文 * 添加Sydney上下文支持 * 调整不同模式下的bing渲染颜色 * 修复样式 * 修复无法结束会话的问题 * fix: 更新版本号 * 修复无法结束对话的问题 * 向缓存服务器传送样式 * 为网址格式的配置添加验证 * 去除重复的Keyv删除，取消锅巴配置格式检查 * 闭合中断的代码块 * 试添加Sydney图片模式的情感显示 * 修复at不兼容 * 处理意外的markdown包裹和结构解析修复 * 修复markdown处理的顺序错误 * 兼容json换行 * 重写completeJSON和使用 * 修复换行格式异常 * 均衡BingToken使用 * 修复删除token的数组处理错误 * 修改token文字描述 * 创建本地缓存服务 * 修复首次使用无法添加bingtoken的问题 * 修复意外的删除格式问题，添加查看token功能 * 修复路由错误，暂时固定ip测试 * 恢复引用功能 * 更新渲染页面 * 更换缓存目录 * 清除调试用消息 * 调整屏幕分辨率 * 使用服务器生成的访问地址 * 改为使用api获取公网ip * 修复引用显示 * 添加依赖需求 * 更新渲染页面和渲染api * 修复渲染页面错误 * 修复建议字符串切割，添加帮助路由 * 添加内容中图片数据获取功能 * 试修复suggestbug * 修复图片导致服务器卡死的问题 * 暂时禁用图片 * 尝试恢复图片 * 添加链接图片识别 * 替换掉request * 修复可能的responseUrls空值 * 优化格式 * 更新渲染页面 * 尝试新的引用索引 * 取消渲染时旧的策略 * 更新帮助页面 * 修复帮助路由 * 修复渲染页面错误 * 修复错误的正则 * 修改系统api服务 * 添加配置项 * 将新渲染方式加入配置并还原原渲染方式，进行并存 * 暂时取消端口设置功能 * 重新开启端口设置 * 修复旧渲染引用 * 更新帮助样式 --------- Co-authored-by: ikechan8370 <geyinchibuaa@gmail.com>
This commit is contained in:
HalcyonAlcedo
GitHub
parent
c469813711
commit
0926009bb3
36 changed files with 10091 additions and 35 deletions
122
apps/chat.js
122
apps/chat.js
|
|
@ -7,12 +7,13 @@ import { ChatGPTAPI } from 'chatgpt'
|
|||
import { BingAIClient } from '@waylaidwanderer/chatgpt-api'
|
||||
import SydneyAIClient from '../utils/SydneyAIClient.js'
|
||||
import {
|
||||
render,
|
||||
render,renderUrl,
|
||||
getMessageById,
|
||||
makeForwardMsg,
|
||||
upsertMessage,
|
||||
randomString,
|
||||
completeJSON,
|
||||
isImage,
|
||||
getDefaultUserSetting, isCN, getMasterQQ
|
||||
} from '../utils/common.js'
|
||||
import { ChatGPTPuppeteer } from '../utils/browser.js'
|
||||
|
|
@ -790,15 +791,26 @@ export class chatgpt extends plugin {
|
|||
if (codeBlockCount && !shouldAddClosingBlock) {
|
||||
response = response.replace(/```$/, '\n```')
|
||||
}
|
||||
|
||||
// 处理引用
|
||||
let quotemessage = []
|
||||
if (chatMessage?.quote) {
|
||||
chatMessage.quote.forEach(function (item, index) {
|
||||
if (item.trim() !== '') {
|
||||
if (item.text.trim() !== '') {
|
||||
quotemessage.push(item)
|
||||
}
|
||||
})
|
||||
}
|
||||
// 处理内容和引用中的图片
|
||||
const regex = /\b((?:https?|ftp|file):\/\/[-a-zA-Z0-9+&@#\/%?=~_|!:,.;]*[-a-zA-Z0-9+&@#\/%=~_|])/g
|
||||
let responseUrls = response.match(regex)
|
||||
let imgUrls = []
|
||||
if (responseUrls) {
|
||||
let images = await Promise.all(responseUrls.map(link => isImage(link)))
|
||||
imgUrls = responseUrls.filter((link, index) => images[index])
|
||||
}
|
||||
for (let quote of quotemessage) {
|
||||
if (quote.imageLink) imgUrls.push(quote.imageLink)
|
||||
}
|
||||
if (useTTS) {
|
||||
// 先把文字回复发出去，避免过久等待合成语音
|
||||
if (Config.alsoSendText) {
|
||||
|
|
@ -825,7 +837,7 @@ export class chatgpt extends plugin {
|
|||
} else if (userSetting.usePicture || (Config.autoUsePicture && response.length > Config.autoUsePictureThreshold)) {
|
||||
// todo use next api of chatgpt to complete incomplete respoonse
|
||||
try {
|
||||
await this.renderImage(e, use !== 'bing' ? 'content/ChatGPT/index' : 'content/Bing/index', response, prompt, quotemessage, mood, Config.showQRCode)
|
||||
await this.renderImage(e, use !== 'bing' ? 'content/ChatGPT/index' : 'content/Bing/index', response, prompt, quotemessage, mood, chatMessage.suggestedResponses, imgUrls)
|
||||
} catch (err) {
|
||||
logger.warn('error happened while uploading content to the cache server. QR Code will not be showed in this picture.')
|
||||
logger.error(err)
|
||||
|
|
@ -943,11 +955,11 @@ export class chatgpt extends plugin {
|
|||
return true
|
||||
}
|
||||
|
||||
async renderImage (e, template, content, prompt, quote = [], mood = '', cache = false) {
|
||||
async renderImage (e, template, content, prompt, quote = [], mood = '', suggest = '', imgUrls = []) {
|
||||
let cacheData = { file: '', cacheUrl: Config.cacheUrl }
|
||||
if (cache) {
|
||||
if (Config.cacheEntry) cacheData.file = randomString()
|
||||
const use = await redis.get('CHATGPT:USE')
|
||||
const use = await redis.get('CHATGPT:USE')
|
||||
if (Config.preview) {
|
||||
cacheData.file = randomString()
|
||||
const cacheresOption = {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
|
|
@ -959,33 +971,69 @@ export class chatgpt extends plugin {
|
|||
prompt: new Buffer.from(prompt).toString('base64'),
|
||||
senderName: e.sender.nickname,
|
||||
style: Config.toneStyle,
|
||||
mood,
|
||||
quote
|
||||
mood: mood,
|
||||
quote: quote,
|
||||
group: e.isGroup ? e.group.name : '',
|
||||
suggest: suggest ? suggest.split("\n").filter(Boolean) : [],
|
||||
images: imgUrls
|
||||
},
|
||||
bing: use === 'bing',
|
||||
entry: Config.cacheEntry ? cacheData.file : ''
|
||||
entry: cacheData.file,
|
||||
userImg: `https://q1.qlogo.cn/g?b=qq&s=0&nk=${e.sender.user_id}`,
|
||||
botImg: `https://q1.qlogo.cn/g?b=qq&s=0&nk=${Bot.uin}`,
|
||||
QR: Config.showQRCode
|
||||
})
|
||||
}
|
||||
if (Config.cacheEntry) {
|
||||
fetch(`${Config.cacheUrl}/cache`, cacheresOption)
|
||||
} else {
|
||||
const cacheres = await fetch(`${Config.cacheUrl}/cache`, cacheresOption)
|
||||
if (cacheres.ok) {
|
||||
cacheData = Object.assign({}, cacheData, await cacheres.json())
|
||||
}
|
||||
const cacheres = await fetch(`http://127.0.0.1:${Config.serverPort || 3321}/cache`, cacheresOption)
|
||||
if (cacheres.ok) {
|
||||
cacheData = Object.assign({}, cacheData, await cacheres.json())
|
||||
}
|
||||
}
|
||||
await e.reply(await render(e, 'chatgpt-plugin', template, {
|
||||
content: new Buffer.from(content).toString('base64'),
|
||||
prompt: new Buffer.from(prompt).toString('base64'),
|
||||
senderName: e.sender.nickname,
|
||||
quote: quote.length > 0,
|
||||
quotes: quote,
|
||||
cache: cacheData,
|
||||
style: Config.toneStyle,
|
||||
mood,
|
||||
version
|
||||
}, { retType: Config.quoteReply ? 'base64' : '' }), e.isGroup && Config.quoteReply)
|
||||
if (cacheData.error)
|
||||
await this.reply(`出现错误：${cacheData.error}`, true)
|
||||
else
|
||||
await e.reply(await renderUrl(e, `http://127.0.0.1:${Config.serverPort || 3321}/page/${cacheData.file}`, { retType: Config.quoteReply ? 'base64' : '' }), e.isGroup && Config.quoteReply)
|
||||
} else {
|
||||
|
||||
if (Config.cacheEntry) cacheData.file = randomString()
|
||||
const cacheresOption = {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
},
|
||||
body: JSON.stringify({
|
||||
content: {
|
||||
content: new Buffer.from(content).toString('base64'),
|
||||
prompt: new Buffer.from(prompt).toString('base64'),
|
||||
senderName: e.sender.nickname,
|
||||
style: Config.toneStyle,
|
||||
mood,
|
||||
quote
|
||||
},
|
||||
bing: use === 'bing',
|
||||
entry: Config.cacheEntry ? cacheData.file : ''
|
||||
})
|
||||
}
|
||||
if (Config.cacheEntry) {
|
||||
fetch(`${Config.cacheUrl}/cache`, cacheresOption)
|
||||
} else {
|
||||
const cacheres = await fetch(`${Config.cacheUrl}/cache`, cacheresOption)
|
||||
if (cacheres.ok) {
|
||||
cacheData = Object.assign({}, cacheData, await cacheres.json())
|
||||
}
|
||||
}
|
||||
await e.reply(await render(e, 'chatgpt-plugin', template, {
|
||||
content: new Buffer.from(content).toString('base64'),
|
||||
prompt: new Buffer.from(prompt).toString('base64'),
|
||||
senderName: e.sender.nickname,
|
||||
quote: quote.length > 0,
|
||||
quotes: quote,
|
||||
cache: cacheData,
|
||||
style: Config.toneStyle,
|
||||
mood,
|
||||
version
|
||||
}, { retType: Config.quoteReply ? 'base64' : '' }), e.isGroup && Config.quoteReply)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
async sendMessage (prompt, conversation = {}, use, e) {
|
||||
|
|
@ -1120,9 +1168,21 @@ export class chatgpt extends plugin {
|
|||
response.response = response.response.replace(/\[\^[0-9]+\^\]/g, (str) => {
|
||||
return str.replace(/[/^]/g, '')
|
||||
})
|
||||
response.quote = response.details.adaptiveCards?.[0]?.body?.[0]?.text?.replace(/\[\^[0-9]+\^\]/g, '').replace(response.response, '').split('\n')
|
||||
// 有了新的引用属性
|
||||
// response.quote = response.details.adaptiveCards?.[0]?.body?.[0]?.text?.replace(/\[\^[0-9]+\^\]/g, '').replace(response.response, '').split('\n')
|
||||
}
|
||||
response.suggestedResponses = response.details.suggestedResponses?.map(s => s.text).join('\n')
|
||||
// 新引用属性读取数据
|
||||
if (response.details.sourceAttributions) {
|
||||
response.quote = []
|
||||
for (let quote of response.details.sourceAttributions) {
|
||||
response.quote.push({
|
||||
text: quote.providerDisplayName,
|
||||
url: quote.seeMoreUrl,
|
||||
imageLink: quote.imageLink || ''
|
||||
})
|
||||
}
|
||||
}
|
||||
errorMessage = ''
|
||||
break
|
||||
} catch (error) {
|
||||
|
|
|
|||
15
apps/help.js
15
apps/help.js
|
|
@ -1,6 +1,6 @@
|
|||
import plugin from '../../../lib/plugins/plugin.js'
|
||||
import { Config } from '../utils/config.js'
|
||||
import { render } from '../utils/common.js'
|
||||
import { render, renderUrl } from '../utils/common.js'
|
||||
let version = Config.version
|
||||
let helpData = [
|
||||
{
|
||||
|
|
@ -286,12 +286,25 @@ export class help extends plugin {
|
|||
{
|
||||
reg: '^#(chatgpt|ChatGPT)(命令|帮助|菜单|help|说明|功能|指令|使用说明)$',
|
||||
fnc: 'help'
|
||||
},
|
||||
{
|
||||
reg: '^#帮助-',
|
||||
fnc: 'newHelp'
|
||||
}
|
||||
]
|
||||
})
|
||||
}
|
||||
|
||||
async help (e) {
|
||||
if (Config.preview)
|
||||
await renderUrl(e, `http://127.0.0.1:${Config.serverPort || 3321}/help/`, {Viewport: {width: 800, height: 600}})
|
||||
else
|
||||
await render(e, 'chatgpt-plugin', 'help/index', { helpData, version })
|
||||
}
|
||||
|
||||
async newHelp (e) {
|
||||
let use = e.msg.replace(/^#帮助-/, '')
|
||||
await renderUrl(e, `http://127.0.0.1:${Config.serverPort || 3321}/help/` + use, {Viewport: {width: 800, height: 600}})
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -191,7 +191,6 @@ export class ChatgptManagement extends plugin {
|
|||
await this.reply(`${tokens}`, true)
|
||||
return false
|
||||
}
|
||||
|
||||
async delBingAccessToken (e) {
|
||||
this.setContext('deleteBingToken')
|
||||
let tokens = await redis.get('CHATGPT:BING_TOKEN')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue