@saltcorn/agents 0.5.2 → 0.5.4

package/agent-view.js

@@ -194,8 +194,8 @@ const realTimeCollabScript = (viewname) => {
   else {
     //legacy
     ensure_script_loaded("/static_assets/${
-    db.connectObj.version_tag
-      }/socket.io.min.js");
+      db.connectObj.version_tag
+    }/socket.io.min.js");
     callback();
   }`)
   );
@@ -321,18 +321,21 @@ const run = async (
               }
             }
           }
-
-          interactMarkups.push(
-            div(
-              { class: "interaction-segment" },
-              span({ class: "badge bg-secondary" }, action.name),
-              typeof interact.content === "string"
-                ? md.render(interact.content)
-                : typeof interact.content?.content === "string"
-                ? md.render(interact.content.content)
-                : interact.content
-            )
-          );
+          if (
+            typeof interact.content === "string" ||
+            typeof interact.content?.content === "string"
+          )
+            interactMarkups.push(
+              div(
+                { class: "interaction-segment" },
+                span({ class: "badge bg-secondary" }, action.name),
+                typeof interact.content === "string"
+                  ? md.render(interact.content)
+                  : typeof interact.content?.content === "string"
+                  ? md.render(interact.content.content)
+                  : interact.content
+              )
+            );
           break;
         case "tool":
           if (interact.content !== "Action run") {
@@ -371,7 +374,11 @@ const run = async (
   for (const skill of get_skill_instances(action.configuration)) {
     if (skill.formWidget)
       skill_form_widgets.push(
-        await skill.formWidget({ user: req.user, klass: "skill-form-widget" })
+        await skill.formWidget({
+          user: req.user,
+          viewname,
+          klass: "skill-form-widget",
+        })
       );
   }
 
@@ -556,6 +563,9 @@ const run = async (
       $("div.prev-runs-list").show().parents(".was-col-3").removeClass(["was-col-3","col-0","d-none"]).addClass("col-3").parent().children(".col-12").removeClass("col-12").addClass("col-9")
       $("div.open-prev-runs").hide()
     }
+    function get_run_id(elem) {
+        return $("input[name=run_id").val()
+    }
     function processCopilotResponse(res) {
         const hadFile = $("input#attach_agent_image").val();
         $("span.filename-label").text("");
@@ -791,6 +801,36 @@ const debug_info = async (table_id, viewname, config, body, { req, res }) => {
 
   return;
 };
+
+const skillroute = async (table_id, viewname, config, body, { req, res }) => {
+  const { run_id, triggering_row_id, skillid } = body;
+  const action = await Trigger.findOne({ id: config.action_id });
+  let triggering_row;
+  if (table_id && triggering_row_id) {
+    const table = Table.findOne(table_id);
+    const pk = table?.pk_name;
+    if (table) triggering_row = await table.getRow({ [pk]: triggering_row_id });
+  }
+  const run = await WorkflowRun.findOne({ id: +run_id });
+  if (!run) return;
+
+  const instances = get_skill_instances(action.configuration);
+  const instance = instances.find((i) => i.skillid === skillid);
+
+  if (!instance?.skillRoute) return;
+  const resp = await instance.skillRoute({
+    triggering_row,
+    run,
+    req,
+    user: req.user,
+  });
+  return {
+    json: {
+      success: "ok",
+      ...resp,
+    },
+  };
+};
 const wrapAction = (
   inner_markup,
   viewname,
@@ -830,5 +870,5 @@ module.exports = {
   //tableless: true,
   table_optional: true,
   run,
-  routes: { interact, delprevrun, debug_info },
+  routes: { interact, delprevrun, debug_info, skillroute },
 };

package/package.json

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

package/skills/RunJsCode.js

@@ -12,6 +12,9 @@ const db = require("@saltcorn/data/db");
 const { eval_expression } = require("@saltcorn/data/models/expression");
 const { interpolate, sleep } = require("@saltcorn/data/utils");
 const { features } = require("@saltcorn/data/db/state");
+const { button } = require("@saltcorn/markup/tags");
+const { validID } = require("@saltcorn/markup/layout_utils");
+
 const vm = require("vm");
 
 //const { fieldProperties } = require("./helpers");
@@ -25,9 +28,11 @@ class RunJsCodeSkill {
 
   constructor(cfg) {
     Object.assign(this, cfg);
+    if (this.mode === "Button")
+      this.skillid = `jsbtn${validID(this.button_label || "jscodebtn")}`;
   }
 
-  async runCode({ row, user, req }) {
+  async runCode({ row, user, req, ...rest }) {
     const sysState = getState();
 
     const f = vm.runInNewContext(`async () => {${this.js_code}\n}`, {
@@ -78,6 +83,7 @@ class RunJsCodeSkill {
       request_ip: req?.ip,
       ...(row || {}),
       ...sysState.eval_context,
+      ...rest,
     });
     return await f();
   }
@@ -86,18 +92,37 @@ class RunJsCodeSkill {
     return this.add_sys_prompt || "";
   }
 
+  async skillRoute({ run, triggering_row, req }) {
+    return await this.runCode({ row: triggering_row, run, user: req.user.req });
+  }
+
   static async configFields() {
     return [
+      {
+        name: "mode",
+        label: "Mode",
+        type: "String",
+        required: true,
+        attributes: { options: ["Tool", "Button"] },
+      },
+      {
+        name: "button_label",
+        label: "Button label",
+        type: "String",
+        showIf: { mode: "Button" },
+      },
       {
         name: "tool_name",
         label: "Tool name",
         type: "String",
         class: "validate-identifier",
+        showIf: { mode: "Tool" },
       },
       {
         name: "tool_description",
         label: "Tool description",
         type: "String",
+        showIf: { mode: "Tool" },
       },
 
       {
@@ -106,9 +131,14 @@ class RunJsCodeSkill {
         input_type: "code",
         attributes: { mode: "text/javascript" },
       },
-      { input_type: "section_header", label: "Tool parameters" },
+      {
+        input_type: "section_header",
+        label: "Tool parameters",
+        showIf: { mode: "Tool" },
+      },
       new FieldRepeat({
         name: "toolargs",
+        showIf: { mode: "Tool" },
         fields: [
           {
             name: "name",
@@ -129,16 +159,37 @@ class RunJsCodeSkill {
           },
         ],
       }),
+      {
+        name: "display_result",
+        label: "Display result",
+        type: "Bool",
+        sublabel: "Show the value returned in JSON format",
+        showIf: { mode: "Tool" },
+      },
       {
         name: "add_sys_prompt",
         label: "Additional prompt",
         type: "String",
         fieldview: "textarea",
+        showIf: { mode: "Tool" },
       },
     ];
   }
 
+  async formWidget({ klass, viewname }) {
+    if (this.mode === "Button")
+      return button(
+        {
+          type: "button",
+          class: ["btn btn-outline-secondary btn-sm btn-xs", klass],
+          onclick: `view_post('${viewname}', 'skillroute', {skillid: '${this.skillid}', run_id: get_run_id(this)});`,
+        },
+        this.button_label
+      );
+  }
+
   provideTools = () => {
+    if (this.mode === "Button") return;
     let properties = {};
     (this.toolargs || []).forEach((arg) => {
       properties[arg.name] = {
@@ -154,12 +205,14 @@ class RunJsCodeSkill {
       /*renderToolCall({ phrase }, { req }) {
         return div({ class: "border border-primary p-2 m-2" }, phrase);
       },*/
-      renderToolResponse: async (response, { req }) => {
-        return div(
-          { class: "border border-success p-2 m-2" },
-          typeof response === "string" ? response : JSON.stringify(response)
-        );
-      },
+      renderToolResponse: this.display_result
+        ? async (response, { req }) => {
+            return div(
+              { class: "border border-success p-2 m-2" },
+              typeof response === "string" ? response : JSON.stringify(response)
+            );
+          }
+        : undefined,
       function: {
         name: this.tool_name,
         description: this.tool_description,