doomiaichat 7.1.13 → 7.1.15

package/dist/corzbot.js

@@ -31,6 +31,7 @@ const DeepThinkingAction = {
     thinking: { start: '<xiaolu-think>', end: '</xiaolu-think>', tag: 'xiaolu-think' },
     reasoning: { start: '<xiaolu-reason>', end: '</xiaolu-reason>', tag: 'xiaolu-reason' },
     card: { start: '<xiaolu-card>', end: '</xiaolu-card>', tag: 'xiaolu-card' },
+    preresponse: { start: '<xiaolu-preresponse>', end: '</xiaolu-preresponse>', tag: 'xiaolu-preresponse' },
 };
 // 定义深度思考的状态
 var DeepThinkingStatus;
@@ -256,7 +257,8 @@ class CorzBot extends gptbase_1.default {
         //                            (status===DeepThinkingStatus.ReasonOutput ? content.indexOf("{\"reasoning_content") : content.indexOf("{\"card_resource")) ;
         const xmlTagLocation = [content.indexOf(DeepThinkingAction.thinking.start),
             content.indexOf(DeepThinkingAction.reasoning.start),
-            content.indexOf(DeepThinkingAction.card.start)];
+            content.indexOf(DeepThinkingAction.card.start),
+            content.indexOf(DeepThinkingAction.preresponse.start)];
         let minLocation = 10000, minIndex = -1;
         // 找到最小的并且大于0 的位置的下标
         xmlTagLocation.forEach((x, index) => {
@@ -269,7 +271,7 @@ class CorzBot extends gptbase_1.default {
         const thinkingStartIndex = minIndex >= 0 ? minLocation : -1; //tagLocation.length > 0 ? Math.min(...tagLocation) : -1;
         if (thinkingStartIndex < 0)
             return { content, status: DeepThinkingStatus.ThinkingOver };
-        const currentAction = [DeepThinkingAction.thinking, DeepThinkingAction.reasoning, DeepThinkingAction.card][minIndex];
+        const currentAction = [DeepThinkingAction.thinking, DeepThinkingAction.reasoning, DeepThinkingAction.card, DeepThinkingAction.preresponse][minIndex];
         const currentActionIsOver = content.indexOf(currentAction.end, thinkingStartIndex);
         const thinkingEndIndex = currentActionIsOver >= 0 ? currentActionIsOver : content.indexOf('</', thinkingStartIndex);
         const thinkingContent = this.extractXmlContent(content.substring(thinkingStartIndex, thinkingEndIndex >= 0 ? thinkingEndIndex : undefined) + currentAction.end, currentAction.tag); //"\"}";
@@ -315,7 +317,7 @@ class CorzBot extends gptbase_1.default {
                 (this.workflowid ? client.workflows.runs.stream(params) :
                     client.workflows.chat.stream(params));
             let deltaindex = 0, fullanswer = [], followup = [], cardData = [];
-            let deepThinking = '', thinkingStatus = DeepThinkingStatus.None, cardResource = ''; // 是否在深度思考中
+            let deepThinking = '', thinkingStatus = DeepThinkingStatus.None, cardResource = '', preresponseText = ''; // 是否在深度思考中
             try {
                 for (var _g = true, stream_1 = __asyncValues(stream), stream_1_1; stream_1_1 = yield stream_1.next(), _a = stream_1_1.done, !_a;) {
                     _c = stream_1_1.value;
@@ -327,6 +329,8 @@ class CorzBot extends gptbase_1.default {
                         if (part.event === api_1.ChatEventType.CONVERSATION_MESSAGE_DELTA ||
                             part.event === api_1.WorkflowEventType.MESSAGE) {
                             let { conversation_id, content_type, type = 'answer', role = 'assistant', content, reasoning_content: reasoning } = part.data;
+                            if (content === 'Default')
+                                continue;
                             if (!content && reasoning) {
                                 this.emit('chatthinking', { text: reasoning, completed: false, action: 'deep-thinking' });
                                 continue;
@@ -357,6 +361,16 @@ class CorzBot extends gptbase_1.default {
                                             this.emit('chatcard', cardData);
                                         }
                                     }
+                                    else if (thinking.action === DeepThinkingAction.preresponse) {
+                                        /// 当正文一样输出
+                                        const spiltPreresponse = result.thinking.text.slice(preresponseText.length);
+                                        preresponseText = result.thinking.text;
+                                        fullanswer.push(spiltPreresponse); // = [result.thinking.text];// .push(result.thinking.text);
+                                        let output = { successed: true, type, content_type, role, requestid, segment: spiltPreresponse, text: fullanswer.join(''), index: index++, session_id: conversation_id };
+                                        if (attach)
+                                            output = Object.assign({}, output, attach);
+                                        this.emit('chattext', output);
+                                    }
                                     else {
                                         this.emit('chatthinking', { text: result.thinking.text, completed: result.thinking.completed, action: (_d = thinking.action) === null || _d === void 0 ? void 0 : _d.tag });
                                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doomiaichat",
-  "version": "7.1.13",
+  "version": "7.1.15",
   "description": "Doomisoft OpenAI",
   "main": "dist/index.js",
   "scripts": {

package/src/corzbot.ts

@@ -32,6 +32,7 @@ const DeepThinkingAction: any = {
     thinking: { start: '<xiaolu-think>', end: '</xiaolu-think>', tag: 'xiaolu-think' },
     reasoning: { start: '<xiaolu-reason>', end: '</xiaolu-reason>', tag: 'xiaolu-reason' },
     card: { start: '<xiaolu-card>', end: '</xiaolu-card>', tag: 'xiaolu-card' },
+    preresponse: { start: '<xiaolu-preresponse>', end: '</xiaolu-preresponse>', tag: 'xiaolu-preresponse' },
 }
 // 定义深度思考的状态
 enum DeepThinkingStatus {
@@ -56,8 +57,8 @@ export default class CorzBot extends GptBase {
     constructor(private authorizationProvider: CorzAuthorization, private setting: any = {}) {
         super();
         ////初始化扣子客户端
-        
-        if (this.setting.workflowid) 
+
+        if (this.setting.workflowid)
             this.workflowid = this.setting.workflowid;
         else if (this.setting.talkflowid)
             this.talkflowid = this.setting.talkflowid;
@@ -126,18 +127,18 @@ export default class CorzBot extends GptBase {
                 additional_messages: message,
                 user_id: callChatOption.userid || callChatOption.cozeUserID,
                 conversation_id,
-                parameters: Object.assign({ request_src:1 }, callChatOption.parameters || {}),
+                parameters: Object.assign({ request_src: 1 }, callChatOption.parameters || {}),
             }
             req.custom_variables = Object.assign({}, this.setting.customVariables || {}, callChatOption.customVariables || {});
             return req as T;
         }
-        if (this.workflowid){
+        if (this.workflowid) {
             const worflowreq: RunWorkflowReq = {
                 ext: callChatOption.ext,
                 workflow_id: this.workflowid,//callChatOption.workflowid,
                 is_async: false,
                 // parameters: Object.assign({ input: message[0]?.content }, this.setting.customVariables || {}, callChatOption.customVariables || {}),
-                parameters: Object.assign({ request_src :1},callChatOption.parameters || {}, { input: message[0]?.content})
+                parameters: Object.assign({ request_src: 1 }, callChatOption.parameters || {}, { input: message[0]?.content })
             }
             return worflowreq as T;
         }
@@ -146,7 +147,7 @@ export default class CorzBot extends GptBase {
             ext: callChatOption.ext,
             workflow_id: this.talkflowid!,//callChatOption.workflowid,
             conversation_id,
-            parameters: Object.assign({request_src:1},callChatOption.parameters || {}) //Object.assign({}, this.setting.customVariables || {}, callChatOption.customVariables || {}),
+            parameters: Object.assign({ request_src: 1 }, callChatOption.parameters || {}) //Object.assign({}, this.setting.customVariables || {}, callChatOption.customVariables || {}),
             //parameters: { input: message[0]?.content }
         }
         return worflowreq as T;
@@ -188,7 +189,7 @@ export default class CorzBot extends GptBase {
         ////如果参数中用的是Workflow，则调用对话流来输出结果
         ////否则用智能体的对话来输出结果
         const params = await this.getRequestStream(client, message, callChatOption);
-        const response = this.botid ? await client.chat.create(params as CreateChatReq) :await client.workflows.runs.create(params as RunWorkflowReq);
+        const response = this.botid ? await client.chat.create(params as CreateChatReq) : await client.workflows.runs.create(params as RunWorkflowReq);
         if (this.workflowid && (response as RunWorkflowData).msg === 'Success') {
             const resp = (response as RunWorkflowData).data;
             return { successed: true, message: [{ role: 'assistant', type: 'answer', content: resp }] };
@@ -237,7 +238,8 @@ export default class CorzBot extends GptBase {
         //                            (status===DeepThinkingStatus.ReasonOutput ? content.indexOf("{\"reasoning_content") : content.indexOf("{\"card_resource")) ;
         const xmlTagLocation = [content.indexOf(DeepThinkingAction.thinking.start),
         content.indexOf(DeepThinkingAction.reasoning.start),
-        content.indexOf(DeepThinkingAction.card.start)];
+        content.indexOf(DeepThinkingAction.card.start),
+        content.indexOf(DeepThinkingAction.preresponse.start)];
         let minLocation = 10000, minIndex = -1;
         // 找到最小的并且大于0 的位置的下标
         xmlTagLocation.forEach((x, index) => {
@@ -249,18 +251,19 @@ export default class CorzBot extends GptBase {
         // const tagLocation = xmlTagLocation.filter(x => x >= 0);
         const thinkingStartIndex = minIndex >= 0 ? minLocation : -1; //tagLocation.length > 0 ? Math.min(...tagLocation) : -1;
         if (thinkingStartIndex < 0) return { content, status: DeepThinkingStatus.ThinkingOver };
-        const currentAction = [DeepThinkingAction.thinking, DeepThinkingAction.reasoning, DeepThinkingAction.card][minIndex];
+        const currentAction = [DeepThinkingAction.thinking, DeepThinkingAction.reasoning, DeepThinkingAction.card, DeepThinkingAction.preresponse][minIndex];
         const currentActionIsOver = content.indexOf(currentAction.end, thinkingStartIndex);
-        const thinkingEndIndex = currentActionIsOver >= 0 ? currentActionIsOver: content.indexOf('</', thinkingStartIndex);
+        const thinkingEndIndex = currentActionIsOver >= 0 ? currentActionIsOver : content.indexOf('</', thinkingStartIndex);
         const thinkingContent = this.extractXmlContent(content.substring(thinkingStartIndex, thinkingEndIndex >= 0 ? thinkingEndIndex : undefined) + currentAction.end, currentAction.tag);  //"\"}";
         if (currentActionIsOver >= 0) content = content.substring(currentActionIsOver + currentAction.end.length);
-        return { 
+        return {
             thinking: {
                 action: currentAction,
                 text: thinkingContent,//Object.values(thinkingObject)[0]
                 completed: currentActionIsOver >= 0
-            }, content};
-       
+            }, content
+        };
+
     }
     /**
      * 流式传输聊天请求
@@ -285,18 +288,19 @@ export default class CorzBot extends GptBase {
         ////否则用智能体的对话来输出结果
         let requestid = Math.ceil(Math.random() * (new Date().getTime() * Math.random()) / 1000), index = 0;
         const params = await this.getRequestStream(client, message, callChatOption);
-        const stream = this.botid ? client.chat.stream(params as StreamChatReq) : 
-            (this.workflowid ? client.workflows.runs.stream(params as RunWorkflowReq) : 
-            client.workflows.chat.stream(params as ChatWorkflowReq)) ;
+        const stream = this.botid ? client.chat.stream(params as StreamChatReq) :
+            (this.workflowid ? client.workflows.runs.stream(params as RunWorkflowReq) :
+                client.workflows.chat.stream(params as ChatWorkflowReq));
         let deltaindex = 0, fullanswer: string[] = [], followup: string[] = [], cardData: CardType[] = [];
-        let deepThinking = '', thinkingStatus = DeepThinkingStatus.None, cardResource = ''; // 是否在深度思考中
+        let deepThinking = '', thinkingStatus = DeepThinkingStatus.None, cardResource = '', preresponseText=''; // 是否在深度思考中
         for await (const part of stream) {
             if (part.event === ChatEventType.ERROR) return this.emit('chaterror', { successed: false, error: 'call failed' });
             if (part.event === ChatEventType.CONVERSATION_MESSAGE_DELTA ||
                 part.event === WorkflowEventType.MESSAGE
             ) {
                 let { conversation_id, content_type, type = 'answer', role = 'assistant', content, reasoning_content: reasoning } = part.data as any;
-                if (!content&& reasoning) {
+                if (content === 'Default') continue;
+                if (!content && reasoning) {
                     this.emit('chatthinking', { text: reasoning, completed: false, action: 'deep-thinking' });
                     continue;
                 }
@@ -324,7 +328,16 @@ export default class CorzBot extends GptBase {
                                 // 将卡片资源返回给客户端
                                 this.emit('chatcard', cardData);
                             }
-                        } else {
+                        } else if(thinking.action === DeepThinkingAction.preresponse){
+                            /// 当正文一样输出
+                            const spiltPreresponse = result.thinking.text.slice(preresponseText.length)
+                            preresponseText = result.thinking.text;
+                            fullanswer.push(spiltPreresponse);// = [result.thinking.text];// .push(result.thinking.text);
+                            let output = { successed: true, type, content_type, role, requestid, segment: spiltPreresponse, text: fullanswer.join(''), index: index++, session_id: conversation_id };
+                            if (attach) output = Object.assign({}, output, attach);
+                            this.emit('chattext', output)
+                        } 
+                        else {
                             this.emit('chatthinking', { text: result.thinking.text, completed: result.thinking.completed, action: thinking.action?.tag });
                         }
                     }
@@ -347,8 +360,8 @@ export default class CorzBot extends GptBase {
             if (part.event === ChatEventType.CONVERSATION_CHAT_COMPLETED ||
                 part.event === WorkflowEventType.DONE
             ) {
-                const { conversation_id, content } =( part.data )?? {} as any;
-                let output = { successed: true, cards: cardData.length ? cardData : null, followup, type: 'answer', content_type: 'text', role: RoleType.Assistant, requestid, segment: null, text: content??fullanswer.join(''), index: index++, session_id: conversation_id };
+                const { conversation_id, content } = (part.data) ?? {} as any;
+                let output = { successed: true, cards: cardData.length ? cardData : null, followup, type: 'answer', content_type: 'text', role: RoleType.Assistant, requestid, segment: null, text: content ?? fullanswer.join(''), index: index++, session_id: conversation_id };
                 if (attach) output = Object.assign({}, output, attach);
                 this.emit('chatdone', output)
             }