@saltcorn/agents 0.4.4 → 0.4.6

package/agent-view.js

@@ -43,6 +43,7 @@ const {
   find_image_tool,
   is_debug_mode,
   get_initial_interactions,
+  get_skill_instances,
 } = require("./common");
 const MarkdownIt = require("markdown-it"),
   md = new MarkdownIt();
@@ -92,6 +93,7 @@ const configuration_workflow = (req) =>
                 name: "stream",
                 label: "Stream response",
                 type: "Bool",
+                sublabel: "Requires dynamic update (Event settings)",
               },
               {
                 name: "placeholder",
@@ -323,6 +325,14 @@ const run = async (
     }
     runInteractions = interactMarkups.join("");
   }
+  const skill_form_widgets = [];
+  for (const skill of get_skill_instances(action.configuration)) {
+    if (skill.formWidget)
+      skill_form_widgets.push(
+        await skill.formWidget({ user: req.user, klass: "skill-form-widget" })
+      );
+  }
+
   const debugMode = is_debug_mode(action.configuration, req.user);
   const input_form = form(
     {
@@ -337,10 +347,14 @@ const run = async (
     }),
     input({
       type: "hidden",
-      class: "form-control  ",
       name: "run_id",
       value: state.run_id ? +state.run_id : undefined,
     }),
+    input({
+      type: "hidden",
+      name: "page_load_tag",
+      value: "",
+    }),
     input({
       type: "hidden",
       class: "form-control  ",
@@ -371,6 +385,7 @@ const run = async (
           onclick: "press_agent_debug_button()",
           class: "debugicon fas fa-bug",
         }),
+      skill_form_widgets,
       explainer && small({ class: "explainer" }, i(explainer))
     ),
     stream && div({ class: "next_response_scratch" })
@@ -457,6 +472,12 @@ const run = async (
               top: -1.8rem;
               left: 0.1rem;
               cursor: pointer;
+            }
+            .copilot-entry .skill-form-widget {
+              position: relative; 
+              top: -2rem;
+              left: 0.4rem;
+              display: inline;
             }
               .session-open-sessions, .open-prev-runs {
               cursor: pointer;
@@ -484,15 +505,15 @@ const run = async (
       ),
       script(
         `
-        function close_session_list() {
-          $("div.prev-runs-list").hide().parents(".col-3").removeClass("col-3").addClass("was-col-3").parent().children(".col-9").removeClass("col-9").addClass("col-12")
-          $("div.open-prev-runs").show()
-        }
-        function open_session_list() {
-          $("div.prev-runs-list").show().parents(".was-col-3").removeClass(["was-col-3","col-0","d-none"]).addClass("col-3").parent().children(".col-12").removeClass("col-12").addClass("col-9")
-          $("div.open-prev-runs").hide()
-        }
-        function processCopilotResponse(res) {
+    function close_session_list() {
+      $("div.prev-runs-list").hide().parents(".col-3").removeClass("col-3").addClass("was-col-3").parent().children(".col-9").removeClass("col-9").addClass("col-12")
+      $("div.open-prev-runs").show()
+    }
+    function open_session_list() {
+      $("div.prev-runs-list").show().parents(".was-col-3").removeClass(["was-col-3","col-0","d-none"]).addClass("col-3").parent().children(".col-12").removeClass("col-12").addClass("col-9")
+      $("div.open-prev-runs").hide()
+    }
+    function processCopilotResponse(res) {
         const hadFile = $("input#attach_agent_image").val();
         $("span.filename-label").text("");
         $("input#attach_agent_image").val(null);
@@ -566,6 +587,10 @@ const run = async (
     function spin_send_button() {
       $("#sendbuttonicon").attr("class","fas fa-spinner fa-spin");
     };`,
+        stream &&
+          domReady(
+            `$('form.agent-view input[name=page_load_tag]').val(window._sc_pageloadtag)`
+          ),
         initial_q && domReady("$('form.copilot').submit()")
       )
     )
@@ -692,13 +717,22 @@ const debug_info = async (table_id, viewname, config, body, { req, res }) => {
     if (table) triggering_row = await table.getRow({ [pk]: triggering_row_id });
   }
   const run = await WorkflowRun.findOne({ id: +run_id });
-  const complArgs = await getCompletionArguments(
-    action.configuration,
-    req.user,
-    triggering_row
-  );
+  let sysPrompt = "";
+  if (
+    run.context.api_interactions?.[0].request?.messages?.[0]?.role === "system"
+  ) {
+    sysPrompt =
+      run.context.api_interactions?.[0].request?.messages?.[0].content;
+  } else {
+    const complArgs = await getCompletionArguments(
+      action.configuration,
+      req.user,
+      triggering_row
+    );
+    sysPrompt = complArgs.systemPrompt;
+  }
   const debug_html = div(
-    div(h4("System prompt"), pre(complArgs.systemPrompt)),
+    div(h4("System prompt"), pre(sysPrompt)),
     div(
       h4("API interactions"),
       pre(JSON.stringify(run.context.api_interactions, null, 2))

package/common.js

@@ -32,6 +32,7 @@ const get_skills = () => {
     require("./skills/PreloadData"),
     require("./skills/GenerateImage"),
     require("./skills/ModelContextProtocol"),
+    require("./skills/PromptPicker"),
     //require("./skills/AdaptiveFeedback"),
     ...exchange_skills,
   ];
@@ -90,7 +91,12 @@ const get_initial_interactions = async (config, user, triggering_row) => {
   return interacts;
 };
 
-const getCompletionArguments = async (config, user, triggering_row) => {
+const getCompletionArguments = async (
+  config,
+  user,
+  triggering_row,
+  formbody
+) => {
   let tools = [];
 
   let sysPrompts = [
@@ -99,7 +105,11 @@ const getCompletionArguments = async (config, user, triggering_row) => {
 
   const skills = get_skill_instances(config);
   for (const skill of skills) {
-    const sysPr = await skill.systemPrompt?.({ user, triggering_row });
+    const sysPr = await skill.systemPrompt?.({
+      ...(formbody || {}),
+      user,
+      triggering_row,
+    });
     if (sysPr) sysPrompts.push(sysPr);
     const skillTools = skill.provideTools?.();
     if (skillTools && Array.isArray(skillTools)) tools.push(...skillTools);
@@ -198,7 +208,8 @@ const process_interaction = async (
   const complArgs = await getCompletionArguments(
     config,
     req.user,
-    triggering_row
+    triggering_row,
+    req.body
   );
   complArgs.chat = run.context.interactions.map(only_response_text_if_present);
   //complArgs.debugResult = true;
@@ -217,6 +228,7 @@ const process_interaction = async (
             eval_js: `$('form.agent-view div.next_response_scratch').append(${JSON.stringify(
               content
             )})`,
+            page_load_tag: req.body.page_load_tag,
           },
           [req.user.id]
         );
@@ -224,6 +236,8 @@ const process_interaction = async (
   }
   const answer = await sysState.functions.llm_generate.run("", complArgs);
 
+  //console.log({answer});
+
   if (debugMode)
     await addToContext(run, {
       api_interactions: [debugCollector],
@@ -306,6 +320,7 @@ const process_interaction = async (
               eval_js: `$('form.agent-view div.next_response_scratch').append(${JSON.stringify(
                 content
               )})`,
+              page_load_tag: req.body.page_load_tag,
             },
             [req.user.id]
           );

package/package.json

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

package/skills/PreloadData.js

@@ -69,7 +69,7 @@ class PreloadData {
       const table = Table.findOne(this.table_name);
       const q = eval_expression(
         this.preload_query,
-        {},
+        triggering_row || {},
         user,
         "PreloadData query"
       );

package/skills/PromptPicker.js

@@ -0,0 +1,51 @@
+const Workflow = require("@saltcorn/data/models/workflow");
+const Form = require("@saltcorn/data/models/form");
+const FieldRepeat = require("@saltcorn/data/models/fieldrepeat");
+const { select, option } = require("@saltcorn/markup/tags");
+const { eval_expression } = require("@saltcorn/data/models/expression");
+const { validID } = require("@saltcorn/markup/layout_utils");
+
+class PromptPicker {
+  static skill_name = "Prompt picker";
+  get skill_label() {
+    return `Prompt picker`;
+  }
+  constructor(cfg) {
+    Object.assign(this, cfg);
+    this.options = eval_expression(
+      this.options_obj,
+      {},
+      null,
+      "Prompt picker options"
+    );
+    this.formname = validID("pp" + Object.keys(this.options));
+  }
+  static async configFields() {
+    return [
+      { name: "placeholder", label: "Placeholder", type: "String" },
+      {
+        name: "options_obj",
+        label: "System prompt contents",
+        sublabel: `JavaScript object where the keys are the options and values are added to system prompt. Example:<br><code>{"Pirate":"Speak like a pirate", "Pop star":"Speak like a pop star"}</code>`,
+        type: "String",
+        fieldview: "textarea",
+        required: true,
+      },
+    ];
+  }
+  async formWidget({ user, klass }) {
+    return select(
+      {
+        class: ["form-select form-select-sm w-unset", klass],
+        name: this.formname,
+      },
+      this.placeholder && option({ disabled: true }, this.placeholder),
+      Object.keys(this.options).map((o) => option(o))
+    );
+  }
+  systemPrompt(body) {
+    if (body[this.formname]) return this.options[body[this.formname]];
+  }
+}
+
+module.exports = PromptPicker;