doomiaichat 7.1.17 → 7.1.18

package/dist/corzbot.js

@@ -315,7 +315,7 @@ class CorzBot extends gptbase_1.default {
             const stream = this.botid ? client.chat.stream(params) :
                 (this.workflowid ? client.workflows.runs.stream(params) :
                     client.workflows.chat.stream(params));
-            let deltaindex = 0, fullanswer = [], followup = [], cardData = [];
+            let deltaindex = 0, fullanswer = [], cardfollowup = [], followup = [], cardData = [];
             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;) {
@@ -353,8 +353,12 @@ class CorzBot extends gptbase_1.default {
                                             const allCards = cardResource.replace(/[\x00-\x1F\x7F]/g, '').split('|');
                                             for (const item of allCards) {
                                                 const cardinfo = (0, querystring_1.parse)(item);
-                                                if (cardinfo.type && cardinfo.tag)
-                                                    cardData.push(Object.assign({}, cardinfo));
+                                                if (cardinfo.type && cardinfo.tag) {
+                                                    if (cardinfo.type === 'follow_up')
+                                                        cardfollowup.push(cardinfo.tag);
+                                                    else
+                                                        cardData.push(Object.assign({}, cardinfo));
+                                                }
                                             }
                                             // 将卡片资源返回给客户端
                                             this.emit('chatcard', cardData);
@@ -396,7 +400,7 @@ class CorzBot extends gptbase_1.default {
                         if (part.event === api_1.ChatEventType.CONVERSATION_CHAT_COMPLETED ||
                             part.event === api_1.WorkflowEventType.DONE) {
                             const { conversation_id, content } = (_f = (part.data)) !== null && _f !== void 0 ? _f : {};
-                            let output = { successed: true, cards: cardData.length ? cardData : null, followup, type: 'answer', content_type: 'text', role: api_1.RoleType.Assistant, requestid, segment: null, text: content !== null && content !== void 0 ? content : fullanswer.join(''), index: index++, session_id: conversation_id };
+                            let output = { successed: true, cards: cardData.length ? cardData : null, cardfollowup, followup, type: 'answer', content_type: 'text', role: api_1.RoleType.Assistant, requestid, segment: null, text: content !== null && content !== void 0 ? content : fullanswer.join(''), index: index++, session_id: conversation_id };
                             if (attach)
                                 output = Object.assign({}, output, attach);
                             this.emit('chatdone', output);

package/package.json

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

package/src/corzbot.ts

@@ -290,7 +290,7 @@ export default class CorzBot extends GptBase {
         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 deltaindex = 0, fullanswer: string[] = [],cardfollowup: string[] = [], followup: string[] = [], cardData: CardType[] = [];
         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' });
@@ -322,7 +322,12 @@ export default class CorzBot extends GptBase {
                                 const allCards = cardResource.replace(/[\x00-\x1F\x7F]/g, '').split('|')
                                 for (const item of allCards) {
                                     const cardinfo: any = parse(item);
-                                    if (cardinfo.type && cardinfo.tag) cardData.push({ ...cardinfo })
+                                    if (cardinfo.type && cardinfo.tag) {
+                                        if (cardinfo.type === 'follow_up') 
+                                            cardfollowup.push(cardinfo.tag);
+                                        else
+                                            cardData.push({ ...cardinfo })
+                                    }
                                 }
                                 // 将卡片资源返回给客户端
                                 this.emit('chatcard', cardData);
@@ -360,7 +365,7 @@ export default class CorzBot extends GptBase {
                 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 };
+                let output = { successed: true, cards: cardData.length ? cardData : null, cardfollowup, 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)
             }