@saltcorn/agents 0.3.1 → 0.3.2

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.2",
   "description": "AI agents for Saltcorn",
   "main": "index.js",
   "dependencies": {

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;