@saltcorn/agents 0.7.15 → 0.8.0

package/action.js

@@ -1,9 +1,11 @@
 const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
 const Table = require("@saltcorn/data/models/table");
-const { get_skills, process_interaction } = require("./common");
+const View = require("@saltcorn/data/models/view");
+const { p } = require("@saltcorn/markup/tags");
+const { get_skills, process_interaction, wrapSegment } = require("./common");
 const { applyAsync } = require("@saltcorn/data/utils");
 const WorkflowRun = require("@saltcorn/data/models/workflow_run");
-const { interpolate } = require("@saltcorn/data/utils");
+const { interpolate, escapeHtml } = require("@saltcorn/data/utils");
 const { getState } = require("@saltcorn/data/db/state");
 
 module.exports = {
@@ -36,8 +38,18 @@ module.exports = {
               sublabel:
                 "When triggered from table event or table view button. Use handlebars <code>{{}}</code> to access table fields. Ignored if run in Agent Chat view.",
               type: "String",
-              required: true,
-              attributes: { options: table.fields.map((f) => f.name) },
+            },
+            {
+              name: "run_id_field",
+              type: "String",
+              label: "Run ID field",
+              sublabel:
+                "Set this field to the run ID, when triggered from table event or table view button. Ignored if run in Agent Chat view.",
+              attributes: {
+                options: table.fields
+                  .filter((f) => f.type?.name === "Integer" && !f.primary_key)
+                  .map((f) => f.name),
+              },
             },
           ]
         : []),
@@ -87,6 +99,7 @@ module.exports = {
     user,
     row,
     trigger_id,
+    table,
     run_id,
     req,
     is_sub_agent,
@@ -108,11 +121,37 @@ module.exports = {
             context: {
               implemented_fcall_ids: [],
               interactions: [],
+              html_interactions: [],
               funcalls: {},
             },
           }));
 
+    if (!rest.run && !run_id && table && configuration.run_id_field) {
+      await table.updateRow(
+        { [configuration.run_id_field]: run.id },
+        row[table.pk_name],
+      );
+    }
+    let use_agent_view_config = agent_view_config;
+    if (!use_agent_view_config) {
+      const agent_views = await View.find({ viewtemplate: "Agent Chat" });
+      const agent_view = agent_views.find(
+        (v) => v?.configuration?.action_id == trigger_id,
+      );
+      if (agent_view)
+        use_agent_view_config = { ...agent_view.configuration, stream: false };
+    }
     run.context.interactions.push({ role: "user", content: userinput });
