@saltcorn/agents 0.3.1 → 0.3.3

package/common.js

@@ -13,6 +13,7 @@ const get_skills = () => {
     require("./skills/Table"),
     require("./skills/PreloadData"),
     require("./skills/GenerateImage"),
+    require("./skills/ModelContextProtocol"),
     //require("./skills/AdaptiveFeedback"),
   ];
 };
@@ -151,10 +152,10 @@ const process_interaction = async (
   //console.log("complArgs", JSON.stringify(complArgs, null, 2));
 
   const answer = await getState().functions.llm_generate.run("", complArgs);
-  //console.log("answer", answer);
+  console.log("answer", answer);
 
   const responses = [];
-  if (typeof answer === "object" && answer.image_calls) {
+  if (answer && typeof answer === "object" && answer.image_calls) {
     for (const image_call of answer.image_calls) {
       const tool = find_image_tool(config);
       let prcRes;
@@ -197,12 +198,13 @@ const process_interaction = async (
           ]
         : [{ role: "assistant", content: answer }],
   });
-  if (typeof answer === "object" && answer.tool_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 = [];
     let hasResult = false;
-    for (const tool_call of answer.tool_calls) {
+    if ((answer.mcp_calls || []).length && !answer.content) hasResult = true;
+    for (const tool_call of answer.tool_calls || []) {
       console.log("call function", tool_call.function);
 
       await addToContext(run, {

package/package.json

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

package/skills/FTSRetrieval.js

@@ -25,7 +25,7 @@ class RetrievalByFullTextSearch {
     if (this.mode === "Tool")
       return `Use the ${this.toolName} tool to search the ${
         this.table_name
-      } database by a search phrase which will locate rows where any field match that query.${
+      } database by a search phrase (using the syntax of web search engines) which will locate rows where any field match that query.${
         this.list_view
           ? ` When the tool call returns rows, do not describe them or repeat the information to the user. The results are already displayed to the user automatically.`
           : ""
@@ -161,7 +161,7 @@ class RetrievalByFullTextSearch {
           properties: {
             phrase: {
               type: "string",
-              description: "The phrase to search the table with",
+              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.",
             },
           },
         },

package/skills/ModelContextProtocol.js

@@ -0,0 +1,67 @@
+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 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");
+
+class ModelContextProtocol {
+  static skill_name = "Model Context Protocol";
+
+  get skill_label() {
+    return `Model Context Protocol: ${this.server_label}`;
+  }
+
+  constructor(cfg) {
+    Object.assign(this, cfg);
+  }
+
+  static async configFields() {
+    return [
+      {
+        name: "server_label",
+        label: "Server label",
+        type: "String",
+        required: true,
+      },
+      {
+        name: "server_url",
+        label: "Server URL",
+        type: "String",
+        required: true,
+      },
+      {
+        name: "header_key",
+        label: "Header key",
+        type: "String",
+        sublabel:
+          "Optional, for authorization. Which HTTP header should be set? For example <code>Authorization</code>",
+      },
+      {
+        name: "header_value",
+        label: "Header value",
+        type: "String",
+        sublabel:
+          "Optional, for authorization. What is the value of the HTTP header? For example <code>Bearer {api_key}</code>",
+      },
+    ];
+  }
+
+  provideTools() {
+    const tool = {
+      type: "mcp",
+      server_label: this.server_label,
+      server_url: this.server_url,
+      require_approval: "never",
+    };
+    if (this.header_key && this.header_value)
+      tool.headers = { [this.header_key]: this.header_value };
+    return tool;
+  }
+}
+
+module.exports = ModelContextProtocol;

package/skills/Table.js

@@ -21,9 +21,11 @@ class TableToSkill {
   systemPrompt() {
     return `Use the query_${this.table_name} tool to search the ${
       this.table_name
-    } database by a search phrase which will locate rows where any field match that query.${
-      this.add_sys_prompt ? ` ${this.add_sys_prompt}` : ""
-    }`;
+    } database by specific fields or a search phrase which will locate rows where any field match that query.${
+      this.list_view
+        ? ` When the tool call returns rows, do not describe them or repeat the information to the user. The results are already displayed to the user automatically.`
+        : ""
+    }${this.add_sys_prompt ? ` ${this.add_sys_prompt}` : ""}`;
   }
 
   static async configFields() {
@@ -78,7 +80,7 @@ class TableToSkill {
         name: "add_sys_prompt",
         label: "Additional system prompt",
         type: "String",
-        fieldview: "textarea"
+        fieldview: "textarea",
       },
     ];
   }
@@ -173,11 +175,12 @@ class TableToSkill {
                   {
                     type: "object",
                     description:
-                      "Search the table by a phrase matched against any string field",
+                      "Search the table by a phrase matched against any string field, using the syntax of web search engines",
                     properties: {
                       full_text_search: {
                         type: "string",
-                        description: "A phrase to search the table with",
+                        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.",
                       },
                     },
                   },