@saltcorn/agents 0.4.0 → 0.4.2

package/agent-view.js

@@ -42,6 +42,7 @@ const {
   process_interaction,
   find_image_tool,
   is_debug_mode,
+  get_initial_interactions,
 } = require("./common");
 const MarkdownIt = require("markdown-it"),
   md = new MarkdownIt();
@@ -81,6 +82,11 @@ const configuration_workflow = (req) =>
                 label: "Show previous runs",
                 type: "Bool",
               },
+              {
+                name: "prev_runs_closed",
+                label: "Initially closed",
+                type: "Bool",
+              },
               {
                 name: "placeholder",
                 label: "Placeholder",
@@ -148,7 +154,14 @@ const uploadForm = (viewname, req) =>
 const run = async (
   table_id,
   viewname,
-  { action_id, show_prev_runs, placeholder, explainer, image_upload },
+  {
+    action_id,
+    show_prev_runs,
+    prev_runs_closed,
+    placeholder,
+    explainer,
+    image_upload,
+  },
   state,
   { res, req }
 ) => {
@@ -171,6 +184,7 @@ const run = async (
       //triggering_row = await table.getRow({ [pk]: state[pk] });
       triggering_row_id = state[pk];
   }
+  const initial_q = state.run_id ? undefined : state._q;
   if (state.run_id) {
     const run = prevRuns.find((r) => r.id == state.run_id);
     const interactMarkups = [];
@@ -328,15 +342,18 @@ const run = async (
     }),
     div(
       { class: "copilot-entry" },
-      textarea({
-        class: "form-control",
-        name: "userinput",
-        "data-fieldname": "userinput",
-        placeholder: placeholder || "How can I help you?",
-        id: "inputuserinput",
-        rows: "3",
-        autofocus: true,
-      }),
+      textarea(
+        {
+          class: "form-control",
+          name: "userinput",
+          "data-fieldname": "userinput",
+          placeholder: placeholder || "How can I help you?",
+          id: "inputuserinput",
+          rows: "3",
+          autofocus: true,
+        },
+        initial_q
+      ),
       span(
         { class: "submit-button p-2", onclick: "$('form.copilot').submit()" },
         i({ id: "sendbuttonicon", class: "far fa-paper-plane" })
@@ -356,8 +373,14 @@ const run = async (
       {
         class: "d-flex justify-content-between align-middle mb-2",
       },
-      h5("Sessions"),
-
+      div(
+        { class: "d-flex" },
+        i({
+          class: "fas fa-caret-down me-1 session-open-sessions",
+          onclick: "close_session_list()",
+        }),
+        h5(req.__("Sessions"))
+      ),
       button(
         {
           type: "button",
@@ -392,6 +415,17 @@ const run = async (
     { class: "card" },
     div(
       { class: "card-body" },
+      div(
+        {
+          class: "open-prev-runs",
+          style: prev_runs_closed ? {} : { display: "none" },
+          onclick: "open_session_list()",
+        },
+        i({
+          class: "fas fa-caret-right me-1",
+        }),
+        req.__("Sessions")
+      ),
       div({ id: "copilotinteractions" }, runInteractions),
       input_form,
       style(
@@ -416,6 +450,9 @@ const run = async (
               left: 0.1rem;
               cursor: pointer;
             }
+              .session-open-sessions, .open-prev-runs {
+              cursor: pointer;
+              }
               .copilot-entry span.attach_agent_image_wrap {
               position: relative; 
               top: -1.8rem;
@@ -426,6 +463,9 @@ const run = async (
               top: -1.2rem;    
               display: block;                        
             }
+              .col-0 {
+              width: 0%
+              }
             .copilot-entry {margin-bottom: -1.25rem; margin-top: 1rem;}
             p.prevrun_content {
                white-space: nowrap;
@@ -434,7 +474,17 @@ const run = async (
     display: block;
     text-overflow: ellipsis;}`
       ),
-      script(`function processCopilotResponse(res) {
+      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) {
         const hadFile = $("input#attach_agent_image").val();
         $("span.filename-label").text("");
         $("input#attach_agent_image").val(null);
@@ -506,17 +556,20 @@ const run = async (
     document.getElementById("inputuserinput").addEventListener("keydown", submitOnEnter);
     function spin_send_button() {
       $("#sendbuttonicon").attr("class","fas fa-spinner fa-spin");
-    }
-`)
+    };`,
+        initial_q && domReady("$('form.copilot').submit()")
+      )
     )
   );
   return show_prev_runs
     ? {
-        widths: [3, 9],
+        widths: prev_runs_closed ? [0, 12] : [3, 9],
+        colClasses: prev_runs_closed ? ["was-col-3 d-none"] : undefined,
         gx: 3,
         besides: [
           {
             type: "container",
+            customClass: "prev-runs-list",
             contents: prev_runs_side_bar,
           },
           {
@@ -530,6 +583,8 @@ const run = async (
 
 const interact = async (table_id, viewname, config, body, { req, res }) => {
   const { userinput, run_id, triggering_row_id } = body;
+  const action = await Trigger.findOne({ id: config.action_id });
+
   let run;
   let triggering_row;
   if (table_id && triggering_row_id) {
@@ -537,19 +592,24 @@ const interact = async (table_id, viewname, config, body, { req, res }) => {
     const pk = table?.pk_name;
     if (table) triggering_row = await table.getRow({ [pk]: triggering_row_id });
   }
-  if (!run_id || run_id === "undefined")
+  if (!run_id || run_id === "undefined") {
+    const ini_interacts = await get_initial_interactions(
+      action.configuration,
+      req.user,
+      triggering_row
+    );
     run = await WorkflowRun.create({
       status: "Running",
       started_by: req.user?.id,
       trigger_id: config.action_id,
       context: {
         implemented_fcall_ids: [],
-        interactions: [{ role: "user", content: userinput }],
+        interactions: [...ini_interacts, { role: "user", content: userinput }],
         funcalls: {},
         triggering_row_id,
       },
     });
-  else {
+  } else {
     run = await WorkflowRun.findOne({ id: +run_id });
     await addToContext(run, {
       interactions: [{ role: "user", content: userinput }],
@@ -590,7 +650,6 @@ const interact = async (table_id, viewname, config, body, { req, res }) => {
       ],
     });
   }
-  const action = await Trigger.findOne({ id: config.action_id });
 
   return await process_interaction(
     run,

package/common.js

@@ -79,6 +79,16 @@ const find_image_tool = (config) => {
   }
 };
 
+const get_initial_interactions = async (config, user, triggering_row) => {
+  const interacts = [];
+  const skills = get_skill_instances(config);
+  for (const skill of skills) {
+    const its = await skill.initialInteractions?.({ user, triggering_row });
+    if (its) interacts.push(...its);
+  }
+  return interacts;
+};
+
 const getCompletionArguments = async (config, user, triggering_row) => {
   let tools = [];
 
@@ -359,4 +369,6 @@ module.exports = {
   process_interaction,
   find_image_tool,
   is_debug_mode,
+  get_initial_interactions,
+  nubBy,
 };

package/locales/de.json

@@ -0,0 +1 @@
+{ "Sessions": "Sitzungen" }

package/package.json

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

package/skills/FTSRetrieval.js

@@ -6,6 +6,7 @@ const View = require("@saltcorn/data/models/view");
 const { getState } = require("@saltcorn/data/db/state");
 const db = require("@saltcorn/data/db");
 const { interpolate } = require("@saltcorn/data/utils");
+const { nubBy } = require("../common");
 
 class RetrievalByFullTextSearch {
   static skill_name = "Retrieval by full-text search";
@@ -105,30 +106,45 @@ class RetrievalByFullTextSearch {
     const table = Table.findOne(this.table_name);
     return {
       type: "function",
-      process: async ({ phrase }, { req }) => {
+      process: async (arg, { req }) => {
         const scState = getState();
         const language = scState.pg_ts_config;
         const use_websearch = scState.getConfig("search_use_websearch", false);
-        const rows = await table.getRows({
-          _fts: {
-            fields: table.fields,
-            searchTerm: phrase,
-            language,
-            use_websearch,
-            table: table.name,
-            schema: db.isSQLite ? undefined : db.getTenantSchema(),
-          },
-        });
-        if (this.hidden_fields) {
-          const hidden_fields = this.hidden_fields
-            .split(",")
-            .map((s) => s.trim());
-          rows.forEach((r) => {
-            hidden_fields.forEach((k) => {
-              delete r[k];
-            });
+        let rows = [];
+        const phrases =
+          arg.query?.phrases ||
+          arg.phrases ||
+          (arg.phrase
+            ? [arg.phrase]
+            : arg.query?.phrase
+            ? [arg.query?.phrase]
+            : []);
+        for (const phrase of phrases) {
+          const my_rows = await table.getRows({
+            _fts: {
+              fields: table.fields,
+              searchTerm: phrase,
+              language,
+              use_websearch,
+              table: table.name,
+              schema: db.isSQLite ? undefined : db.getTenantSchema(),
+            },
           });
+          if (this.hidden_fields) {
+            const hidden_fields = this.hidden_fields
+              .split(",")
+              .map((s) => s.trim());
+            my_rows.forEach((r) => {
+              hidden_fields.forEach((k) => {
+                delete r[k];
+              });
+            });
+          }
+          rows.push(...my_rows);
         }
+        const pk = table.pk_name;
+        rows = nubBy((r) => r[pk], rows);
+
         if (rows.length)
           if (!this.doc_format) return { rows };
           else {
@@ -139,7 +155,8 @@ class RetrievalByFullTextSearch {
           }
         else
           return {
-            responseText: "There are no rows related to: " + phrase,
+            responseText:
+              "There are no rows related to: " + phrases.join(" or "),
           };
       },
       /*renderToolCall({ phrase }, { req }) {
@@ -163,15 +180,41 @@ class RetrievalByFullTextSearch {
         name: this.toolName,
         description: `Search the ${this.table_name} database table${
           table.description ? ` (${table.description})` : ""
-        } by a search phrase matched against all fields in the table with full text search. The retrieved rows will be returned`,
+        } by one or several search phrase or multiple search phrases matched against all fields in the table with full text search. The retrieved rows will be returned. If you want to search for documents matching any of several phrases, call this tool once with the phrases argument and give all the phrases you want to search for in one tool call.`,
         parameters: {
           type: "object",
-          required: ["phrase"],
+          required: ["query"],
           properties: {
-            phrase: {
-              type: "string",
-              description:
-                "The phrase to search the table with. The search phrase is the synatx used by web search engines: use double quotes for exact match, unquoted text for words in any order, dash (minus sign) to exclude a word. Do not use SQL or any other formal query language.",
+            query: {
+              anyOf: [
+                {
+                  type: "object",
+                  required: ["phrase"],
+                  properties: {
+                    phrase: {
+                      type: "string",
+                      description:
+                        "The phrase to search the table with. The search phrase is the synatx used by web search engines: use double quotes for exact match, unquoted text for words in any order, dash (minus sign) to exclude a word. Do not use SQL or any other formal query language.",
+                    },
+                  },
+                },
+                {
+                  type: "object",
+                  required: ["phrases"],
+                  description:
+                    "Search the table by any of a number of phrases. This will return any document that matches one or the other of the phrases",
+                  properties: {
+                    phrases: {
+                      type: "array",
+                      description:
+                        "A phrase to search the table with. The search phrase is the synatx used by web search engines: use double quotes for exact match, unquoted text for words in any order, dash (minus sign) to exclude a word. Do not use SQL or any other formal query language.",
+                      items: {
+                        type: "string",
+                      },
+                    },
+                  },
+                },
+              ],
             },
           },
         },

package/skills/PreloadData.js

@@ -2,11 +2,15 @@ const { div, pre } = require("@saltcorn/markup/tags");
 const Workflow = require("@saltcorn/data/models/workflow");
 const Form = require("@saltcorn/data/models/form");
 const Table = require("@saltcorn/data/models/table");
+const File = require("@saltcorn/data/models/file");
+const Trigger = require("@saltcorn/data/models/trigger");
+const User = require("@saltcorn/data/models/user");
 const View = require("@saltcorn/data/models/view");
 const { getState } = require("@saltcorn/data/db/state");
 const db = require("@saltcorn/data/db");
 const { eval_expression } = require("@saltcorn/data/models/expression");
 const { interpolate } = require("@saltcorn/data/utils");
+const vm = require("vm");
 
 class PreloadData {
   static skill_name = "Preload Data";
@@ -19,28 +23,69 @@ class PreloadData {
     Object.assign(this, cfg);
   }
 
-  async systemPrompt({ user }) {
-    const prompts = [];
-    if (this.add_sys_prompt) prompts.push(this.add_sys_prompt);
-    const table = Table.findOne(this.table_name);
-    const q = eval_expression(
-      this.preload_query,
-      {},
+  async run_the_code({ user, triggering_row }) {
+    const sysState = getState();
+    const f = vm.runInNewContext(`async () => {${this.code}\n}`, {
+      Table,
+      row: triggering_row,
+      context: triggering_row,
       user,
-      "PreloadData query"
-    );
+      User,
+      File,
+      Buffer,
+      Trigger,
+      setTimeout,
+      interpolate,
+      require,
+      getConfig: (k) =>
+        sysState.isFixedConfig(k) ? undefined : sysState.getConfig(k),
+      ...(triggering_row || {}),
+      ...sysState.eval_context,
+    });
+    return await f();
+  }
 
-    const rows = await table.getRows(q);
-    if (this.contents_expr) {
-      for (const row of rows)
-        prompts.push(interpolate(this.contents_expr, row, user));
+  async initialInteractions({ user, triggering_row }) {
+    if (this._stashed_initial_interactions)
+      return this._stashed_initial_interactions;
+    if (this.data_source === "Code") {
+      const result = await this.run_the_code({ user, triggering_row });
+      return result?.interactions;
+    }
+  }
+
+  async systemPrompt({ user, triggering_row }) {
+    const prompts = [];
+    if (this.data_source === "Code") {
+      const result = await this.run_the_code({ user, triggering_row });
+      if (typeof result === "string") return result;
+      if (result?.interactions)
+        this._stashed_initial_interactions = result?.interactions;
+      if (result?.systemPrompt) return result.systemPrompt;
     } else {
-      const hidden_fields = this.hidden_fields.split(",").map((s) => s.trim());
-      for (const row of rows) {
-        hidden_fields.forEach((k) => {
-          delete row[k];
-        });
-        prompts.push(JSON.stringify(row));
+      if (this.add_sys_prompt) prompts.push(this.add_sys_prompt);
+      const table = Table.findOne(this.table_name);
+      const q = eval_expression(
+        this.preload_query,
+        {},
+        user,
+        "PreloadData query"
+      );
+
+      const rows = await table.getRows(q);
+      if (this.contents_expr) {
+        for (const row of rows)
+          prompts.push(interpolate(this.contents_expr, row, user));
+      } else {
+        const hidden_fields = this.hidden_fields
+          .split(",")
+          .map((s) => s.trim());
+        for (const row of rows) {
+          hidden_fields.forEach((k) => {
+            delete row[k];
+          });
+          prompts.push(JSON.stringify(row));
+        }
       }
     }
     return prompts.join("\n");
@@ -50,6 +95,34 @@ class PreloadData {
     const allTables = await Table.find();
 
     return [
+      {
+        name: "data_source",
+        label: "Data source",
+        type: "String",
+        required: true,
+        attributes: { options: ["Table", "Code"] },
+      },
+      {
+        name: "code",
+        label: "Code",
+        input_type: "code",
+        attributes: { mode: "application/javascript" },
+        showIf: { data_source: "Code" },
+        class: "validate-statements",
+        sublabel:
+          "Return string or object <code>{systemPrompt: string, interactions: Interaction[]}</code>",
+        validator(s) {
+          try {
+            let AsyncFunction = Object.getPrototypeOf(
+              async function () {}
+            ).constructor;
+            AsyncFunction(s);
+            return true;
+          } catch (e) {
+            return e.message;
+          }
+        },
+      },
       {
         name: "table_name",
         label: "Table",
@@ -57,17 +130,20 @@ class PreloadData {
         type: "String",
         required: true,
         attributes: { options: allTables.map((t) => t.name) },
+        showIf: { data_source: "Table" },
       },
       {
         name: "preload_query",
         label: "Query",
         type: "String",
         class: "validate-expression",
+        showIf: { data_source: "Table" },
       },
       {
         name: "add_sys_prompt",
         label: "Additional prompt",
         type: "String",
+        showIf: { data_source: "Table" },
         fieldview: "textarea",
       },
       {
@@ -75,6 +151,7 @@ class PreloadData {
         label: "Contents string",
         type: "String",
         fieldview: "textarea",
+        showIf: { data_source: "Table" },
         sublabel:
           "Use handlebars (<code>{{ }}</code>) to access fields in each retrieved row",
       },
@@ -82,6 +159,7 @@ class PreloadData {
         name: "hidden_fields",
         label: "Hide fields",
         type: "String",
+        showIf: { data_source: "Table" },
         sublabel:
           "Comma-separated list of fields to hide from the prompt, if not using the contents string",
       },