@saltcorn/agents 0.6.9 → 0.6.11

package/agent-view.js

@@ -533,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),
+              ),
             ),
           ),
         ),
@@ -894,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: [

package/common.js

@@ -326,9 +326,10 @@ const process_interaction = async (
           let stop = false,
             myHasResult = false;
           if (stream && viewname) {
-            let content =
-              "Using skill: " + tool.skill.skill_label ||
-              tool.skill.constructor.skill_name;
+            let content = span(
+              { class: "badge text-bg-secondary me-1" },
+              tool.skill.skill_label || tool.skill.constructor.skill_name,
+            );
             const view = View.findOne({ name: viewname });
             const pageLoadTag = req.body.page_load_tag;
             view.emitRealTimeEvent(
@@ -418,6 +419,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: span({ class: "badge text-bg-secondary me-1" }, s),
+                  },
+                );
+              },
             });
             if (generateUsed)
               await addToContext(run, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/agents",
-  "version": "0.6.9",
+  "version": "0.6.11",
   "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,10 +42,14 @@ class GenerateAndRunJsCodeSkill {
           }
         : {}),
       ...(this.allow_fetch ? { fetch } : {}),
+      ...(this.allow_functions ? sysState.eval_context : {}),
       user,
       console,
       sleep,
       setTimeout,
+      URL,
+      Buffer,
+      console,
     });
     return await f();
   }
@@ -94,6 +98,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 +126,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,15 +146,14 @@ 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,
           add_response: res,