eoss-ui 0.6.39 → 0.6.40

package/lib/dialog.js

@@ -547,10 +547,18 @@ var ajaxStream = function ajaxStream(_ref2) {
     if (params && !Object.prototype.hasOwnProperty.call(params, 'userId') && userId) {
       params.userId = getStorage('userId');
     }
-    var info = {};
+    var info = {
+      time: 0,
+      conversationId: '',
+      content: '',
+      thinkContent: '',
+      primeval: '',
+      chunk: ''
+    };
     var partialData = '';
     var lastProcessedIndex = 0;
     var done = false;
+    var finishThink = false;
     ajax(_extends({
       timeout: 990000,
       format: false,
@@ -565,6 +573,9 @@ var ajaxStream = function ajaxStream(_ref2) {
         // 获取从上次处理后新增的数据
         var currentResponse = (progressEvent.event || progressEvent).currentTarget.responseText;
         var chunk = currentResponse.slice(lastProcessedIndex);
+        if (chunk === 'data:') {
+          return;
+        }
 
         // 更新偏移量
         lastProcessedIndex = currentResponse.length;
@@ -573,7 +584,12 @@ var ajaxStream = function ajaxStream(_ref2) {
         partialData += chunk;
         var lines = partialData.split('\n');
         var remainingData = ''; // 用于保存未完整处理的部分数据
+        var primeval = '';
+        var chunks = '';
         lines.forEach(function (line) {
+          if (line === '') {
+            return;
+          }
           if (line.startsWith('data:')) {
             var _data = line.replace('data:', '').trim();
             if (_data) {
@@ -582,8 +598,6 @@ var ajaxStream = function ajaxStream(_ref2) {
                 var parsedData = JSON.parse(_data);
                 info.time = parsedData.time;
                 info.conversationId = parsedData.conversationId;
-
-                // 使用正则表达式匹配 <think> 标签
                 var thinkRegex = /<think>([\s\S]*?)<\/think>([\s\S]*)?/;
                 var match = parsedData.message.match(thinkRegex);
                 if (match) {
@@ -593,20 +607,43 @@ var ajaxStream = function ajaxStream(_ref2) {
                   info.thinkContent += thinkContent;
                   info.content += content;
                 } else {
-                  // 如果没有 <think> 标签，直接将消息内容赋值到 content
-                  info.content += parsedData.message;
+                  var startRegex = /<think>([\s\S]*)/;
+                  var endRegex = /([\s\S]*?)<\/think>([\s\S]*)?/;
+                  var start = parsedData.message.match(startRegex);
+                  var end = parsedData.message.match(endRegex);
+                  if (start) {
+                    var _thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
+                    info.thinkContent += _thinkContent;
+                  } else {
+                    if (end) {
+                      finishThink = true;
+                      var _thinkContent2 = end[1] ? end[1].trim() : ''; // <think> 标签后的数据
+                      var _content = end[2] ? end[2].trim() : '';
+                      // 更新 AI 消息内容
+                      info.thinkContent += _thinkContent2;
+                      info.content += _content;
+                      chunks += _content;
+                    } else if (finishThink) {
+                      info.content += parsedData.message;
+                      chunks += parsedData.message;
+                    } else {
+                      info.thinkContent += parsedData.message;
+                    }
+                  }
                 }
+                primeval += parsedData.message;
                 done = parsedData.done;
               } catch (parseError) {
                 console.error('解析数据出错:', parseError);
               }
-              // Promise.resolve({message: info, controller});
             }
           } else {
             // 保存未处理完的部分数据
             remainingData += line + '\n';
           }
         });
+        info.primeval = primeval;
+        info.chunk = chunks;
 
         // 将未完整处理的数据保留到 partialData 中
         partialData = remainingData;