@saltcorn/copilot 0.4.1 → 0.4.2

package/package.json

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

package/user-copilot.js

@@ -68,10 +68,12 @@ const configuration_workflow = (req) =>
               viewtemplate: "Show",
             });
             show_view_opts[t.name] = views.map((v) => v.name);
-            const lviews = await View.find({
-              table_id: t.id,
-              viewtemplate: "List",
-            });
+            const lviews = await View.find_table_views_where(
+              t.id,
+              ({ state_fields, viewrow }) =>
+                viewrow.viewtemplate !== "Edit" &&
+                state_fields.every((sf) => !sf.required)
+            );
             list_view_opts[t.name] = lviews.map((v) => v.name);
           }
           return new Form({
@@ -203,6 +205,20 @@ const run = async (table_id, viewname, config, state, { res, req }) => {
                       "Copilot"
                     )
                   );
+              } else if (tool_call.function.name.startsWith("Query")) {
+                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)
+                    ),
+                    "Copilot"
+                  )
+                );
               }
             }
           } else
@@ -479,7 +495,10 @@ const getCompletionArguments = async (config) => {
           ];
         } else Object.assign(fieldProperties(field), properties[field.name]);
       });
-
+    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, 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. If you use sql_id_query, use it alone, do not combine with other field queries. Any other fields you want to filter on must be accessed in the WHERE clause`,
+    };
     tools.push({
       type: "function",
       function: {
@@ -524,9 +543,39 @@ const getCompletionArguments = async (config) => {
       },
     });
   }
+  const tables = (await Table.find({})).filter(
+    (t) => !t.external && !t.provider_name
+  );
+  const schemaPrefix = db.getTenantSchemaPrefix();
   const systemPrompt =
     "You are helping users retrieve information and perform actions on a relational database" +
-    config.sys_prompt;
+    config.sys_prompt +
+    `
+    If you are generating SQL, Your database the following tables in PostgreSQL: 
+
+` +
+    tables
+      .map(
+        (t) => `CREATE TABLE "${t.name}" (${
+          t.description
+            ? `
+  /* ${t.description} */`
+            : ""
+        }
+${t.fields
+  .map(
+    (f) =>
+      `  "${f.name}" ${
+        f.primary_key && f.type?.name === "Integer"
+          ? "SERIAL PRIMARY KEY"
+          : f.sql_type.replace(schemaPrefix, "")
+      }`
+  )
+  .join(",\n")}
+)`
+      )
+      .join(";\n\n");
+  //console.log("sysprompt", systemPrompt);
 
   if (tools.length === 0) tools = undefined;
   return { tools, systemPrompt };
@@ -647,7 +696,10 @@ const process_interaction = async (
           result,
         });
 
-        if (typeof result === "object" && Object.keys(result || {}).length) {
+        if (
+          (typeof result === "object" && Object.keys(result || {}).length) ||
+          typeof result === "string"
+        ) {
           responses.push(
             wrapSegment(
               wrapCard(
@@ -665,7 +717,10 @@ const process_interaction = async (
               role: "tool",
               tool_call_id: tool_call.id,
               name: tool_call.function.name,
-              content: result ? JSON.stringify(result) : "Action run",
+              content:
+                result && typeof result !== "string"
+                  ? JSON.stringify(result)
+                  : result || "Action run",
             },
           ],
         });
@@ -674,10 +729,46 @@ const process_interaction = async (
           name: tool_call.function.name.replace("Query", ""),
         });
         const query = JSON.parse(tool_call.function.arguments);
-        const result = await table.getRows(query, {
-          forUser: req.user,
-          forPublic: !req.user,
-        });
+        let result;
+        if (query.sql_id_query) {
+          const is_sqlite = db.isSQLite;
+
+          const client = is_sqlite ? db : await db.getClient();
+          await client.query(`BEGIN;`);
+          if (!is_sqlite) {
+            await client.query(
+              `SET LOCAL search_path TO "${db.getTenantSchema()}";`
+            );
+            await client.query(
+              `SET SESSION CHARACTERISTICS AS TRANSACTION READ ONLY;`
+            );
+          }
+
+          const { rows } = await client.query(query.sql_id_query);
+          await client.query(`ROLLBACK;`);
+
+          if (!is_sqlite) client.release(true);
+          result = await table.getRows(
+            { [table.pk_name]: { in: rows.map((r) => r[table.pk_name]) } },
+            {
+              forUser: req.user,
+              forPublic: !req.user,
+            }
+          );
+          responses.push(
+            wrapSegment(
+              wrapCard(
+                "Query " + tool_call.function.name.replace("Query", ""),
+                pre(query.sql_id_query)
+              ),
+              "Copilot"
+            )
+          );
+        } else
+          result = await table.getRows(query, {
+            forUser: req.user,
+            forPublic: !req.user,
+          });
         await addToContext(run, {
           interactions: [
             {