@saltcorn/agents 0.4.7 → 0.4.8

package/agent-view.js

@@ -162,23 +162,38 @@ const realTimeCollabScript = (viewname) => {
   const view = View.findOne({ name: viewname });
   return script(
     domReady(`
-  ensure_script_loaded("/static_assets/${
-    db.connectObj.version_tag
-  }/socket.io.min.js")
-  const collabCfg = {
-    events: {
-      ['${view.getRealTimeEventName(
-        "STREAM_CHUNK"
-      )}' + \`?page_load_tag=\${_sc_pageloadtag}\`]: async (data) => {
-        $('form.agent-view div.next_response_scratch').append(
-          data.content
-        );
+  const callback = () => {
+    const collabCfg = {
+      events: {
+        ['${view.getRealTimeEventName(
+          "STREAM_CHUNK"
+        )}' + \`?page_load_tag=\${_sc_pageloadtag}\`]: async (data) => {
+          $('form.agent-view div.next_response_scratch').append(
+            data.content
+          );
+        }
       }
+    };
+    let retries = 0
+    function init_it() {
+      if(window.io) init_collab_room('${viewname}', collabCfg);
+      else setTimeout(init_it, retries * 100);
+      retries+=1;
     }
+    init_it();
   };
-  setTimeout(() => {
-    init_collab_room('${viewname}', collabCfg);
-  });`)
+
+  if (ensure_script_loaded.length >= 2) {
+    ensure_script_loaded("/static_assets/${
+      db.connectObj.version_tag
+    }/socket.io.min.js", callback);
+  }
+  else {
+    ensure_script_loaded("/static_assets/${
+    db.connectObj.version_tag
+      }/socket.io.min.js");
+    callback();
+  }`)
   );
 };
 

package/common.js

@@ -164,11 +164,13 @@ const addToContext = async (run, newCtx) => {
 };
 
 const wrapSegment = (html, who) =>
-  '<div class="interaction-segment"><span class="badge bg-secondary">' +
-  who +
-  "</span>" +
-  html +
-  "</div>";
+  who === null
+    ? html
+    : '<div class="interaction-segment"><span class="badge bg-secondary">' +
+      who +
+      "</span>" +
+      html +
+      "</div>";
 
 const wrapCard = (title, ...inners) =>
   span({ class: "badge bg-info ms-1" }, title) +
@@ -220,13 +222,13 @@ const process_interaction = async (
   const debugCollector = {};
   if (debugMode) complArgs.debugCollector = debugCollector;
   if (stream && viewname) {
+    const view = View.findOne({ name: viewname });
     complArgs.streamCallback = (response) => {
       const content =
         typeof response === "string"
           ? response
           : response.choices[0].content || response.choices[0].delta?.content;
       if (content) {
-        const view = View.findOne({ name: viewname });
         const pageLoadTag = req.body.page_load_tag;
         view.emitRealTimeEvent(`STREAM_CHUNK?page_load_tag=${pageLoadTag}`, {
           content,
@@ -272,7 +274,11 @@ const process_interaction = async (
       }
     }
     if (answer.content && !answer.tool_calls)
-      responses.push(wrapSegment(md.render(answer.content), agent_label));
+      responses.push(
+        req.disable_markdown_render
+          ? answer
+          : wrapSegment(md.render(answer.content), agent_label)
+      );
   }
   if (answer.ai_sdk)
     await addToContext(run, {
@@ -297,7 +303,11 @@ const process_interaction = async (
     (answer.tool_calls || answer.mcp_calls)
   ) {
     if (answer.content)
-      responses.push(wrapSegment(md.render(answer.content), agent_label));
+      responses.push(
+        req.disable_markdown_render
+          ? answer
+          : wrapSegment(md.render(answer.content), agent_label)
+      );
     //const actions = [];
     let hasResult = false;
     if ((answer.mcp_calls || []).length && !answer.content) hasResult = true;
@@ -430,7 +440,11 @@ const process_interaction = async (
         agentsViewCfg
       );
   } else if (typeof answer === "string")
-    responses.push(wrapSegment(md.render(answer), agent_label));
+    responses.push(
+      req.disable_markdown_render
+        ? answer
+        : wrapSegment(md.render(answer), agent_label)
+    );
 
   return {
     json: {

package/index.js

@@ -1,7 +1,7 @@
 const Workflow = require("@saltcorn/data/models/workflow");
 const Form = require("@saltcorn/data/models/form");
 const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
-const { features } = require("@saltcorn/data/db/state");
+const Trigger = require("@saltcorn/data/models/trigger");
 const {
   get_skills,
   getCompletionArguments,
@@ -101,6 +101,40 @@ module.exports = {
       },
     },
   },
+  functions: {
+    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: {},
+          },
+        });
+        const result = await process_interaction(
+          run,
+          action.configuration,
+          {
+            user: opts?.user,
+            body: {},
+            disable_markdown: opts?.disable_markdown_render
+          },
+          null
+        );
+        return result.json.response;
+      },
+      isAsync: true,
+      description: "Run an agent on a prompt",
+      arguments: [
+        { name: "agent_name", type: "String" },
+        { name: "prompt", type: "String" },
+      ],
+    },
+  },
 };
 
 /* 

package/package.json

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