@saltcorn/agents 0.6.8 → 0.6.10

package/agent-view.js

@@ -32,6 +32,7 @@ const {
   a,
   br,
   img,
+  text,
 } = require("@saltcorn/markup/tags");
 const { getState } = require("@saltcorn/data/db/state");
 const {
@@ -50,7 +51,7 @@ const {
 } = require("./common");
 const MarkdownIt = require("markdown-it"),
   md = new MarkdownIt();
-const { isWeb } = require("@saltcorn/data/utils");
+const { isWeb, escapeHtml } = require("@saltcorn/data/utils");
 const path = require("path");
 
 const configuration_workflow = (req) =>
@@ -240,7 +241,7 @@ const run = async (
   state,
   { res, req },
 ) => {
-  const action = agent_action || await Trigger.findOne({ id: action_id });
+  const action = agent_action || (await Trigger.findOne({ id: action_id }));
   if (!action) throw new Error(`Action not found: ${action_id}`);
   const prevRuns = show_prev_runs
     ? (
@@ -532,9 +533,11 @@ const run = async (
 
             p(
               { class: "prevrun_content" },
-              run.context.interactions
-                .find((i) => typeof i?.content === "string")
-                ?.content?.substring?.(0, 80),
+              escapeHtml(
+                run.context.interactions
+                  .find((i) => typeof i?.content === "string")
+                  ?.content?.substring?.(0, 80),
+              ),
             ),
           ),
         ),
@@ -820,7 +823,8 @@ const run = async (
 
 const interact = async (table_id, viewname, config, body, { req, res }) => {
   const { userinput, run_id, triggering_row_id } = body;
-  const action = config.agent_action || await Trigger.findOne({ id: config.action_id });
+  const action =
+    config.agent_action || (await Trigger.findOne({ id: config.action_id }));
 
   let run;
   let triggering_row;
@@ -892,7 +896,11 @@ const interact = async (table_id, viewname, config, body, { req, res }) => {
     await saveInteractions(run);
     fileBadges = div({ class: "d-flex" }, badges);
   }
-  const userInteractions = wrapSegment(p(userinput) + fileBadges, "You", true);
+  const userInteractions = wrapSegment(
+    p(escapeHtml(userinput)) + fileBadges,
+    "You",
+    true,
+  );
 
   await addToContext(run, {
     interactions: [
@@ -951,7 +959,8 @@ const delprevrun = async (table_id, viewname, config, body, { req, res }) => {
 
 const debug_info = async (table_id, viewname, config, body, { req, res }) => {
   const { run_id, triggering_row_id } = body;
-  const action = config.agent_action || await Trigger.findOne({ id: config.action_id });
+  const action =
+    config.agent_action || (await Trigger.findOne({ id: config.action_id }));
   let triggering_row;
   if (table_id && triggering_row_id) {
     const table = Table.findOne(table_id);
@@ -974,10 +983,12 @@ const debug_info = async (table_id, viewname, config, body, { req, res }) => {
     sysPrompt = complArgs.systemPrompt;
   }
   const debug_html = div(
-    div(h4("System prompt"), pre(sysPrompt)),
+    div(h4("System prompt"), pre(text(escapeHtml(sysPrompt)))),
     div(
       h4("API interactions"),
-      pre(JSON.stringify(run.context.api_interactions, null, 2)),
+      pre(
+        text(escapeHtml(JSON.stringify(run.context.api_interactions, null, 2))),
+      ),
     ),
   );
   if (run && req.user?.role_id === 1)
@@ -993,7 +1004,8 @@ const debug_info = async (table_id, viewname, config, body, { req, res }) => {
 
 const skillroute = async (table_id, viewname, config, body, { req, res }) => {
   const { run_id, triggering_row_id, skillid } = body;
-  const action = config.agent_action || await Trigger.findOne({ id: config.action_id });
+  const action =
+    config.agent_action || (await Trigger.findOne({ id: config.action_id }));
   let triggering_row;
   if (table_id && triggering_row_id) {
     const table = Table.findOne(table_id);
@@ -1030,7 +1042,8 @@ const execute_user_action = async (
 ) => {
   const { run_id, rndid, uaname } = body;
 
-  const action = config.agent_action || await Trigger.findOne({ id: config.action_id });
+  const action =
+    config.agent_action || (await Trigger.findOne({ id: config.action_id }));
   const run = await WorkflowRun.findOne({ id: +run_id });
   //console.log("run uas",run.context.user_actions );
 

package/common.js

@@ -418,6 +418,17 @@ const process_interaction = async (
                   ...opts,
                 });
               },
+              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,
+                  },
+                );
+              },
             });
             if (generateUsed)
               await addToContext(run, {
@@ -431,7 +442,7 @@ const process_interaction = async (
                   { role: "system", content: postprocres.add_system_prompt },
                 ],
               });
-            if (postprocres.add_response)
+            if (postprocres.add_response) {
               add_response(
                 wrapSegment(
                   wrapCard(
@@ -441,6 +452,26 @@ const process_interaction = async (
                   agent_label,
                 ),
               );
+              //replace tool response with this
+              // run.context.interactions.forEach((ic) => {});
+              const result = postprocres.add_response;
+              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,
+                },
+              );
+            }
             if (postprocres.add_user_action && viewname) {
               const user_actions = Array.isArray()
                 ? postprocres.add_user_action

package/package.json

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

package/skills/GenerateAndRunJsCode.js

@@ -27,7 +27,7 @@ class GenerateAndRunJsCodeSkill {
   }
 
   constructor(cfg) {
-    Object.assign(this, cfg);    
+    Object.assign(this, cfg);
   }
 
   async runCode(code, { user, req }) {
@@ -42,6 +42,7 @@ class GenerateAndRunJsCodeSkill {
           }
         : {}),
       ...(this.allow_fetch ? { fetch } : {}),
+      ...(this.allow_functions ? sysState.eval_context : {}),
       user,
       console,
       sleep,
@@ -94,6 +95,11 @@ class GenerateAndRunJsCodeSkill {
         label: "Allow access to tables",
         type: "Bool",
       },
+      {
+        name: "allow_functions",
+        label: "Allow calls to functions from codepages and modules",
+        type: "Bool",
+      },
       ...(Table.subClass
         ? [
             {
@@ -117,9 +123,15 @@ class GenerateAndRunJsCodeSkill {
       /*renderToolCall({ phrase }, { req }) {
         return div({ class: "border border-primary p-2 m-2" }, phrase);
       },*/
-      postProcess: async ({ tool_call, req, generate, ...rest }) => {
+      postProcess: async ({
+        tool_call,
+        req,
+        generate,
+        emit_update,
+        ...rest
+      }) => {
         //console.log("postprocess args", { tool_call, ...rest });
-
+        emit_update("Generating code");
         const str = await generate(
           `You will now be asked to write JavaScript code.          
 ${this.code_description ? "\nSome more information: " + this.code_description : ""}
@@ -131,17 +143,16 @@ The code you write can use await at the top level, and should return
 
 Now generate the JavaScript code required by the user.`,
         );
-        //console.log("gen answer", str);
-
+        getState().log(6, "Generated code: \n" + str);
         const js_code = str.includes("```javascript")
           ? str.split("```javascript")[1].split("```")[0]
           : str;
-
+        emit_update("Running code");
         const res = await this.runCode(js_code, { user: req.user });
         //console.log("code response", res);
-
+        getState().log(6, "Code answer: " + JSON.stringify(res));
         return {
-          stop: true,
+          //stop: true,
           add_response: res,
         };
       },