@saltcorn/agents 0.4.3 → 0.4.5

package/agent-view.js

@@ -43,6 +43,7 @@ const {
   find_image_tool,
   is_debug_mode,
   get_initial_interactions,
+  get_skill_instances,
 } = require("./common");
 const MarkdownIt = require("markdown-it"),
   md = new MarkdownIt();
@@ -86,6 +87,12 @@ const configuration_workflow = (req) =>
                 name: "prev_runs_closed",
                 label: "Initially closed",
                 type: "Bool",
+                showIf: { show_prev_runs: true },
+              },
+              {
+                name: "stream",
+                label: "Stream response",
+                type: "Bool",
               },
               {
                 name: "placeholder",
@@ -161,6 +168,7 @@ const run = async (
     placeholder,
     explainer,
     image_upload,
+    stream,
   },
   state,
   { res, req }
@@ -316,11 +324,19 @@ const run = async (
     }
     runInteractions = interactMarkups.join("");
   }
+  const skill_form_widgets = [];
+  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" })
+      );
+  }
+
   const debugMode = is_debug_mode(action.configuration, req.user);
   const input_form = form(
     {
       onsubmit: `event.preventDefault();spin_send_button();view_post('${viewname}', 'interact', new FormData(this), processCopilotResponse);return false;`,
-      class: "form-namespace copilot mt-2",
+      class: ["form-namespace copilot mt-2 agent-view"],
       method: "post",
     },
     input({
@@ -364,8 +380,10 @@ const run = async (
           onclick: "press_agent_debug_button()",
           class: "debugicon fas fa-bug",
         }),
+      skill_form_widgets,
       explainer && small({ class: "explainer" }, i(explainer))
-    )
+    ),
+    stream && div({ class: "next_response_scratch" })
   );
 
   const prev_runs_side_bar = div(
@@ -449,6 +467,12 @@ const run = async (
               top: -1.8rem;
               left: 0.1rem;
               cursor: pointer;
+            }
+            .copilot-entry .skill-form-widget {
+              position: relative; 
+              top: -2rem;
+              left: 0.4rem;
+              display: inline;
             }
               .session-open-sessions, .open-prev-runs {
               cursor: pointer;
@@ -497,6 +521,7 @@ const run = async (
         if(hadFile)
           $("#copilotinteractions").append(wrapSegment('File', "You"))
         $("textarea[name=userinput]").val("")
+        $('form.agent-view div.next_response_scratch').html("")
 
         if(res.response)
             $("#copilotinteractions").append(res.response)
@@ -657,7 +682,8 @@ const interact = async (table_id, viewname, config, body, { req, res }) => {
     req,
     action.name,
     [],
-    triggering_row
+    triggering_row,
+    config.stream
   );
 };
 
@@ -682,13 +708,22 @@ const debug_info = async (table_id, viewname, config, body, { req, res }) => {
     if (table) triggering_row = await table.getRow({ [pk]: triggering_row_id });
   }
   const run = await WorkflowRun.findOne({ id: +run_id });
-  const complArgs = await getCompletionArguments(
-    action.configuration,
-    req.user,
-    triggering_row
-  );
+  let sysPrompt = "";
+  if (
+    run.context.api_interactions?.[0].request?.messages?.[0]?.role === "system"
+  ) {
+    sysPrompt =
+      run.context.api_interactions?.[0].request?.messages?.[0].content;
+  } else {
+    const complArgs = await getCompletionArguments(
+      action.configuration,
+      req.user,
+      triggering_row
+    );
+    sysPrompt = complArgs.systemPrompt;
+  }
   const debug_html = div(
-    div(h4("System prompt"), pre(complArgs.systemPrompt)),
+    div(h4("System prompt"), pre(sysPrompt)),
     div(
       h4("API interactions"),
       pre(JSON.stringify(run.context.api_interactions, null, 2))

package/common.js

@@ -2,6 +2,7 @@ const { getState } = require("@saltcorn/data/db/state");
 const { div, span } = require("@saltcorn/markup/tags");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { interpolate } = require("@saltcorn/data/utils");
+const db = require("@saltcorn/data/db");
 
 const MarkdownIt = require("markdown-it"),
   md = new MarkdownIt();
@@ -31,6 +32,7 @@ const get_skills = () => {
     require("./skills/PreloadData"),
     require("./skills/GenerateImage"),
     require("./skills/ModelContextProtocol"),
+    require("./skills/PromptPicker"),
     //require("./skills/AdaptiveFeedback"),
     ...exchange_skills,
   ];
@@ -89,7 +91,12 @@ const get_initial_interactions = async (config, user, triggering_row) => {
   return interacts;
 };
 
-const getCompletionArguments = async (config, user, triggering_row) => {
+const getCompletionArguments = async (
+  config,
+  user,
+  triggering_row,
+  formbody
+) => {
   let tools = [];
 
   let sysPrompts = [
@@ -98,7 +105,11 @@ const getCompletionArguments = async (config, user, triggering_row) => {
 
   const skills = get_skill_instances(config);
   for (const skill of skills) {
-    const sysPr = await skill.systemPrompt?.({ user, triggering_row });
+    const sysPr = await skill.systemPrompt?.({
+      ...(formbody || {}),
+      user,
+      triggering_row,
+    });
     if (sysPr) sysPrompts.push(sysPr);
     const skillTools = skill.provideTools?.();
     if (skillTools && Array.isArray(skillTools)) tools.push(...skillTools);
@@ -190,12 +201,15 @@ const process_interaction = async (
   req,
   agent_label = "Copilot",
   prevResponses = [],
-  triggering_row = {}
+  triggering_row = {},
+  stream = false
 ) => {
+  const sysState = getState();
   const complArgs = await getCompletionArguments(
     config,
     req.user,
-    triggering_row
+    triggering_row,
+    req.body
   );
   complArgs.chat = run.context.interactions.map(only_response_text_if_present);
   //complArgs.debugResult = true;
@@ -203,7 +217,26 @@ const process_interaction = async (
   const debugMode = is_debug_mode(config, req.user);
   const debugCollector = {};
   if (debugMode) complArgs.debugCollector = debugCollector;
-  const answer = await getState().functions.llm_generate.run("", complArgs);
+  if (stream && sysState.getConfig("enable_dynamic_updates") && req.user) {
+    complArgs.streamCallback = (response) => {
+      const content =
+        response.choices[0].content || response.choices[0].delta?.content;
+      if (content)
+        sysState?.emitDynamicUpdate(
+          db.getTenantSchema(),
+          {
+            eval_js: `$('form.agent-view div.next_response_scratch').append(${JSON.stringify(
+              content
+            )})`,
+          },
+          [req.user.id]
+        );
+    };
+  }
+  const answer = await sysState.functions.llm_generate.run("", complArgs);
+
+  //console.log({answer});
+
   if (debugMode)
     await addToContext(run, {
       api_interactions: [debugCollector],
@@ -263,7 +296,7 @@ const process_interaction = async (
     let hasResult = false;
     if ((answer.mcp_calls || []).length && !answer.content) hasResult = true;
     for (const tool_call of answer.tool_calls || []) {
-      console.log("call function", tool_call.function);
+      console.log("call function", tool_call.function?.name);
 
       await addToContext(run, {
         funcalls: { [tool_call.id]: tool_call.function },
@@ -272,6 +305,24 @@ const process_interaction = async (
       const tool = find_tool(tool_call.function?.name, config);
 
       if (tool) {
+        if (
+          stream &&
+          sysState.getConfig("enable_dynamic_updates") &&
+          req.user
+        ) {
+          let content =
+            "Using skill: " + tool.skill.skill_label ||
+            tool.skill.constructor.skill_name;
+          sysState?.emitDynamicUpdate(
+            db.getTenantSchema(),
+            {
+              eval_js: `$('form.agent-view div.next_response_scratch').append(${JSON.stringify(
+                content
+              )})`,
+            },
+            [req.user.id]
+          );
+        }
         if (tool.tool.renderToolCall) {
           const row = JSON.parse(tool_call.function.arguments);
           const rendered = await tool.tool.renderToolCall(row, {
@@ -337,7 +388,8 @@ const process_interaction = async (
         req,
         agent_label,
         [...prevResponses, ...responses],
-        triggering_row
+        triggering_row,
+        stream
       );
   } else if (typeof answer === "string")
     responses.push(wrapSegment(md.render(answer), agent_label));

package/package.json

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

package/skills/PreloadData.js

@@ -11,7 +11,7 @@ const db = require("@saltcorn/data/db");
 const { eval_expression } = require("@saltcorn/data/models/expression");
 const { interpolate } = require("@saltcorn/data/utils");
 const vm = require("vm");
-const fetch = require("node-fetch");
+const fetch = global.fetch || require("node-fetch");
 
 class PreloadData {
   static skill_name = "Preload Data";
@@ -69,7 +69,7 @@ class PreloadData {
       const table = Table.findOne(this.table_name);
       const q = eval_expression(
         this.preload_query,
-        {},
+        triggering_row || {},
         user,
         "PreloadData query"
       );

package/skills/PromptPicker.js

@@ -0,0 +1,51 @@
+const Workflow = require("@saltcorn/data/models/workflow");
+const Form = require("@saltcorn/data/models/form");
+const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
+const { select, option } = require("@saltcorn/markup/tags");
+const { eval_expression } = require("@saltcorn/data/models/expression");
+const { validID } = require("@saltcorn/markup/layout_utils");
+
+class PromptPicker {
+  static skill_name = "Prompt picker";
+  get skill_label() {
+    return `Prompt picker`;
+  }
+  constructor(cfg) {
+    Object.assign(this, cfg);
+    this.options = eval_expression(
+      this.options_obj,
+      {},
+      null,
+      "Prompt picker options"
+    );
+    this.formname = validID("pp" + Object.keys(this.options));
+  }
+  static async configFields() {
+    return [
+      { name: "placeholder", label: "Placeholder", type: "String" },
+      {
+        name: "options_obj",
+        label: "System prompt contents",
+        sublabel: `JavaScript object where the keys are the options and values are added to system prompt. Example:<br><code>{"Pirate":"Speak like a pirate", "Pop star":"Speak like a pop star"}</code>`,
+        type: "String",
+        fieldview: "textarea",
+        required: true,
+      },
+    ];
+  }
+  async formWidget({ user, klass }) {
+    return select(
+      {
+        class: ["form-select form-select-sm w-unset", klass],
+        name: this.formname,
+      },
+      this.placeholder && option({ disabled: true }, this.placeholder),
+      Object.keys(this.options).map((o) => option(o))
+    );
+  }
+  systemPrompt(body) {
+    if (body[this.formname]) return this.options[body[this.formname]];
+  }
+}
+
+module.exports = PromptPicker;