@ibiz-template/vue3-components 0.7.41-alpha.149 → 0.7.41-alpha.150

package/es/util/ai-chat-util/ai-chat-util.mjs

@@ -19,6 +19,8 @@ class AIChatUtil {
     __publicField(this, "TEMP_CHAT_SUFFIX", "temp");
     __publicField(this, "UNKOWN_CHAT_SUFFIX", "unknow");
     __publicField(this, "PRE_ERROR_MESSAGE", "Expected content-type to be text/event-stream, Actual: application/json;charset=UTF-8");
+    // 无流内容回来
+    __publicField(this, "NONE_ERROR_MESSAGE", "Expected content-type to be text/event-stream, Actual: null");
   }
   /**
    * 获取AI聊天对象
@@ -366,7 +368,9 @@ class AIChatUtil {
         await deService.aiChatSse(
           (msg) => {
             if (msg.actionstate === 20 && msg.actionresult) {
-              aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
+              if (!aiChat.getActiveAsyncacitonId()) {
+                aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
+              }
               aiChat.addMessage({
                 messageid: id,
                 state: msg.actionstate,
@@ -431,6 +435,7 @@ class AIChatUtil {
         abortController == null ? void 0 : abortController.abort();
       } finally {
         aiChat.completeMessage(id, true);
+        aiChat.setActiveAsyncacitonId("");
         return true;
       }
     };
@@ -467,6 +472,106 @@ class AIChatUtil {
       });
       await aiChat.completeMessage(id, true);
     };
+    chatOptions.resumeQuestion = async (aiChat, ctx, param, other, arr) => {
+      if (other.asyncacitonid) {
+        id = createUUID();
+        abortController = new AbortController();
+        const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
+        const resumeRequestData = { asyncacitonid: other.asyncacitonid };
+        if (other.sessionid) {
+          Object.assign(resumeRequestData, {
+            sessionid: other.sessionid
+          });
+        }
+        if (other.srfaiagent) {
+          Object.assign(resumeRequestData, {
+            srfaiagent: other.srfaiagent
+          });
+        }
+        if (other.srfproject)
+          Object.assign(resumeRequestData, {
+            srfproject: other.srfproject
+          });
+        try {
+          await deService.aiResumeSse(
+            (msg) => {
+              if (msg.actionstate === 20 && msg.actionresult) {
+                aiChat.isLoading.value = true;
+                if (!aiChat.getActiveAsyncacitonId()) {
+                  aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
+                }
+                aiChat.addMessage({
+                  messageid: id,
+                  state: msg.actionstate,
+                  type: "DEFAULT",
+                  role: "ASSISTANT",
+                  content: msg.actionresult,
+                  status: "pending"
+                });
+              } else if (msg.actionstate === 30 && msg.actionresult) {
+                const result = JSON.parse(msg.actionresult);
+                if (result.usage) {
+                  aiChat.updateMsgUsage(id, result.usage);
+                }
+                const choices = result.choices;
+                if (choices && choices.length > 0) {
+                  aiChat.replaceMessage({
+                    messageid: id,
+                    state: msg.actionstate,
+                    type: "DEFAULT",
+                    role: "ASSISTANT",
+                    content: choices[0].content || "",
+                    realmessageid: choices[0].messageid,
+                    status: "sent"
+                  });
+                }
+              } else if (msg.actionstate === 40) {
+                aiChat.replaceMessage({
+                  messageid: id,
+                  state: msg.actionstate,
+                  type: "ERROR",
+                  role: "ASSISTANT",
+                  errorText: msg.actionresult,
+                  status: "failed"
+                });
+              }
+            },
+            abortController,
+            ctx,
+            { srfactag: param.srfactag },
+            { ...resumeRequestData }
+          );
+        } catch (error) {
+          if (error && error.message !== this.NONE_ERROR_MESSAGE) {
+            if (error && error.message !== this.PRE_ERROR_MESSAGE) {
+              aiChat.replaceMessage({
+                messageid: id,
+                state: 40,
+                type: "ERROR",
+                role: "ASSISTANT",
+                errorText: error.message || ibiz.i18n.t("app.aiError"),
+                status: "failed"
+              });
+            } else {
+              const lastMessage = arr[arr.length - 1];
+              aiChat.replaceMessage(
+                {
+                  ...lastMessage,
+                  state: 40
+                },
+                false
+              );
+            }
+          }
+          abortController == null ? void 0 : abortController.abort();
+        } finally {
+          aiChat.isLoading.value = false;
+          aiChat.completeMessage(id, true);
+          aiChat.setActiveAsyncacitonId("");
+          return true;
+        }
+      }
+    };
     chatOptions.supplementQuestion = async (aiChat, ctx, param, other) => {
       const asyncacitonid = aiChat.getActiveAsyncacitonId();
       if (asyncacitonid) {
@@ -1064,7 +1169,9 @@ class AIChatUtil {
         await deService.aiChatSse(
           (msg) => {
             if (msg.actionstate === 20 && msg.actionresult) {
-              aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
+              if (!aiChat.getActiveAsyncacitonId()) {
+                aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
+              }
               aiChat.addMessage({
                 messageid: id,
                 state: msg.actionstate,
@@ -1128,6 +1235,7 @@ class AIChatUtil {
         }
         abortController == null ? void 0 : abortController.abort();
       } finally {
+        aiChat.setActiveAsyncacitonId("");
         aiChat.completeMessage(id, true);
         return true;
       }
@@ -1165,6 +1273,106 @@ class AIChatUtil {
       });
       await aiChat.completeMessage(id, true);
     };
+    chatOptions.resumeQuestion = async (aiChat, ctx, param, other, arr) => {
+      if (other.asyncacitonid) {
+        id = createUUID();
+        abortController = new AbortController();
+        const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
+        const resumeRequestData = { asyncacitonid: other.asyncacitonid };
+        if (other.sessionid) {
+          Object.assign(resumeRequestData, {
+            sessionid: other.sessionid
+          });
+        }
+        if (other.srfaiagent) {
+          Object.assign(resumeRequestData, {
+            srfaiagent: other.srfaiagent
+          });
+        }
+        if (other.srfproject)
+          Object.assign(resumeRequestData, {
+            srfproject: other.srfproject
+          });
+        try {
+          await deService.aiResumeSse(
+            (msg) => {
+              if (msg.actionstate === 20 && msg.actionresult) {
+                aiChat.isLoading.value = true;
+                if (!aiChat.getActiveAsyncacitonId()) {
+                  aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
+                }
+                aiChat.addMessage({
+                  messageid: id,
+                  state: msg.actionstate,
+                  type: "DEFAULT",
+                  role: "ASSISTANT",
+                  content: msg.actionresult,
+                  status: "pending"
+                });
+              } else if (msg.actionstate === 30 && msg.actionresult) {
+                const result = JSON.parse(msg.actionresult);
+                if (result.usage) {
+                  aiChat.updateMsgUsage(id, result.usage);
+                }
+                const choices = result.choices;
+                if (choices && choices.length > 0) {
+                  aiChat.replaceMessage({
+                    messageid: id,
+                    state: msg.actionstate,
+                    type: "DEFAULT",
+                    role: "ASSISTANT",
+                    content: choices[0].content || "",
+                    realmessageid: choices[0].messageid,
+                    status: "sent"
+                  });
+                }
+              } else if (msg.actionstate === 40) {
+                aiChat.replaceMessage({
+                  messageid: id,
+                  state: msg.actionstate,
+                  type: "ERROR",
+                  role: "ASSISTANT",
+                  errorText: msg.actionresult,
+                  status: "failed"
+                });
+              }
+            },
+            abortController,
+            ctx,
+            { srfactag: param.srfactag },
+            { ...resumeRequestData }
+          );
+        } catch (error) {
+          if (error && error.message !== this.NONE_ERROR_MESSAGE) {
+            if (error && error.message !== this.PRE_ERROR_MESSAGE) {
+              aiChat.replaceMessage({
+                messageid: id,
+                state: 40,
+                type: "ERROR",
+                role: "ASSISTANT",
+                errorText: error.message || ibiz.i18n.t("app.aiError"),
+                status: "failed"
+              });
+            } else {
+              const lastMessage = arr[arr.length - 1];
+              aiChat.replaceMessage(
+                {
+                  ...lastMessage,
+                  state: 40
+                },
+                false
+              );
+            }
+          }
+          abortController == null ? void 0 : abortController.abort();
+        } finally {
+          aiChat.isLoading.value = false;
+          aiChat.completeMessage(id, true);
+          aiChat.setActiveAsyncacitonId("");
+          return true;
+        }
+      }
+    };
     chatOptions.supplementQuestion = async (aiChat, ctx, param, other) => {
       const asyncacitonid = aiChat.getActiveAsyncacitonId();
       if (asyncacitonid) {

package/lib/util/ai-chat-util/ai-chat-util.cjs

@@ -21,6 +21,8 @@ class AIChatUtil {
     __publicField(this, "TEMP_CHAT_SUFFIX", "temp");
     __publicField(this, "UNKOWN_CHAT_SUFFIX", "unknow");
     __publicField(this, "PRE_ERROR_MESSAGE", "Expected content-type to be text/event-stream, Actual: application/json;charset=UTF-8");
+    // 无流内容回来
+    __publicField(this, "NONE_ERROR_MESSAGE", "Expected content-type to be text/event-stream, Actual: null");
   }
   /**
    * 获取AI聊天对象
@@ -368,7 +370,9 @@ class AIChatUtil {
         await deService.aiChatSse(
           (msg) => {
             if (msg.actionstate === 20 && msg.actionresult) {
-              aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
+              if (!aiChat.getActiveAsyncacitonId()) {
+                aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
+              }
               aiChat.addMessage({
                 messageid: id,
                 state: msg.actionstate,
@@ -433,6 +437,7 @@ class AIChatUtil {
         abortController == null ? void 0 : abortController.abort();
       } finally {
         aiChat.completeMessage(id, true);
+        aiChat.setActiveAsyncacitonId("");
         return true;
       }
     };
@@ -469,6 +474,106 @@ class AIChatUtil {
       });
       await aiChat.completeMessage(id, true);
     };
+    chatOptions.resumeQuestion = async (aiChat, ctx, param, other, arr) => {
+      if (other.asyncacitonid) {
+        id = qxUtil.createUUID();
+        abortController = new AbortController();
+        const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
+        const resumeRequestData = { asyncacitonid: other.asyncacitonid };
+        if (other.sessionid) {
+          Object.assign(resumeRequestData, {
+            sessionid: other.sessionid
+          });
+        }
+        if (other.srfaiagent) {
+          Object.assign(resumeRequestData, {
+            srfaiagent: other.srfaiagent
+          });
+        }
+        if (other.srfproject)
+          Object.assign(resumeRequestData, {
+            srfproject: other.srfproject
+          });
+        try {
+          await deService.aiResumeSse(
+            (msg) => {
+              if (msg.actionstate === 20 && msg.actionresult) {
+                aiChat.isLoading.value = true;
+                if (!aiChat.getActiveAsyncacitonId()) {
+                  aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
+                }
+                aiChat.addMessage({
+                  messageid: id,
+                  state: msg.actionstate,
+                  type: "DEFAULT",
+                  role: "ASSISTANT",
+                  content: msg.actionresult,
+                  status: "pending"
+                });
+              } else if (msg.actionstate === 30 && msg.actionresult) {
+                const result = JSON.parse(msg.actionresult);
+                if (result.usage) {
+                  aiChat.updateMsgUsage(id, result.usage);
+                }
+                const choices = result.choices;
+                if (choices && choices.length > 0) {
+                  aiChat.replaceMessage({
+                    messageid: id,
+                    state: msg.actionstate,
+                    type: "DEFAULT",
+                    role: "ASSISTANT",
+                    content: choices[0].content || "",
+                    realmessageid: choices[0].messageid,
+                    status: "sent"
+                  });
+                }
+              } else if (msg.actionstate === 40) {
+                aiChat.replaceMessage({
+                  messageid: id,
+                  state: msg.actionstate,
+                  type: "ERROR",
+                  role: "ASSISTANT",
+                  errorText: msg.actionresult,
+                  status: "failed"
+                });
+              }
+            },
+            abortController,
+            ctx,
+            { srfactag: param.srfactag },
+            { ...resumeRequestData }
+          );
+        } catch (error) {
+          if (error && error.message !== this.NONE_ERROR_MESSAGE) {
+            if (error && error.message !== this.PRE_ERROR_MESSAGE) {
+              aiChat.replaceMessage({
+                messageid: id,
+                state: 40,
+                type: "ERROR",
+                role: "ASSISTANT",
+                errorText: error.message || ibiz.i18n.t("app.aiError"),
+                status: "failed"
+              });
+            } else {
+              const lastMessage = arr[arr.length - 1];
+              aiChat.replaceMessage(
+                {
+                  ...lastMessage,
+                  state: 40
+                },
+                false
+              );
+            }
+          }
+          abortController == null ? void 0 : abortController.abort();
+        } finally {
+          aiChat.isLoading.value = false;
+          aiChat.completeMessage(id, true);
+          aiChat.setActiveAsyncacitonId("");
+          return true;
+        }
+      }
+    };
     chatOptions.supplementQuestion = async (aiChat, ctx, param, other) => {
       const asyncacitonid = aiChat.getActiveAsyncacitonId();
       if (asyncacitonid) {
@@ -1066,7 +1171,9 @@ class AIChatUtil {
         await deService.aiChatSse(
           (msg) => {
             if (msg.actionstate === 20 && msg.actionresult) {
-              aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
+              if (!aiChat.getActiveAsyncacitonId()) {
+                aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
+              }
               aiChat.addMessage({
                 messageid: id,
                 state: msg.actionstate,
@@ -1130,6 +1237,7 @@ class AIChatUtil {
         }
         abortController == null ? void 0 : abortController.abort();
       } finally {
+        aiChat.setActiveAsyncacitonId("");
         aiChat.completeMessage(id, true);
         return true;
       }
@@ -1167,6 +1275,106 @@ class AIChatUtil {
       });
       await aiChat.completeMessage(id, true);
     };
+    chatOptions.resumeQuestion = async (aiChat, ctx, param, other, arr) => {
+      if (other.asyncacitonid) {
+        id = qxUtil.createUUID();
+        abortController = new AbortController();
+        const deService = await ibiz.hub.getApp(ctx.srfappid).deService.getService(ctx, other.appDataEntityId);
+        const resumeRequestData = { asyncacitonid: other.asyncacitonid };
+        if (other.sessionid) {
+          Object.assign(resumeRequestData, {
+            sessionid: other.sessionid
+          });
+        }
+        if (other.srfaiagent) {
+          Object.assign(resumeRequestData, {
+            srfaiagent: other.srfaiagent
+          });
+        }
+        if (other.srfproject)
+          Object.assign(resumeRequestData, {
+            srfproject: other.srfproject
+          });
+        try {
+          await deService.aiResumeSse(
+            (msg) => {
+              if (msg.actionstate === 20 && msg.actionresult) {
+                aiChat.isLoading.value = true;
+                if (!aiChat.getActiveAsyncacitonId()) {
+                  aiChat.setActiveAsyncacitonId(msg.asyncacitonid);
+                }
+                aiChat.addMessage({
+                  messageid: id,
+                  state: msg.actionstate,
+                  type: "DEFAULT",
+                  role: "ASSISTANT",
+                  content: msg.actionresult,
+                  status: "pending"
+                });
+              } else if (msg.actionstate === 30 && msg.actionresult) {
+                const result = JSON.parse(msg.actionresult);
+                if (result.usage) {
+                  aiChat.updateMsgUsage(id, result.usage);
+                }
+                const choices = result.choices;
+                if (choices && choices.length > 0) {
+                  aiChat.replaceMessage({
+                    messageid: id,
+                    state: msg.actionstate,
+                    type: "DEFAULT",
+                    role: "ASSISTANT",
+                    content: choices[0].content || "",
+                    realmessageid: choices[0].messageid,
+                    status: "sent"
+                  });
+                }
+              } else if (msg.actionstate === 40) {
+                aiChat.replaceMessage({
+                  messageid: id,
+                  state: msg.actionstate,
+                  type: "ERROR",
+                  role: "ASSISTANT",
+                  errorText: msg.actionresult,
+                  status: "failed"
+                });
+              }
+            },
+            abortController,
+            ctx,
+            { srfactag: param.srfactag },
+            { ...resumeRequestData }
+          );
+        } catch (error) {
+          if (error && error.message !== this.NONE_ERROR_MESSAGE) {
+            if (error && error.message !== this.PRE_ERROR_MESSAGE) {
+              aiChat.replaceMessage({
+                messageid: id,
+                state: 40,
+                type: "ERROR",
+                role: "ASSISTANT",
+                errorText: error.message || ibiz.i18n.t("app.aiError"),
+                status: "failed"
+              });
+            } else {
+              const lastMessage = arr[arr.length - 1];
+              aiChat.replaceMessage(
+                {
+                  ...lastMessage,
+                  state: 40
+                },
+                false
+              );
+            }
+          }
+          abortController == null ? void 0 : abortController.abort();
+        } finally {
+          aiChat.isLoading.value = false;
+          aiChat.completeMessage(id, true);
+          aiChat.setActiveAsyncacitonId("");
+          return true;
+        }
+      }
+    };
     chatOptions.supplementQuestion = async (aiChat, ctx, param, other) => {
       const asyncacitonid = aiChat.getActiveAsyncacitonId();
       if (asyncacitonid) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.41-alpha.149",
+  "version": "0.7.41-alpha.150",
   "description": "web端组件库(vue3)",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -31,16 +31,16 @@
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@floating-ui/dom": "^1.5.3",
-    "@ibiz-template-plugin/ai-chat": "^0.0.114",
+    "@ibiz-template-plugin/ai-chat": "^0.0.115",
     "@ibiz-template-plugin/gantt": "0.1.8-alpha.468",
     "@ibiz-template-plugin/bi-report": "0.0.32",
     "@ibiz-template-plugin/data-view": "0.0.8",
     "@ibiz-template/core": "0.7.41-alpha.150",
     "@ibiz-template/devtool": "0.0.17",
-    "@ibiz-template/model-helper": "0.7.41-alpha.150",
-    "@ibiz-template/runtime": "0.7.41-alpha.150",
+    "@ibiz-template/model-helper": "0.7.41-alpha.151",
+    "@ibiz-template/runtime": "0.7.41-alpha.151",
     "@ibiz-template/theme": "0.7.39",
-    "@ibiz-template/vue3-util": "0.7.41-alpha.150",
+    "@ibiz-template/vue3-util": "0.7.41-alpha.151",
     "@ibiz-template/web-theme": "3.16.0",
     "@ibiz/model-core": "^0.1.89",
     "@imengyu/vue3-context-menu": "^1.3.5",