@saltcorn/server 0.8.7 → 0.8.8-beta.0

package/routes/models.js

@@ -0,0 +1,492 @@
+/**
+ * @category server
+ * @module routes/models
+ * @subcategory routes
+ */
+
+const Router = require("express-promise-router");
+
+const { error_catcher, is_relative_url, isAdmin } = require("./utils.js");
+const Table = require("@saltcorn/data/models/table");
+const Form = require("@saltcorn/data/models/form");
+const Model = require("@saltcorn/data/models/model");
+const ModelInstance = require("@saltcorn/data/models/model_instance");
+const { getState } = require("@saltcorn/data/db/state");
+const db = require("@saltcorn/data/db");
+const moment = require("moment");
+
+const { mkTable, renderForm, post_delete_btn } = require("@saltcorn/markup");
+const {
+  span,
+  h4,
+  p,
+  a,
+  div,
+  i,
+  form,
+  label,
+  input,
+  text,
+  script,
+  domReady,
+  code,
+  iframe,
+  style,
+  pre,
+} = require("@saltcorn/markup/tags");
+
+const router = new Router();
+module.exports = router;
+
+const newModelForm = (table, req) => {
+  return new Form({
+    action: "/models/new/" + table.id,
+    fields: [
+      { name: "name", label: "Name", type: "String", required: true },
+      {
+        name: "modelpattern",
+        label: "Model pattern",
+        type: "String",
+        required: true,
+        attributes: { options: Object.keys(getState().modelpatterns) },
+      },
+    ],
+  });
+};
+
+router.get(
+  "/new/:table_id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { table_id } = req.params;
+    const table = await Table.findOne({ id: table_id });
+    res.sendWrap(req.__(`New model`), {
+      above: [
+        {
+          type: "breadcrumbs",
+          crumbs: [
+            { text: req.__("Tables"), href: "/table" },
+            { href: `/table/${table.id}`, text: table.name },
+            { text: req.__(`New model`) },
+          ],
+        },
+        {
+          type: "card",
+          class: "mt-0",
+          title: req.__(`New model`),
+          contents: renderForm(newModelForm(table, req), req.csrfToken()),
+        },
+      ],
+    });
+  })
+);
+
+router.post(
+  "/new/:table_id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { table_id } = req.params;
+    const table = await Table.findOne({ id: table_id });
+    const form = newModelForm(table, req);
+    form.validate(req.body);
+    if (form.hasErrors) {
+      res.sendWrap(req.__(`New model`), renderForm(form, req.csrfToken()));
+    } else {
+      const model = await Model.create({ ...form.values, table_id: table.id });
+      if (model.templateObj.configuration_workflow)
+        res.redirect(`/models/config/${model.id}`);
+      else res.redirect(`/models/show/${model.id}`);
+    }
+  })
+);
+
+const respondWorkflow = (model, table, wf, wfres, req, res) => {
+  const wrap = (contents, noCard, previewURL) => ({
+    above: [
+      {
+        type: "breadcrumbs",
+        crumbs: [
+          { text: req.__("Tables"), href: "/table" },
+          { href: `/table/${table.id || table.name}`, text: table.name },
+          { href: `/models/show/${model.id}`, text: model.name },
+          { text: req.__("Configuration") },
+        ],
+      },
+      {
+        type: noCard ? "container" : "card",
+        class: !noCard && "mt-0",
+        title: wfres.title,
+        titleAjaxIndicator: true,
+        contents,
+      },
+    ],
+  });
+  if (wfres.flash) req.flash(wfres.flash[0], wfres.flash[1]);
+  if (wfres.renderForm)
+    res.sendWrap(
+      {
+        title: req.__(`%s configuration`, model.name),
+        headers: [
+          {
+            script: `/static_assets/${db.connectObj.version_tag}/jquery-menu-editor.min.js`,
+          },
+          {
+            script: `/static_assets/${db.connectObj.version_tag}/iconset-fontawesome5-3-1.min.js`,
+          },
+          {
+            script: `/static_assets/${db.connectObj.version_tag}/bootstrap-iconpicker.js`,
+          },
+          {
+            css: `/static_assets/${db.connectObj.version_tag}/bootstrap-iconpicker.min.css`,
+          },
+        ],
+      },
+      wrap(
+        renderForm(wfres.renderForm, req.csrfToken()),
+        false,
+        wfres.previewURL
+      )
+    );
+  else res.redirect(wfres.redirect);
+};
+
+const get_model_workflow = (model, req) => {
+  const workflow = model.templateObj.configuration_workflow(req);
+  workflow.action = `/models/config/${model.id}`;
+  const oldOnDone = workflow.onDone || ((c) => c);
+  workflow.onDone = async (ctx) => {
+    const { id, ...configuration } = await oldOnDone(ctx);
+    await model.update({ configuration });
+
+    return {
+      redirect: `/models/show/${model.id}`,
+      flash: ["success", `Model ${this.name || ""} saved`],
+    };
+  };
+  return workflow;
+};
+
+router.get(
+  "/config/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const { step } = req.query;
+
+    const model = await Model.findOne({ id });
+    const table = await Table.findOne({ id: model.table_id });
+    const configFlow = get_model_workflow(model, req);
+    const wfres = await configFlow.run(
+      {
+        ...model.configuration,
+        id: model.id,
+        table_id: model.table_id,
+        ...(step ? { stepName: step } : {}),
+      },
+      req
+    );
+    respondWorkflow(model, table, configFlow, wfres, req, res);
+  })
+);
+
+router.post(
+  "/config/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const { step } = req.query;
+
+    const model = await Model.findOne({ id });
+    const table = await Table.findOne({ id: model.table_id });
+    if (!table) {
+      req.flash("error", `Table not found`);
+      res.redirect(`/table`);
+      return;
+    }
+    const workflow = get_model_workflow(model, req);
+    const wfres = await workflow.run(req.body, req);
+    respondWorkflow(model, table, workflow, wfres, req, res);
+  })
+);
+
+router.get(
+  "/show/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const model = await Model.findOne({ id });
+    const table = await Table.findOne({ id: model.table_id });
+    const instances = await ModelInstance.find({ model_id: model.id });
+    const metrics = model.templateObj.metrics || {};
+    const metricCols = Object.entries(metrics).map(([k, v]) => ({
+      label: k,
+      key: (inst) => inst.metric_values?.[k]?.toPrecision(6),
+    }));
+    const anyReport = instances.some((i) => !!i.report);
+    res.sendWrap(req.__(`Show model`), {
+      above: [
+        {
+          type: "breadcrumbs",
+          crumbs: [
+            { text: req.__("Tables"), href: "/table" },
+            { href: `/table/${table.id}`, text: table.name },
+            { text: model.name },
+          ],
+          after: a(
+            { href: `/models/config/${model.id}` },
+            req.__("Edit"),
+            i({ class: "ms-1 fas fa-edit" })
+          ),
+        },
+        {
+          type: "card",
+          class: "mt-0",
+          title: req.__("Model instances"),
+          contents: div(
+            mkTable(
+              [
+                { label: req.__("Name"), key: "name" },
+                {
+                  label: req.__("Trained"),
+                  key: (inst) => moment(inst.trained_on).fromNow(),
+                },
+                ...(anyReport
+                  ? [
+                      {
+                        label: req.__("Report"),
+                        key: (inst) =>
+                          inst.report
+                            ? a(
+                                { href: `/models/show-report/${inst.id}` },
+                                i({ class: "fas fa-file-alt" })
+                              )
+                            : "",
+                      },
+                    ]
+                  : []),
+                ...metricCols,
+                {
+                  label: req.__("Default"),
+                  key: (inst) =>
+                    form(
+                      {
+                        action: `/models/make-default-instance/${inst.id}`,
+                        method: "POST",
+                      },
+                      span(
+                        { class: "form-switch" },
+                        input({
+                          class: ["form-check-input"],
+                          type: "checkbox",
+                          onChange: "this.form.submit()",
+                          role: "switch",
+                          name: "enabled",
+                          ...(inst.is_default && { checked: true }),
+                        })
+                      ),
+                      input({
+                        type: "hidden",
+                        name: "_csrf",
+                        value: req.csrfToken(),
+                      })
+                    ),
+                },
+                {
+                  label: req.__("Delete"),
+                  key: (r) =>
+                    post_delete_btn(
+                      `/models/delete-instance/${encodeURIComponent(r.id)}`,
+                      req
+                    ),
+                },
+              ],
+              instances
+            ),
+            a(
+              { href: `/models/train/${model.id}`, class: "btn btn-primary" },
+              i({ class: "fas fa-graduation-cap me-1" }),
+              req.__("Train new instance")
+            )
+          ),
+        },
+      ],
+    });
+  })
+);
+const model_train_form = (model, table, req) => {
+  const hyperparameter_fields =
+    model.templateObj.hyperparameter_fields?.({
+      table,
+      ...model,
+    }) || [];
+  return new Form({
+    action: `/models/train/${model.id}`,
+    onSubmit: "press_store_button(this)",
+    fields: [
+      {
+        name: "name",
+        label: req.__("Name"),
+        type: "String",
+        required: true,
+      },
+      ...hyperparameter_fields,
+    ],
+  });
+};
+router.post(
+  "/delete/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const model = await Model.findOne({ id });
+    await model.delete();
+    req.flash("success", req.__("Model %s deleted", model.name));
+    res.redirect(`/table/${model.table_id}`);
+  })
+);
+
+router.post(
+  "/delete-instance/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const model_inst = await ModelInstance.findOne({ id });
+    await model_inst.delete();
+    req.flash("success", req.__("Model instance %s deleted", model_inst.name));
+    res.redirect(`/models/show/${model_inst.model_id}`);
+  })
+);
+
+router.get(
+  "/train/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const model = await Model.findOne({ id });
+    const table = await Table.findOne({ id: model.table_id });
+    const form = model_train_form(model, table, req);
+    res.sendWrap(req.__(`Train model`), {
+      above: [
+        {
+          type: "breadcrumbs",
+          crumbs: [
+            { text: req.__("Tables"), href: "/table" },
+            { href: `/table/${table.id}`, text: table.name },
+            { href: `/models/show/${model.id}`, text: model.name },
+            { text: req.__(`Train`) },
+          ],
+        },
+        {
+          type: "card",
+          class: "mt-0",
+          title: req.__(`New model`),
+          contents: renderForm(form, req.csrfToken()),
+        },
+      ],
+    });
+  })
+);
+router.post(
+  "/train/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const model = await Model.findOne({ id });
+    const table = Table.findOne({ id: model.table_id });
+    const form = model_train_form(model, table, req);
+    form.validate(req.body);
+    if (form.hasErrors) {
+      res.sendWrap(req.__(`Train model`), renderForm(form, req.csrfToken()));
+    } else {
+      const { name, ...hyperparameters } = form.values;
+
+      const train_res = await model.train_instance(name, hyperparameters, {});
+      if (typeof train_res === "string") {
+        res.sendWrap(req.__(`Model training error`), {
+          above: [
+            {
+              type: "breadcrumbs",
+              crumbs: [
+                { text: req.__("Tables"), href: "/table" },
+                { href: `/table/${table.id}`, text: table.name },
+                { href: `/models/show/${model.id}`, text: model.name },
+                { text: req.__(`Training error`) },
+              ],
+            },
+            {
+              type: "card",
+              class: "mt-0",
+              title: req.__(`Training error`),
+              contents: pre(train_res),
+            },
+          ],
+        });
+      } else {
+        req.flash("success", "Model trained");
+        res.redirect(`/models/show/${model.id}`);
+      }
+    }
+  })
+);
+
+router.post(
+  "/make-default-instance/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const model_instance = await ModelInstance.findOne({ id });
+    await model_instance.make_default(!req.body.enabled);
+    res.redirect(`/models/show/${model_instance.model_id}`);
+  })
+);
+
+const encode = (s) =>
+  s.replace(
+    //https://stackoverflow.com/a/57448862/19839414
+    /[&<>'"]/g,
+    (tag) =>
+      ({
+        "&": "&amp;",
+        "<": "&lt;",
+        ">": "&gt;",
+        "'": "&#39;",
+        '"': "&quot;",
+      }[tag])
+  );
+
+router.get(
+  "/show-report/:id",
+  isAdmin,
+  error_catcher(async (req, res) => {
+    const { id } = req.params;
+    const model_instance = await ModelInstance.findOne({ id });
+    const model = await Model.findOne({ id: model_instance.model_id });
+    const table = Table.findOne({ id: model.table_id });
+    res.sendWrap(req.__(`Train model`), {
+      above: [
+        {
+          type: "breadcrumbs",
+          crumbs: [
+            { text: req.__("Tables"), href: "/table" },
+            { href: `/table/${table.id}`, text: table.name },
+            { href: `/models/show/${model.id}`, text: model.name },
+            { text: model_instance.name },
+            { text: req.__(`Report`) },
+          ],
+        },
+        {
+          type: "card",
+          class: "mt-0",
+          title: req.__(`Model training report`),
+          contents:
+            iframe({
+              id: "trainreport",
+              width: "100%",
+              height: "100vh",
+              srcdoc: encode(model_instance.report),
+            }) + style(`iframe#trainreport { height: 100vh}`),
+        },
+      ],
+    });
+  })
+);

package/routes/page.js

@@ -7,6 +7,7 @@
 const Router = require("express-promise-router");
 
 const Page = require("@saltcorn/data/models/page");
+const Trigger = require("@saltcorn/data/models/trigger");
 const { getState } = require("@saltcorn/data/db/state");
 const {
   error_catcher,
@@ -40,18 +41,21 @@ router.get(
     const { pagename } = req.params;
     const state = getState();
     state.log(3, `Route /page/${pagename} user=${req.user?.id}`);
-    const tic = state.logLevel >= 5 ? new Date() : null;
+    const tic = new Date();
 
     const role = req.user && req.user.id ? req.user.role_id : 100;
     const db_page = await Page.findOne({ name: pagename });
     if (db_page && role <= db_page.min_role) {
       const contents = await db_page.run(req.query, { res, req });
       const title = scan_for_page_title(contents, db_page.title);
-      if (tic) {
-        const tock = new Date();
-        const ms = tock.getTime() - tic.getTime();
-        state.log(5, `Page ${pagename} rendered in ${ms} ms`);
-      }
+      const tock = new Date();
+      const ms = tock.getTime() - tic.getTime();
+      Trigger.emitEvent("PageLoad", null, req.user, {
+        text: req.__("Page '%s' was loaded", pagename),
+        type: "page",
+        name: pagename,
+        render_time: ms,
+      });
       res.sendWrap(
         {
           title,

package/routes/tables.js

@@ -11,6 +11,7 @@ const Table = require("@saltcorn/data/models/table");
 const File = require("@saltcorn/data/models/file");
 const View = require("@saltcorn/data/models/view");
 const User = require("@saltcorn/data/models/user");
+const Model = require("@saltcorn/data/models/model");
 const Trigger = require("@saltcorn/data/models/trigger");
 const {
   mkTable,
@@ -54,7 +55,7 @@ const {
 } = require("@saltcorn/data/models/discovery");
 const { getState } = require("@saltcorn/data/db/state");
 const { cardHeaderTabs } = require("@saltcorn/markup/layout_utils");
-const { tablesList } = require("./common_lists");
+const { tablesList, viewsList } = require("./common_lists");
 const {
   InvalidConfiguration,
   removeAllWhiteSpace,
@@ -654,7 +655,14 @@ const attribBadges = (f) => {
   let s = "";
   if (f.attributes) {
     Object.entries(f.attributes).forEach(([k, v]) => {
-      if (["summary_field", "on_delete_cascade", "on_delete"].includes(k))
+      if (
+        [
+          "summary_field",
+          "on_delete_cascade",
+          "on_delete",
+          "unique_error_msg",
+        ].includes(k)
+      )
         return;
       if (v || v === 0) s += badge("secondary", k);
     });
@@ -785,37 +793,10 @@ router.get(
       );
       var viewCardContents;
       if (views.length > 0) {
-        viewCardContents = mkTable(
-          [
-            {
-              label: req.__("Name"),
-              key: (r) => link(`/view/${encodeURIComponent(r.name)}`, r.name),
-            },
-            { label: req.__("Pattern"), key: "viewtemplate" },
-            {
-              label: req.__("Configure"),
-              key: (r) =>
-                link(
-                  `/viewedit/config/${encodeURIComponent(
-                    r.name
-                  )}?on_done_redirect=${encodeURIComponent(
-                    `table/${table.name}`
-                  )}`,
-                  req.__("Configure")
-                ),
-            },
-            {
-              label: req.__("Delete"),
-              key: (r) =>
-                post_delete_btn(
-                  `/viewedit/delete/${encodeURIComponent(r.id)}`,
-                  req
-                ),
-            },
-          ],
-          views,
-          { hover: true }
-        );
+        viewCardContents = await viewsList(views, req, {
+          on_done_redirect: encodeURIComponent(`table/${table.name}`),
+          notable: true,
+        });
       } else {
         viewCardContents = div(
           h4(req.__("No views defined")),
@@ -838,6 +819,33 @@ router.get(
           ),
       };
     }
+    const models = await Model.find({ table_id: table.id });
+    const modelCard = div(
+      mkTable(
+        [
+          {
+            label: req.__("Name"),
+            key: (r) => link(`/models/show/${r.id}`, r.name),
+          },
+          { label: req.__("Pattern"), key: "modelpattern" },
+          {
+            label: req.__("Delete"),
+            key: (r) =>
+              post_delete_btn(
+                `/models/delete/${encodeURIComponent(r.id)}`,
+                req
+              ),
+          },
+        ],
+        models
+      ),
+      a(
+        { href: `/models/new/${table.id}`, class: "btn btn-primary" },
+        i({ class: "fas fa-plus-square me-1" }),
+        req.__("Create model")
+      )
+    );
+
     // Table Data card
     const dataCard = div(
       { class: "d-flex text-center" },
@@ -997,6 +1005,15 @@ router.get(
           titleAjaxIndicator: true,
           contents: renderForm(tblForm, req.csrfToken()),
         },
+        ...(Model.has_templates
+          ? [
+              {
+                type: "card",
+                title: req.__("Models"),
+                contents: modelCard,
+              },
+            ]
+          : []),
       ],
     });
   })
@@ -1389,11 +1406,19 @@ const constraintForm = (req, table_id, fields, type) => {
         blurb: req.__(
           "Tick the boxes for the fields that should be jointly unique"
         ),
-        fields: fields.map((f) => ({
-          name: f.name,
-          label: f.label,
-          type: "Bool",
-        })),
+        fields: [
+          ...fields.map((f) => ({
+            name: f.name,
+            label: f.label,
+            type: "Bool",
+          })),
+          {
+            name: "errormsg",
+            label: "Error message",
+            sublabel: "Shown the user if joint uniqueness is violated",
+            type: "String",
+          },
+        ],
       });
     case "Index":
       return new Form({
@@ -1485,11 +1510,12 @@ router.post(
     if (form.hasErrors) req.flash("error", req.__("An error occurred"));
     else {
       let configuration = {};
-      if (type === "Unique")
+      if (type === "Unique") {
         configuration.fields = fields
           .map((f) => f.name)
           .filter((f) => form.values[f]);
-      else configuration = form.values;
+        configuration.errormsg = form.values.errormsg;
+      } else configuration = form.values;
       await TableConstraint.create({
         table_id: table.id,
         type,
@@ -1873,7 +1899,7 @@ const get_provider_workflow = (table, req) => {
 
     return {
       redirect: `/table/${table.id}`,
-      flash: ["success", `Table ${this.name || ""} saved`],
+      flash: ["success", `Table ${table.name || ""} saved`],
     };
   };
   return workflow;