@saltcorn/agents 0.3.3 → 0.3.5

package/agent-view.js

@@ -190,7 +190,7 @@ const run = async (
 
           for (const tool_call of interact.tool_calls || []) {
             const toolSkill = find_tool(
-              tool_call.function.name,
+              tool_call.function?.name,
               action.configuration
             );
             if (toolSkill) {

package/common.js

@@ -42,7 +42,7 @@ const find_tool = (name, config) => {
       : Array.isArray(skillTools)
       ? skillTools
       : [skillTools];
-    const found = tools.find((t) => t?.function.name === name);
+    const found = tools.find((t) => t?.function?.name === name);
     if (found) return { tool: found, skill };
   }
 };
@@ -139,6 +139,23 @@ const wrapCard = (title, ...inners) =>
     div({ class: "card-body" }, inners)
   );
 
+const only_response_text_if_present = (interact) => {
+  if (
+    interact.role === "tool" &&
+    interact.call_id &&
+    interact.content?.[0] === "{"
+  ) {
+    try {
+      const result = JSON.parse(interact.content);
+      if (result.responseText)
+        return { ...interact, content: result.responseText };
+    } catch {
+      //ignore, not json content
+    }
+  }
+  return interact;
+};
+
 const process_interaction = async (
   run,
   config,
@@ -147,7 +164,7 @@ const process_interaction = async (
   prevResponses = []
 ) => {
   const complArgs = await getCompletionArguments(config, req.user);
-  complArgs.chat = run.context.interactions;
+  complArgs.chat = run.context.interactions.map(only_response_text_if_present);
   //complArgs.debugResult = true;
   //console.log("complArgs", JSON.stringify(complArgs, null, 2));
 
@@ -198,7 +215,11 @@ const process_interaction = async (
           ]
         : [{ role: "assistant", content: answer }],
   });
-  if (answer && typeof answer === "object" && (answer.tool_calls || answer.mcp_calls)) {
+  if (
+    answer &&
+    typeof answer === "object" &&
+    (answer.tool_calls || answer.mcp_calls)
+  ) {
     if (answer.content)
       responses.push(wrapSegment(md.render(answer.content), agent_label));
     //const actions = [];
@@ -211,7 +232,7 @@ const process_interaction = async (
         funcalls: { [tool_call.id]: tool_call.function },
       });
 
-      const tool = find_tool(tool_call.function.name, config);
+      const tool = find_tool(tool_call.function?.name, config);
 
       if (tool) {
         if (tool.tool.renderToolCall) {

package/package.json

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

package/skills/EmbeddingRetrieval.js

@@ -5,6 +5,7 @@ const Table = require("@saltcorn/data/models/table");
 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");
 
 class RetrievalByEmbedding {
   static skill_name = "Retrieval by embedding";
@@ -109,6 +110,14 @@ class RetrievalByEmbedding {
         type: "String",
         fieldview: "textarea",
       },
+      {
+        name: "doc_format",
+        label: "Document format",
+        type: "String",
+        fieldview: "textarea",
+        sublabel:
+          "Format of text to send to LLM, use <code>{{ }}</code> to access variables in the document table. If not set, document will be sent as JSON",
+      },
     ];
   }
 
@@ -124,7 +133,7 @@ class RetrievalByEmbedding {
       : table0;
     return {
       type: "function",
-      process: async ({ phrase_or_question }) => {
+      process: async ({ phrase_or_question }, { req }) => {
         const [table_name, field_name] = this.vec_field.split(".");
         const table = Table.findOne({ name: table_name });
         if (!table)
@@ -149,12 +158,20 @@ class RetrievalByEmbedding {
         rows.forEach((r) => {
           delete r[field_name];
         });
+
+        const set_doc_format = (rows) => {
+          if (!this.doc_format) return { rows };
+          const responseText = rows
+            .map((row) => interpolate(this.doc_format, row, req.user))
+            .join("\n");
+          return { rows, responseText };
+        };
         if (!rows.length)
           return {
-            response:
+            responseText:
               "There are no documents related to: " + phrase_or_question,
           };
-        else if (!this.doc_relation) return { rows };
+        else if (!this.doc_relation) return set_doc_format(rows);
         else {
           const relField = table.getField(this.doc_relation);
           const relTable = Table.findOne(relField.reftable_name);
@@ -167,10 +184,10 @@ class RetrievalByEmbedding {
           const docs = ids
             .map((id) => docsUnsorted.find((d) => d.id == id))
             .filter(Boolean);
-          return { rows: docs };
+          return set_doc_format(docs);
         }
       },
-      renderToolResponse: async ({ response, rows }, { req }) => {
+      renderToolResponse: async ({ responseText, rows }, { req }) => {
         if (rows) {
           const view = View.findOne({ name: this.list_view });
 
@@ -186,7 +203,7 @@ class RetrievalByEmbedding {
             return viewRes;
           } else return "";
         }
-        return div({ class: "border border-success p-2 m-2" }, response);
+        return div(responseText);
       },
       function: {
         name: this.toolName,

package/skills/FTSRetrieval.js

@@ -5,6 +5,7 @@ const Table = require("@saltcorn/data/models/table");
 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");
 
 class RetrievalByFullTextSearch {
   static skill_name = "Retrieval by full-text search";
@@ -84,13 +85,14 @@ class RetrievalByFullTextSearch {
         type: "String",
         fieldview: "textarea",
       },
-      /*{
-        name: "contents_expr",
-        label: "Contents string",
+      {
+        name: "doc_format",
+        label: "Document format",
         type: "String",
+        fieldview: "textarea",
         sublabel:
-          "Use handlebars (<code>{{ }}</code>) to access fields in the retrieved rows",
-      },*/
+          "Format of text to send to LLM, use <code>{{ }}</code> to access variables in the document table. If not set, document will be sent as JSON",
+      },
     ];
   }
 
@@ -103,7 +105,7 @@ class RetrievalByFullTextSearch {
     const table = Table.findOne(this.table_name);
     return {
       type: "function",
-      process: async ({ phrase }) => {
+      process: async ({ phrase }, { req }) => {
         const scState = getState();
         const language = scState.pg_ts_config;
         const use_websearch = scState.getConfig("search_use_websearch", false);
@@ -127,16 +129,23 @@ class RetrievalByFullTextSearch {
             });
           });
         }
-        if (rows.length) return { rows };
+        if (rows.length)
+          if (!this.doc_format) return { rows };
+          else {
+            const responseText = rows
+              .map((row) => interpolate(this.doc_format, row, req.user))
+              .join("\n");
+            return { rows, responseText };
+          }
         else
           return {
-            response: "There are no rows related to: " + phrase,
+            responseText: "There are no rows related to: " + phrase,
           };
       },
       /*renderToolCall({ phrase }, { req }) {
         return div({ class: "border border-primary p-2 m-2" }, phrase);
       },*/
-      renderToolResponse: async ({ response, rows }, { req }) => {
+      renderToolResponse: async ({ responseText, rows }, { req }) => {
         if (rows) {
           const view = View.findOne({ name: this.list_view });
 
@@ -148,7 +157,7 @@ class RetrievalByFullTextSearch {
             return viewRes;
           } else return "";
         }
-        return div({ class: "border border-success p-2 m-2" }, response);
+        return div({ class: "border border-success p-2 m-2" }, responseText);
       },
       function: {
         name: this.toolName,
@@ -161,7 +170,8 @@ class RetrievalByFullTextSearch {
           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.",
+              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.",
             },
           },
         },