@nocobase/plugin-ai 2.1.0-alpha.29 → 2.1.0-alpha.30

package/dist/server/llm-providers/xai.d.ts

@@ -0,0 +1,17 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import { ChatXAI } from '@langchain/xai';
+import { LLMProvider } from './provider';
+import { LLMProviderMeta } from '../manager/ai-manager';
+export declare class XAIProvider extends LLMProvider {
+    chatModel: ChatXAI;
+    get baseURL(): string;
+    createModel(): ChatXAI;
+}
+export declare const xaiProviderOptions: LLMProviderMeta;

package/dist/server/llm-providers/xai.js

@@ -0,0 +1,88 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var xai_exports = {};
+__export(xai_exports, {
+  XAIProvider: () => XAIProvider,
+  xaiProviderOptions: () => xaiProviderOptions
+});
+module.exports = __toCommonJS(xai_exports);
+var import_xai = require("@langchain/xai");
+var import_provider = require("./provider");
+var import_ai_manager = require("../manager/ai-manager");
+class XAIProvider extends import_provider.LLMProvider {
+  get baseURL() {
+    return "https://api.x.ai/v1";
+  }
+  createModel() {
+    const { baseURL, apiKey } = this.serviceOptions || {};
+    const { responseFormat, structuredOutput, ...restModelOptions } = this.modelOptions || {};
+    const { schema } = structuredOutput || {};
+    const responseFormatOptions = {
+      type: responseFormat ?? "text"
+    };
+    if (responseFormat === "json_schema" && schema) {
+      responseFormatOptions["json_schema"] = schema;
+    }
+    return new import_xai.ChatXAI({
+      apiKey,
+      ...restModelOptions,
+      baseURL: baseURL || this.baseURL,
+      modelKwargs: {
+        response_format: responseFormatOptions
+      }
+    });
+  }
+}
+const xaiProviderOptions = {
+  title: "xAI",
+  supportedModel: [import_ai_manager.SupportedModel.LLM],
+  models: {
+    [import_ai_manager.SupportedModel.LLM]: [
+      "grok-4",
+      "grok-4-1",
+      "grok-4-1-fast",
+      "grok-4-1-fast-non-reasoning",
+      "grok-3",
+      "grok-3-fast",
+      "grok-3-fast-beta",
+      "grok-3-beta",
+      "grok-3-mini",
+      "grok-3-mini-fast",
+      "grok-3-mini-beta",
+      "grok-3-mini-fast-beta",
+      "grok-2",
+      "grok-2-vision",
+      "grok-vision-beta"
+    ]
+  },
+  provider: XAIProvider
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  XAIProvider,
+  xaiProviderOptions
+});

package/dist/server/plugin.js

@@ -70,6 +70,7 @@ var import_aiMcpClients = __toESM(require("./resource/aiMcpClients"));
 var import_work_context_handler = require("./manager/work-context-handler");
 var import_ai_coding_manager = require("./manager/ai-coding-manager");
 var import_kimi = require("./llm-providers/kimi");
+var import_xai = require("./llm-providers/xai");
 var import_document_loader = require("./document-loader");
 var import_checkpoints = require("./ai-employees/checkpoints");
 var import_mimo = require("./llm-providers/mimo");
