@saltcorn/agents 0.4.2 → 0.4.4

package/agent-view.js

@@ -86,6 +86,12 @@ const configuration_workflow = (req) =>
                 name: "prev_runs_closed",
                 label: "Initially closed",
                 type: "Bool",
+                showIf: { show_prev_runs: true },
+              },
+              {
+                name: "stream",
+                label: "Stream response",
+                type: "Bool",
               },
               {
                 name: "placeholder",
@@ -161,6 +167,7 @@ const run = async (
     placeholder,
     explainer,
     image_upload,
+    stream,
   },
   state,
   { res, req }
@@ -320,7 +327,7 @@ const run = async (
   const input_form = form(
     {
       onsubmit: `event.preventDefault();spin_send_button();view_post('${viewname}', 'interact', new FormData(this), processCopilotResponse);return false;`,
-      class: "form-namespace copilot mt-2",
+      class: ["form-namespace copilot mt-2 agent-view"],
       method: "post",
     },
     input({
@@ -365,7 +372,8 @@ const run = async (
           class: "debugicon fas fa-bug",
         }),
       explainer && small({ class: "explainer" }, i(explainer))
-    )
+    ),
+    stream && div({ class: "next_response_scratch" })
   );
 
   const prev_runs_side_bar = div(
@@ -497,6 +505,7 @@ const run = async (
         if(hadFile)
           $("#copilotinteractions").append(wrapSegment('File', "You"))
         $("textarea[name=userinput]").val("")
+        $('form.agent-view div.next_response_scratch').html("")
 
         if(res.response)
             $("#copilotinteractions").append(res.response)
@@ -657,7 +666,8 @@ const interact = async (table_id, viewname, config, body, { req, res }) => {
     req,
     action.name,
     [],
-    triggering_row
+    triggering_row,
+    config.stream
   );
 };
 

package/common.js

@@ -2,6 +2,7 @@ const { getState } = require("@saltcorn/data/db/state");
 const { div, span } = require("@saltcorn/markup/tags");
 const Trigger = require("@saltcorn/data/models/trigger");
 const { interpolate } = require("@saltcorn/data/utils");
+const db = require("@saltcorn/data/db");
 
 const MarkdownIt = require("markdown-it"),
   md = new MarkdownIt();
@@ -105,13 +106,9 @@ const getCompletionArguments = async (config, user, triggering_row) => {
     else if (skillTools) tools.push(skillTools);
   }
   if (tools.length === 0) tools = undefined;
-  return { tools, systemPrompt: sysPrompts.join("\n\n") };
-};
-
-const getCompletion = async (language, prompt) => {
-  return getState().functions.llm_generate.run(prompt, {
-    systemPrompt: `You are a helpful code assistant. Your language of choice is ${language}. Do not include any explanation, just generate the code block itself.`,
-  });
+  const complArgs = { tools, systemPrompt: sysPrompts.join("\n\n") };
+  if (config.model) complArgs.model = config.model;
+  return complArgs;
 };
 
 const incompleteCfgMsg = () => {
@@ -194,8 +191,10 @@ const process_interaction = async (
   req,
   agent_label = "Copilot",
   prevResponses = [],
-  triggering_row = {}
+  triggering_row = {},
+  stream = false
 ) => {
+  const sysState = getState();
   const complArgs = await getCompletionArguments(
     config,
     req.user,
@@ -207,7 +206,24 @@ const process_interaction = async (
   const debugMode = is_debug_mode(config, req.user);
   const debugCollector = {};
   if (debugMode) complArgs.debugCollector = debugCollector;
-  const answer = await getState().functions.llm_generate.run("", complArgs);
+  if (stream && sysState.getConfig("enable_dynamic_updates") && req.user) {
+    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]
+        );
+    };
+  }
+  const answer = await sysState.functions.llm_generate.run("", complArgs);
+
   if (debugMode)
     await addToContext(run, {
       api_interactions: [debugCollector],
@@ -267,7 +283,7 @@ 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);
+      console.log("call function", tool_call.function?.name);
 
       await addToContext(run, {
         funcalls: { [tool_call.id]: tool_call.function },
@@ -276,6 +292,24 @@ const process_interaction = async (
       const tool = find_tool(tool_call.function?.name, config);
 
       if (tool) {
+        if (
+          stream &&
+          sysState.getConfig("enable_dynamic_updates") &&
+          req.user
+        ) {
+          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]
+          );
+        }
         if (tool.tool.renderToolCall) {
           const row = JSON.parse(tool_call.function.arguments);
           const rendered = await tool.tool.renderToolCall(row, {
@@ -341,7 +375,8 @@ const process_interaction = async (
         req,
         agent_label,
         [...prevResponses, ...responses],
-        triggering_row
+        triggering_row,
+        stream
       );
   } else if (typeof answer === "string")
     responses.push(wrapSegment(md.render(answer), agent_label));
@@ -359,7 +394,6 @@ module.exports = {
   get_skills,
   get_skill_class,
   incompleteCfgMsg,
-  getCompletion,
   find_tool,
   get_skill_instances,
   getCompletionArguments,

package/index.js

@@ -56,7 +56,12 @@ module.exports = {
             type: "String",
             fieldview: "textarea",
           },
-
+          {
+            name: "model",
+            label: "Model",
+            sublabel: "Override default model name",
+            type: "String",
+          },
           new FieldRepeat({
             name: "skills",
             label: "Skills",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/agents",
-  "version": "0.4.2",
+  "version": "0.4.4",
   "description": "AI agents for Saltcorn",
   "main": "index.js",
   "dependencies": {
@@ -9,7 +9,8 @@
     "node-sql-parser": "4.15.0",
     "markdown-it": "14.1.0",
     "style-to-object": "1.0.8",
-    "node-html-parser": "7.0.1"
+    "node-html-parser": "7.0.1",
+    "node-fetch": "2.6.9"
   },
   "author": "Tom Nielsen",
   "license": "MIT",

package/skills/PreloadData.js

@@ -11,6 +11,7 @@ const db = require("@saltcorn/data/db");
 const { eval_expression } = require("@saltcorn/data/models/expression");
 const { interpolate } = require("@saltcorn/data/utils");
 const vm = require("vm");
+const fetch = global.fetch || require("node-fetch");
 
 class PreloadData {
   static skill_name = "Preload Data";
@@ -36,6 +37,7 @@ class PreloadData {
       Trigger,
       setTimeout,
       interpolate,
+      fetch,
       require,
       getConfig: (k) =>
         sysState.isFixedConfig(k) ? undefined : sysState.getConfig(k),