@nocobase/plugin-ai 2.1.0-beta.43 → 2.1.0-beta.45

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

@@ -7,11 +7,9 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -25,14 +23,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var ollama_exports = {};
 __export(ollama_exports, {
@@ -44,17 +34,16 @@ module.exports = __toCommonJS(ollama_exports);
 var import_ollama = require("@langchain/ollama");
 var import_provider = require("./provider");
 var import_ai_manager = require("../manager/ai-manager");
-var import_axios = __toESM(require("axios"));
+var import_utils = require("@nocobase/utils");
 const OLLAMA_DEFAULT_URL = "http://localhost:11434";
 class OllamaProvider extends import_provider.LLMProvider {
   get baseURL() {
     return OLLAMA_DEFAULT_URL;
   }
   createModel() {
-    const { baseURL } = this.serviceOptions || {};
     const { model, temperature, topP, topK, numPredict, ...rest } = this.modelOptions || {};
     return new import_ollama.ChatOllama({
-      baseUrl: baseURL || this.baseURL,
+      baseUrl: this.getResolvedBaseURL(),
       model: model || "mistral-nemo:12b",
       temperature,
       topP,
@@ -68,16 +57,20 @@ class OllamaProvider extends import_provider.LLMProvider {
   }
   async listModels() {
     var _a;
-    const options = this.serviceOptions || {};
-    let baseURL = options.baseURL || this.baseURL;
-    if (!baseURL) {
-      return { code: 400, errMsg: "baseURL is required" };
+    let url;
+    try {
+      url = this.buildRequestURL("api/tags");
+    } catch (e) {
+      return { code: 400, errMsg: e instanceof Error ? e.message : String(e) };
     }
-    if (baseURL && baseURL.endsWith("/")) {
-      baseURL = baseURL.slice(0, -1);
+    if (!url) {
+      return { code: 400, errMsg: "baseURL is required" };
     }
     try {
-      const res = await import_axios.default.get(`${baseURL}/api/tags`);
+      const res = await (0, import_utils.serverRequest)({
+        method: "GET",
+        url
+      });
       const models = ((_a = res == null ? void 0 : res.data) == null ? void 0 : _a.models) || [];
       return {
         models: models.map((model) => ({
@@ -87,7 +80,7 @@ class OllamaProvider extends import_provider.LLMProvider {
     } catch (e) {
       return {
         code: 500,
-        errMsg: `Failed to fetch Ollama models: ${e.message}. Make sure Ollama is running at ${baseURL}`
+        errMsg: `Failed to fetch Ollama models: ${e.message}. Make sure Ollama is running at ${this.getResolvedBaseURL()}`
       };
     }
   }

package/dist/server/llm-providers/openai/completions.js

@@ -36,7 +36,7 @@ class OpenAICompletionsProvider extends import_provider.LLMProvider {
     return "https://api.openai.com/v1";
   }
   createModel() {
-    const { baseURL, apiKey } = this.serviceOptions || {};
+    const { apiKey } = this.serviceOptions || {};
     const { responseFormat, structuredOutput } = this.modelOptions || {};
     const { schema } = structuredOutput || {};
     const responseFormatOptions = {
@@ -52,7 +52,7 @@ class OpenAICompletionsProvider extends import_provider.LLMProvider {
         response_format: responseFormatOptions
       },
       configuration: {
-        baseURL: baseURL || this.baseURL
+        baseURL: this.getResolvedBaseURL()
       }
     });
   }

package/dist/server/llm-providers/openai/embedding.js

@@ -38,7 +38,7 @@ class OpenAiEmbeddingProvider extends import_provider.EmbeddingProvider {
   createEmbedding() {
     return new import_openai.OpenAIEmbeddings({
       configuration: {
-        baseURL: this.baseURL ?? "",
+        baseURL: this.baseURL,
         apiKey: this.apiKey
       },
       model: this.model

package/dist/server/llm-providers/openai/responses.js

@@ -37,7 +37,7 @@ class OpenAIResponsesProvider extends import_provider.LLMProvider {
     return "https://api.openai.com/v1";
   }
   createModel() {
-    const { baseURL, apiKey } = this.serviceOptions || {};
+    const { apiKey } = this.serviceOptions || {};
     const { responseFormat, structuredOutput } = this.modelOptions || {};
     const { schema } = structuredOutput || {};
     const responseFormatOptions = {
@@ -56,7 +56,7 @@ class OpenAIResponsesProvider extends import_provider.LLMProvider {
         }
       },
       configuration: {
-        baseURL: baseURL || this.baseURL
+        baseURL: this.getResolvedBaseURL()
       },
       verbose: false,
       useResponsesApi: true

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

@@ -91,6 +91,8 @@ export declare abstract class LLMProvider {
     parseResponseMetadata(output: LLMResult): any;
     parseResponseError(err: any): any;
     protected get documentLoader(): CachedDocumentLoader;
+    protected getResolvedBaseURL(): string;
+    protected buildRequestURL(pathname: string): string;
     protected get aiPlugin(): PluginAIServer;
 }
 export interface EmbeddingProviderOptions {
@@ -107,6 +109,6 @@ export declare abstract class EmbeddingProvider {
     abstract createEmbedding(): EmbeddingsInterface;
     protected abstract getDefaultUrl(): string;
     protected get apiKey(): any;
-    protected get baseURL(): any;
+    protected get baseURL(): string;
     protected get model(): any;
 }

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

@@ -40,12 +40,26 @@ __export(provider_exports, {
   LLMProvider: () => LLMProvider
 });
 module.exports = __toCommonJS(provider_exports);
-var import_axios = __toESM(require("axios"));
-var import_utils = require("../utils");
+var import_utils = require("@nocobase/utils");
+var import_utils2 = require("../utils");
 var import_stream = require("@langchain/core/utils/stream");
 var import_document_loader = require("../document-loader");
 var import_node_path = __toESM(require("node:path"));
 var import_reasoning = require("./common/reasoning");
+function normalizeBaseURL(baseURL) {
+  (0, import_utils.checkUrlAgainstWhitelist)(baseURL);
+  return new URL(baseURL).toString().replace(/\/$/, "");
+}
+function resolveServiceOptions(serviceOptions, app) {
+  const rendered = app.environment.renderJsonTemplate(serviceOptions ?? {});
+  if ((rendered == null ? void 0 : rendered.baseURL) != null) {
+    if (typeof rendered.baseURL !== "string") {
+      throw new Error("baseURL must be a string");
+    }
+    rendered.baseURL = normalizeBaseURL(rendered.baseURL);
+  }
+  return rendered;
+}
 class LLMProvider {
   app;
   serviceOptions;
@@ -57,7 +71,7 @@ class LLMProvider {
   constructor(opts) {
     const { app, serviceOptions, modelOptions } = opts;
     this.app = app;
-    this.serviceOptions = app.environment.renderJsonTemplate(serviceOptions);
+    this.serviceOptions = resolveServiceOptions(serviceOptions, app);
     if (modelOptions) {
       this.modelOptions = modelOptions;
       this.chatModel = this.createModel();
@@ -69,7 +83,7 @@ class LLMProvider {
   prepareChain(context) {
     var _a, _b, _c, _d;
     let chain = this.chatModel;
-    const toolDefinitions = (_a = context.tools) == null ? void 0 : _a.map(import_utils.buildTool);
+    const toolDefinitions = (_a = context.tools) == null ? void 0 : _a.map(import_utils2.buildTool);
     if ((_b = this.builtInTools()) == null ? void 0 : _b.length) {
       const tools = [...this.builtInTools()];
       if (!this.isToolConflict() && (toolDefinitions == null ? void 0 : toolDefinitions.length)) {
@@ -118,18 +132,19 @@ class LLMProvider {
     var _a, _b, _c, _d;
     const options = this.serviceOptions || {};
     const apiKey = options.apiKey;
-    let baseURL = options.baseURL || this.baseURL;
-    if (!baseURL) {
-      return { code: 400, errMsg: "baseURL is required" };
+    let url;
+    try {
+      url = this.buildRequestURL("models");
+    } catch (e) {
+      return { code: 400, errMsg: e instanceof Error ? e.message : String(e) };
     }
     if (!apiKey) {
       return { code: 400, errMsg: "API Key required" };
     }
-    if (baseURL && baseURL.endsWith("/")) {
-      baseURL = baseURL.slice(0, -1);
-    }
     try {
-      const res = await import_axios.default.get(`${baseURL}/models`, {
+      const res = await (0, import_utils.serverRequest)({
+        method: "GET",
+        url,
         headers: {
           Authorization: `Bearer ${apiKey}`
         }
@@ -143,10 +158,10 @@ class LLMProvider {
     }
   }
   parseResponseMessage(message) {
-    return (0, import_utils.parseResponseMessage)(message);
+    return (0, import_utils2.parseResponseMessage)(message);
   }
   parseResponseChunk(chunk) {
-    return (0, import_utils.stripToolCallTags)(chunk);
+    return (0, import_utils2.stripToolCallTags)(chunk);
   }
   async parseAttachment(ctx, attachment) {
     if (this.isApiSupportedAttachment(attachment)) {
@@ -181,7 +196,7 @@ class LLMProvider {
   async convertToContent(ctx, attachment) {
     const fileManager = this.app.pm.get("file-manager");
     const url = await fileManager.getFileURL(attachment);
-    const data = await (0, import_utils.encodeFile)(ctx, decodeURIComponent(url));
+    const data = await (0, import_utils2.encodeFile)(ctx, decodeURIComponent(url));
     if (attachment.mimetype.startsWith("image/")) {
       return {
         placement: "contentBlocks",
@@ -207,17 +222,16 @@ class LLMProvider {
     }
   }
   async loadDocument(ctx, attachment) {
-    const referer = ctx.get("referer") || "";
-    const ua = ctx.get("user-agent") || "";
     const safeFilename = attachment.filename ? import_node_path.default.basename(attachment.filename) : "document";
-    const parsed = await this.documentLoader.load(attachment, {
+    const loaderOptions = typeof ctx.get === "function" ? {
       requestOptions: {
         headers: {
-          Referer: referer,
-          "User-Agent": ua
+          Referer: ctx.get("referer") || "",
+          "User-Agent": ctx.get("user-agent") || ""
         }
       }
-    });
+    } : void 0;
+    const parsed = await this.documentLoader.load(attachment, loaderOptions);
     if (!parsed.supported) {
       return {
         placement: "system",
@@ -307,6 +321,22 @@ ${parsed.text}
   get documentLoader() {
     return this.aiPlugin.documentLoaders.cached;
   }
+  getResolvedBaseURL() {
+    var _a;
+    const baseURL = ((_a = this.serviceOptions) == null ? void 0 : _a.baseURL) ?? this.baseURL;
+    if (!baseURL) {
+      throw new Error("baseURL is required");
+    }
+    if (typeof baseURL !== "string") {
+      throw new Error("baseURL must be a string");
+    }
+    return normalizeBaseURL(baseURL);
+  }
+  buildRequestURL(pathname) {
+    const url = new URL(pathname.replace(/^\/+/, ""), `${this.getResolvedBaseURL()}/`).toString();
+    (0, import_utils.checkUrlAgainstWhitelist)(url);
+    return url;
+  }
   get aiPlugin() {
     return this.app.pm.get("ai");
   }
@@ -316,7 +346,7 @@ class EmbeddingProvider {
     this.opts = opts;
     const { app, serviceOptions, modelOptions } = this.opts;
     this.app = app;
-    this.serviceOptions = app.environment.renderJsonTemplate(serviceOptions ?? {});
+    this.serviceOptions = resolveServiceOptions(serviceOptions, app);
     this.modelOptions = modelOptions;
   }
   app;
@@ -335,7 +365,10 @@ class EmbeddingProvider {
     if (!baseURL) {
       throw new Error("baseURL is required");
     }
-    return baseURL;
+    if (typeof baseURL !== "string") {
+      throw new Error("baseURL must be a string");
+    }
+    return normalizeBaseURL(baseURL);
   }
   get model() {
     const { model } = this.modelOptions ?? {};

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

@@ -38,7 +38,7 @@ class XAIProvider extends import_provider.LLMProvider {
     return "https://api.x.ai/v1";
   }
   createModel() {
-    const { baseURL, apiKey } = this.serviceOptions || {};
+    const { apiKey } = this.serviceOptions || {};
     const { responseFormat, structuredOutput, ...restModelOptions } = this.modelOptions || {};
     const { schema } = structuredOutput || {};
     const responseFormatOptions = {
@@ -50,7 +50,7 @@ class XAIProvider extends import_provider.LLMProvider {
     return new import_xai.ChatXAI({
       apiKey,
       ...restModelOptions,
-      baseURL: baseURL || this.baseURL,
+      baseURL: this.getResolvedBaseURL(),
       modelKwargs: {
         response_format: responseFormatOptions
       }

package/dist/server/resource/ai.js

@@ -39,7 +39,10 @@ __export(ai_exports, {
   default: () => ai_default
 });
 module.exports = __toCommonJS(ai_exports);
+var import_package = require("../../../package.json");
 var import_lodash = __toESM(require("lodash"));
+const getModelsListFailedMessage = "Get models list failed, you can enter a model name manually.";
+const testFlightFailedMessage = "LLM service test failed. Please check the service configuration.";
 const aiResource = {
   name: "ai",
   actions: {
@@ -98,10 +101,7 @@ const aiResource = {
         const res = await provider.listModels();
         if (res.errMsg) {
           ctx.log.error(res.errMsg);
-          ctx.throw(
-            res.code || 500,
-            `${ctx.t("Get models list failed, you can enter a model name manually.")} ${res.errMsg}`
-          );
+          ctx.throw(res.code || 500, ctx.t(getModelsListFailedMessage, { ns: import_package.name }));
         }
         ctx.body = res.models || [];
       }
@@ -122,10 +122,7 @@ const aiResource = {
       const res = await providerClient.listModels();
       if (res.errMsg) {
         ctx.log.error(res.errMsg);
-        ctx.throw(
-          res.code || 500,
-          `${ctx.t("Get models list failed, you can enter a model name manually.")} ${res.errMsg}`
-        );
+        ctx.throw(res.code || 500, ctx.t(getModelsListFailedMessage, { ns: import_package.name }));
       }
       const models = res.models || [];
       if (model) {
@@ -151,7 +148,12 @@ const aiResource = {
           responseFormat: "text"
         }
       });
-      ctx.body = await providerClient.testFlight();
+      const result = await providerClient.testFlight();
+      if (result.status === "error") {
+        ctx.log.error(result.message);
+        result.message = ctx.t(testFlightFailedMessage, { ns: import_package.name });
+      }
+      ctx.body = result;
       return next();
     },
     listAllEnabledModels: async (ctx, next) => {

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

@@ -436,8 +436,7 @@ async function parseAssignees(node, processor) {
   if (plainIds.length) {
     const users = await UserRepo.find({
       filter: { id: { $in: plainIds } },
-      fields: ["id"],
-      transaction: processor.mainTransaction
+      fields: ["id"]
     });
     users.forEach((u) => validIdSet.add(u.id));
   }
@@ -454,8 +453,7 @@ async function parseAssignees(node, processor) {
       }
       const result = await UserRepo.find({
         ...item,
-        fields: ["id"],
-        transaction: processor.mainTransaction
+        fields: ["id"]
       });
       result.forEach((user) => addAssignee(user.id));
     } else {

package/dist/server/workflow/nodes/employee/types.d.ts

@@ -21,10 +21,10 @@ export type AIEmployeeInstructionConfig = {
         [key: string]: any;
     };
     webSearch?: boolean;
-    model: {
+    model?: {
         llmService: string;
         model: string;
-    };
+    } | null;
     requiresApproval?: RequiresApproval;
     assignees?: string[];
     userId: string;

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.43",
+  "version": "2.1.0-beta.45",
   "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": "6d7750e2373bf2451d246de88cc1f62491685e18"
+  "gitHead": "42587115fc34c3eb01ef2b2549f1c998e5708318"
 }

package/dist/ai/docs/nocobase/api/cli/app/down.md

@@ -1,41 +0,0 @@
----
-title: "nb app down"
-description: "nb app down command reference: stop and clean up local runtime resources for a selected env."
-keywords: "nb app down,NocoBase CLI,cleanup,remove containers,storage"
----
-
-# nb app down
-
-Stop and clean up local runtime resources for a selected env. Storage data and env configuration are kept by default; pass `--all --force` explicitly to delete everything.
-
-## Usage
-
-```bash
-nb app down [flags]
-```
-
-## Parameters
-
-| Parameter | Type | Description |
-| --- | --- | --- |
-| `--env`, `-e` | string | CLI env name to clean up; uses the current env if omitted |
-| `--all` | boolean | Delete all content for the env, including storage data and saved env configuration |
-| `--yes`, `-y` | boolean | When an explicitly passed `--env` targets a different env than the current env, skip the interactive confirmation prompt |
-| `--force`, `-f` | boolean | Force destructive cleanup, such as `--all` or other high-risk cleanup in non-interactive mode |
-| `--verbose` | boolean | Show underlying stop and cleanup command output |
-
-## Examples
-
-```bash
-nb app down --env app1
-nb app down --env app1 --all --force
-nb app down --env app1 --force
-```
-
-`--yes` only skips the interactive confirmation when an explicitly passed `--env` targets a different env than the current env. `--force` is for actually forcing destructive cleanup, such as `--all` or other high-risk cleanup in non-interactive mode.
-
-## Related Commands
-
-- [`nb app stop`](./stop.md)
-- [`nb env remove`](../env/remove.md)
-- [`nb db stop`](../db/stop.md)