@saltcorn/agents 0.4.9 → 0.4.11

package/common.js

@@ -142,6 +142,7 @@ const incompleteCfgMsg = () => {
 };
 
 const addToContext = async (run, newCtx) => {
+  if (!run) return;
   if (run.addToContext) return await run.addToContext(newCtx);
   let changed = true;
   Object.keys(newCtx).forEach((k) => {
@@ -160,7 +161,7 @@ const addToContext = async (run, newCtx) => {
       changed = true;
     }
   });
-  if (changed) await run.update({ context: run.context });
+  if (changed && run.update) await run.update({ context: run.context });
 };
 
 const wrapSegment = (html, who) =>
@@ -450,7 +451,7 @@ const process_interaction = async (
     json: {
       success: "ok",
       response: [...prevResponses, ...responses].join(""),
-      run_id: run.id,
+      run_id: run?.id,
     },
   };
 };

package/index.js

@@ -105,27 +105,45 @@ module.exports = {
     agent_generate: {
       run: async (agent_name, prompt, opts = {}) => {
         const action = await Trigger.findOne({ name: agent_name });
-        const run = await WorkflowRun.create({
-          status: "Running",
-          started_by: opts.user?.id,
-          trigger_id: action.id,
-          context: {
-            implemented_fcall_ids: [],
-            interactions: [{ role: "user", content: prompt }],
-            funcalls: {},
-          },
-        });
+        let run;
+        let context = {
+          implemented_fcall_ids: [],
+          interactions: [
+            ...(opts.interactions || []),
+            { role: "user", content: prompt },
+          ],
+          funcalls: {},
+        };
+        if (opts.run_id === null || (!opts.run_id && opts.run === null))
+          run = { context };
+        else if (opts.run) run = opts.run;
+        else if (opts.run_id)
+          run = await WorkflowRun.findOne({ id: +opts.run_id });
+        else
+          run = await WorkflowRun.create({
+            status: "Running",
+            started_by: opts.user?.id,
+            trigger_id: action.id,
+            context,
+          });
         const result = await process_interaction(
           run,
           action.configuration,
           {
             user: opts?.user,
             body: {},
-            disable_markdown: opts?.disable_markdown_render,
+            disable_markdown_render:
+              typeof opts.disable_markdown_render !== "undefined"
+                ? opts.disable_markdown_render
+                : !opts?.render_markdown,
           },
           null
         );
-        return { text: result.json.response };
+        return {
+          text: result.json.response,
+          run,
+          ...(run.id ? { run_id: run.id } : {}),
+        };
       },
       isAsync: true,
       description: "Run an agent on a prompt",

package/package.json

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