+    run.context.html_interactions.push(
+      wrapSegment(
+        p(escapeHtml(userinput)),
+        "You",
+        true,
+        use_agent_view_config?.layout,
+        req?.user,
+      ),
+    );   
+
     return await process_interaction(
       run,
       configuration,
@@ -120,7 +159,7 @@ module.exports = {
       agent_label || undefined,
       [],
       row,
-      agent_view_config || { stream: false },
+      use_agent_view_config || { stream: false },
       dyn_updates,
       is_sub_agent,
     );

package/agent-view.js

@@ -557,7 +557,7 @@ const run = async (
                 {
                   type: "button",
                   class: "btn btn-primary btn-sm rounded-pill px-3",
-                  onclick: "unset_state_field('run_id')",
+                  onclick: "unset_state_field('run_id', this)",
                   title: "New chat",
                 },
                 i({ class: "fas fa-plus me-1" }),
@@ -582,7 +582,7 @@ const run = async (
                   type: "button",
                   class: "btn btn-secondary btn-sm pt-0 pb-1",
                   style: "font-size: 0.9em;height:1.5em",
-                  onclick: "unset_state_field('run_id')",
+                  onclick: "unset_state_field('run_id', this)",
                   title: "New session",
                 },
                 i({ class: "fas fa-redo fa-sm" }),
@@ -598,7 +598,7 @@ const run = async (
           return isModernSidebar
             ? div(
                 {
-                  onclick: `set_state_field('run_id',${run.id})`,
+                  onclick: `set_state_field('run_id',${run.id}, this)`,
                   class:
                     "prevcopilotrun modern-session-item" +
                     (isActive ? " active-session" : ""),
@@ -621,7 +621,7 @@ const run = async (
               )
             : div(
                 {
-                  onclick: `set_state_field('run_id',${run.id})`,
+                  onclick: `set_state_field('run_id',${run.id}, this)`,
                   class: "prevcopilotrun border p-2",
                 },
                 div(

package/common.js

@@ -403,26 +403,13 @@ const process_interaction = async (
           const response_label = is_sub_agent
             ? agent_label
             : tool.skill.skill_label || tool.skill.constructor.skill_name;
+          let rendered_tool_call = "";
           if (tool.tool.renderToolCall) {
             const row = tool_call.input;
 
-            const rendered = await tool.tool.renderToolCall(row, {
+            rendered_tool_call = await tool.tool.renderToolCall(row, {
               req,
             });
-            if (rendered)
-              add_response(
-                wrapSegment(
-                  wrapCard(
-                    response_label,
-                    typeof rendered === "string"
-                      ? md.render(rendered)
-                      : rendered,
-                  ),
-                  agent_label,
-                  false,
-                  layout,
-                ),
-              );
           }
           myHasResult = true;
           let result = await tool.tool.process(tool_call.input, {
@@ -431,7 +418,8 @@ const process_interaction = async (
           const tool_response = result.add_response || result;
           toolResults[tool_call.tool_call_id] = result;
           if (result?.stop) stop = true;
-          if (result?.add_user_action && viewname) {
+          let add_user_action_html = "";
+          if (result?.add_user_action) {
             const user_actions = Array.isArray()
               ? result.add_user_action
               : [result.add_user_action];
@@ -442,46 +430,61 @@ const process_interaction = async (
             await addToContext(run, {
               user_actions,
             });
-            add_response(
-              div(
-                { class: "d-flex mb-2" },
-                user_actions.map((ua) =>
-                  button(
-                    {
-                      "data-useraction-id": ua.rndid,
-                      class: "btn btn-primary", //press_store_button(this, true);
-                      onclick: `view_post('${viewname}', 'execute_user_action', {uaname: "${ua.name}",rndid: "${ua.rndid}", run_id: ${run.id}}, processExecuteResponse)`,
-                    },
-                    ua.label,
-                  ),
+            add_user_action_html = div(
+              { class: "d-flex mb-2" },
+              user_actions.map((ua) =>
+                button(
+                  {
+                    "data-useraction-id": ua.rndid,
+                    class: "btn btn-primary", //press_store_button(this, true);
+                    onclick: `view_post(${viewname ? `'${viewname}'` : `$(this).closest('[data-sc-embed-viewname]').attr('data-sc-embed-viewname')`}, 'execute_user_action', {uaname: "${ua.name}",rndid: "${ua.rndid}", run_id: ${run.id}}, processExecuteResponse)`,
+                  },
+                  ua.label,
                 ),
               ),
             );
           }
+          let rendered_tool_response = "";
           if (
             (typeof tool_response === "object" &&
               Object.keys(tool_response || {}).length) ||
             typeof tool_response === "string"
           ) {
             if (tool.tool.renderToolResponse) {
-              const rendered = await tool.tool.renderToolResponse(
+              rendered_tool_response = await tool.tool.renderToolResponse(
                 tool_response,
                 {
                   req,
+                  tool_call,
                 },
               );
-              if (rendered)
-                add_response(
-                  wrapSegment(
-                    wrapCard(response_label, rendered),
-                    agent_label,
-                    false,
-                    layout,
-                  ),
-                );
             }
             myHasResult = true;
           }
+          if (
+            rendered_tool_call ||
+            add_user_action_html ||
+            rendered_tool_response
+          )
+            add_response(
+              wrapSegment(
+                div(
+                  rendered_tool_call &&
+                    wrapCard(
+                      response_label,
+                      typeof rendered_tool_call === "string"
+                        ? md.render(rendered_tool_call)
+                        : rendered_tool_call,
+                    ),
+                  rendered_tool_response,
+                  add_user_action_html,
+                ),
+                agent_label,
+                false,
+                layout,
+              ),
+            );
+
           await sysState.functions.llm_add_message.run(
             "tool_response",
             !tool_response || typeof tool_response === "string"

package/package.json

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