@@ -146,6 +147,8 @@ class PluginAIServer extends import_server.Plugin {
     this.aiManager.registerLLMProvider("mimo", import_mimo.mimoProviderOptions);
     this.aiManager.registerLLMProvider("ollama", import_ollama.ollamaProviderOptions);
     this.aiManager.registerLLMProvider("openai-completions", import_openai2.openaiCompletionsProviderOptions);
+    this.aiManager.registerLLMProvider("kimi", import_kimi.kimiProviderOptions);
+    this.aiManager.registerLLMProvider("xai", import_xai.xaiProviderOptions);
   }
   registerTools() {
     const toolsManager = this.ai.toolsManager;

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

@@ -49,7 +49,6 @@ __reExport(employee_exports, require("./handler"), module.exports);
 __reExport(employee_exports, require("./tools"), module.exports);
 class AIEmployeeInstruction extends import_plugin_workflow.Instruction {
   async run(node, input, processor) {
-    var _a, _b, _c, _d, _e;
     const {
       username,
       message,
@@ -81,151 +80,155 @@ ${typeof message.system === "object" ? JSON.stringify(message.system) : message.
       upstreamId: (input == null ? void 0 : input.id) ?? null
     });
     await processor.exit();
-    try {
-      if (skillSettings && skillSettings.skillsVersion == null) {
-        skillSettings.skillsVersion = 2;
-      }
-      if (skillSettings && skillSettings.toolsVersion == null) {
-        skillSettings.toolsVersion = 2;
-      }
-      const { conversation, aiWorkflowTasks } = await this.createWorkflowTask({
-        username,
-        userMessage,
-        systemMessage,
-        skillSettings,
-        requiresApproval,
-        toolName,
-        node,
-        processor,
-        jobId: id
-      });
-      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 runner = async () => {
+      var _a, _b, _c, _d, _e;
+      try {
+        if (skillSettings && skillSettings.skillsVersion == null) {
+          skillSettings.skillsVersion = 2;
+        }
+        if (skillSettings && skillSettings.toolsVersion == null) {
+          skillSettings.toolsVersion = 2;
+        }
+        const { conversation, aiWorkflowTasks } = await this.createWorkflowTask({
+          username,
+          userMessage,
+          systemMessage,
+          skillSettings,
+          requiresApproval,
+          toolName,
+          node,
+          processor,
+          jobId: id
+        });
+        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({
+            filter: {
+              userId: ((_c = (_b = input == null ? void 0 : input.result) == null ? void 0 : _b.user) == null ? void 0 : _c.id) ?? userId,
+              default: true
+            }
+          });
+          currentRoles = defaultRole == null ? void 0 : defaultRole.roleName;
+        }
+        const employee = await this.workflow.db.getRepository("aiEmployees").findOne({
           filter: {
-            userId: ((_c = (_b = input == null ? void 0 : input.result) == null ? void 0 : _b.user) == null ? void 0 : _c.id) ?? userId,
-            default: true
+            username
           }
         });
-        currentRoles = defaultRole == null ? void 0 : defaultRole.roleName;
-      }
-      const employee = await this.workflow.db.getRepository("aiEmployees").findOne({
-        filter: {
-          username
-        }
-      });
-      const aiEmployee = new import_ai_employee.AIEmployee({
-        ctx: {
-          app: this.workflow.app,
-          db: this.workflow.app.db,
-          log: this.workflow.app.log,
-          logger: this.workflow.app.log,
-          state: { currentRoles },
-          auth: {
-            user: {
-              id: ((_e = (_d = input == null ? void 0 : input.result) == null ? void 0 : _d.user) == null ? void 0 : _e.id) ?? userId
-            }
-          },
-          action: {
-            params: {
-              values: {
-                sessionId: conversation.sessionId,
-                model
+        const aiEmployee = new import_ai_employee.AIEmployee({
+          ctx: {
+            app: this.workflow.app,
+            db: this.workflow.app.db,
+            log: this.workflow.app.log,
+            logger: this.workflow.app.log,
+            state: { currentRoles },
+            auth: {
+              user: {
+                id: ((_e = (_d = input == null ? void 0 : input.result) == null ? void 0 : _d.user) == null ? void 0 : _e.id) ?? userId
               }
-            }
-          }
-        },
-        employee,
-        sessionId: conversation.sessionId,
-        systemMessage,
-        skillSettings,
-        webSearch,
-        model,
-        tools: [{ name: toolName }]
-      });
-      const attachmentPart = {};
-      if (files == null ? void 0 : files.length) {
-        const { resolveAttachments, resolveUrls } = import_files.Files.resolvers(this.workflow, attachmentPart);
-        await resolveAttachments(files);
-        await resolveUrls(files);
-      }
-      let result;
-      let isToolInvoke = false;
-      let retry = 0;
-      do {
-        const userMessages = [
-          {
-            role: "user",
-            content: {
-              type: "text",
-              content: userMessage
             },
-            ...attachmentPart
-          }
-        ];
-        if (retry > 0) {
-          if (retry < 2) {
-            const firstUserMessage = await this.workflow.db.getRepository("aiConversations.messages", conversation.sessionId).findOne({
-              filter: {
-                role: "user"
+            action: {
+              params: {
+                values: {
+                  sessionId: conversation.sessionId,
+                  model
+                }
+              }
+            }
+          },
+          employee,
+          sessionId: conversation.sessionId,
+          systemMessage,
+          skillSettings,
+          webSearch,
+          model,
+          tools: [{ name: toolName }]
+        });
+        const attachmentPart = {};
+        if (files == null ? void 0 : files.length) {
+          const { resolveAttachments, resolveUrls } = import_files.Files.resolvers(this.workflow, attachmentPart);
+          await resolveAttachments(files);
+          await resolveUrls(files);
+        }
+        let result;
+        let isToolInvoke = false;
+        let retry = 0;
+        do {
+          const userMessages = [
+            {
+              role: "user",
+              content: {
+                type: "text",
+                content: userMessage
               },
-              sort: ["messageId"]
-            });
-            const messageId = firstUserMessage == null ? void 0 : firstUserMessage.messageId;
-            result = await aiEmployee.invoke({ messageId, userMessages });
-          } else {
-            result = await aiEmployee.invoke({
-              userMessages: [
-                {
-                  role: "user",
-                  content: {
-                    type: "text",
-                    content: `You failed to call the required tool "aiEmployeeWorkflowTaskOutput" in your previous response.
+              ...attachmentPart
+            }
+          ];
+          if (retry > 0) {
+            if (retry < 2) {
+              const firstUserMessage = await this.workflow.db.getRepository("aiConversations.messages", conversation.sessionId).findOne({
+                filter: {
+                  role: "user"
+                },
+                sort: ["messageId"]
+              });
+              const messageId = firstUserMessage == null ? void 0 : firstUserMessage.messageId;
+              result = await aiEmployee.invoke({ messageId, userMessages });
+            } else {
+              result = await aiEmployee.invoke({
+                userMessages: [
+                  {
+                    role: "user",
+                    content: {
+                      type: "text",
+                      content: `You failed to call the required tool "aiEmployeeWorkflowTaskOutput" in your previous response.
 Call "aiEmployeeWorkflowTaskOutput" now to submit the workflow outcome.
 Do not send another normal assistant response without invoking it.
                   `
+                    }
                   }
-                }
-              ]
-            });
+                ]
+              });
+            }
+          } else {
+            result = await aiEmployee.invoke({ userMessages });
           }
-        } else {
-          result = await aiEmployee.invoke({ userMessages });
+          isToolInvoke = result.messages.filter((it) => it.type === "ai").flatMap((it) => it.tool_calls).some((it) => it.name === toolName);
+        } while (!isToolInvoke && retry++ < 2);
+        if (!isToolInvoke) {
+          throw new Error("AI employee not do job correctly");
         }
-        isToolInvoke = result.messages.filter((it) => it.type === "ai").flatMap((it) => it.tool_calls).some((it) => it.name === toolName);
-      } while (!isToolInvoke && retry++ < 2);
-      if (!isToolInvoke) {
-        throw new Error("AI employee not do job correctly");
-      }
-      await this.checkApproval({ requiresApproval, conversation, aiWorkflowTasks, result, aiEmployee, toolName });
-    } catch (e) {
-      processor.logger.error(`ai employee invoke failed, ${e.message}`, {
-        node: node.id,
-        stack: e.stack,
-        chatOptions: node.config
-      });
-      const job = await this.workflow.app.db.getRepository("jobs").findOne({
-        filterByTk: id
-      });
-      job.set({
-        status: import_plugin_workflow.JOB_STATUS.ERROR,
-        result: e.message
-      });
-      const aiWorkflowTask = await this.workflow.db.getRepository("aiWorkflowTasks").findOne({
-        filter: {
-          jobId: id
-        }
-      });
-      if (aiWorkflowTask) {
-        await this.workflow.db.getRepository("aiWorkflowTasks").update({
-          values: { status: "aborted" },
+        await this.checkApproval({ requiresApproval, conversation, aiWorkflowTasks, result, aiEmployee, toolName });
+      } catch (e) {
+        processor.logger.error(`ai employee invoke failed, ${e.message}`, {
+          node: node.id,
+          stack: e.stack,
+          chatOptions: node.config
+        });
+        const job = await this.workflow.app.db.getRepository("jobs").findOne({
+          filterByTk: id
+        });
+        job.set({
+          status: import_plugin_workflow.JOB_STATUS.ERROR,
+          result: e.message
+        });
+        const aiWorkflowTask = await this.workflow.db.getRepository("aiWorkflowTasks").findOne({
           filter: {
-            id: aiWorkflowTask.id
+            jobId: id
           }
         });
+        if (aiWorkflowTask) {
+          await this.workflow.db.getRepository("aiWorkflowTasks").update({
+            values: { status: "aborted" },
+            filter: {
+              id: aiWorkflowTask.id
+            }
+          });
+        }
+        await this.workflow.resume(job);
       }
-      await this.workflow.resume(job);
-    }
+    };
+    runner();
   }
   resume(node, job, processor) {
     return job;

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-alpha.29",
+  "version": "2.1.0-alpha.30",
   "main": "dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/action-ai",
   "homepage.ru-RU": "https://docs-ru.nocobase.com/handbook/action-ai",
@@ -42,6 +42,7 @@
     "@langchain/langgraph-checkpoint": "^1.0.0",
     "@langchain/ollama": "^1.2.2",
     "@langchain/openai": "^1.2.7",
+    "@langchain/xai": "1.3.3",
     "@nocobase/ai-employee-avatars": "^1.0.2",
     "@xyflow/react": "^12.7.0",
     "diff": "9.0.0",
@@ -63,5 +64,5 @@
   "keywords": [
     "AI"
   ],
-  "gitHead": "526e36e399a570755286f9a0d34fa202b4a58a03"
+  "gitHead": "292ae0ad87f195ed201b274902d21ecd96f5ddd0"
 }