Merge pull request #128 from camicroscope/develop

For 3.9.8

caracal.js

@@ -19,10 +19,15 @@ const proxyHandler = require('./handlers/proxyHandler.js');
 const permissionHandler = require('./handlers/permssionHandler.js');
 const dataHandlers = require('./handlers/dataHandlers.js');
 const sanitizeBody = require('./handlers/sanitizeHandler.js');
-const DataSet = require('./handlers/datasetHandler.js');
-const Model = require('./handlers/modelTrainer.js');
 const DataTransformationHandler = require('./handlers/dataTransformationHandler.js');
-// TODO validation of data
+
+// TODO -- make optional
+const DISABLE_TF = true; // DUE TO PRODUCTION STABILITY ISSUES WITH TFJS
+
+if (!DISABLE_TF) {
+  const DataSet = require('./handlers/datasetHandler.js');
+  const Model = require('./handlers/modelTrainer.js');
+}
 
 const {connector} = require("./service/database/connector");
 
@@ -79,10 +84,6 @@ var HANDLERS = {
   "permissionHandler": permissionHandler,
   "editHandler": auth.editHandler,
   "proxyHandler": proxyHandler,
-  "getDataset": DataSet.getDataset,
-  "trainModel": Model.trainModel,
-  "deleteDataset": DataSet.deleteData,
-  "sendTrainedModel": Model.sendTrainedModel,
   "iipHandler": function() {
     return iipHandler;
   },
@@ -115,6 +116,23 @@ var HANDLERS = {
   },
 };
 
+if (!DISABLE_TF) {
+  HANDLERS["getDataset"] = DataSet.getDataset;
+  HANDLERS["trainModel"] = Model.trainModel;
+  HANDLERS["deleteDataset"] = DataSet.deleteData;
+  HANDLERS["sendTrainedModel"] = Model.sendTrainedModel;
+} else {
+  function disabledRoute() {
+    return function(req, res) {
+      res.status(500).send('{"err":"This TF route is disabled"}');
+    };
+  }
+  HANDLERS["getDataset"] = disabledRoute;
+  HANDLERS["trainModel"] = disabledRoute;
+  HANDLERS["deleteDataset"] = disabledRoute;
+  HANDLERS["sendTrainedModel"] = disabledRoute;
+}
+
 // register configurable services
 // TODO verify all
 for (let i in routeConfig) {
@@ -211,4 +229,3 @@ connector.init().then(() => {
 });
 
 module.exports = app; // for tests
-