首轮不注入注意力prompt

optimize code in messagesPrepare

package.json

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

src/api/controllers/chat.ts

@@ -328,21 +328,27 @@ async function fakeRequest(refreshToken: string) {
  * @param messages 参考gpt系列消息格式，多轮对话请完整提供上下文
  */
 function extractRefFileUrls(messages: any[]) {
-  return messages.reduce((urls, message) => {
+  const urls = [];
-    if (_.isArray(message.content)) {
+  // 如果没有消息，则返回[]
-      message.content.forEach(v => {
+  if (!messages.length) {
-        if (!_.isObject(v) || !['file', 'image_url'].includes(v['type']))
-          return;
-        // kimi-free-api支持格式
-        if (v['type'] == 'file' && _.isObject(v['file_url']) && _.isString(v['file_url']['url']))
-          urls.push(v['file_url']['url']);
-        // 兼容gpt-4-vision-preview API格式
-        else if (v['type'] == 'image_url' && _.isObject(v['image_url']) && _.isString(v['image_url']['url']))
-          urls.push(v['image_url']['url']);
-      });
-    }
     return urls;
-  }, []);
+  }
+  // 只获取最新的消息
+  const lastMessage = messages[messages.length - 1];
+  if (_.isArray(lastMessage.content)) {
+    lastMessage.content.forEach(v => {
+      if (!_.isObject(v) || !['file', 'image_url'].includes(v['type']))
+        return;
+      // kimi-free-api支持格式
+      if (v['type'] == 'file' && _.isObject(v['file_url']) && _.isString(v['file_url']['url']))
+        urls.push(v['file_url']['url']);
+      // 兼容gpt-4-vision-preview API格式
+      else if (v['type'] == 'image_url' && _.isObject(v['image_url']) && _.isString(v['image_url']['url']))
+        urls.push(v['image_url']['url']);
+    });
+  }
+  logger.info("本次请求上传：" + urls.length + "个文件");
+  return urls;
 }
 
 /**
@@ -356,17 +362,39 @@ function extractRefFileUrls(messages: any[]) {
  * @param messages 参考gpt系列消息格式，多轮对话请完整提供上下文
  */
 function messagesPrepare(messages: any[]) {
+  // 注入消息提升注意力
+  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 = messages.reduce((content, message) => {
-    if (_.isArray(message.content)) {
+    if (Array.isArray(message.content)) {
       return message.content.reduce((_content, v) => {
-        if (!_.isObject(v) || v['type'] != 'text')
+        if (!_.isObject(v) || v['type'] != 'text') return _content;
-          return _content;
+        return _content + `${message.role || "user"}:${v["text"] || ""}\n`;
-        return _content + (v['text'] || '');
       }, content);
     }
     return content += `${message.role || 'user'}:${wrapUrlsToTags(message.content)}\n`;
   }, '');
-
+  logger.info("\n对话合并：\n" + content);
   return [
     { role: 'user', content }
   ]
@@ -474,8 +502,8 @@ async function uploadFile(fileUrl: string, refreshToken: string) {
     data: fileData,
     // 100M限制
     maxBodyLength: FILE_MAX_SIZE,
-    // 60秒超时
+    // 120秒超时
-    timeout: 60000,
+    timeout: 120000,
     headers: {
       'Content-Type': mimeType,
       Authorization: `Bearer ${token}`,