@saltcorn/agents 0.7.3 → 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

@@ -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();
@@ -290,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)
@@ -457,7 +459,7 @@ const process_interaction = async (
             interactions: run.context.interactions,
           });
 
-          if (myHasResult && !stop) hasResult = true;
+          if (myHasResult && !stop && !tool.tool.postProcess) hasResult = true;
         }
       }
 
@@ -520,10 +522,17 @@ 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,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.3",
+  "version": "0.7.4",
   "description": "AI agents for Saltcorn",
   "main": "index.js",
   "dependencies": {

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/tests/action.test.js

@@ -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. You must call both the OracleAgent and the MathsAgent tools simultaneously",
         },
         configuration,
         user,