@nocobase/plugin-ai 2.1.0-beta.32 → 2.1.0-beta.34

package/dist/server/resource/aiConversations.js

@@ -43,6 +43,7 @@ var import_actions = __toESM(require("@nocobase/actions"));
 var import_database = require("@nocobase/database");
 var import_utils = require("../utils");
 var import_ai_employee = require("../ai-employees/ai-employee");
+var import_ai_chat_conversation = require("../manager/ai-chat-conversation");
 async function getAIEmployee(ctx, username) {
   var _a;
   const filter = {
@@ -67,12 +68,17 @@ function setupSSEHeaders(ctx) {
 function sendErrorResponse(ctx, errorMessage) {
   (0, import_utils.sendSSEError)(ctx, errorMessage);
 }
-async function parallelConversationsLimit(ctx, next) {
+async function loginInCheck(ctx, next) {
   var _a;
   const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
   if (!userId) {
     return ctx.throw(403);
   }
+  await next();
+}
+const isReachParallelLimit = async (ctx) => {
+  var _a;
+  const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
   const activeStreamCount = await ctx.db.getModel("aiConversations").count({
     where: {
       userId,
@@ -82,27 +88,32 @@ async function parallelConversationsLimit(ctx, next) {
       }
     }
   });
-  if (activeStreamCount > 2) {
-    sendErrorResponse(ctx, ctx.t("There are conversations in progress. Please try again later."));
+  return activeStreamCount > 2;
+};
+const saveUserMessages = async (ctx, sessionId, messages, messageId) => {
+  const userMessages = messages.filter((message) => message.role === "user");
+  if (!userMessages.length) {
     return;
   }
-  await next();
-}
+  const aiChatConversation = (0, import_ai_chat_conversation.createAIChatConversation)(ctx, sessionId);
+  await aiChatConversation.withTransaction(async (conversation) => {
+    if (messageId && await conversation.getMessage(messageId)) {
+      await conversation.removeMessages({ messageId });
+    }
+    await conversation.addMessages(userMessages);
+  });
+};
 var aiConversations_default = {
   name: "aiConversations",
   middlewares: [
     {
-      only: ["sendMessages", "resendMessages", "resumeStream"],
-      handler: parallelConversationsLimit
+      handler: loginInCheck
     }
   ],
   actions: {
     async list(ctx, next) {
       var _a;
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
-      if (!userId) {
-        return ctx.throw(403);
-      }
       const filter = ctx.action.params.filter || {};
       ctx.action.mergeParams({
         filter: {
@@ -117,9 +128,6 @@ var aiConversations_default = {
     async unreadCount(ctx, next) {
       var _a;
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
-      if (!userId) {
-        return ctx.throw(403);
-      }
       const count = await ctx.db.getModel("aiConversations").count({
         where: {
           userId,
@@ -136,9 +144,6 @@ var aiConversations_default = {
     async unreadCounts(ctx, next) {
       var _a;
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
-      if (!userId) {
-        return ctx.throw(403);
-      }
       const [conversationUnreadCount, workflowTaskUnreadCount] = await Promise.all([
         ctx.db.getModel("aiConversations").count({
           where: {
@@ -165,9 +170,6 @@ var aiConversations_default = {
       var _a;
       const plugin = ctx.app.pm.get("ai");
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
-      if (!userId) {
-        return ctx.throw(403);
-      }
       const { aiEmployee, systemMessage, skillSettings, conversationSettings, modelSettings } = ctx.action.params.values || {};
       const employee = await getAIEmployee(ctx, aiEmployee.username);
       if (!employee) {
@@ -196,9 +198,6 @@ var aiConversations_default = {
       var _a;
       const plugin = ctx.app.pm.get("ai");
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
-      if (!userId) {
-        return ctx.throw(403);
-      }
       const { filterByTk: sessionId } = ctx.action.params;
       const { title } = ctx.action.params.values || {};
       ctx.body = await plugin.aiConversationsManager.update({ userId, sessionId, title });
@@ -208,9 +207,6 @@ var aiConversations_default = {
       var _a;
       const plugin = ctx.app.pm.get("ai");
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
-      if (!userId) {
-        return ctx.throw(403);
-      }
       const { filterByTk: sessionId } = ctx.action.params;
       if (!sessionId) {
         return ctx.throw(400, "invalid sessionId");
@@ -236,9 +232,6 @@ var aiConversations_default = {
     async destroy(ctx, next) {
       var _a;
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
-      if (!userId) {
-        return ctx.throw(403);
-      }
       ctx.action.mergeParams({
         filter: {
           userId
@@ -250,9 +243,6 @@ var aiConversations_default = {
       var _a, _b;
       const plugin = ctx.app.pm.get("ai");
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
-      if (!userId) {
-        return ctx.throw(403);
-      }
       const { sessionId, cursor, updateRead: originalUpdateRead } = ctx.action.params || {};
       if (!sessionId) {
         ctx.throw(400);
@@ -279,9 +269,6 @@ var aiConversations_default = {
       var _a;
       const plugin = ctx.app.pm.get("ai");
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
-      if (!userId) {
-        return ctx.throw(403);
-      }
       const {
         sessionId,
         messageId,
@@ -320,11 +307,8 @@ var aiConversations_default = {
     },
     async sendMessages(ctx, next) {
       var _a, _b, _c, _d;
-      const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
-      if (!userId) {
-        return ctx.throw(403);
-      }
       const plugin = ctx.app.pm.get("ai");
+      const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
       const {
         sessionId,
         aiEmployee: employeeName,
@@ -338,38 +322,27 @@ var aiConversations_default = {
       if (shouldStream) {
         setupSSEHeaders(ctx);
       }
-      if (!sessionId) {
-        if (shouldStream) {
-          sendErrorResponse(ctx, "sessionId is required");
-        } else {
-          ctx.status = 400;
-          ctx.body = { error: "sessionId is required" };
+      try {
+        if (!sessionId) {
+          throw new import_utils.ResourceActionError(400, ctx.t("sessionId is required"));
         }
-        return next();
-      }
-      const userMessage = messages.find((message) => message.role === "user");
-      if (!userMessage) {
-        if (shouldStream) {
-          sendErrorResponse(ctx, "user message is required");
-        } else {
-          ctx.status = 400;
-          ctx.body = { error: "user message is required" };
+        if (!Array.isArray(messages)) {
+          throw new import_utils.ResourceActionError(400, ctx.t("messages must be an array"));
+        }
+        const userMessage = messages.find((message) => message.role === "user");
+        if (!userMessage) {
+          throw new import_utils.ResourceActionError(400, ctx.t("user message is required"));
         }
-        return next();
-      }
-      try {
         const conversation = await plugin.aiConversationsManager.getConversation({
           sessionId,
           userId
         });
         if (!conversation) {
-          if (shouldStream) {
-            sendErrorResponse(ctx, "conversation not found");
-          } else {
-            ctx.status = 404;
-            ctx.body = { error: "conversation not found" };
-          }
-          return next();
+          throw new import_utils.ResourceActionError(400, ctx.t("conversation not found"));
+        }
+        const employee = await getAIEmployee(ctx, employeeName);
+        if (!employee) {
+          throw new import_utils.ResourceActionError(400, ctx.t("AI employee not found"));
         }
         if (!conversation.title) {
           const textUserMessage = messages.find(
@@ -384,15 +357,9 @@ var aiConversations_default = {
             await conversation.save();
           }
         }
-        const employee = await getAIEmployee(ctx, employeeName);
-        if (!employee) {
-          if (shouldStream) {
-            sendErrorResponse(ctx, "AI employee not found");
-          } else {
-            ctx.status = 404;
-            ctx.body = { error: "AI employee not found" };
-          }
-          return next();
+        if (await isReachParallelLimit(ctx)) {
+          await saveUserMessages(ctx, sessionId, messages, editingMessageId);
+          throw new import_utils.ResourceActionError(400, ctx.t("There are conversations in progress. Please try again later."));
         }
         const legacy = conversation.thread === 0;
         const resolvedModel = await plugin.aiEmployeesManager.resolveModel(employee, model);
@@ -442,11 +409,19 @@ var aiConversations_default = {
         }
       } catch (err) {
         ctx.log.error(err);
+        let status = 500;
+        let message = ctx.t("Server unexpected error occur");
+        if (err instanceof import_utils.ResourceActionError) {
+          status = err.status;
+          message = err.message;
+        } else if (err instanceof Error) {
+          status = 500;
+          message = err.message;
+        }
         if (shouldStream) {
-          sendErrorResponse(ctx, err.message || "Tool call error");
+          sendErrorResponse(ctx, message);
         } else {
-          ctx.status = 500;
-          ctx.body = { error: err.message || "Tool call error" };
+          ctx.throw(status, message);
         }
       } finally {
         await next();
@@ -455,9 +430,6 @@ var aiConversations_default = {
     async abort(ctx, next) {
       var _a;
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
-      if (!userId) {
-        return ctx.throw(403);
-      }
       const { sessionId } = ctx.action.params.values || {};
       const plugin = ctx.app.pm.get("ai");
       const conversation = await plugin.aiConversationsManager.getConversation({
@@ -474,30 +446,44 @@ var aiConversations_default = {
       var _a, _b, _c, _d, _e;
       const plugin = ctx.app.pm.get("ai");
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
-      if (!userId) {
-        return ctx.throw(403);
-      }
+      const abortController = new AbortController();
+      const abortStream = () => abortController.abort();
+      const shouldStopStream = () => abortController.signal.aborted || ctx.res.destroyed || ctx.res.writableEnded;
       setupSSEHeaders(ctx);
       const sessionId = ((_b = ctx.action.params) == null ? void 0 : _b.sessionId) || ((_d = (_c = ctx.action.params) == null ? void 0 : _c.values) == null ? void 0 : _d.sessionId) || ((_e = ctx.action.params) == null ? void 0 : _e.filterByTk);
       if (!sessionId) {
         sendErrorResponse(ctx, "sessionId is required");
         return;
       }
+      ctx.req.once("aborted", abortStream);
+      ctx.res.once("close", abortStream);
       try {
         const conversation = await plugin.aiConversationsManager.getConversation({
           sessionId,
           userId
         });
+        if (shouldStopStream()) {
+          return;
+        }
         if (!conversation) {
           sendErrorResponse(ctx, "conversation not found");
           return;
         }
+        const reachLimit = await isReachParallelLimit(ctx);
+        if (shouldStopStream()) {
+          return;
+        }
         let hasChunks = false;
-        for await (const chunk of plugin.llmStreamCachedManager.getCached(sessionId).stream()) {
-          hasChunks = true;
-          ctx.res.write(chunk);
+        if (!reachLimit) {
+          for await (const chunk of plugin.llmStreamCachedManager.getCached(sessionId).stream({ signal: abortController.signal })) {
+            if (shouldStopStream()) {
+              break;
+            }
+            hasChunks = true;
+            ctx.res.write(chunk);
+          }
         }
-        if (!hasChunks) {
+        if (!hasChunks && !shouldStopStream()) {
           const currentConversation = await plugin.aiConversationsManager.getConversation({
             sessionId,
             userId
@@ -510,11 +496,16 @@ var aiConversations_default = {
           }
         }
       } catch (err) {
+        if (shouldStopStream()) {
+          return;
+        }
         ctx.log.error(err);
         sendErrorResponse(ctx, err.message || "Resume stream error");
         return;
       } finally {
-        if (!ctx.res.writableEnded) {
+        ctx.req.off("aborted", abortStream);
+        ctx.res.off("close", abortStream);
+        if (!shouldStopStream()) {
           ctx.res.end();
         }
         await next();
@@ -524,24 +515,26 @@ var aiConversations_default = {
       var _a, _b, _c, _d;
       const plugin = ctx.app.pm.get("ai");
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
-      if (!userId) {
-        return ctx.throw(403);
-      }
-      setupSSEHeaders(ctx);
-      const { sessionId, webSearch, model } = ctx.action.params.values || {};
+      const { sessionId, webSearch, model, stream = true } = ctx.action.params.values || {};
       let { messageId } = ctx.action.params.values || {};
-      if (!sessionId) {
-        sendErrorResponse(ctx, "sessionId is required");
-        return next();
+      const shouldStream = stream !== false;
+      if (shouldStream) {
+        setupSSEHeaders(ctx);
       }
       try {
+        if (!sessionId) {
+          throw new import_utils.ResourceActionError(400, ctx.t("sessionId is required"));
+        }
         const conversation = await plugin.aiConversationsManager.getConversation({
           sessionId,
           userId
         });
         if (!conversation) {
-          sendErrorResponse(ctx, "conversation not found");
-          return next();
+          throw new import_utils.ResourceActionError(400, ctx.t("conversation not found"));
+        }
+        const employee = await getAIEmployee(ctx, conversation.aiEmployeeUsername);
+        if (!employee) {
+          throw new import_utils.ResourceActionError(400, ctx.t("AI employee not found"));
         }
         const resendMessages = [];
         if (messageId) {
@@ -551,8 +544,7 @@ var aiConversations_default = {
             }
           });
           if (!message) {
-            sendErrorResponse(ctx, "message not found");
-            return next();
+            throw new import_utils.ResourceActionError(400, ctx.t("message not found"));
           }
         } else {
           const message = await ctx.db.getRepository("aiConversations.messages", sessionId).findOne({
@@ -562,8 +554,7 @@ var aiConversations_default = {
             sort: ["-messageId"]
           });
           if (!message) {
-            sendErrorResponse(ctx, "No messages to resend");
-            return next();
+            throw new import_utils.ResourceActionError(400, ctx.t("message not found"));
           }
           messageId = message.messageId;
           if (["user", "tool"].includes(message.role)) {
@@ -577,10 +568,8 @@ var aiConversations_default = {
             });
           }
         }
-        const employee = await getAIEmployee(ctx, conversation.aiEmployeeUsername);
-        if (!employee) {
-          sendErrorResponse(ctx, "AI employee not found");
-          return next();
+        if (await isReachParallelLimit(ctx)) {
+          throw new import_utils.ResourceActionError(400, ctx.t("There are conversations in progress. Please try again later."));
         }
         const resolvedModel = await plugin.aiEmployeesManager.resolveModel(employee, model);
         const aiEmployee = new import_ai_employee.AIEmployee({
@@ -593,20 +582,38 @@ var aiConversations_default = {
           webSearch,
           model: resolvedModel
         });
-        await aiEmployee.stream({ messageId, userMessages: resendMessages.length ? resendMessages : void 0 });
+        if (shouldStream) {
+          await aiEmployee.stream({ messageId, userMessages: resendMessages.length ? resendMessages : void 0 });
+        } else {
+          ctx.body = await aiEmployee.invoke({
+            messageId,
+            userMessages: resendMessages.length ? resendMessages : void 0
+          });
+        }
       } catch (err) {
         ctx.log.error(err);
-        sendErrorResponse(ctx, err.message || "Chat error warning");
+        let status = 500;
+        let message = ctx.t("Server unexpected error occur");
+        if (err instanceof import_utils.ResourceActionError) {
+          status = err.status;
+          message = err.message;
+        } else if (err instanceof Error) {
+          status = 500;
+          message = err.message;
+        }
+        if (shouldStream) {
+          sendErrorResponse(ctx, message);
+        } else {
+          ctx.throw(status, message);
+        }
+      } finally {
+        await next();
       }
-      await next();
     },
     async updateUserDecision(ctx, next) {
       var _a;
       const plugin = ctx.app.pm.get("ai");
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
-      if (!userId) {
-        return ctx.throw(403);
-      }
       const { sessionId, messageId, toolCallId, userDecision } = ctx.action.params.values || {};
       if (!sessionId) {
         ctx.throw(400);
@@ -686,9 +693,6 @@ var aiConversations_default = {
     async resumeToolCall(ctx, next) {
       var _a, _b, _c, _d;
       const userId = (_a = ctx.auth) == null ? void 0 : _a.user.id;
-      if (!userId) {
-        return ctx.throw(403);
-      }
       setupSSEHeaders(ctx);
       const plugin = ctx.app.pm.get("ai");
       const { sessionId, messageId, model, webSearch } = ctx.action.params.values || {};

package/dist/server/utils.d.ts

@@ -21,3 +21,7 @@ export declare function encodeLocalFile(url: string): Promise<string>;
 export declare function encodeFile(ctx: Context, url: string): Promise<string>;
 export declare function parseVariables(ctx: Context, value: string): Promise<any>;
 export declare const buildTool: (toolsEntry: ToolsEntry) => import("@langchain/core/dist/tools").DynamicTool<any>;
+export declare class ResourceActionError extends Error {
+    readonly status: number;
+    constructor(status: number, message: string, options?: ErrorOptions);
+}

package/dist/server/utils.js

@@ -36,6 +36,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
+  ResourceActionError: () => ResourceActionError,
   buildTool: () => buildTool,
   encodeFile: () => encodeFile,
   encodeLocalFile: () => encodeLocalFile,
@@ -179,8 +180,16 @@ const buildTool = (toolsEntry) => {
     }
   );
 };
+class ResourceActionError extends Error {
+  constructor(status, message, options) {
+    super(message, options);
+    this.status = status;
+    this.name = "ResourceActionError";
+  }
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  ResourceActionError,
   buildTool,
   encodeFile,
   encodeLocalFile,

package/dist/server/workflow/nodes/employee/index.js

@@ -103,13 +103,12 @@ ${typeof message.system === "object" ? JSON.stringify(message.system) : message.
         });
         let currentRoles = (_a = input == null ? void 0 : input.result) == null ? void 0 : _a.roleName;
         if (!currentRoles) {
-          const defaultRole = await this.workflow.db.getRepository("rolesUsers").findOne({
+          const roles = await this.workflow.db.getRepository("rolesUsers").find({
             filter: {
-              userId: ((_c = (_b = input == null ? void 0 : input.result) == null ? void 0 : _b.user) == null ? void 0 : _c.id) ?? userId,
-              default: true
+              userId: ((_c = (_b = input == null ? void 0 : input.result) == null ? void 0 : _b.user) == null ? void 0 : _c.id) ?? userId
             }
           });
-          currentRoles = defaultRole == null ? void 0 : defaultRole.roleName;
+          currentRoles = roles.map((x) => x.roleName);
         }
         const employee = await this.workflow.db.getRepository("aiEmployees").findOne({
           filter: {

package/package.json

@@ -6,7 +6,7 @@
   "description": "Create AI employees with diverse skills to collaborate with humans, build systems, and handle business operations.",
   "description.ru-RU": "Поддержка интеграции с AI-сервисами: предоставляются AI-узлы для рабочих процессов, расширяя возможности бизнес-обработки.",
   "description.zh-CN": "创建各种技能的 AI 员工，与人类协同，搭建系统，处理业务。",
-  "version": "2.1.0-beta.32",
+  "version": "2.1.0-beta.34",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-ai",
   "homepage.ru-RU": "https://docs-ru.nocobase.com/handbook/action-ai",
@@ -64,5 +64,5 @@
   "keywords": [
     "AI"
   ],
-  "gitHead": "659c5efe992da7118d33c768bbd9e837a2c4716f"
+  "gitHead": "ca804833299c547f8d49f8d58f73273a4bfcd03c"
 }