@saltcorn/agents 0.6.5 → 0.6.7

package/index.js

@@ -7,6 +7,7 @@ const {
   get_skills,
   getCompletionArguments,
   process_interaction,
+  get_skill_instances,
 } = require("./common");
 const { applyAsync } = require("@saltcorn/data/utils");
 const WorkflowRun = require("@saltcorn/data/models/workflow_run");
@@ -49,9 +50,22 @@ module.exports = {
           user,
           row,
         );
+        const skills = get_skill_instances(action.configuration);
+        const skill_tools = [];
+        for (const skill of skills) {
+          const skillTools = skill.provideTools?.();
+          const tools = !skillTools
+            ? []
+            : Array.isArray(skillTools)
+              ? skillTools
+              : [skillTools];
+          skill_tools.push(...tools);
+        }
         return {
           ...complArgs,
           action,
+          skills,
+          skill_tools,
         };
       },
       isAsync: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/agents",
-  "version": "0.6.5",
+  "version": "0.6.7",
   "description": "AI agents for Saltcorn",
   "main": "index.js",
   "dependencies": {

package/skills/RunJsCode.js

@@ -48,15 +48,15 @@ class RunJsCodeSkill {
         if (!enabled) {
           sysState.log(
             5,
-            "emit_to_client called, but dynamic updates are disabled"
+            "emit_to_client called, but dynamic updates are disabled",
           );
           return;
         }
         const safeIds = Array.isArray(userIds)
           ? userIds
           : userIds
-          ? [userIds]
-          : [];
+            ? [userIds]
+            : [];
         sysState.emitDynamicUpdate(db.getTenantSchema(), data, safeIds);
       },
       tryCatchInTransaction: db.tryCatchInTransaction,
@@ -184,23 +184,25 @@ class RunJsCodeSkill {
           class: ["btn btn-outline-secondary btn-sm me-1", klass],
           onclick: `view_post('${viewname}', 'skillroute', {skillid: '${this.skillid}', triggering_row_id: $('input[name=triggering_row_id').val(), run_id: get_run_id(this)});`,
         },
-        this.button_label
+        this.button_label,
       );
   }
 
   provideTools = () => {
     if (this.mode === "Button") return;
     let properties = {};
-    (this.toolargs || []).forEach((arg) => {
-      properties[arg.name] = {
-        description: arg.description,
-        type: arg.argtype,
-      };
-    });
+    (this.toolargs || [])
+      .filter((arg) => arg.name)
+      .forEach((arg) => {
+        properties[arg.name] = {
+          description: arg.description,
+          type: arg.argtype,
+        };
+      });
     return {
       type: "function",
       process: async (row, { req }) => {
-        return await this.runCode({ row, user: req.user.req });
+        return await this.runCode({ row, user: req.user });
       },
       /*renderToolCall({ phrase }, { req }) {
         return div({ class: "border border-primary p-2 m-2" }, phrase);
@@ -209,7 +211,9 @@ class RunJsCodeSkill {
         ? async (response, { req }) => {
             return div(
               { class: "border border-success p-2 m-2" },
-              typeof response === "string" ? response : JSON.stringify(response)
+              typeof response === "string"
+                ? response
+                : JSON.stringify(response),
             );
           }
         : undefined,
@@ -218,7 +222,7 @@ class RunJsCodeSkill {
         description: this.tool_description,
         parameters: {
           type: "object",
-          required: (this.toolargs || []).map((a) => a.name),
+          required: (this.toolargs || []).filter((arg) => arg.name).map((a) => a.name),
           properties,
         },
       },