@nocobase/plugin-ai 2.0.0-alpha.25 → 2.0.0-alpha.27

package/dist/server/manager/ai-chat-conversation.js

@@ -141,14 +141,14 @@ class AIChatConversationImpl {
     };
   }
   async formatMessages(messages, options) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const formattedMessages = [];
     const { provider, workContextHandler } = options;
     for (const msg of messages) {
       const attachments = msg.attachments;
       const workContext = msg.workContext;
-      let content = msg.content.content;
-      if (!content && !attachments && !((_a = msg.toolCalls) == null ? void 0 : _a.length)) {
+      let content = (_a = msg.content) == null ? void 0 : _a.content;
+      if (!content && !attachments && !((_b = msg.toolCalls) == null ? void 0 : _b.length)) {
         continue;
       }
       if (msg.role === "user") {
@@ -182,7 +182,7 @@ class AIChatConversationImpl {
         formattedMessages.push({
           role: "tool",
           content,
-          tool_call_id: (_c = (_b = msg.metadata) == null ? void 0 : _b.toolCall) == null ? void 0 : _c.id
+          tool_call_id: (_d = (_c = msg.metadata) == null ? void 0 : _c.toolCall) == null ? void 0 : _d.id
         });
         continue;
       }

package/dist/server/manager/ai-context-datasource-manager.d.ts

@@ -15,15 +15,19 @@ export declare class AIContextDatasourceManager {
     protected plugin: PluginAIServer;
     constructor(plugin: PluginAIServer);
     preview(ctx: Context, options: PreviewOptions): Promise<QueryResult | null>;
+    query(ctx: Context, options: InnerQueryOptions): Promise<QueryResult | null>;
     provideWorkContextResolveStrategy(): WorkContextResolveStrategy;
     private innerQuery;
 }
-export type PreviewOptions = Pick<AIContextDatasource, 'datasource' | 'collectionName' | 'fields' | 'appends' | 'filter' | 'sort' | 'limit'>;
+export type PreviewOptions = Pick<AIContextDatasource, 'datasource' | 'collectionName' | 'fields' | 'appends' | 'filter' | 'sort' | 'limit'> & {
+    offset?: number;
+};
 export type QueryOptions = {
     id: string;
 };
 export type QueryResult = {
     options: InnerQueryOptions;
+    total: number;
     records: {
         name: string;
         type: string;

package/dist/server/manager/ai-context-datasource-manager.js

@@ -37,6 +37,9 @@ class AIContextDatasourceManager {
   async preview(ctx, options) {
     return await this.innerQuery(ctx, { ...options, filter: options.filter ? (0, import_utils.transformFilter)(options.filter) : null });
   }
+  async query(ctx, options) {
+    return await this.innerQuery(ctx, { ...options, filter: options.filter });
+  }
   provideWorkContextResolveStrategy() {
     return async (ctx, contextItem) => {
       if (!contextItem.content) {
@@ -57,6 +60,7 @@ class AIContextDatasourceManager {
       this.plugin.log.warn(`Datasource ${datasource} not found`);
       return {
         options,
+        total: 0,
         records: []
       };
     }
@@ -65,6 +69,7 @@ class AIContextDatasourceManager {
       this.plugin.log.warn(`Collection ${collectionName} not found`);
       return {
         options,
+        total: 0,
         records: []
       };
     }
@@ -78,6 +83,7 @@ class AIContextDatasourceManager {
       if (!can || typeof can !== "object") {
         return {
           options,
+          total: 0,
           records: []
         };
       }
@@ -113,8 +119,9 @@ class AIContextDatasourceManager {
         }
       });
     }
-    const { fields, filter, sort, limit } = options;
-    const result = await collection.repository.find({ fields, filter, sort, limit });
+    const { fields, filter, sort, offset, limit } = options;
+    const result = await collection.repository.find({ fields, filter, sort, offset: offset ?? 0, limit });
+    const total = await collection.repository.count({ fields, filter });
     const records = result.map(
       (x) => fields.map((field) => {
         var _a2;
@@ -129,6 +136,7 @@ class AIContextDatasourceManager {
     );
     return {
       options,
+      total,
       records
     };
   }

package/dist/server/plugin.js

@@ -66,6 +66,7 @@ var import_aiContextDatasources = require("./resource/aiContextDatasources");
 var import_work_context_handler = require("./manager/work-context-handler");
 var import_ai_coding_manager = require("./manager/ai-coding-manager");
 var import_code_editor = require("./tools/code-editor");
+var import_datasource_query = require("./tools/datasource-query");
 class PluginAIServer extends import_server.Plugin {
   features = new import_ai_feature_manager.AIPluginFeatureManagerImpl();
   aiManager = new import_ai_manager.AIManager(this);
@@ -111,6 +112,7 @@ class PluginAIServer extends import_server.Plugin {
     const dataModelingGroupName = "dataModeling";
     const workflowGroupName = "workflowCaller";
     const codeEditorGroupName = "codeEditor";
+    const dataSourceGroupName = "dataSource";
     toolManager.registerToolGroup({
       groupName: frontendGroupName,
       title: '{{t("Frontend")}}',
@@ -131,6 +133,11 @@ class PluginAIServer extends import_server.Plugin {
       title: '{{t("CodeEditor")}}',
       description: '{{t("CodeEditor actions")}}'
     });
+    toolManager.registerToolGroup({
+      groupName: dataSourceGroupName,
+      title: '{{t("DataSource")}}',
+      description: '{{t("Data source query")}}'
+    });
     this.aiManager.toolManager.registerTools([
       {
         groupName: frontendGroupName,
@@ -162,6 +169,14 @@ class PluginAIServer extends import_server.Plugin {
       {
         groupName: codeEditorGroupName,
         tool: import_code_editor.getCodeSnippet
+      },
+      {
+        groupName: dataSourceGroupName,
+        tool: import_datasource_query.dataSourceCounting
+      },
+      {
+        groupName: dataSourceGroupName,
+        tool: import_datasource_query.dataSourceQuery
       }
     ]);
     toolManager.registerDynamicTool({

package/dist/server/resource/aiEmployees.d.ts

@@ -8,6 +8,7 @@
  */
 import { Context, Next } from '@nocobase/actions';
 export declare const list: (ctx: Context, next: Next) => Promise<void>;
+export declare const create: (ctx: Context, next: Next) => Promise<void>;
 export declare const listByUser: (ctx: Context, next: Next) => Promise<any>;
 export declare const updateUserPrompt: (ctx: Context, next: Next) => Promise<any>;
 export declare const getTemplates: (ctx: Context, next: Next) => Promise<void>;

package/dist/server/resource/aiEmployees.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 aiEmployees_exports = {};
 __export(aiEmployees_exports, {
+  create: () => create,
   getTemplates: () => getTemplates,
   list: () => list,
   listByUser: () => listByUser,
@@ -44,6 +45,7 @@ __export(aiEmployees_exports, {
 module.exports = __toCommonJS(aiEmployees_exports);
 var import_actions = __toESM(require("@nocobase/actions"));
 var templates = __toESM(require("../ai-employees/templates"));
+var import_lodash = __toESM(require("lodash"));
 const list = async (ctx, next) => {
   const { paginate } = ctx.action.params || {};
   const plugin = ctx.app.pm.get("ai");
@@ -62,6 +64,22 @@ const list = async (ctx, next) => {
   });
   await next();
 };
+const create = async (ctx, next) => {
+  const { skillSettings } = ctx.action.params.values ?? {};
+  const skills = skillSettings.skills ?? [];
+  skills.push(
+    {
+      name: "dataSource-dataSourceCounting",
+      autoCall: true
+    },
+    {
+      name: "dataSource-dataSourceQuery",
+      autoCall: true
+    }
+  );
+  skillSettings.skills = import_lodash.default.uniqBy(skills, "name");
+  await import_actions.default.create(ctx, next);
+};
 const listByUser = async (ctx, next) => {
   const plugin = ctx.app.pm.get("ai");
   const user = ctx.auth.user;
@@ -168,6 +186,7 @@ const getTemplates = async (ctx, next) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  create,
   getTemplates,
   list,
   listByUser,

package/dist/server/tools/datasource-query.d.ts

@@ -0,0 +1,11 @@
+/**
+ * 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 { ToolOptions } from '../manager/tool-manager';
+export declare const dataSourceQuery: ToolOptions;
+export declare const dataSourceCounting: ToolOptions;

package/dist/server/tools/datasource-query.js

@@ -0,0 +1,133 @@
+/**
+ * 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 datasource_query_exports = {};
+__export(datasource_query_exports, {
+  dataSourceCounting: () => dataSourceCounting,
+  dataSourceQuery: () => dataSourceQuery
+});
+module.exports = __toCommonJS(datasource_query_exports);
+var import_zod = require("zod");
+const ArgSchema = import_zod.z.object({
+  datasource: import_zod.z.string().describe('{{t("Data source key")}}'),
+  collectionName: import_zod.z.string().describe('{{t("Collection name")}}'),
+  fields: import_zod.z.array(import_zod.z.string()).describe('{{t("Fields to be queried")}}'),
+  appends: import_zod.z.array(import_zod.z.string()).describe('{{t("Related collection to be queried")}}'),
+  filter: import_zod.z.object({}).catchall(import_zod.z.any()).describe(`# Parameters definition
+\`\`\`
+export type QueryCondition = {
+  [field: string]: { // \`field\` key is Field name
+    [operator: string]: any; // \`operator\` key is Query condition operator.
+  };
+};
+
+
+export type QueryObject =
+  | {
+      [logic: string]: (QueryCondition | QueryObject)[]; // \`logic\` key is the relationship between query conditions, should be one of '$and', '$or', the value is recursion object array, item in array can be QueryCondition or QueryObject
+    }
+  | QueryCondition // QueryCondition definition above;
+\`\`\`
+
+
+// QueryCondition examples
+
+\`\`\`
+const example1: QueryCondition = {
+  age: { $gt: 18 },          // age great than 18
+  name: { $like: '%John%' }, // name include John
+};
+
+const example2: QueryCondition = {
+  status: { $in: ['active', 'pending'] }, // status is active or pending
+};
+\`\`\`
+
+// QueryObject example
+\`\`\`
+const example1: QueryObject = {
+  $and: [
+    { age: { $gt: 18 } },
+    { status: { $eq: 'active' } }
+  ]
+};
+
+const example2: QueryObject = {
+  $or: [
+    { name: { $like: '%John%' } },
+    {
+      $and: [
+        { age: { $gte: 30 } },
+        { status: { $eq: 'pending' } }
+      ]
+    }
+  ]
+};
+
+const example3: QueryObject = { age: { $lt: 50 } };
+\`\`\`
+`),
+  sort: import_zod.z.array(import_zod.z.string()).describe(
+    '{{t("Sort field names. By default, they are in ascending order. A minus sign before the field name indicates descending order")}}'
+  ),
+  offset: import_zod.z.number().describe('{{t("Offset of records to be queried")}}'),
+  limit: import_zod.z.number().describe('{{t("Maximum number of records to be queried")}}')
+});
+const dataSourceQuery = {
+  name: "dataSourceQuery",
+  title: '{{t("Data source query")}}',
+  description: '{{t("Use dataSource, collectionName, and collection fields to query data from the database")}}',
+  schema: ArgSchema,
+  invoke: async (ctx, args) => {
+    const plugin = ctx.app.pm.get("ai");
+    const content = await plugin.aiContextDatasourceManager.query(ctx, args);
+    return {
+      status: "success",
+      content: JSON.stringify(content)
+    };
+  }
+};
+const dataSourceCounting = {
+  name: "dataSourceCounting",
+  title: '{{t("Data source records counting")}}',
+  description: '{{t("Use dataSource, collectionName, and collection fields to query data from the database, get total count of records")}}',
+  schema: ArgSchema,
+  invoke: async (ctx, args) => {
+    const plugin = ctx.app.pm.get("ai");
+    args.offset = 0;
+    args.limit = 1;
+    const content = await plugin.aiContextDatasourceManager.query(ctx, args);
+    return {
+      status: "success",
+      content: String((content == null ? void 0 : content.total) ?? 0)
+    };
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  dataSourceCounting,
+  dataSourceQuery
+});

package/dist/server/utils.js

@@ -56,8 +56,8 @@ function stripToolCallTags(content) {
 function parseResponseMessage(row) {
   const { content: rawContent, messageId, metadata, role, toolCalls, attachments, workContext } = row;
   const content = {
-    ...rawContent,
-    content: stripToolCallTags(rawContent.content),
+    ...rawContent ?? {},
+    content: stripToolCallTags(rawContent == null ? void 0 : rawContent.content),
     messageId,
     metadata,
     attachments,

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "AI 员工",
   "description": "Create AI employees with diverse skills to collaborate with humans, build systems, and handle business operations.",
   "description.zh-CN": "创建各种技能的 AI 员工，与人类协同，搭建系统，处理业务。",
-  "version": "2.0.0-alpha.25",
+  "version": "2.0.0-alpha.27",
   "main": "dist/server/index.js",
   "peerDependencies": {
     "@nocobase/client": "2.x",
@@ -42,5 +42,5 @@
   "keywords": [
     "AI"
   ],
-  "gitHead": "8ce1972206272bd1723db193abd0425c532c5687"
+  "gitHead": "bb67b95bc49f8d808209e635296ba15a1bd72f72"
 }