@saltcorn/copilot 0.4.3 → 0.4.5

package/actions/generate-tables.js

@@ -17,7 +17,7 @@ class GenerateTables {
     const types = Object.values(getState().types);
     const fieldTypeCfg = types.map((ty) => {
       const properties = {
-        data_type: { const: ty.name },
+        data_type: { type: "string", enum: [ty.name] },
       };
       const attrs = apply(ty.attributes, {}) || [];
       if (Array.isArray(attrs))
@@ -40,7 +40,7 @@ class GenerateTables {
       description:
         "A foreign key to a different table. This will reference the primary key on another table.",
       properties: {
-        data_type: { const: "ForeignKey" },
+        data_type: { type: "string", enum: ["ForeignKey"] },
         reference_table: {
           type: "string",
           description: "Name of the table being referenced",
@@ -52,7 +52,7 @@ class GenerateTables {
       description:
         "A reference (file path) to a file on disk. This can be used for example to hold images or documents",
       properties: {
-        data_type: { const: "File" },
+        data_type: { type: "string", enum: ["File"] },
       },
     });
     return {

package/actions/generate-workflow.js

@@ -16,7 +16,9 @@ const steps = async () => {
   );
 
   const stepTypeAndCfg = Object.keys(actionExplainers).map((actionName) => {
-    const properties = { step_type: { const: actionName } };
+    const properties = { 
+      step_type: { type: "string", enum: [actionName] }
+    };
     const myFields = actionFields.filter(
       (f) => f.showIf?.wf_action_name === actionName
     );
@@ -37,7 +39,9 @@ const steps = async () => {
   });
   for (const [actionName, action] of stateActionList) {
     try {
-      const properties = { step_type: { const: actionName } };
+      const properties = { 
+        step_type: { type: "string", enum: [actionName] }
+      };
       const cfgFields = await getActionConfigFields(action, null, {
         mode: "workflow",
         copilot: true,
@@ -69,7 +73,10 @@ const steps = async () => {
   //TODO workflows
   for (const trigger of triggers) {
     const properties = {
-      step_type: { const: trigger.name },
+      step_type: { 
+        type: "string",
+        enum: [trigger.name],  
+      },
     };
     if (trigger.table_id) {
       const table = Table.findOne({ id: trigger.table_id });

package/common.js

@@ -99,7 +99,19 @@ const fieldProperties = (field) => {
       if (field.options) props.enum = toArrayOfStrings(field.options);
       break;
   }
+  if (!props.type) {
+    switch (field.input_type) {
+      case "code":
+        props.type = "string";
+        break;
+    }
+  }
   return props;
 };
 
-module.exports = { getCompletion, getPromptFromTemplate, incompleteCfgMsg, fieldProperties };
+module.exports = {
+  getCompletion,
+  getPromptFromTemplate,
+  incompleteCfgMsg,
+  fieldProperties,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/copilot",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "AI assistant for building Saltcorn applications",
   "main": "index.js",
   "dependencies": {

package/user-copilot.js

@@ -196,6 +196,17 @@ const run = async (table_id, viewname, config, state, { res, req }) => {
         case "assistant":
         case "system":
           if (interact.tool_calls) {
+            if (interact.content) {
+              interactMarkups.push(
+                div(
+                  { class: "interaction-segment" },
+                  span({ class: "badge bg-secondary" }, "Copilot"),
+                  typeof interact.content === "string"
+                    ? md.render(interact.content)
+                    : interact.content
+                )
+              );
+            }
             for (const tool_call of interact.tool_calls) {
               const action = config.actions.find(
                 (a) => a.trigger_name === tool_call.function.name
@@ -212,17 +223,14 @@ const run = async (table_id, viewname, config, state, { res, req }) => {
                       "Copilot"
                     )
                   );
-              } else if (tool_call.function.name.startsWith("Query")) {
+              } else if (tool_call.function.name === "TableQuery") {
                 const query = JSON.parse(tool_call.function.arguments);
                 const queryText = query.sql_id_query
                   ? query.sql_id_query
                   : JSON.stringify(query, null, 2);
                 interactMarkups.push(
                   wrapSegment(
-                    wrapCard(
-                      "Query " + tool_call.function.name.replace("Query", ""),
-                      pre(queryText)
-                    ),
+                    wrapCard("Query " + query.table_name, pre(queryText)),
                     "Copilot"
                   )
                 );
@@ -240,25 +248,40 @@ const run = async (table_id, viewname, config, state, { res, req }) => {
             );
           break;
         case "tool":
-          if (interact.name.startsWith("Query")) {
-            const table = Table.findOne({
-              name: interact.name.replace("Query", ""),
-            });
-            interactMarkups.push(
-              await renderQueryInteraction(
-                table,
-                JSON.parse(interact.content),
-                config,
-                req
+          if (interact.name === "TableQuery") {
+            const tool_call = run.context.interactions
+              .map(
+                (i) =>
+                  i.tool_calls &&
+                  i.tool_calls.find((tc) => tc.id === interact.tool_call_id)
               )
-            );
+              .filter(Boolean)[0];
+            if (tool_call) {
+              const args = JSON.parse(tool_call.function.arguments);
+              const table = Table.findOne(args.table_name);
+              interactMarkups.push(
+                await renderQueryInteraction(
+                  table,
+                  JSON.parse(interact.content),
+                  config,
+                  req
+                )
+              );
+            }
           } else if (interact.content !== "Action run") {
+            let markupContent;
+            try {
+              markupContent = JSON.stringify(
+                JSON.parse(interact.content),
+                null,
+                2
+              );
+            } catch {
+              markupContent = interact.content;
+            }
             interactMarkups.push(
               wrapSegment(
-                wrapCard(
-                  interact.name,
-                  pre(JSON.stringify(JSON.parse(interact.content), null, 2))
-                ),
+                wrapCard(interact.name, pre(markupContent)),
                 "Copilot"
               )
             );
@@ -443,32 +466,40 @@ const run = async (table_id, viewname, config, state, { res, req }) => {
 const getCompletionArguments = async (config) => {
   let tools = [];
   const sysPrompts = [];
-  for (const tableCfg of config?.tables || []) {
-    let properties = {};
+  let properties = {};
 
-    const table = Table.findOne({ name: tableCfg.table_name });
+  const tableNames = (config?.tables || []).map((t) => t.table_name);
+  properties.table_name = {
+    type: "string",
+    enum: tableNames,
+    description: `Which table is this query from. Every query has to select rows from one table, even if it is based on joins from different tables`,
+  };
+  properties.sql_id_query = {
+    type: "string",
+    description: `An SQL query for this table's primary keys. This must select only the primary keys (even if the user wants a count), for example SELECT ${
+      tableNames[0][0]
+    }."${Table.findOne(tableNames[0]).pk_name}" from "${tableNames[0]}" ${
+      tableNames[0][0]
+    } JOIN ... where... Use this to join other tables in the database.`,
+  };
+  properties.is_count = {
+    type: "boolean",
+    description: `Is the only desired output a count? Make this true if the user wants a count of rows`,
+  };
 
-    properties.sql_id_query = {
-      type: "string",
-      description: `An SQL query for this table's primary keys (${table.pk_name}). This must select only the primary keys (even if the user wants a count), for example SELECT ${table.name[0]}."${table.pk_name}" from "${table.name}" ${table.name[0]} JOIN ... where... Use this to join other tables in the database.`,
-    };
-    properties.is_count = {
-      type: "boolean",
-      description: `Is the only desired output a count? Make this true if the user wants a count of rows`,
-    };
-    tools.push({
-      type: "function",
-      function: {
-        name: "Query" + table.name,
-        description: `Query the ${table.name} table and show the results to the user in a grid format`,
-        parameters: {
-          type: "object",
-          //required: ["action_javascript_code", "action_name"],
-          properties,
-        },
+  tools.push({
+    type: "function",
+    function: {
+      name: "TableQuery",
+      description: `Query a table and show the results to the user in a grid format`,
+      parameters: {
+        type: "object",
+        required: ["table_name", "sql_id_query", "is_count"],
+        properties,
       },
-    });
-  }
+    },
+  });
+
   for (const action of config?.actions || []) {
     let properties = {};
 
@@ -532,9 +563,10 @@ ${t.fields
       .join(";\n\n") +
     `
       
-If the user asks to you show rows from a table, just run the query tool for that table. This will display the result to the user.
-You should not render the results again, that will cause them to be displayed twice. Only if the user asks for a summary
-or a calculation based on the query results should you show that requested summary or calculation.
+Use the TableQuery tool if the user asks to see, find or count or otherwise access rows from a table that matches what the user is looking for, or if
+the user is asking for a summary or inference from such rows. The TableQuery query is parametrised by a SQL SELECT query which 
+selects primary key values from the specified table. You can join other tables or use complex logic in the WHERE clause, but you must 
+always return porimary key values from the specified table.
 `;
   //console.log("sysprompt", systemPrompt);
 
@@ -575,7 +607,7 @@ const renderQueryInteraction = async (table, result, config, req) => {
   if (typeof result === "number")
     return wrapSegment(
       wrapCard(
-        "Query " + table.name,
+        "Query " + table?.name || "",
         //div("Query: ", code(JSON.stringify(query))),
         `${result}`
       ),
@@ -584,7 +616,7 @@ const renderQueryInteraction = async (table, result, config, req) => {
   if (result.length === 0)
     return wrapSegment(
       wrapCard(
-        "Query " + table.name,
+        "Query " + table?.name || "",
         //div("Query: ", code(JSON.stringify(query))),
         "No rows found"
       ),
@@ -630,6 +662,7 @@ const process_interaction = async (
 ) => {
   const complArgs = await getCompletionArguments(config);
   complArgs.chat = run.context.interactions;
+  //complArgs.debugResult = true;
   //console.log(complArgs);
   console.log("complArgs", JSON.stringify(complArgs, null, 2));
 
@@ -638,12 +671,20 @@ const process_interaction = async (
   await addToContext(run, {
     interactions:
       typeof answer === "object" && answer.tool_calls
-        ? [{ role: "assistant", tool_calls: answer.tool_calls }]
+        ? [
+            {
+              role: "assistant",
+              tool_calls: answer.tool_calls,
+              content: answer.content,
+            },
+          ]
         : [{ role: "assistant", content: answer }],
   });
   const responses = [];
 
   if (typeof answer === "object" && answer.tool_calls) {
+    if (answer.content)
+      responses.push(wrapSegment(md.render(answer.content), "Copilot"));
     //const actions = [];
     let hasResult = false;
     for (const tool_call of answer.tool_calls) {
@@ -702,12 +743,12 @@ const process_interaction = async (
             },
           ],
         });
-      } else if (tool_call.function.name.startsWith("Query")) {
+      } else if (tool_call.function.name == "TableQuery") {
+        const query = JSON.parse(tool_call.function.arguments);
         const table = Table.findOne({
-          name: tool_call.function.name.replace("Query", ""),
+          name: query.table_name,
         });
         const tableCfg = config.tables.find((t) => t.table_name === table.name);
-        const query = JSON.parse(tool_call.function.arguments);
 
         const is_sqlite = db.isSQLite;