ChatGPT/step-free-api
1
0
Fork 0
mirror of https://github.com/LLM-Red-Team/step-free-api.git synced 2026-01-13 07:00:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix 上下文上传文件聊天不连贯问题

Browse Source
This commit is contained in:
Yanyutin753
2024-04-02 23:26:52 +08:00
parent e7df8f6ff2
commit e2e8f58a0e
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/api/controllers/chat.ts
View File

@@ -387,12 +387,19 @@ function extractRefFileUrls(messages: any[]) {
* @param messages 参考gpt系列消息格式，多轮对话请完整提供上下文
*/
function messagesPrepare(convId: string, messages: any[], refs: any[]) {
// 只保留最新消息以及不包含"type": "image_url"或"type": "file"的消息
let validMessages = messages.filter((message, index) => {
if (index === messages.length - 1) return true;
if (!Array.isArray(message.content)) return true;
// 不含"type": "image_url"或"type": "file"的消息保留
return !message.content.some(v => (typeof v === 'object' && ['file', 'image_url'].includes(v['type'])));
// 先剔除所有的 base64 数据
let validMessages = messages.map((message) => {
if (Array.isArray(message.content)) {
message.content = message.content.filter(v => {
if (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",如果有则注入消息
@@ -400,13 +407,6 @@ function messagesPrepare(convId: string, messages: any[], refs: any[]) {
let hasFileOrImage = Array.isArray(latestMessage.content)
&& latestMessage.content.some(v => (typeof v === 'object' && ['file', 'image_url'].includes(v['type'])));
if (hasFileOrImage) {
// 对 latestMessage.content 进行过滤，只保留不含base64的内容
latestMessage.content = latestMessage.content.filter(v => {
if (typeof v === 'object' && ['file', 'image_url'].includes(v['type'])) {
return !util.isBASE64Data(v['image_url']['url']);
}
return true;
});
let newFileMessage = {
"content": "关注用户最新发送文件和消息结尾",
"role": "system"
@@ -426,7 +426,7 @@ function messagesPrepare(convId: string, messages: any[], refs: any[]) {
if (_.isArray(message.content)) {
return message.content.reduce((_content, v) => {
if (!_.isObject(v) || v["type"] != "text") return _content;
return _content + (v["text"] || "");
return _content + ('user:' + v['text'] || "") + "\n";
}, content);
}
return (content += `${message.role || "user"}:${message.content}\n`);