@saltcorn/agents 0.7.8 → 0.7.10

package/common.js

@@ -40,6 +40,7 @@ const get_skills = () => {
     require("./skills/Fetch"),
     require("./skills/WebSearch"),
     require("./skills/Subagent"),
+    require("./skills/ExternalSkill"),
     //require("./skills/AdaptiveFeedback"),
     ...exchange_skills,
   ];
@@ -245,16 +246,16 @@ const process_interaction = async (
   const sysState = getState();
   const complArgs = await getCompletionArguments(
     config,
-    req.user,
+    req?.user,
     triggering_row,
-    req.body,
+    req?.body,
   );
   complArgs.appendToChat = true;
   complArgs.chat = run.context.interactions;
   const use_alt_config = complArgs.alt_config;
   //complArgs.debugResult = true;
   //console.log("complArgs", JSON.stringify(complArgs, null, 2));
-  const debugMode = is_debug_mode(config, req.user);
+  const debugMode = is_debug_mode(config, req?.user);
   const debugCollector = {};
   if (debugMode) complArgs.debugCollector = debugCollector;
   if (stream && viewname) {
@@ -265,10 +266,11 @@ const process_interaction = async (
           ? response
           : response.choices[0].content || response.choices[0].delta?.content;
       if (content) {
-        const pageLoadTag = req.body.page_load_tag;
-        view.emitRealTimeEvent(`STREAM_CHUNK?page_load_tag=${pageLoadTag}`, {
-          content,
-        });
+        const pageLoadTag = req?.body?.page_load_tag;
+        if (pageLoadTag)
+          view.emitRealTimeEvent(`STREAM_CHUNK?page_load_tag=${pageLoadTag}`, {
+            content,
+          });
       }
     };
   }
@@ -303,7 +305,7 @@ const process_interaction = async (
           eval_js: `processCopilotResponse({response: ${JSON.stringify(resp)}, run_id: ${run.id}}, true)`,
           page_load_tag: req?.headers?.["page-load-tag"],
         },
-        [req.user.id],
+        [req?.user?.id],
       );
     else responses.push(resp);
     await addToContext(run, {
@@ -342,7 +344,7 @@ const process_interaction = async (
     }
     if (answer.content && !answer.tool_calls)
       add_response(
-        req.disable_markdown_render
+        req?.disable_markdown_render
           ? answer
           : wrapSegment(md.render(answer.content), agent_label, false, layout),
       );
@@ -355,7 +357,7 @@ const process_interaction = async (
   ) {
     if (answer.content)
       add_response(
-        req.disable_markdown_render
+        req?.disable_markdown_render
           ? answer
           : wrapSegment(md.render(answer.content), agent_label, false, layout),
       );
@@ -383,13 +385,14 @@ const process_interaction = async (
               (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,
-              },
-            );
+            const pageLoadTag = req?.body?.page_load_tag;
+            if (pageLoadTag)
+              view.emitRealTimeEvent(
+                `STREAM_CHUNK?page_load_tag=${pageLoadTag}`,
+                {
+                  content,
+                },
+              );
           }
           const response_label = is_sub_agent
             ? agent_label
@@ -411,11 +414,11 @@ const process_interaction = async (
               );
           }
           myHasResult = true;
-          const result = await tool.tool.process(tool_call.input, {
+          let result = await tool.tool.process(tool_call.input, {
             req,
-          });
+          });        
           toolResults[tool_call.tool_call_id] = result;
-          if (result.stop) stop = true;
+          if (result?.stop) stop = true;
           if (
             (typeof result === "object" && Object.keys(result || {}).length) ||
             typeof result === "string"
@@ -469,7 +472,7 @@ const process_interaction = async (
           let stop = false,
             myHasResult = false;
           if (tool.tool.postProcess && !stop) {
-            let result = toolResults[tool_call.tool_call_id];            
+            let result = toolResults[tool_call.tool_call_id];
             const response_label = is_sub_agent
               ? agent_label
               : tool.skill.skill_label || tool.skill.constructor.skill_name;
@@ -477,9 +480,9 @@ const process_interaction = async (
             let generateUsed = false;
             const systemPrompt = await getSystemPrompt(
               config,
-              req.user,
+              req?.user,
               triggering_row,
-              req.body,
+              req?.body,
             );
             const postprocres = await tool.tool.postProcess({
               tool_call,
@@ -502,13 +505,14 @@ const process_interaction = async (
               emit_update(s) {
                 if (!stream || !viewname) return;
                 const view = View.findOne({ name: viewname });
-                const pageLoadTag = req.body.page_load_tag;
-                view.emitRealTimeEvent(
-                  `STREAM_CHUNK?page_load_tag=${pageLoadTag}`,
-                  {
-                    content: s + " ",
-                  },
-                );
+                const pageLoadTag = req?.body?.page_load_tag;
+                if (pageLoadTag)
+                  view.emitRealTimeEvent(
+                    `STREAM_CHUNK?page_load_tag=${pageLoadTag}`,
+                    {
+                      content: s + " ",
+                    },
+                  );
               },
             });
             if (generateUsed)
@@ -645,7 +649,7 @@ const process_interaction = async (
       );
   } else if (typeof answer === "string")
     add_response(
-      req.disable_markdown_render
+      req?.disable_markdown_render
         ? answer
         : wrapSegment(md.render(answer), agent_label, false, layout),
     );
@@ -656,7 +660,7 @@ const process_interaction = async (
         eval_js: `final_agent_response()`,
         page_load_tag: req?.headers?.["page-load-tag"],
       },
-      [req.user.id],
+      [req?.user?.id],
     );
 
   return {

package/index.js

@@ -25,13 +25,13 @@ module.exports = {
       script: `/plugins/public/agents@${
         require("./package.json").version
       }/markdown-it.min.js`,
-      onlyViews: ["Agent Chat"],
+      onlyViews: ["Agent Chat", "Saltcorn Agent copilot"],
     },
     {
       script: `/plugins/public/agents@${
         require("./package.json").version
       }/jquery.autogrow-textarea.js`,
-      onlyViews: ["Agent Chat"],
+      onlyViews: ["Agent Chat", "Saltcorn Agent copilot"],
     },
   ],
   actions: {

package/package.json

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

package/skills/ExternalSkill.js

@@ -0,0 +1,38 @@
+const path = require("path");
+const fs = require("fs").promises;
+
+class ExternalSkill {
+  static skill_name = "External Skill (SKILL.md)";
+
+  get skill_label() {
+    return "External Skill";
+  }
+
+  constructor(cfg) {
+    Object.assign(this, cfg);
+  }
+
+  static async configFields() {
+    return [
+      {
+        name: "skills_dir",
+        label: "Skill directory",
+        type: "String",
+        required: true,
+        sublabel: "Path to the directory containing SKILL.md",
+      },
+    ];
+  }
+
+  async systemPrompt() {
+    if (!this.skills_dir) return;
+    const skillMdPath = path.join(this.skills_dir, "SKILL.md");
+    try {
+      return await fs.readFile(skillMdPath, "utf8");
+    } catch (e) {
+      return `[ExternalSkill: could not read ${skillMdPath}: ${e.message}]`;
+    }
+  }
+}
+
+module.exports = ExternalSkill;

package/skills/GenerateAndRunJsCode.js

@@ -304,13 +304,14 @@ const getTablePrompt = (read_only) => {
   const state = getState();
   const tables = state.tables;
   const tableLines = [];
-  tables.forEach((table) => {
+  tables.map(t=>new Table(t)).forEach((table) => {
     const fieldLines = table.fields.map(
       (f) =>
-        `  * ${f.name} with type: ${f.pretty_type.replace(
-          "Key to",
-          "ForeignKey referencing",
-        )}.${f.description ? ` ${f.description}` : ""}`,
+        `  * ${f.name} with type: ${
+          f?.pretty_type
+            ? f.pretty_type.replace("Key to", "ForeignKey referencing")
+            : "Unknown"
+        }.${f?.description ? ` ${f.description}` : ""}`,
     );
     tableLines.push(
       `${table.name}${