@saltcorn/copilot 0.3.0 → 0.3.2

package/actions/generate-tables.js

@@ -20,14 +20,15 @@ class GenerateTables {
         data_type: { const: ty.name },
       };
       const attrs = apply(ty.attributes, {}) || [];
-      attrs.forEach((a) => {
-        properties[a.name] = {
-          description:
-            a.copilot_description ||
-            `${a.label}.${a.sublabel ? ` ${a.sublabel}` : ""}`,
-          ...fieldProperties(a),
-        };
-      });
+      if (Array.isArray(attrs))
+        attrs.forEach((a) => {
+          properties[a.name] = {
+            description:
+              a.copilot_description ||
+              `${a.label}.${a.sublabel ? ` ${a.sublabel}` : ""}`,
+            ...fieldProperties(a),
+          };
+        });
       return {
         type: "object",
         description: ty.copilot_description || ty.description,

package/chat-copilot.js

@@ -33,6 +33,8 @@ const {
   getPromptFromTemplate,
   incompleteCfgMsg,
 } = require("./common");
+const MarkdownIt = require("markdown-it"),
+  md = new MarkdownIt();
 
 const get_state_fields = () => [];
 
@@ -85,7 +87,9 @@ const run = async (table_id, viewname, cfg, state, { res, req }) => {
               div(
                 { class: "interaction-segment" },
                 span({ class: "badge bg-secondary" }, "Copilot"),
-                p(interact.content)
+                typeof interact.content === "string"
+                  ? md.render(interact.content)
+                  : interact.content
               )
             );
           break;
@@ -154,18 +158,19 @@ const run = async (table_id, viewname, cfg, state, { res, req }) => {
             button(
               {
                 type: "button",
-                class: "btn btn-secondary btn-sm",
+                class: "btn btn-secondary btn-sm py-0",
+                style: "font-size: 0.9em;height:1.5em",
                 onclick: "unset_state_field('run_id')",
                 title: "New session",
               },
-              i({ class: "fas fa-redo" })
+              i({ class: "fas fa-redo fa-sm" })
             )
           ),
           prevRuns.map((run) =>
             div(
               {
                 onclick: `set_state_field('run_id',${run.id})`,
-                class: "prevcopilotrun",
+                class: "prevcopilotrun border p-2",
               },
               localeDateTime(run.started_at),
 
@@ -200,9 +205,8 @@ const run = async (table_id, viewname, cfg, state, { res, req }) => {
               `div.interaction-segment:not(:first-child) {border-top: 1px solid #e7e7e7; }
               div.interaction-segment {padding-top: 5px;padding-bottom: 5px;}
               div.interaction-segment p {margin-bottom: 0px;}
-              div.interaction-segment div.card {margin-top: 0.5rem;}
-            div.prevcopilotrun {border-top: 1px solid #e7e7e7;border-right: 1px solid #e7e7e7;padding-top:3px; padding-bottom:3px; padding-right: 1rem;}
-            div.prevcopilotrun:hover {cursor: pointer}
+              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));}
             .copilot-entry .submit-button:hover { cursor: pointer}
 
             .copilot-entry .submit-button {
@@ -238,7 +242,7 @@ const run = async (table_id, viewname, cfg, state, { res, req }) => {
     function restore_old_button_elem(btn) {
         const oldText = $(btn).data("old-text");
         btn.html(oldText);
-        btn.css({ width: "" });
+        btn.css({ width: "" }).prop("disabled", false);
         btn.removeData("old-text");
     }
     function processExecuteResponse(res) {
@@ -382,7 +386,10 @@ const interact = async (table_id, viewname, config, body, { req }) => {
       actions.push(markup);
     }
     return { json: { success: "ok", actions, run_id: run.id } };
-  } else return { json: { success: "ok", response: answer, run_id: run.id } };
+  } else
+    return {
+      json: { success: "ok", response: md.render(answer), run_id: run.id },
+    };
 };
 
 const renderToolcall = async (tool_call, viewname, implemented, run) => {
@@ -409,9 +416,9 @@ const wrapAction = (
   implemented,
   run
 ) =>
+  span({ class: "badge bg-info ms-1" }, actionClass.title) +
   div(
-    { class: "card mb-3" },
-    div({ class: "card-header" }, h5(actionClass.title)),
+    { class: "card mb-3 bg-secondary-subtle" },
     div(
       { class: "card-body" },
       inner_markup,

package/common.js

@@ -1,4 +1,3 @@
-const axios = require("axios");
 const fsp = require("fs").promises;
 const _ = require("underscore");
 const path = require("path");

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@saltcorn/copilot",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "AI assistant for building Saltcorn applications",
   "main": "index.js",
   "dependencies": {
     "@saltcorn/data": "^0.9.0",
-    "axios": "0.16.2",
     "underscore": "1.13.6",
-    "node-sql-parser": "4.15.0"
+    "node-sql-parser": "4.15.0",
+    "markdown-it": "14.1.0"
   },
   "author": "Tom Nielsen",
   "license": "MIT",