@saltcorn/agents 0.5.8 → 0.6.1

package/common.js

@@ -1,5 +1,5 @@
 const { getState } = require("@saltcorn/data/db/state");
-const { div, span } = require("@saltcorn/markup/tags");
+const { div, span, button } = require("@saltcorn/markup/tags");
 const Trigger = require("@saltcorn/data/models/trigger");
 const View = require("@saltcorn/data/models/view");
 const { interpolate } = require("@saltcorn/data/utils");
@@ -21,8 +21,8 @@ const nubBy = (f, xs) => {
 const get_skills = () => {
   const state = getState();
   const exchange_skills = nubBy(
-    (c) => c.constructor.name,
-    state.exchange?.agent_skills || []
+    (c) => c.skill_name,
+    state.exchange?.agent_skills || [],
   );
 
   return [
@@ -62,8 +62,8 @@ const find_tool = (name, config) => {
     const tools = !skillTools
       ? []
       : Array.isArray(skillTools)
-      ? skillTools
-      : [skillTools];
+        ? skillTools
+        : [skillTools];
     const found = tools.find((t) => t?.function?.name === name);
     if (found) return { tool: found, skill };
   }
@@ -76,8 +76,8 @@ const find_image_tool = (config) => {
     const tools = !skillTools
       ? []
       : Array.isArray(skillTools)
-      ? skillTools
-      : [skillTools];
+        ? skillTools
+        : [skillTools];
     const found = tools.find((t) => t?.type === "image_generation");
     if (found) return { tool: found, skill };
   }
@@ -97,7 +97,7 @@ const getCompletionArguments = async (
   config,
   user,
   triggering_row,
-  formbody
+  formbody,
 ) => {
   let tools = [];
 
@@ -131,11 +131,11 @@ const incompleteCfgMsg = () => {
     !plugin_cfgs["large-language-model"]
   ) {
     const modName = Object.keys(plugin_cfgs).find((m) =>
-      m.includes("large-language-model")
+      m.includes("large-language-model"),
     );
     if (modName)
       return `LLM module not configured. Please configure <a href="/plugins/configure/${encodeURIComponent(
-        modName
+        modName,
       )}">here<a> before using copilot.`;
     else
       return `LLM module not configured. Please install and configure <a href="/plugins">here<a> before using copilot.`;
@@ -150,7 +150,8 @@ const addToContext = async (run, newCtx) => {
     if (Array.isArray(run.context[k])) {
       if (!Array.isArray(newCtx[k]))
         throw new Error("Must be array to append to array");
-      run.context[k].push(...newCtx[k]);
+      if (k === "interactions") run.context[k] = newCtx[k];
+      else run.context[k].push(...newCtx[k]);
       changed = true;
     } else if (typeof run.context[k] === "object") {
       if (typeof newCtx[k] !== "object")
@@ -178,26 +179,9 @@ const wrapCard = (title, ...inners) =>
   span({ class: "badge bg-info ms-1" }, title) +
   div(
     { class: "card mb-3 bg-secondary-subtle" },
-    div({ class: "card-body" }, inners)
+    div({ class: "card-body" }, inners),
   );
 
-const only_response_text_if_present = (interact) => {
-  if (
-    interact.role === "tool" &&
-    interact.call_id &&
-    interact.content?.[0] === "{"
-  ) {
-    try {
-      const result = JSON.parse(interact.content);
-      if (result.responseText)
-        return { ...interact, content: result.responseText };
-    } catch {
-      //ignore, not json content
-    }
-  }
-  return interact;
-};
-
 const is_debug_mode = (config, user) => user?.role_id === 1;
 
 const process_interaction = async (
@@ -207,7 +191,8 @@ const process_interaction = async (
   agent_label = "Copilot",
   prevResponses = [],
   triggering_row = {},
-  agentsViewCfg = { stream: false }
+  agentsViewCfg = { stream: false },
+  dyn_updates = false,
 ) => {
   const { stream, viewname } = agentsViewCfg;
   const sysState = getState();
@@ -215,9 +200,10 @@ const process_interaction = async (
     config,
     req.user,
     triggering_row,
-    req.body
+    req.body,
   );
-  complArgs.chat = run.context.interactions.map(only_response_text_if_present);
+  complArgs.appendToChat = true;
+  complArgs.chat = run.context.interactions;
   //complArgs.debugResult = true;
   //console.log("complArgs", JSON.stringify(complArgs, null, 2));
   const debugMode = is_debug_mode(config, req.user);
@@ -240,13 +226,30 @@ const process_interaction = async (
   }
   const answer = await sysState.functions.llm_generate.run("", complArgs);
 
-  //console.log({answer});
+  //console.log("answer", answer);
 
   if (debugMode)
     await addToContext(run, {
       api_interactions: [debugCollector],
     });
+  await addToContext(run, {
+    interactions: complArgs.chat,
+  });
   const responses = [];
+  const add_response = async (resp) => {
+    if (dyn_updates)
+      getState().emitDynamicUpdate(
+        db.getTenantSchema(),
+        {
+          eval_js: `processCopilotResponse({response: ${JSON.stringify(resp)}, run_id: ${run.id}})`,
+        },
+        [req.user.id],
+      );
+    else responses.push(resp);
+    await addToContext(run, {
+    html_interactions: [resp],
+  });
+  };
   if (answer && typeof answer === "object" && answer.image_calls) {
     for (const image_call of answer.image_calls) {
       const tool = find_image_tool(config);
@@ -261,176 +264,203 @@ const process_interaction = async (
           { ...image_call, ...(prcRes || {}) },
           {
             req,
-          }
+          },
         );
         if (rendered)
-          responses.push(
+          add_response(
             wrapSegment(
               wrapCard(
                 tool.skill.skill_label || tool.skill.constructor.skill_name,
-                rendered
+                rendered,
               ),
-              agent_label
-            )
+              agent_label,
+            ),
           );
       }
     }
     if (answer.content && !answer.tool_calls)
-      responses.push(
+      add_response(
         req.disable_markdown_render
           ? answer
-          : wrapSegment(md.render(answer.content), agent_label)
+          : wrapSegment(md.render(answer.content), agent_label),
       );
   }
-  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" &&
-    (answer.tool_calls || answer.mcp_calls)
+    (answer.hasToolCalls || answer.mcp_calls)
   ) {
     if (answer.content)
-      responses.push(
+      add_response(
         req.disable_markdown_render
           ? answer
-          : wrapSegment(md.render(answer.content), agent_label)
+          : wrapSegment(md.render(answer.content), agent_label),
       );
     //const actions = [];
     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.toolName || tool_call.function?.name
-      );
+    if (answer.hasToolCalls)
+      for (const tool_call of answer.getToolCalls()) {
+        console.log("call function", tool_call.tool_name);
 
-      await addToContext(run, {
-        funcalls: {
-          [tool_call.id || tool_call.toolCallId]: answer.ai_sdk
-            ? tool_call
-            : tool_call.function,
-        },
-      });
+        await addToContext(run, {
+          funcalls: {
+            [tool_call.tool_call_id]: tool_call,
+          },
+        });
 
-      const tool = find_tool(
-        tool_call.toolName || tool_call.function?.name,
-        config
-      );
+        const tool = find_tool(tool_call.tool_name, config);
 
-      if (tool) {
-        if (stream && viewname) {
-          let content =
-            "Using skill: " + tool.skill.skill_label ||
-            tool.skill.constructor.skill_name;
-          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 = answer.ai_sdk
-            ? tool_call.input
-            : JSON.parse(tool_call.function.arguments);
-          const rendered = await tool.tool.renderToolCall(row, {
-            req,
-          });
-          if (rendered)
-            responses.push(
-              wrapSegment(
-                wrapCard(
-                  tool.skill.skill_label || tool.skill.constructor.skill_name,
-                  rendered
-                ),
-                agent_label
-              )
+        if (tool) {
+          let stop = false,
+            myHasResult = false;
+          if (stream && viewname) {
+            let content =
+              "Using skill: " + tool.skill.skill_label ||
+              tool.skill.constructor.skill_name;
+            const view = View.findOne({ name: viewname });
+            const pageLoadTag = req.body.page_load_tag;
+            view.emitRealTimeEvent(
+              `STREAM_CHUNK?page_load_tag=${pageLoadTag}`,
+              {
+                content,
+              },
             );
-        }
-        hasResult = true;
-        const result = await tool.tool.process(
-          answer.ai_sdk
-            ? tool_call.input
-            : JSON.parse(tool_call.function.arguments),
-          { req }
-        );
-        if (
-          (typeof result === "object" && Object.keys(result || {}).length) ||
-          typeof result === "string"
-        ) {
-          if (tool.tool.renderToolResponse) {
-            const rendered = await tool.tool.renderToolResponse(result, {
+          }
+          if (tool.tool.renderToolCall) {
+            const row = tool_call.input;
+
+            const rendered = await tool.tool.renderToolCall(row, {
               req,
             });
             if (rendered)
-              responses.push(
+              add_response(
                 wrapSegment(
                   wrapCard(
                     tool.skill.skill_label || tool.skill.constructor.skill_name,
-                    rendered
+                    rendered,
                   ),
-                  agent_label
-                )
+                  agent_label,
+                ),
               );
           }
-          hasResult = true;
-        }
-        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)),
-                          },
-                  },
-                ],
-              },
-            ],
+          myHasResult = true;
+          const result = await tool.tool.process(tool_call.input, {
+            req,
           });
-        else
+          if (result.stop) stop = true;
+          if (
+            (typeof result === "object" && Object.keys(result || {}).length) ||
+            typeof result === "string"
+          ) {
+            if (tool.tool.renderToolResponse) {
+              const rendered = await tool.tool.renderToolResponse(result, {
+                req,
+              });
+              if (rendered)
+                add_responses(
+                  wrapSegment(
+                    wrapCard(
+                      tool.skill.skill_label ||
+                        tool.skill.constructor.skill_name,
+                      rendered,
+                    ),
+                    agent_label,
+                  ),
+                );
+            }
+            myHasResult = true;
+          }
+          await sysState.functions.llm_add_message.run(
+            "tool_response",
+            !result || typeof result === "string"
+              ? {
+                  type: "text",
+                  value: result || "Action run",
+                }
+              : {
+                  type: "json",
+                  value: JSON.parse(JSON.stringify(result)),
+                },
+            {
+              chat: run.context.interactions,
+              tool_call,
+            },
+          );
+
           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",
-              },
-            ],
+            interactions: run.context.interactions,
           });
+          if (tool.tool.postProcess && !stop) {
+            const chat = run.context.interactions;
+            let generateUsed = false;
+            const postprocres = await tool.tool.postProcess({
+              tool_call,
+              result,
+              chat,
+              req,
+              async generate(prompt, opts = {}) {
+                generateUsed = true;
+                return await sysState.functions.llm_generate.run(prompt, {
+                  chat,
+                  appendToChat: true,
+                  ...opts,
+                });
+              },
+            });
+            if (generateUsed)
+              await addToContext(run, {
+                interactions: chat,
+              });
+            if (postprocres.stop) stop = true;
+            if (postprocres.add_system_prompt)
+              await addToContext(run, {
+                interactions: [
+                  ...chat,
+                  { role: "system", content: postprocres.add_system_prompt },
+                ],
+              });
+            if (postprocres.add_response)
+              add_response(
+                wrapSegment(
+                  wrapCard(
+                    tool.skill.skill_label || tool.skill.constructor.skill_name,
+                    postprocres.add_response,
+                  ),
+                  agent_label,
+                ),
+              );
+            if (postprocres.add_user_action && viewname) {
+              const user_actions = Array.isArray()
+                ? postprocres.add_user_action
+                : [postprocres.add_user_action];
+              for (const uact of user_actions) {
+                uact.rndid = Math.floor(Math.random() * 16777215).toString(16);
+                uact.tool_call = tool_call;
+              }
+              await addToContext(run, {
+                user_actions,
+              });
+              add_response(
+                div(
+                  { class: "d-flex mb-2" },
+                  user_actions.map((ua) =>
+                    button(
+                      {
+                        class: "btn btn-primary", //press_store_button(this, true);
+                        onclick: `view_post('${viewname}', 'execute_user_action', {uaname: "${ua.name}",rndid: "${ua.rndid}", run_id: ${run.id}}, processExecuteResponse)`,
+                      },
+                      ua.label,
+                    ),
+                  ),
+                ),
+              );
+            }
+          }
+          if (myHasResult && !stop) hasResult = true;
+        }
       }
-    }
     if (hasResult)
       return await process_interaction(
         run,
@@ -439,13 +469,14 @@ const process_interaction = async (
         agent_label,
         [...prevResponses, ...responses],
         triggering_row,
-        agentsViewCfg
+        agentsViewCfg,
+        dyn_updates,
       );
   } else if (typeof answer === "string")
-    responses.push(
+    add_response(
       req.disable_markdown_render
         ? answer
-        : wrapSegment(md.render(answer), agent_label)
+        : wrapSegment(md.render(answer), agent_label),
     );
 
   return {

package/index.js

@@ -25,97 +25,15 @@ module.exports = {
       }/markdown-it.min.js`,
       onlyViews: ["Agent Chat"],
     },
+    {
+      script: `/plugins/public/agents@${
+        require("./package.json").version
+      }/jquery.autogrow-textarea.js`,
+      onlyViews: ["Agent Chat"],
+    },
   ],
   actions: {
-    Agent: {
-      disableInBuilder: true,
-      disableInList: true,
-      disableInWorkflow: true,
-      configFields: async ({ table, mode }) => {
-        const skills = get_skills();
-        const skills_fields = [];
-        for (const skill of skills) {
-          if (skill.configFields) {
-            const fields = await applyAsync(skill.configFields, undefined);
-            for (const field of fields) {
-              if (!field.showIf) field.showIf = {};
-              field.showIf.skill_type = skill.skill_name;
-              skills_fields.push(field);
-            }
-          }
-        }
-        const tables_with_json_field = (await Table.find({})).filter(
-          (table) =>
-            !table.external &&
-            !table.provider_name &&
-            table.fields.some((f) => f.type?.name === "JSON")
-        );
-        return [
-          ...(table
-            ? [
-                {
-                  name: "prompt",
-                  label: "Prompt",
-                  sublabel:
-                    "When triggered from table event or table view button. Use handlebars <code>{{}}</code> to access table fields. Ignored if run in Agent Chat view.",
-                  type: "String",
-                  required: true,
-                  attributes: { options: table.fields.map((f) => f.name) },
-                },
-              ]
-            : []),
-          {
-            name: "sys_prompt",
-            label: "System prompt",
-            sublabel:
-              "Additional information for the system prompt. Use interpolations <code>{{ }}</code> to access triggering row variables or user",
-            type: "String",
-            fieldview: "textarea",
-          },
-          {
-            name: "model",
-            label: "Model",
-            sublabel: "Override default model name",
-            type: "String",
-          },
-          new FieldRepeat({
-            name: "skills",
-            label: "Skills",
-            fields: [
-              {
-                name: "skill_type",
-                label: "Type",
-                type: "String",
-                required: true,
-                attributes: { options: skills.map((s) => s.skill_name) },
-              },
-              ...skills_fields,
-            ],
-          }),
-        ];
-      },
-      run: async ({ configuration, user, row, trigger_id, req, ...rest }) => {
-        const userinput = interpolate(configuration.prompt, row, user);
-        const run = await WorkflowRun.create({
-          status: "Running",
-          started_by: user?.id,
-          trigger_id: trigger_id || undefined,
-          context: {
-            implemented_fcall_ids: [],
-            interactions: [{ role: "user", content: userinput }],
-            funcalls: {},
-          },
-        });
-        return await process_interaction(
-          run,
-          configuration,
-          req,
-          undefined,
-          [],
-          row
-        );
-      },
-    },
+    Agent: require("./action"),
   },
   functions: {
     agent_generate: {
@@ -153,7 +71,7 @@ module.exports = {
                 ? opts.disable_markdown_render
                 : !opts?.render_markdown,
           },
-          null
+          null,
         );
         return {
           text: result.json.response,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/agents",
-  "version": "0.5.8",
+  "version": "0.6.1",
   "description": "AI agents for Saltcorn",
   "main": "index.js",
   "dependencies": {
@@ -15,6 +15,12 @@
   "author": "Tom Nielsen",
   "license": "MIT",
   "repository": "github:saltcorn/agents",
+  "devDependencies": {
+    "jest": "^29.7.0"
+  },
+  "scripts": {
+    "test": "jest tests --runInBand"
+  },
   "eslintConfig": {
     "extends": "eslint:recommended",
     "parserOptions": {
@@ -22,7 +28,8 @@
     },
     "env": {
       "node": true,
-      "es6": true
+      "es6": true,
+      "jest/globals": true
     },
     "rules": {
       "no-unused-vars": "off",