首轮不注入注意力prompt

optimize code in messagesPrepare

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kimi-free-api",
-  "version": "0.0.19",
+  "version": "0.0.22",
   "description": "Kimi Free API Server",
   "type": "module",
   "main": "dist/index.js",

src/api/controllers/chat.ts

@@ -347,6 +347,7 @@ function extractRefFileUrls(messages: any[]) {
         urls.push(v['image_url']['url']);
     });
   }
+  logger.info("本次请求上传：" + urls.length + "个文件");
   return urls;
 }
 
@@ -361,24 +362,39 @@ 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'])));
-  });
+  // 注入消息提升注意力
+  let latestMessage = messages[messages.length - 1];
+  let hasFileOrImage = Array.isArray(latestMessage.content)
+    && latestMessage.content.some(v => (typeof v === 'object' && ['file', 'image_url'].includes(v['type'])));
+  // 第二轮开始注入system prompt
+  if (messages.length > 2) {
+    if (hasFileOrImage) {
+      let newFileMessage = {
+        "content": "关注用户最新发送文件和消息",
+        "role": "system"
+      };
+      messages.splice(messages.length - 1, 0, newFileMessage);
+      logger.info("注入提升尾部文件注意力system prompt");
+    } else {
+      let newTextMessage = {
+        "content": "关注用户最新的消息",
+        "role": "system"
+      };
+      messages.splice(messages.length - 1, 0, newTextMessage);
+      logger.info("注入提升尾部消息注意力system prompt");
+    }
+  }
 
-  const content = validMessages.reduce((content, message) => {
+  const content = messages.reduce((content, message) => {
     if (Array.isArray(message.content)) {
       return message.content.reduce((_content, v) => {
-        if (!_.isObject(v) || v['type'] != 'text')
-          return _content;
-        return _content + (v['text'] || '');
+        if (!_.isObject(v) || v['type'] != 'text') return _content;
+        return _content + `${message.role || "user"}:${v["text"] || ""}\n`;
       }, content);
     }
     return content += `${message.role || 'user'}:${wrapUrlsToTags(message.content)}\n`;
   }, '');
+  logger.info("\n对话合并：\n" + content);
   return [
     { role: 'user', content }
   ]
@@ -486,8 +502,8 @@ async function uploadFile(fileUrl: string, refreshToken: string) {
     data: fileData,
     // 100M限制
     maxBodyLength: FILE_MAX_SIZE,
-    // 60秒超时
-    timeout: 60000,
+    // 120秒超时
+    timeout: 120000,
     headers: {
       'Content-Type': mimeType,
       Authorization: `Bearer ${token}`,