From 6853087757c33c33ecfd5588f5d30db4a0c9fc04 Mon Sep 17 00:00:00 2001
From: Yanyutin753 <132346501+Yanyutin753@users.noreply.github.com>
Date: Tue, 2 Apr 2024 23:13:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=99=8D=E4=BD=8E=E4=BC=A0?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=B8=8B=E6=96=87=E6=B7=B7=E6=B7=86?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/controllers/chat.ts | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/src/api/controllers/chat.ts b/src/api/controllers/chat.ts
index bc53064..44045fb 100644
--- a/src/api/controllers/chat.ts
+++ b/src/api/controllers/chat.ts
@@ -362,12 +362,19 @@ function extractRefFileUrls(messages: any[]) {
  * @param messages 参考gpt系列消息格式，多轮对话请完整提供上下文
  */
 function messagesPrepare(messages: 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",如果有则注入消息
@@ -375,17 +382,6 @@ function messagesPrepare(messages: any[]) {
   let hasFileOrImage = Array.isArray(latestMessage.content)
     && latestMessage.content.some(v => (typeof v === 'object' && ['file', 'image_url'].includes(v['type'])));
   if (hasFileOrImage) {
-
-    // 对 latestMessage.content 进行过滤，只保留"type": "text"的内容
-    // latestMessage.content = latestMessage.content.filter(v => typeof v === 'object' && v['type'] === 'text');
-
-    // 对 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"
@@ -406,13 +402,13 @@ function messagesPrepare(messages: any[]) {
       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'}:${wrapUrlsToTags(message.content)}\n`;
   }, '');
 
-  logger.info("本次上传消息：" + { role: 'user', content });
+  logger.info("上传消息：" + content);
   return [
     { role: 'user', content }
   ]