@saltcorn/agents 0.7.3 → 0.7.5

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

@@ -239,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();
@@ -276,7 +277,9 @@ const process_interaction = async (
     run.context.interactions[run.context.interactions.length - 1];
 
   const answer = await sysState.functions.llm_generate.run(
-    lastInteract?.role === "user" ? "" : "Continue",
+    lastInteract?.role === "user" || lastInteract?.role === "tool"
+      ? ""
+      : "Continue",
     complArgs,
   );
 
@@ -290,6 +293,7 @@ const process_interaction = async (
     interactions: complArgs.chat,
   });
   const responses = [];
+  const raw_responses = [];
 
   const add_response = async (resp, not_final) => {
     if (dyn_updates)
@@ -457,7 +461,7 @@ const process_interaction = async (
             interactions: run.context.interactions,
           });
 
-          if (myHasResult && !stop) hasResult = true;
+          if (myHasResult && !stop && !tool.tool.postProcess) hasResult = true;
         }
       }
 
@@ -520,10 +524,15 @@ const process_interaction = async (
                 ],
               });
             if (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 postprocres.add_response === "string"
-                  ? md.render(postprocres.add_response)
-                  : postprocres.add_response;
+                typeof add_resp === "string" ? md.render(add_resp) : add_resp;
               add_response(
                 wrapSegment(
                   wrapCard(
@@ -537,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"
@@ -605,6 +614,7 @@ const process_interaction = async (
         triggering_row,
         agentsViewCfg,
         dyn_updates,
+        is_sub_agent,
       );
   } else if (typeof answer === "string")
     add_response(
@@ -625,15 +635,22 @@ const process_interaction = async (
   return {
     json: {
       success: "ok",
+      ...(is_sub_agent ? { raw_responses } : {}),
       response: [...prevResponses, ...responses].join(""),
       run_id: run?.id,
     },
   };
 };
 
+const replaceUserContinue = (chat, newPrompt) => {
+  const lastChat = chat[chat.length - 1];
+  console.log("lastChat", lastChat);
+};
+
 module.exports = {
   get_skills,
   get_skill_class,
+  replaceUserContinue,
   incompleteCfgMsg,
   find_tool,
   get_skill_instances,

package/package.json

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

package/skills/GenerateAndRunJsCode.js

@@ -16,6 +16,7 @@ const { button } = require("@saltcorn/markup/tags");
 const { validID } = require("@saltcorn/markup/layout_utils");
 
 const vm = require("vm");
+const { replaceUserContinue } = require("../common");
 
 //const { fieldProperties } = require("./helpers");
 
@@ -100,7 +101,8 @@ class GenerateAndRunJsCodeSkill {
       },
       {
         name: "allow_functions",
-        label: "Allow calls to functions from codepages and modules",
+        label: "Allow system functions",
+        sublabel: "Allow calls to functions from codepages and modules",
         type: "Bool",
       },
       ...(Table.subClass
@@ -131,12 +133,14 @@ class GenerateAndRunJsCodeSkill {
         req,
         generate,
         emit_update,
+        chat,
         ...rest
       }) => {
         //console.log("postprocess args", { tool_call, ...rest });
         emit_update("Generating code");
-        const str = await generate(
-          `You will now be asked to write JavaScript code.          
+        const gen_the_code = async (extra) => {
+          const str = await generate(
+            `You will now be asked to write JavaScript code.          
 ${this.code_description ? "\nSome more information: " + this.code_description : ""}
 ${this.allow_fetch ? "\nYou can use the standard fetch JavaScript function to make HTTP(S) requests." : ""}
 ${this.allow_table ? getTablePrompt(this.read_only) : ""}
@@ -165,24 +169,53 @@ const y = await anotherAsyncFunction(x)
 return { x, y }
 \`\`\`
 
+${extra || ""}
 
 Now generate the JavaScript code required by the user.`,
-        );
-        getState().log(
-          6,
-          "Generated code:\n--BEGIN CODE--\n" + str + "\n--END CODE--\n",
-        );
-        const js_code = str.includes("```javascript")
-          ? str.split("```javascript")[1].split("```")[0]
-          : str;
-        emit_update("Running code");
-        const res = await this.runCode(js_code, { user: req.user });
-        //console.log("code response", res);
-        getState().log(6, "Code answer: " + JSON.stringify(res));        
-        return {
-          stop: typeof res ==="string",
-          add_response: res,
+          );
+          getState().log(
+            6,
+            "Generated code:\n--BEGIN CODE--\n" + str + "\n--END CODE--\n",
+          );
+          const js_code = str.includes("```javascript")
+            ? str.split("```javascript")[1].split("```")[0]
+            : str;
+          return js_code;
         };
+        const js_code = await gen_the_code();
+        emit_update("Running code");
+        try {
+          const res = await this.runCode(js_code, { user: req.user });
+          //console.log("code response", res);
+          getState().log(6, "Code answer: " + JSON.stringify(res));
+          return {
+            stop: typeof res === "string",
+            add_response: res,
+          };
+        } catch (err) {
+          console.error(err);
+          const retry_js_code =
+            await gen_the_code(`You were previously asked to complete this task. This was the code generated:
+\`\`\`javascript
+${js_code}
+\`\`\`
+
+this code produced the following error:
+
+\`\`\`
+${err.message}
+\`\`\`
+
+Correct this error.
+`);
+          const res = await this.runCode(retry_js_code, { user: req.user });
+          //console.log("code response", res);
+          getState().log(6, "Code retry answer: " + JSON.stringify(res));
+          return {
+            stop: typeof res === "string",
+            add_response: res,
+          };
+        }
       },
       function: {
         name: this.tool_name,

package/skills/ModelPicker.js

@@ -34,8 +34,9 @@ class ModelPicker {
         class: ["form-select form-select-sm w-unset", klass],
         name: "modelpicker",
       },
-      this.placeholder && option({ disabled: true }, this.placeholder),
-      option({ value: "" }, this.default_label),
+      this.placeholder &&
+        option({ disabled: true }, this.placeholder || "Select model"),
+      option({ value: "" }, this.default_label || "Standard"),
       alt_config_options.map((o) => option(o)),
     );
   }

package/skills/Subagent.js

@@ -8,6 +8,7 @@ const { getState } = require("@saltcorn/data/db/state");
 const db = require("@saltcorn/data/db");
 const { fieldProperties } = require("./helpers");
 const agent_action = require("../action");
+const { replaceUserContinue } = require("../common");
 
 class SubagentToSkill {
   static skill_name = "Subagent";
@@ -45,7 +46,12 @@ class SubagentToSkill {
         required: true,
         attributes: { options: actions.map((a) => a.name) },
       },
-      // TODO: confirm, show response, show argument
+      {
+        name: "handover_prompt",
+        label: "Handover prompt",
+        sublabel: `Optional. The prompt initialising the subagent. Example: "Continue answering my query using the tool now at you disposal"`,
+        type: "String",
+      },
     ];
   }
 
@@ -65,14 +71,32 @@ class SubagentToSkill {
       /*renderToolCall({ phrase }, { req }) {
         return div({ class: "border border-primary p-2 m-2" }, phrase);
       },*/
-      postProcess: async ({ tool_call, req, generate, emit_update, run }) => {
-        await agent_action.run({
+      postProcess: async ({
+        tool_call,
+        req,
+        generate,
+        emit_update,
+        run,
+        chat,
+      }) => {
+        getState().log(6, "Running subagent", this.agent_name);        
+        const subres = await agent_action.run({
           row: {},
-          configuration: { ...trigger.configuration, prompt: "continue" },
+          configuration: {
+            ...trigger.configuration,
+            prompt:
+              this.handover_prompt ||
+              "Your instructions and tools have changed. Continue answering my query using the instructions and tools at you disposal, if any",
+          },
           user: req.user,
           run_id: run.id,
+          is_sub_agent: true,
           req,
         });
+        getState().log(6, "Subagent response", subres.json.raw_responses);
+
+        if (subres.json.raw_responses)
+          return { add_responses: subres.json.raw_responses };
         return {
           //stop: true,
           //add_response: result,

package/tests/action.test.js

@@ -41,7 +41,7 @@ beforeAll(async () => {
   //await getState().setConfig("log_level", 6);
 });
 
-jest.setTimeout(30000);
+jest.setTimeout(40000);
 
 const user = { id: 1, role_id: 1 };
 const action = require("../action");
@@ -128,7 +128,7 @@ for (const nameconfig of require("./configs")) {
       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",
+            "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. Call both the OracleAgent and the MathsAgent tools",
         },
         configuration,
         user,