MigrateRepos/glm-free-api
1
0
Fork 0
mirror of https://github.com/LLM-Red-Team/glm-free-api.git synced 2024-12-23 01:19:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10 from Yanyutin753/master

Browse Source 
optimize code in messagesPrepare
This commit is contained in:
Vinlic科技 2024-04-05 23:15:18 +08:00 committed by GitHub
commit 869e71f6db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -502,26 +502,8 @@ function extractRefFileUrls(messages: any[]) {
* @param messages 参考gpt系列消息格式，多轮对话请完整提供上下文 * @param messages 参考gpt系列消息格式，多轮对话请完整提供上下文
*/ */
function messagesPrepare(messages: any[], refs: any[]) { function messagesPrepare(messages: any[], refs: any[]) {
// 先剔除所有的 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",如果有则注入消息 // 检查最新消息是否含有"type": "image_url"或"type": "file",如果有则注入消息
let latestMessage = validMessages[validMessages.length - 1]; let latestMessage = messages[messages.length - 1];
let hasFileOrImage = let hasFileOrImage =
Array.isArray(latestMessage.content) && Array.isArray(latestMessage.content) &&
latestMessage.content.some( latestMessage.content.some(
@ -532,7 +514,7 @@ function messagesPrepare(messages: any[], refs: any[]) {
content: "关注用户最新发送文件和消息", content: "关注用户最新发送文件和消息",
role: "system", role: "system",
}; };
validMessages.splice(validMessages.length - 1, 0, newFileMessage); messages.splice(messages.length - 1, 0, newFileMessage);
logger.info("注入提升尾部文件注意力system prompt"); logger.info("注入提升尾部文件注意力system prompt");
} else { } else {
// 由于注入会导致设定污染，暂时注释 // 由于注入会导致设定污染，暂时注释
@ -540,12 +522,12 @@ function messagesPrepare(messages: any[], refs: any[]) {
// content: "关注用户最新的消息", // content: "关注用户最新的消息",
// role: "system", // role: "system",
// }; // };
// validMessages.splice(validMessages.length - 1, 0, newTextMessage); // messages.splice(messages.length - 1, 0, newTextMessage);
// logger.info("注入提升尾部消息注意力system prompt"); // logger.info("注入提升尾部消息注意力system prompt");
} }
const content = ( const content = (
validMessages.reduce((content, message) => { messages.reduce((content, message) => {
if (_.isArray(message.content)) { if (_.isArray(message.content)) {
return ( return (
message.content.reduce((_content, v) => { message.content.reduce((_content, v) => {