@saltcorn/copilot 0.5.0 → 0.5.2

package/package.json

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

package/user-copilot.js

@@ -362,7 +362,14 @@ const run = async (table_id, viewname, config, state, { res, req }) => {
                 onclick: `set_state_field('run_id',${run.id})`,
                 class: "prevcopilotrun border p-2",
               },
-              localeDateTime(run.started_at),
+              div(
+                { class: "d-flex justify-content-between" },
+                localeDateTime(run.started_at),
+                i({
+                  class: "far fa-trash-alt",
+                  onclick: `delprevrun(event, ${run.id})`,
+                })
+              ),
 
               p(
                 { class: "prevrun_content" },
@@ -397,6 +404,8 @@ const run = async (table_id, viewname, config, state, { res, req }) => {
               div.interaction-segment p {margin-bottom: 0px;}
               div.interaction-segment div.card {margin-top: 0.5rem;}            
             div.prevcopilotrun:hover {cursor: pointer; background-color: var(--tblr-secondary-bg-subtle, var(--bs-secondary-bg-subtle, gray));}
+            div.prevcopilotrun i.fa-trash-alt {display: none;}
+            div.prevcopilotrun:hover i.fa-trash-alt {display: block;}
             .copilot-entry .submit-button:hover { cursor: pointer}
 
             .copilot-entry .submit-button {
@@ -430,6 +439,13 @@ const run = async (table_id, viewname, config, state, { res, req }) => {
         btn.css({ width: "" }).prop("disabled", false);
         btn.removeData("old-text");
     }
+    function delprevrun(e, runid) {
+        e.preventDefault();
+        e.stopPropagation();
+        view_post('${viewname}', 'delprevrun', {run_id:runid})
+        $(e.target).closest(".prevcopilotrun").remove()
+        return false;
+    }
     function processExecuteResponse(res) {
         const btn = $("#exec-"+res.fcall_id)
         restore_old_button_elem($("#exec-"+res.fcall_id))
@@ -466,39 +482,42 @@ const run = async (table_id, viewname, config, state, { res, req }) => {
 const getCompletionArguments = async (config) => {
   let tools = [];
   const sysPrompts = [];
-  let properties = {};
 
-  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`,
-  };
+  if (config.tables.length) {
+    let properties = {};
+
+    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`,
+    };
 
-  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,
+    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 = {};
@@ -536,18 +555,19 @@ const getCompletionArguments = async (config) => {
   const systemPrompt =
     "You are helping users retrieve information and perform actions on a relational database" +
     config.sys_prompt +
-    `
-    If you are generating SQL, Your database the following tables in PostgreSQL: 
+    (config.tables.length
+      ? `
+    If you are generating SQL, Your database has the following tables in PostgreSQL: 
 
 ` +
-    tables
-      .map(
-        (t) => `CREATE TABLE "${t.name}" (${
-          t.description
-            ? `
+        tables
+          .map(
+            (t) => `CREATE TABLE "${t.name}" (${
+              t.description
+                ? `
   /* ${t.description} */`
-            : ""
-        }
+                : ""
+            }
 ${t.fields
   .map(
     (f) =>
@@ -559,15 +579,16 @@ ${t.fields
   )
   .join(",\n")}
 )`
-      )
-      .join(";\n\n") +
-    `
+          )
+          .join(";\n\n") +
+        `
       
 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);
 
   if (tools.length === 0) tools = undefined;
@@ -600,7 +621,17 @@ const interact = async (table_id, viewname, config, body, { req, res }) => {
       interactions: [{ role: "user", content: userinput }],
     });
   }
-  return await process_interaction(run, userinput, config, req);
+  return await process_interaction(run, config, req);
+};
+
+const delprevrun = async (table_id, viewname, config, body, { req, res }) => {
+  const { run_id } = body;
+  let run;
+  
+  run = await WorkflowRun.findOne({ id: +run_id });
+  await run.delete();
+
+  return;
 };
 
 const renderQueryInteraction = async (table, result, config, req) => {
@@ -653,20 +684,13 @@ const renderQueryInteraction = async (table, result, config, req) => {
   );
 };
 
-const process_interaction = async (
-  run,
-  input,
-  config,
-  req,
-  prevResponses = []
-) => {
+const process_interaction = async (run, config, req, prevResponses = []) => {
   const complArgs = await getCompletionArguments(config);
   complArgs.chat = run.context.interactions;
   //complArgs.debugResult = true;
-  //console.log(complArgs);
-  console.log("complArgs", JSON.stringify(complArgs, null, 2));
+  //console.log("complArgs", JSON.stringify(complArgs, null, 2));
 
-  const answer = await getState().functions.llm_generate.run(input, complArgs);
+  const answer = await getState().functions.llm_generate.run("", complArgs);
   console.log("answer", answer);
   await addToContext(run, {
     interactions:
@@ -820,7 +844,7 @@ const process_interaction = async (
       }
     }
     if (hasResult)
-      return await process_interaction(run, "", config, req, [
+      return await process_interaction(run, config, req, [
         ...prevResponses,
         ...responses,
       ]);
@@ -909,5 +933,5 @@ module.exports = {
   get_state_fields,
   tableless: true,
   run,
-  routes: { interact },
+  routes: { interact, delprevrun },
 };