MurasameNoa/chatgpt-plugin
1
0
Fork 0
mirror of https://github.com/ikechan8370/chatgpt-plugin.git synced 2025-12-17 13:57:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ikechan8370:v2' into v2

Browse source
This commit is contained in:
ifeif 2024-02-04 20:46:35 +08:00 • committed by GitHub
commit 6ccedd8e7c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/prompts.js
View file

@ -159,7 +159,8 @@ export class help extends plugin {
Custom: 'sydney', Custom: 'sydney',
claude: 'slackClaudeGlobalPreset', claude: 'slackClaudeGlobalPreset',
qwen: 'promptPrefixOverride', qwen: 'promptPrefixOverride',
gemini: 'geminiPrompt' gemini: 'geminiPrompt',
xh: 'xhPrompt'
} }
if (keyMap[use]) { if (keyMap[use]) {
@ -169,6 +170,9 @@ export class help extends plugin {
} else { } else {
Config[keyMap[use]] = prompt.content Config[keyMap[use]] = prompt.content
} }
if (use === 'xh') {
Config.xhPromptSerialize = false
}
await redis.set(`CHATGPT:PROMPT_USE_${use}`, promptName) await redis.set(`CHATGPT:PROMPT_USE_${use}`, promptName)
await e.reply(`你当前正在使用${use}模式，已将该模式设定应用为"${promptName}"。更该设定后建议结束对话以使设定更好生效`, true) await e.reply(`你当前正在使用${use}模式，已将该模式设定应用为"${promptName}"。更该设定后建议结束对话以使设定更好生效`, true)
} else { } else {

1
guoba.support.js
View file

@ -631,6 +631,7 @@ export function supportGuoba () {
{ label: '讯飞星火认知大模型V1.5', value: 'api' }, { label: '讯飞星火认知大模型V1.5', value: 'api' },
{ label: '讯飞星火认知大模型V2.0', value: 'apiv2' }, { label: '讯飞星火认知大模型V2.0', value: 'apiv2' },
{ label: '讯飞星火认知大模型V3.0', value: 'apiv3' }, { label: '讯飞星火认知大模型V3.0', value: 'apiv3' },
{ label: '讯飞星火认知大模型V3.5', value: 'apiv3.5' },
{ label: '讯飞星火助手', value: 'assistants' } { label: '讯飞星火助手', value: 'assistants' }
] ]
} }

14
utils/xinghuo/xinghuo.js
View file

@ -86,6 +86,8 @@ export default class XinghuoClient {
APILink = '/v2.1/chat' APILink = '/v2.1/chat'
} else if (Config.xhmode === 'apiv3') { } else if (Config.xhmode === 'apiv3') {
APILink = '/v3.1/chat' APILink = '/v3.1/chat'
} else if (Config.xhmode === 'apiv3.5') {
APILink = '/v3.5/chat'
} }
const date = new Date().toGMTString() const date = new Date().toGMTString()
const algorithm = 'hmac-sha256' const algorithm = 'hmac-sha256'
@ -176,7 +178,13 @@ export default class XinghuoClient {
const wsUrl = Config.xhmode == 'assistants' ? Config.xhAssistants : await this.getWsUrl() const wsUrl = Config.xhmode == 'assistants' ? Config.xhAssistants : await this.getWsUrl()
if (!wsUrl) throw new Error('获取ws链接失败') if (!wsUrl) throw new Error('获取ws链接失败')
let domain = 'general' let domain = 'general'
if (Config.xhmode == 'apiv2') { domain = 'generalv2' } else if (Config.xhmode == 'apiv3') { domain = 'generalv3' } if (Config.xhmode == 'apiv2') {
domain = 'generalv2'
} else if (Config.xhmode == 'apiv3') {
domain = 'generalv3'
} else if (Config.xhmode == 'apiv3.5') {
domain = 'generalv3.5'
}
// 编写消息内容 // 编写消息内容
const wsSendData = { const wsSendData = {
header: { header: {
@ -375,7 +383,7 @@ export default class XinghuoClient {
let chatId = option?.chatId let chatId = option?.chatId
let image = option?.image let image = option?.image
if (Config.xhmode == 'api' || Config.xhmode == 'apiv2' || Config.xhmode == 'apiv3' || Config.xhmode == 'assistants') { if (Config.xhmode == 'api' || Config.xhmode == 'apiv2' || Config.xhmode == 'apiv3' || Config.xhmode == 'apiv3.5' || Config.xhmode == 'assistants') {
if (!Config.xhAppId || !Config.xhAPISecret || !Config.xhAPIKey) throw new Error('未配置api') if (!Config.xhAppId || !Config.xhAPISecret || !Config.xhAPIKey) throw new Error('未配置api')
let Prompt = [] let Prompt = []
// 设定 // 设定
@ -387,7 +395,7 @@ export default class XinghuoClient {
logger.warn('星火设定序列化失败,本次对话不附带设定') logger.warn('星火设定序列化失败,本次对话不附带设定')
} }
} else { } else {
Prompt = Config.xhPrompt ? [{ role: 'user', content: Config.xhPrompt }] : [] Prompt = Config.xhPrompt ? [{ role: 'system', content: Config.xhPrompt }] : []
} }
if (Config.xhPromptEval) { if (Config.xhPromptEval) {
Prompt.forEach(obj => { Prompt.forEach(obj => {