doomiaichat 7.1.17 → 7.1.19

package/dist/corzauthorization.d.ts

@@ -1,5 +1,5 @@
 export declare class CorzAuthorization {
-    private appid;
+    appid: string;
     private accessToken;
     private expiresAt;
     private pemfile;

package/dist/corzbot.d.ts

@@ -28,7 +28,7 @@ export default class CorzBot extends GptBase {
      * @param params
      * @returns
      */
-    setVariables(params: any): Promise<ApiResult>;
+    setVariables(params?: any): Promise<ApiResult>;
     /**
      * 获取设置的变量
      * @returns

package/dist/corzbot.js

@@ -99,11 +99,17 @@ class CorzBot extends gptbase_1.default {
      * @param params
      * @returns
      */
-    setVariables(params) {
+    setVariables(params = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const client = yield this.createClient();
-            const cozeParams = Object.assign({}, this.botid ? { bot_id: this.botid } : {}, params);
-            client.variables.update(cozeParams);
+            !params.type && (params.type = 'app');
+            const cozeParams = { data: params.data };
+            params.type === 'app' && (cozeParams.app_id = this.authorizationProvider.appid);
+            params.type === 'bot' && this.botid && (cozeParams.bot_id = this.botid);
+            params.user_id && (cozeParams.connector_uid = params.user_id);
+            //Object.assign({ connector_uid: params?.user_id||'123456' }, params.type==='app'?{app_id:this.authorizationProvider.appid}:(params.type==='bot' ? { bot_id: this.botid } : {}), params);
+            const result = yield client.variables.update(cozeParams, { debug: true });
+            console.log('setVariables result', result);
             return { successed: true };
         });
     }
@@ -207,9 +213,15 @@ class CorzBot extends gptbase_1.default {
             ////否则用智能体的对话来输出结果
             const params = yield this.getRequestStream(client, message, callChatOption);
             const response = this.botid ? yield client.chat.create(params) : yield client.workflows.runs.create(params);
-            if (this.workflowid && response.msg === 'Success') {
-                const resp = response.data;
-                return { successed: true, message: [{ role: 'assistant', type: 'answer', content: resp }] };
+            if (this.workflowid) {
+                const workflowResp = response;
+                if (workflowResp.msg === 'Success') {
+                    const resp = workflowResp.data;
+                    return { successed: true, message: [{ role: 'assistant', type: 'answer', content: resp }] };
+                }
+                else {
+                    console.error('workflow run failed', workflowResp.msg, workflowResp);
+                }
                 // try {
                 //     return { successed: true, message: [{ role: 'assistant', type: 'answer', content: JSON.parse(resp).data }] };
                 // } catch (error) {
@@ -315,7 +327,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 +365,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 +412,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: cardfollowup.filter(x => typeof x === 'string' && x.length > 0), 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.19",
   "description": "Doomisoft OpenAI",
   "main": "dist/index.js",
   "scripts": {

package/src/corzauthorization.ts

@@ -7,7 +7,7 @@ export class CorzAuthorization {
     private pemfile: string;
     private secret: string;
     private sessionName: string;
-    constructor(private appid: string,setting:Record<string,any>) {
+    constructor(public appid: string,setting:Record<string,any>) {
         this.secret = setting["keyid"];
         this.pemfile = setting["pemfile"] ||  "private.pem"
         this.sessionName = setting["sessionName"] || "default";

package/src/corzbot.ts

@@ -94,10 +94,16 @@ export default class CorzBot extends GptBase {
      * @param params 
      * @returns 
      */
-    override async setVariables(params: any): Promise<ApiResult> {
+    override async setVariables(params: any = {}): Promise<ApiResult> {
         const client = await this.createClient();
-        const cozeParams: VariableUpdateReq = Object.assign({}, this.botid ? { bot_id: this.botid } : {}, params);
-        client.variables.update(cozeParams)
+        !params.type && (params.type='app');
+        const cozeParams: VariableUpdateReq = { data: params.data }; 
+        params.type === 'app' && (cozeParams.app_id = this.authorizationProvider.appid);
+        params.type === 'bot' && this.botid && (cozeParams.bot_id = this.botid);
+        params.user_id && (cozeParams.connector_uid = params.user_id);
+        //Object.assign({ connector_uid: params?.user_id||'123456' }, params.type==='app'?{app_id:this.authorizationProvider.appid}:(params.type==='bot' ? { bot_id: this.botid } : {}), params);
+        const result = await client.variables.update(cozeParams, { debug : true })
+        console.log('setVariables result', result);
         return { successed: true };
     }
     /**
@@ -189,9 +195,14 @@ export default class CorzBot extends GptBase {
         ////否则用智能体的对话来输出结果
         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);
-        if (this.workflowid && (response as RunWorkflowData).msg === 'Success') {
-            const resp = (response as RunWorkflowData).data;
-            return { successed: true, message: [{ role: 'assistant', type: 'answer', content: resp }] };
+        if (this.workflowid) {
+            const workflowResp = response as RunWorkflowData;
+            if (workflowResp.msg === 'Success'){
+                const resp = workflowResp.data;
+                return { successed: true, message: [{ role: 'assistant', type: 'answer', content: resp }] };
+            }else{
+                console.error('workflow run failed', workflowResp.msg, workflowResp)
+            }
             // try {
             //     return { successed: true, message: [{ role: 'assistant', type: 'answer', content: JSON.parse(resp).data }] };
             // } catch (error) {
@@ -290,7 +301,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 +333,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 +376,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: cardfollowup.filter(x=>typeof x === 'string' && x.length > 0), 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)
             }