@saltcorn/agents 0.7.13 → 0.7.15

package/agent-view.js

@@ -133,6 +133,12 @@ const configuration_workflow = (req) =>
                     },
                   ]
                 : []),
+              {
+                name: "shared",
+                label: "Shared runs",
+                sublabel: "Users can open runs created by other users",
+                type: "Bool",
+              },
               {
                 name: "layout",
                 label: "Layout",
@@ -267,16 +273,31 @@ const run = async (
     stream,
     audio_recorder,
     layout,
+    shared,
   },
   state,
   { res, req },
 ) => {
   const action = agent_action || (await Trigger.findOne({ id: action_id }));
   if (!action) throw new Error(`Action not found: ${action_id}`);
+  let triggering_row_id;
+  if (table_id) {
+    const table = Table.findOne(table_id);
+    const pk = table?.pk_name;
+    if (table && state[pk])
+      //triggering_row = await table.getRow({ [pk]: state[pk] });
+      triggering_row_id = state[pk];
+  }
   const prevRuns = show_prev_runs
     ? (
         await WorkflowRun.find(
-          { trigger_id: action.id, started_by: req.user?.id },
+          {
+            trigger_id: action.id,
+            ...(shared ? {} : { started_by: req.user?.id }),
+            ...(triggering_row_id
+              ? { context: { json: ["triggering_row_id", triggering_row_id] } }
+              : {}),
+          },
           { orderBy: "started_at", orderDesc: true, limit: 30 },
         )
       ).filter((r) => r.context.interactions)
@@ -285,21 +306,14 @@ const run = async (
   const cfgMsg = incompleteCfgMsg();
   if (cfgMsg) return cfgMsg;
   let runInteractions = "";
-  let triggering_row_id;
-  if (table_id) {
-    const table = Table.findOne(table_id);
-    const pk = table?.pk_name;
-    if (table && state[pk])
-      //triggering_row = await table.getRow({ [pk]: state[pk] });
-      triggering_row_id = state[pk];
-  }
+
   const initial_q = state.run_id ? undefined : state._q;
   if (state.run_id) {
     const run = prevRuns
       ? prevRuns.find((r) => r.id == state.run_id)
       : await WorkflowRun.findOne({
           trigger_id: action.id,
-          started_by: req.user?.id,
+          ...(shared ? {} : { started_by: req.user?.id }),
           id: state.run_id,
         });
     const interactMarkups = [];
@@ -509,6 +523,15 @@ const run = async (
           { id: "audioinputicon", class: "", onclick: "" },
           i({ class: "fas fa-microphone" }),
         ),
+      button(
+        {
+          type: "button",
+          class: "btn btn-xs btn-sm btn-outline-secondary cancelbtn ms-2",
+          onclick: "press_cancel_button()",
+          style: { display: "none" },
+        },
+        i({ class: "fas fa-stop" }),
+      ),
       explainer && small({ class: "explainer" }, i(explainer)),
     ),
     stream && realTimeCollabScript(viewname, rndid, layout),
@@ -670,6 +693,12 @@ const run = async (
               left: 0.1rem;
               cursor: pointer;
             }
+            .copilot-entry .cancelbtn {
+              position: relative; 
+              top: -1.8rem;
+              left: 0.1rem;
+              cursor: pointer;
+            }
             .copilot-entry .skill-form-widget {
               position: relative; 
               top: -2rem;
@@ -957,7 +986,10 @@ const run = async (
         $("span.filename-label").text("").removeClass("me-2");
         window._agentDT.items.clear();
         $("input#attach_agent_image").val(null);
-        if(!not_final || (!${JSON.stringify(dyn_updates)})) $("#sendbuttonicon").attr("class","far fa-paper-plane");
+        if(!not_final || (!${JSON.stringify(dyn_updates)})) {
+          $("#sendbuttonicon").attr("class","far fa-paper-plane");
+          $(".cancelbtn").hide();
+        }
         const $runidin= $("input[name=run_id")
         if(res.run_id && (!$runidin.val() || $runidin.val()=="undefined"))
           $runidin.val(res.run_id);
@@ -983,6 +1015,7 @@ const run = async (
       $(".agent-waiting-indicator").remove();
       $("textarea[name=userinput]").prop("disabled", false).attr("placeholder", ${JSON.stringify(placeholder || "How can I help you?")}).focus();
       $(".copilot-entry .submit-button").css("pointer-events", "");
+      $(".cancelbtn").hide();
       scrollAgentToBottom();
     }
     window._agentDT = new DataTransfer();
@@ -1028,6 +1061,12 @@ const run = async (
         if(runid)
         view_post('${viewname}', 'debug_info', {run_id:runid, triggering_row_id:$("input[name=triggering_row_id").val()}, show_agent_debug_info)
     }
+    function press_cancel_button() {
+        const $runidin= $("input[name=run_id")
+        const runid = $runidin.val()
+        if(runid)
+        view_post('${viewname}', 'cancel', {run_id:runid})
+    }
     function show_agent_debug_info(info) {
       ensure_modal_exists_and_closed();
       $("#scmodal .modal-body").html(info.debug_html);
@@ -1106,6 +1145,7 @@ const run = async (
     }
     function spin_send_button() {
       $("#sendbuttonicon").attr("class","fas fa-spinner fa-spin");
+      $(".cancelbtn").show()
       $("textarea[name=userinput]").prop("disabled", true).attr("placeholder", "Waiting for response...");
       $(".copilot-entry .submit-button").css("pointer-events", "none");
       const isModernLayout = ${JSON.stringify((layout || "").startsWith("Modern chat"))};
@@ -1235,14 +1275,15 @@ const interact = async (table_id, viewname, config, body, { req, res }) => {
     "You",
     true,
     config.layout,
+    req?.user,
   );
-
   await addToContext(run, {
     interactions: [
       ...(run.context.interactions || []),
       { role: "user", content: userinput },
     ],
     html_interactions: [userInteractions],
+    status: "Running",
   });
   const dyn_updates = getState().getConfig("enable_dynamic_updates", true);
   if (dyn_updates) {
@@ -1292,6 +1333,13 @@ const delprevrun = async (table_id, viewname, config, body, { req, res }) => {
   return;
 };
 
+const cancel = async (table_id, viewname, config, body, { req, res }) => {
+  const { run_id } = body;
+  const run = await WorkflowRun.findOne({ id: +run_id });
+  await run.update({ status: "Cancel" });
+  return;
+};
+
 const debug_info = async (table_id, viewname, config, body, { req, res }) => {
   const { run_id, triggering_row_id } = body;
   const action =
@@ -1478,7 +1526,7 @@ const execute_user_action = async (
       const { layout } = config;
 
       const resp = JSON.stringify(
-        wrapSegment(uadata.click_replace_text, "You", true, layout),
+        wrapSegment(uadata.click_replace_text, "You", true, layout, req?.user),
       );
       getState().emitDynamicUpdate(
         db.getTenantSchema(),
@@ -1497,19 +1545,27 @@ const execute_user_action = async (
               "You",
               true,
               config.layout,
+              req?.user,
             );
           return hi;
         },
       );
       await run.update({ context: run.context });
     }
+    let row = {};
+    if (run.context.triggering_row_id) {
+      const table = Table.findOne(table_id);
+      const pk = table?.pk_name;
+      if (table)
+        row = await table.getRow({ [pk]: run.context.triggering_row_id });
+    }
     await process_interaction(
       run,
       action.configuration,
       req,
       action.name,
       [],
-      {}, //row?
+      row,
       config,
       dyn_updates,
     );
@@ -1537,6 +1593,13 @@ module.exports = {
   //tableless: true,
   table_optional: true,
   run,
-  routes: { interact, delprevrun, debug_info, skillroute, execute_user_action },
+  routes: {
+    interact,
+    delprevrun,
+    debug_info,
+    skillroute,
+    execute_user_action,
+    cancel,
+  },
   mobile_render_server_side: true,
 };

package/common.js

@@ -4,6 +4,7 @@ const Trigger = require("@saltcorn/data/models/trigger");
 const View = require("@saltcorn/data/models/view");
 const { interpolate } = require("@saltcorn/data/utils");
 const db = require("@saltcorn/data/db");
+const WorkflowRun = require("@saltcorn/data/models/workflow_run");
 
 const MarkdownIt = require("markdown-it"),
   md = new MarkdownIt({ html: true, breaks: true, linkify: true });
@@ -183,6 +184,7 @@ const addToContext = async (run, newCtx) => {
   if (!run) return;
   if (run.addToContext) return await run.addToContext(newCtx);
   let changed = true;
+  let extraRunSet = {};
   Object.keys(newCtx).forEach((k) => {
     if (Array.isArray(run.context[k])) {
       if (!Array.isArray(newCtx[k]))
@@ -195,12 +197,15 @@ const addToContext = async (run, newCtx) => {
         throw new Error("Must be object to append to object");
       Object.assign(run.context[k], newCtx[k]);
       changed = true;
+    } else if (k === "status") {
+      extraRunSet.status = newCtx[k];
     } else {
       run.context[k] = newCtx[k];
       changed = true;
     }
   });
-  if (changed && run.update) await run.update({ context: run.context });
+  if (changed && run.update)
+    await run.update({ context: run.context, ...extraRunSet });
 };
 
 const saveInteractions = async (run) => {
@@ -209,12 +214,12 @@ const saveInteractions = async (run) => {
   });
 };
 
-const wrapSegment = (html, who, to_right, layout) =>
+const wrapSegment = (html, who, to_right, layout, user) =>
   who === null
     ? html
     : layout && layout.startsWith("Modern chat")
       ? `<div class="chat-message ${to_right ? "chat-user" : "chat-assistant"}">` +
-        `<div class="chat-avatar"><i class="fas ${to_right ? "fa-user" : "fa-robot"}"></i></div>` +
+        `<div class="chat-avatar"${user ? ` title="${user.email} at ${new Date().toString()}"` : ""}><i class="fas ${to_right ? "fa-user" : "fa-robot"}"></i></div>` +
         `<div class="chat-bubble">${html}</div>` +
         `</div>`
       : `<div class="interaction-segment ${to_right ? "to-right" : ""}"><div><div class="badgewrap"><span class="badge bg-secondary">` +
@@ -407,7 +412,12 @@ const process_interaction = async (
             if (rendered)
               add_response(
                 wrapSegment(
-                  wrapCard(response_label, rendered),
+                  wrapCard(
+                    response_label,
+                    typeof rendered === "string"
+                      ? md.render(rendered)
+                      : rendered,
+                  ),
                   agent_label,
                   false,
                   layout,
@@ -668,7 +678,10 @@ const process_interaction = async (
           if (myHasResult && !stop) hasResult = true;
         }
       }
-    if (hasResult)
+    //await db.commitAndBeginNewTransaction();
+    const freshRun = await WorkflowRun.findOne({ id: run.id });
+
+    if (hasResult && freshRun.status !== "Cancel")
       return await process_interaction(
         run,
         config,

package/locales/de.json

@@ -1 +1 @@
-{ "Sessions": "Sitzungen" }
+{ "Sessions": "Sitzungen", "Approve": "Freigeben", "Approved": "Freigegeben" }

package/package.json

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

package/skills/PlanApproval.js

@@ -63,17 +63,15 @@ class PlanApprovalSkill {
   provideTools = () => {
     return {
       type: "function",
-      process: async (row) => {
-        console.log("process plan row", row);
-
+      process: async (row, { req }) => {
         return {
           stop: true,
           add_response: row.plan,
           add_user_action: {
             name: "approve_plan",
             type: "button",
-            label: `Approve`,
-            click_replace_text: "Approved",
+            label: req.__("Approve"),
+            click_replace_text: req.__("Approved"),
             input: {},
           },
         };