@saltcorn/agents 0.7.2 → 0.7.4

package/action.js

@@ -89,6 +89,7 @@ module.exports = {
     trigger_id,
     run_id,
     req,
+    is_sub_agent,
     ...rest
   }) => {
     const userinput = interpolate(configuration.prompt, row, user);
@@ -114,6 +115,9 @@ module.exports = {
       undefined,
       [],
       row,
+      { stream: false },
+      false,
+      is_sub_agent
     );
   },
 };

package/common.js

@@ -34,9 +34,11 @@ const get_skills = () => {
     require("./skills/GenerateImage"),
     require("./skills/ModelContextProtocol"),
     require("./skills/PromptPicker"),
+    require("./skills/ModelPicker"),
     require("./skills/RunJsCode"),
     require("./skills/GenerateAndRunJsCode"),
     require("./skills/Fetch"),
+    require("./skills/WebSearch"),
     require("./skills/Subagent"),
     //require("./skills/AdaptiveFeedback"),
     ...exchange_skills,
@@ -127,12 +129,21 @@ const getCompletionArguments = async (
   ];
 
   const skills = get_skill_instances(config);
+  const overrides = {};
   for (const skill of skills) {
     const sysPr = await skill.systemPrompt?.({
       ...(formbody || {}),
       user,
       triggering_row,
     });
+    const overide =
+      (await skill.settingsOverride?.({
+        ...(formbody || {}),
+        user,
+        triggering_row,
+      })) || {};
+    Object.assign(overrides, overide);
+
     if (sysPr) sysPrompts.push(sysPr);
     const skillTools = skill.provideTools?.();
     if (skillTools && Array.isArray(skillTools)) tools.push(...skillTools);
@@ -141,7 +152,9 @@ const getCompletionArguments = async (
   if (tools.length === 0) tools = undefined;
   const complArgs = { tools, systemPrompt: sysPrompts.join("\n\n") };
   if (config.model) complArgs.model = config.model;
-  if (config.alt_config) complArgs.alt_config = config.alt_config;
+
+  if (overrides.alt_config || config.alt_config)
+    complArgs.alt_config = overrides.alt_config || config.alt_config;
   return complArgs;
 };
 
@@ -226,6 +239,7 @@ const process_interaction = async (
   triggering_row = {},
   agentsViewCfg = { stream: false },
   dyn_updates = false,
+  is_sub_agent = false,
 ) => {
   const { stream, viewname, layout } = agentsViewCfg;
   const sysState = getState();
@@ -237,6 +251,7 @@ const process_interaction = async (
   );
   complArgs.appendToChat = true;
   complArgs.chat = run.context.interactions;
+  const use_alt_config = complArgs.alt_config;
   //complArgs.debugResult = true;
   //console.log("complArgs", JSON.stringify(complArgs, null, 2));
   const debugMode = is_debug_mode(config, req.user);
@@ -276,6 +291,7 @@ const process_interaction = async (
     interactions: complArgs.chat,
   });
   const responses = [];
+  const raw_responses = [];
 
   const add_response = async (resp, not_final) => {
     if (dyn_updates)
@@ -344,6 +360,7 @@ const process_interaction = async (
     //const actions = [];
     let hasResult = false;
     if ((answer.mcp_calls || []).length && !answer.content) hasResult = true;
+    const toolResults = {};
     if (answer.hasToolCalls)
       for (const tool_call of answer.getToolCalls()) {
         getState().log(6, "call function " + tool_call.tool_name);
@@ -395,6 +412,7 @@ const process_interaction = async (
           const result = await tool.tool.process(tool_call.input, {
             req,
           });
+          toolResults[tool_call.tool_call_id] = result;
           if (result.stop) stop = true;
           if (
             (typeof result === "object" && Object.keys(result || {}).length) ||
@@ -440,7 +458,21 @@ const process_interaction = async (
           await addToContext(run, {
             interactions: run.context.interactions,
           });
+
+          if (myHasResult && !stop && !tool.tool.postProcess) hasResult = true;
+        }
+      }
+
+    // postprocess - now all tool calls have responses
+    if (answer.hasToolCalls)
+      for (const tool_call of answer.getToolCalls()) {
+        const tool = find_tool(tool_call.tool_name, config);
+        if (tool) {
+          let stop = false,
+            myHasResult = false;
           if (tool.tool.postProcess && !stop) {
+            let result = toolResults[tool_call.tool_call_id];
+
             const chat = run.context.interactions;
             let generateUsed = false;
             const systemPrompt = await getSystemPrompt(
@@ -461,7 +493,7 @@ const process_interaction = async (
                   chat,
                   appendToChat: true,
                   systemPrompt,
-                  alt_config: config.alt_config,
+                  alt_config: use_alt_config,
                   ...opts,
                 });
               },
@@ -490,9 +522,17 @@ const process_interaction = async (
                 ],
               });
             if (postprocres.add_response) {
-              const renderedAddResponse = typeof postprocres.add_response === "string"
-                ? md.render(postprocres.add_response)
-                : postprocres.add_response;
+              if (!postprocres.add_responses)
+                postprocres.add_responses = [postprocres.add_response];
+              else postprocres.add_responses.push(postprocres.add_response);
+            }
+
+            for (const add_resp of postprocres.add_responses || []) {
+              raw_responses.push(add_resp);
+              const renderedAddResponse =
+                typeof add_resp === "string"
+                  ? md.render(add_resp)
+                  : add_resp;
               add_response(
                 wrapSegment(
                   wrapCard(
@@ -506,7 +546,7 @@ const process_interaction = async (
               );
               //replace tool response with this
               // run.context.interactions.forEach((ic) => {});
-              const result = postprocres.add_response;
+              const result = add_resp;
               await sysState.functions.llm_add_message.run(
                 "assistant",
                 !result || typeof result === "string"
@@ -574,6 +614,7 @@ const process_interaction = async (
         triggering_row,
         agentsViewCfg,
         dyn_updates,
+        is_sub_agent,
       );
   } else if (typeof answer === "string")
     add_response(
@@ -594,6 +635,7 @@ const process_interaction = async (
   return {
     json: {
       success: "ok",
+      ...(is_sub_agent ? { raw_responses } : {}),
       response: [...prevResponses, ...responses].join(""),
       run_id: run?.id,
     },

package/package.json

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

package/skills/ModelPicker.js

@@ -0,0 +1,47 @@
+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");
+const { getState } = require("@saltcorn/data/db/state");
+
+class ModelPicker {
+  static skill_name = "Model picker";
+  get skill_label() {
+    return `Model picker`;
+  }
+  constructor(cfg) {
+    Object.assign(this, cfg);
+  }
+  static async configFields() {
+    return [
+      { name: "placeholder", label: "Placeholder", type: "String" },
+      {
+        name: "default_label",
+        label: "Default configuration label",
+        type: "String",
+      },
+    ];
+  }
+  async formWidget({ user, klass }) {
+    const llm_cfg_fun = getState().functions.llm_get_configuration;
+    const alt_config_options = llm_cfg_fun
+      ? llm_cfg_fun.run().alt_config_names || []
+      : [];
+    return select(
+      {
+        class: ["form-select form-select-sm w-unset", klass],
+        name: "modelpicker",
+      },
+      this.placeholder && option({ disabled: true }, this.placeholder),
+      option({ value: "" }, this.default_label),
+      alt_config_options.map((o) => option(o)),
+    );
+  }
+  settingsOverride(body) {
+    if (body.modelpicker) return { alt_config: body.modelpicker };
+  }
+}
+
+module.exports = ModelPicker;

package/skills/Subagent.js

@@ -66,13 +66,16 @@ class SubagentToSkill {
         return div({ class: "border border-primary p-2 m-2" }, phrase);
       },*/
       postProcess: async ({ tool_call, req, generate, emit_update, run }) => {
-        await agent_action.run({
+        const subres = await agent_action.run({
           row: {},
           configuration: { ...trigger.configuration, prompt: "continue" },
           user: req.user,
           run_id: run.id,
+          is_sub_agent: true,
           req,
         });
+        if (subres.json.raw_responses)
+          return { add_responses: subres.json.raw_responses };
         return {
           //stop: true,
           //add_response: result,

package/skills/WebSearch.js

@@ -0,0 +1,96 @@
+const { div, pre, a } = require("@saltcorn/markup/tags");
+const Workflow = require("@saltcorn/data/models/workflow");
+const Form = require("@saltcorn/data/models/form");
+const Table = require("@saltcorn/data/models/table");
+const User = require("@saltcorn/data/models/user");
+const File = require("@saltcorn/data/models/file");
+const View = require("@saltcorn/data/models/view");
+const Trigger = require("@saltcorn/data/models/trigger");
+const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
+const { getState } = require("@saltcorn/data/db/state");
+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");
+
+class WebSearchSkill {
+  static skill_name = "Web search";
+
+  get skill_label() {
+    return "Web search";
+  }
+
+  constructor(cfg) {
+    Object.assign(this, cfg);
+  }
+
+  static async configFields() {
+    return [
+      {
+        name: "search_provider",
+        label: "Search provider",
+        type: "String",
+        required: true,
+        attributes: { options: ["By URL template"] },
+      },
+      {
+        name: "url_template",
+        label: "URL template",
+        sublabel: "Use <code>{{q}}</code> for the URL-encoded search phrase",
+        type: "String",
+        required: true,
+        showIf: { search_provider: "By URL template" },
+      },
+      {
+        name: "header",
+        label: "Header",
+        sublabel: "For example <code>X-Subscription-Token: YOUR_API_KEY</code>",
+        type: "String",
+        showIf: { search_provider: "By URL template" },
+      },
+    ];
+  }
+  systemPrompt() {
+    return "If you need to search the web with a search phrase, use the web_search to get search engine results";
+  }
+
+  provideTools = () => {
+    return {
+      type: "function",
+      process: async (row) => {
+        const fOpts = { method: "GET" };
+        if (this.header) {
+          const [key, val] = this.header.split(":");
+          const myHeaders = new Headers();
+          myHeaders.append(key, val.trim());
+          fOpts.headers = myHeaders;
+        }
+        const url = interpolate(this.url_template, { q: row.search_phrase });
+        const resp = await fetch(url);
+        return await resp.text();
+      },
+      function: {
+        name: "web_search",
+        description: "Search the web with a search engine by a search phrase",
+        parameters: {
+          type: "object",
+          required: ["search_phrase"],
+          properties: {
+            search_phrase: {
+              description: "The phrase to search for",
+              type: "string",
+            },
+          },
+        },
+      },
+    };
+  };
+}
+
+module.exports = WebSearchSkill;

package/tests/action.test.js

@@ -29,6 +29,13 @@ beforeAll(async () => {
     when_trigger: "Never",
     configuration: require("./agentcfg").maths_agent_cfg,
   });
+  await Trigger.create({
+    name: "OracleAgent",
+    description: "The all-knowing oracle answers any question",
+    action: "Agent",
+    when_trigger: "Never",
+    configuration: require("./agentcfg").oracle_agent_cfg,
+  });
 
   await getState().refresh_triggers(false);
   //await getState().setConfig("log_level", 6);
@@ -109,6 +116,27 @@ for (const nameconfig of require("./configs")) {
       });
       expect(result.json.response).toContain("987");
     });
+    it("run multiple subagents concurrenty", async () => {
+      const configuration = { ...require("./agentcfg").agent1 };
+      configuration.skills = [
+        ...configuration.skills,
+        {
+          agent_name: "OracleAgent",
+          skill_type: "Subagent",
+        },
+      ];
+      const result = await action.run({
+        row: {
+          theprompt:
+            "What is the 16th Fibonacci number (when F1=1 and F2=1)? Consult both the math agent and the oracle and see if they agree. You must call both the OracleAgent and the MathsAgent tools simultaneously",
+        },
+        configuration,
+        user,
+        req: { user },
+      });
+      expect(result.json.response).toContain("987");
+    });
   });
+
   //break;
 }

package/tests/agentcfg.js

@@ -65,4 +65,26 @@ const maths_agent_cfg = {
     "If the user asks an arithmetic question, generate javascript code to solve it with the generate_arithmetic_code tool",
 };
 
-module.exports = { agent1, maths_agent_cfg };
+const oracle_agent_cfg = {
+  model: "",
+  prompt: "{{theprompt}}",
+  skills: [
+    {
+      tool_name: "ask_the_oracle",
+      tool_description: "Ask the all-knowing oracle a question",
+      skill_type: "Run JavaScript code",
+      js_code: "return '987';",
+      toolargs: [
+        {
+          name: "question",
+          description: "The question you would like to ask",
+          argtype: "string",
+        },
+      ],
+    },
+  ],
+  sys_prompt:
+    "You can ask a question of the all-knowing oracle by calling the ask_the_oracle tool ",
+};
+
+module.exports = { agent1, maths_agent_cfg, oracle_agent_cfg };