@saltcorn/agents 0.4.5 → 0.4.7

package/agent-view.js

@@ -158,6 +158,30 @@ const uploadForm = (viewname, req) =>
     span({ class: "ms-2 filename-label" })
   );
 
+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
+        );
+      }
+    }
+  };
+  setTimeout(() => {
+    init_collab_room('${viewname}', collabCfg);
+  });`)
+  );
+};
+
 const run = async (
   table_id,
   viewname,
@@ -346,10 +370,14 @@ const run = async (
     }),
     input({
       type: "hidden",
-      class: "form-control  ",
       name: "run_id",
       value: state.run_id ? +state.run_id : undefined,
     }),
+    input({
+      type: "hidden",
+      name: "page_load_tag",
+      value: "",
+    }),
     input({
       type: "hidden",
       class: "form-control  ",
@@ -383,7 +411,8 @@ const run = async (
       skill_form_widgets,
       explainer && small({ class: "explainer" }, i(explainer))
     ),
-    stream && div({ class: "next_response_scratch" })
+    stream &&
+      realTimeCollabScript(viewname) + div({ class: "next_response_scratch" })
   );
 
   const prev_runs_side_bar = div(
@@ -500,15 +529,15 @@ const run = async (
       ),
       script(
         `
-        function close_session_list() {
-          $("div.prev-runs-list").hide().parents(".col-3").removeClass("col-3").addClass("was-col-3").parent().children(".col-9").removeClass("col-9").addClass("col-12")
-          $("div.open-prev-runs").show()
-        }
-        function open_session_list() {
-          $("div.prev-runs-list").show().parents(".was-col-3").removeClass(["was-col-3","col-0","d-none"]).addClass("col-3").parent().children(".col-12").removeClass("col-12").addClass("col-9")
-          $("div.open-prev-runs").hide()
-        }
-        function processCopilotResponse(res) {
+    function close_session_list() {
+      $("div.prev-runs-list").hide().parents(".col-3").removeClass("col-3").addClass("was-col-3").parent().children(".col-9").removeClass("col-9").addClass("col-12")
+      $("div.open-prev-runs").show()
+    }
+    function open_session_list() {
+      $("div.prev-runs-list").show().parents(".was-col-3").removeClass(["was-col-3","col-0","d-none"]).addClass("col-3").parent().children(".col-12").removeClass("col-12").addClass("col-9")
+      $("div.open-prev-runs").hide()
+    }
+    function processCopilotResponse(res) {
         const hadFile = $("input#attach_agent_image").val();
         $("span.filename-label").text("");
         $("input#attach_agent_image").val(null);
@@ -582,6 +611,10 @@ const run = async (
     function spin_send_button() {
       $("#sendbuttonicon").attr("class","fas fa-spinner fa-spin");
     };`,
+        stream &&
+          domReady(
+            `$('form.agent-view input[name=page_load_tag]').val(window._sc_pageloadtag)`
+          ),
         initial_q && domReady("$('form.copilot').submit()")
       )
     )
@@ -683,7 +716,7 @@ const interact = async (table_id, viewname, config, body, { req, res }) => {
     action.name,
     [],
     triggering_row,
-    config.stream
+    config
   );
 };
 

package/common.js

@@ -1,6 +1,7 @@
 const { getState } = require("@saltcorn/data/db/state");
 const { div, span } = require("@saltcorn/markup/tags");
 const Trigger = require("@saltcorn/data/models/trigger");
+const View = require("@saltcorn/data/models/view");
 const { interpolate } = require("@saltcorn/data/utils");
 const db = require("@saltcorn/data/db");
 
@@ -202,8 +203,9 @@ const process_interaction = async (
   agent_label = "Copilot",
   prevResponses = [],
   triggering_row = {},
-  stream = false
+  agentsViewCfg = { stream: false }
 ) => {
+  const { stream, viewname } = agentsViewCfg;
   const sysState = getState();
   const complArgs = await getCompletionArguments(
     config,
@@ -217,20 +219,19 @@ const process_interaction = async (
   const debugMode = is_debug_mode(config, req.user);
   const debugCollector = {};
   if (debugMode) complArgs.debugCollector = debugCollector;
-  if (stream && sysState.getConfig("enable_dynamic_updates") && req.user) {
+  if (stream && viewname) {
     complArgs.streamCallback = (response) => {
       const content =
-        response.choices[0].content || response.choices[0].delta?.content;
-      if (content)
-        sysState?.emitDynamicUpdate(
-          db.getTenantSchema(),
-          {
-            eval_js: `$('form.agent-view div.next_response_scratch').append(${JSON.stringify(
-              content
-            )})`,
-          },
-          [req.user.id]
-        );
+        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,
+        });
+      }
     };
   }
   const answer = await sysState.functions.llm_generate.run("", complArgs);
@@ -273,18 +274,23 @@ const process_interaction = async (
     if (answer.content && !answer.tool_calls)
       responses.push(wrapSegment(md.render(answer.content), agent_label));
   }
-  await addToContext(run, {
-    interactions:
-      typeof answer === "object" && answer.tool_calls
-        ? [
-            {
-              role: "assistant",
-              tool_calls: answer.tool_calls,
-              content: answer.content,
-            },
-          ]
-        : [{ role: "assistant", content: answer }],
-  });
+  if (answer.ai_sdk)
+    await addToContext(run, {
+      interactions: answer.messages,
+    });
+  else
+    await addToContext(run, {
+      interactions:
+        typeof answer === "object" && answer.tool_calls
+          ? [
+              {
+                role: "assistant",
+                tool_calls: answer.tool_calls,
+                content: answer.content,
+              },
+            ]
+          : [{ role: "assistant", content: answer }],
+    });
   if (
     answer &&
     typeof answer === "object" &&
@@ -296,35 +302,39 @@ const process_interaction = async (
     let hasResult = false;
     if ((answer.mcp_calls || []).length && !answer.content) hasResult = true;
     for (const tool_call of answer.tool_calls || []) {
-      console.log("call function", tool_call.function?.name);
+      console.log(
+        "call function",
+        tool_call.toolName || tool_call.function?.name
+      );
 
       await addToContext(run, {
-        funcalls: { [tool_call.id]: tool_call.function },
+        funcalls: {
+          [tool_call.id || tool_call.toolCallId]: answer.ai_sdk
+            ? tool_call
+            : tool_call.function,
+        },
       });
 
-      const tool = find_tool(tool_call.function?.name, config);
+      const tool = find_tool(
+        tool_call.toolName || tool_call.function?.name,
+        config
+      );
 
       if (tool) {
-        if (
-          stream &&
-          sysState.getConfig("enable_dynamic_updates") &&
-          req.user
-        ) {
+        if (stream && viewname) {
           let content =
             "Using skill: " + tool.skill.skill_label ||
             tool.skill.constructor.skill_name;
-          sysState?.emitDynamicUpdate(
-            db.getTenantSchema(),
-            {
-              eval_js: `$('form.agent-view div.next_response_scratch').append(${JSON.stringify(
-                content
-              )})`,
-            },
-            [req.user.id]
-          );
+          const view = View.findOne({ name: viewname });
+          const pageLoadTag = req.body.page_load_tag;
+          view.emitRealTimeEvent(`STREAM_CHUNK?page_load_tag=${pageLoadTag}`, {
+            content,
+          });
         }
         if (tool.tool.renderToolCall) {
-          const row = JSON.parse(tool_call.function.arguments);
+          const row = answer.ai_sdk
+            ? tool_call.input
+            : JSON.parse(tool_call.function.arguments);
           const rendered = await tool.tool.renderToolCall(row, {
             req,
           });
@@ -341,7 +351,9 @@ const process_interaction = async (
         }
         hasResult = true;
         const result = await tool.tool.process(
-          JSON.parse(tool_call.function.arguments),
+          answer.ai_sdk
+            ? tool_call.input
+            : JSON.parse(tool_call.function.arguments),
           { req }
         );
         if (
@@ -365,20 +377,46 @@ const process_interaction = async (
           }
           hasResult = true;
         }
-        await addToContext(run, {
-          interactions: [
-            {
-              role: "tool",
-              tool_call_id: tool_call.id,
-              call_id: tool_call.call_id,
-              name: tool_call.function.name,
-              content:
-                result && typeof result !== "string"
-                  ? JSON.stringify(result)
-                  : result || "Action run",
-            },
-          ],
-        });
+        if (answer.ai_sdk)
+          await addToContext(run, {
+            interactions: [
+              {
+                role: "tool",
+                content: [
+                  {
+                    type: "tool-result",
+                    toolCallId: tool_call.toolCallId,
+                    toolName: tool_call.toolName,
+                    output:
+                      !result || typeof result === "string"
+                        ? {
+                            type: "text",
+                            value: result || "Action run",
+                          }
+                        : {
+                            type: "json",
+                            value: JSON.parse(JSON.stringify(result)),
+                          },
+                  },
+                ],
+              },
+            ],
+          });
+        else
+          await addToContext(run, {
+            interactions: [
+              {
+                role: "tool",
+                tool_call_id: tool_call.toolCallId || tool_call.id,
+                call_id: tool_call.call_id,
+                name: tool_call.toolName || tool_call.function.name,
+                content:
+                  result && typeof result !== "string"
+                    ? JSON.stringify(result)
+                    : result || "Action run",
+              },
+            ],
+          });
       }
     }
     if (hasResult)
@@ -389,7 +427,7 @@ const process_interaction = async (
         agent_label,
         [...prevResponses, ...responses],
         triggering_row,
-        stream
+        agentsViewCfg
       );
   } else if (typeof answer === "string")
     responses.push(wrapSegment(md.render(answer), agent_label));

package/package.json

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