Merge pull request #137 from MetaCell/feature/135

Feature/135

Author: filippomc

.gitignore

@@ -18,3 +18,5 @@ Dockerfile_mini
 npm*
 .vscode
 app.log
+utilities/x86_64
+.idea

k8s/cf.yaml

@@ -60,8 +60,8 @@ steps:
     
           resources:
             requests:
-              cpu: 200m
-              memory: 512Mi
+              cpu: 100m
+              memory: 128Mi
 
           allowNamedServers: true
           namedServerLimitPerUser: 2
@@ -123,7 +123,7 @@ steps:
     environment:
       - CHART_NAME=jupyterhub
       - RELEASE_NAME=${{RELEASE_NAME}}
-      - KUBE_CONTEXT=geppetto-cluster@metacellllc
+      - KUBE_CONTEXT=${{CLUSTER_NAME}}
       - NAMESPACE=${{NAMESPACE}}
       - TILLER_NAMESPACE=kube-system
       - CHART_VERSION=0.9.0-beta.4

netpyne_ui/netpyne_model_interpreter.py

@@ -6,9 +6,9 @@
 import pygeppetto.model as pygeppetto
 from pygeppetto.model.model_factory import GeppettoModelFactory
 from pygeppetto.model.values import Point, ArrayElement, ArrayValue
+from pygeppetto.services.model_interpreter import ModelInterpreter
 
-
-class NetPyNEModelInterpreter():
+class NetPyNEModelInterpreter(ModelInterpreter):
 
     def __init__(self):
         self.factory = GeppettoModelFactory()

package-lock.json

@@ -0,0 +1 @@
+Subproject commit 840c78f5ff64a291af5af87332f749df1ee84d48

src/jupyter-geppetto

@@ -3,22 +3,25 @@ global.GEPPETTO_CONFIGURATION = require('./GeppettoConfiguration.json');
 
 jQuery(function () {
   require('geppetto-client-initialization');
-  var ReactDOM = require('react-dom');
-  var React = require('react');
-  var getMuiTheme = require('@material-ui/core/styles/createMuiTheme').default;
-  var MuiThemeProvider = require('@material-ui/core/styles').MuiThemeProvider;
-  var NetPyNE = require('./NetPyNE').default;
+  const ReactDOM = require('react-dom');
+  const React = require('react');
+  const getMuiTheme = require('@material-ui/core/styles/createMuiTheme').default;
+  const MuiThemeProvider = require('@material-ui/core/styles').MuiThemeProvider;
+  const NetPyNE = require('./components').NetPyNE;
 
 
-  var Utils = require('./Utils').default;
-  var Console = require('geppetto-client/js/components/interface/console/Console');
-  var TabbedDrawer = require('geppetto-client/js/components/interface/drawer/TabbedDrawer');
-  var PythonConsole = require('geppetto-client/js/components/interface/pythonConsole/PythonConsole');
-  var theme = require('./Theme').default
+  const Utils = require('./Utils').default;
+  const Console = require('geppetto-client/js/components/interface/console/Console');
+  const TabbedDrawer = require('geppetto-client/js/components/interface/drawer/TabbedDrawer');
+  const PythonConsole = require('geppetto-client/js/components/interface/pythonConsole/PythonConsole');
+
+  const theme = require('./Theme').default
 
   const Provider = require("react-redux").Provider;
   const configureStore = require('./redux/store').default;
 
+  const modelLoaded = require('./redux/actions/general').modelLoaded;
+
   require('./css/netpyne.less');
   require('./css/material.less');
   require('./css/traceback.less');
@@ -51,15 +54,19 @@ jQuery(function () {
   GEPPETTO.G.debug(false); // Change this to true to see messages on the Geppetto console while loading
   GEPPETTO.Resources.COLORS.DEFAULT = "#6f54aa";
   GEPPETTO.trigger(GEPPETTO.Events.Show_spinner, "Initialising NetPyNE");
+  
 
   GEPPETTO.on('jupyter_geppetto_extension_ready', data => {
     let project = { id: 1, name: 'Project', experiments: [{ "id": 1, "name": 'Experiment', "status": 'DESIGN' }] }
     GEPPETTO.Manager.loadProject(project, false);
     GEPPETTO.Manager.loadExperiment(1, [], []);
     Utils.execPythonMessage('from netpyne_ui.netpyne_geppetto import netpyne_geppetto');
     Utils.evalPythonMessage('netpyne_geppetto.getData',[]).then(response => {
-      var data = Utils.convertToJSON(response)
-      ReactDOM.render(<App data={data} />, document.querySelector('#mainContainer'));
+      const data = Utils.convertToJSON(response);
+      GEPPETTO.on(GEPPETTO.Events.Model_loaded, () => {
+        store.dispatch(modelLoaded);
+      });
+      ReactDOM.render(<App data={data} />, document.querySelector('#mainContainer'), store.dispatch(modelLoaded));
       GEPPETTO.trigger("spinner:hide");
     })
   });

webapp/Main.js

@@ -145,7 +145,7 @@ const Utils = {
   },
 
   parsePythonException (exception){
-    return <pre dangerouslySetInnerHTML={{ __html: IPython.utils.fixConsole(exception) }}></pre>
+    return <pre style={{ whiteSpace: 'pre-wrap' }} dangerouslySetInnerHTML={{ __html: IPython.utils.fixConsole(exception) }}></pre>
   },
 
   handleUpdate (updateCondition, newValue, originalValue, context, componentName) {
@@ -185,4 +185,32 @@ const Utils = {
   evalPythonMessage: evalPythonMessage
 }
 
+/**
+ * Deep object comparison
+ * @param {*} a 
+ * @param {*} b 
+ */
+export function isEqual (a, b) {
+  if (a === b) {
+    return true;
+  }
+  if (a instanceof Date && b instanceof Date) {
+    return a.getTime() === b.getTime();
+  }
+  if (!a || !b || (typeof a !== 'object' && typeof b !== 'object')) {
+    return a === b;
+  }
+  if (a === null || a === undefined || b === null || b === undefined) {
+    return false;
+  }
+  if (a.prototype !== b.prototype) {
+    return false;
+  }
+  let keys = Object.keys(a);
+  if (keys.length !== Object.keys(b).length) {
+    return false;
+  }
+  return keys.every(k => isEqual(a[k], b[k]));
+}
+
 export default Utils