Upload chat.js

src/router/chat.js

@@ -94,74 +94,117 @@ async function convertOpenAIToMammouth(openaiRequest, requestId = null) {
 
   for (const message of regularMessages) {
     // 处理包含图片的消息
-    const imagesData = []
     let content = message.content
+    let processedMessages = [] // 存储处理后的消息（可能包含多个片段）
 
     // 如果是对象数组（多模态内容）
     if (Array.isArray(message.content)) {
       const textParts = []
+      const imageParts = []
 
-      // 遍历内容部分
+      // 分离文本和图片部分
       for (const part of message.content) {
         if (part.type === 'text') {
           textParts.push(part.text)
         } else if (part.type === 'image_url') {
-          try {
-            // 获取图片数据
-            let imageUrl = part.image_url
-            if (typeof imageUrl === 'object' && imageUrl.url) {
-              imageUrl = imageUrl.url
-            }
+          imageParts.push(part)
+        }
+      }
 
-            // 使用智能上传方法处理图片（支持长图）
-            let uploadedUrls = []
-            if (imageUrl.startsWith('data:image')) {
-              uploadedUrls = await imageUploader.uploadFromBase64Smart(
-                imageUrl,
-                null,
-                requestId,
-                currentImageIndex
-              )
-            } else {
-              uploadedUrls = await imageUploader.uploadFromUrlSmart(
-                imageUrl,
-                null,
-                requestId,
-                currentImageIndex
-              )
-            }
+      // 合并所有文本部分
+      const combinedText = textParts.join('\n')
 
-            // 将所有上传的URL添加到imagesData中
-            // 对于长图，这将包含多个片段的URL
-            imagesData.push(...uploadedUrls)
+      // 处理每个图片
+      for (const imagePart of imageParts) {
+        try {
+          // 获取图片数据
+          let imageUrl = imagePart.image_url
+          if (typeof imageUrl === 'object' && imageUrl.url) {
+            imageUrl = imageUrl.url
+          }
+
+          // 使用智能上传方法处理图片（支持长图）
+          let uploadedUrls = []
+          if (imageUrl.startsWith('data:image')) {
+            uploadedUrls = await imageUploader.uploadFromBase64Smart(
+              imageUrl,
+              null,
+              requestId,
+              currentImageIndex
+            )
+          } else {
+            uploadedUrls = await imageUploader.uploadFromUrlSmart(
+              imageUrl,
+              null,
+              requestId,
+              currentImageIndex
+            )
+          }
+
+          // 如果是长图（多个片段），为每个片段创建单独的消息
+          if (uploadedUrls.length > 1) {
+            console.log(`[长图处理] 图片${currentImageIndex}被切割为${uploadedUrls.length}个片段，将按顺序发送`)
 
-            currentImageIndex++
-          } catch (error) {
             if (requestId) {
-              logger.logError(requestId, 'IMAGE_PROCESSING_ERROR', error.message, {
-                imageIndex: currentImageIndex,
-                imageUrl: typeof part.image_url === 'string' ? part.image_url.substring(0, 100) : 'object'
-              })
+              logger.logMessageSegmentation(requestId, currentImageIndex, uploadedUrls.length)
             }
-            console.error('图片处理错误:', error.message)
-            currentImageIndex++
+
+            uploadedUrls.forEach((url, segmentIndex) => {
+              const segmentText = segmentIndex === 0
+                ? `${combinedText}\n\n[长图片段 ${segmentIndex + 1}/${uploadedUrls.length}]`
+                : `[长图片段 ${segmentIndex + 1}/${uploadedUrls.length}]`
+
+              processedMessages.push({
+                content: segmentText || '.',
+                imagesData: [url],
+                documentsData: []
+              })
+
+              console.log(`[消息生成] 片段${segmentIndex + 1}: "${segmentText.substring(0, 50)}..."`)
+            })
+          } else {
+            // 普通图片，添加到当前消息
+            processedMessages.push({
+              content: combinedText || '.',
+              imagesData: uploadedUrls,
+              documentsData: []
+            })
           }
+
+          currentImageIndex++
+        } catch (error) {
+          if (requestId) {
+            logger.logError(requestId, 'IMAGE_PROCESSING_ERROR', error.message, {
+              imageIndex: currentImageIndex,
+              imageUrl: typeof imagePart.image_url === 'string' ? imagePart.image_url.substring(0, 100) : 'object'
+            })
+          }
+          console.error('图片处理错误:', error.message)
+          currentImageIndex++
         }
       }
 
-      // 将所有文本部分合并
-      content = textParts.join('\n')
-    }
-    if (!content || content === '') {
-      // 如���只上传了图片而没有文本,则添加".",防止报错
-      content = '.'
+      // 如果没有图片，只有文本
+      if (imageParts.length === 0) {
+        processedMessages.push({
+          content: combinedText || '.',
+          imagesData: [],
+          documentsData: []
+        })
+      }
+    } else {
+      // 纯文本消息
+      processedMessages.push({
+        content: content || '.',
+        imagesData: [],
+        documentsData: []
+      })
     }
 
-    form.append('messages', JSON.stringify({
-      content: content,
-      imagesData: imagesData,
-      documentsData: []
-    }))
+    // 将所有处理后的消息添加到表单
+    processedMessages.forEach(msg => {
+      form.append('messages', JSON.stringify(msg))
+    })
   }
 
   return form