Merge pull request #38 from Yanyutin753/transfer

优化降低传文件上下文混淆问题
This commit is contained in:
Vinlic科技 2024-04-02 23:17:13 +08:00 committed by GitHub
commit ff59201961
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -347,6 +347,7 @@ function extractRefFileUrls(messages: any[]) {
urls.push(v['image_url']['url']); urls.push(v['image_url']['url']);
}); });
} }
logger.info("本次请求上传:" + urls.length + "个文件");
return urls; return urls;
} }
@ -361,24 +362,53 @@ function extractRefFileUrls(messages: any[]) {
* @param messages gpt系列消息格式 * @param messages gpt系列消息格式
*/ */
function messagesPrepare(messages: any[]) { function messagesPrepare(messages: any[]) {
// 只保留最新消息以及不包含"type": "image_url"或"type": "file"的消息 // 先剔除所有的 base64 数据
let validMessages = messages.filter((message, index) => { let validMessages = messages.map((message) => {
if (index === messages.length - 1) return true; if (Array.isArray(message.content)) {
if (!Array.isArray(message.content)) return true; message.content = message.content.filter(v => {
// 不含"type": "image_url"或"type": "file"的消息保留 if (typeof v === 'object' && ['file', 'image_url'].includes(v['type'])) {
return !message.content.some(v => (typeof v === 'object' && ['file', 'image_url'].includes(v['type']))); // 如果内容是 base64 数据,就剔除
return !util.isBASE64Data(v['url']);
}
// 如果不是 base64 数据,就保留
return true;
}); });
}
return message;
});
// 检查最新消息是否含有"type": "image_url"或"type": "file",如果有则注入消息
let latestMessage = validMessages[validMessages.length - 1];
let hasFileOrImage = Array.isArray(latestMessage.content)
&& latestMessage.content.some(v => (typeof v === 'object' && ['file', 'image_url'].includes(v['type'])));
if (hasFileOrImage) {
let newFileMessage = {
"content": "关注用户最新发送文件和消息结尾",
"role": "system"
};
validMessages.splice(validMessages.length - 1, 0, newFileMessage);
logger.info("检查注入文件消息");
} else {
let newTextMessage = {
"content": "关注用户消息的结尾",
"role": "system"
};
validMessages.splice(validMessages.length - 1, 0, newTextMessage);
logger.info("检查注入文本消息");
}
const content = validMessages.reduce((content, message) => { const content = validMessages.reduce((content, message) => {
if (Array.isArray(message.content)) { if (Array.isArray(message.content)) {
return message.content.reduce((_content, v) => { return message.content.reduce((_content, v) => {
if (!_.isObject(v) || v['type'] != 'text') if (!_.isObject(v) || v['type'] != 'text')
return _content; return _content;
return _content + (v['text'] || ''); return _content + ('user:' + v['text'] || '') + "\n";
}, content); }, content);
} }
return content += `${message.role || 'user'}:${wrapUrlsToTags(message.content)}\n`; return content += `${message.role || 'user'}:${wrapUrlsToTags(message.content)}\n`;
}, ''); }, '');
logger.info("上传消息:" + content);
return [ return [
{ role: 'user', content } { role: 'user', content }
] ]