Merge branch 'release/1.0.0' into feature/netpyne-99

Author: aranega

Dockerfile

@@ -46,7 +46,7 @@ RUN jupyter nbextension enable --py --sys-prefix jupyter_geppetto
 RUN jupyter nbextension enable --py --sys-prefix widgetsnbextension
 RUN jupyter serverextension enable --py --sys-prefix jupyter_geppetto
 
-RUN python utilities/install.py ${BUILD_ARGS} --geppetto ${GEPPETTO_VERSION} --netpyne $NETPYNE_VERSION --workspace WORKSPACE_VERSION --npm-skip
+RUN python utilities/install.py ${BUILD_ARGS} --geppetto ${GEPPETTO_VERSION} --workspace WORKSPACE_VERSION --npm-skip
 
 RUN jupyter labextension disable @jupyterlab/hub-extension
 

netpyne_ui/netpyne_geppetto.py

@@ -513,7 +513,7 @@ def _create3D_shapes(self, json_path: str):
                 sim.loadSimData(json_path)
 
     def loadFromIndexFile(self, json_path: str):
-        cfg, netParams = sim.loadFromIndexFile(json_path)
+        cfg, netParams = sim.loadModel(json_path, loadMechs=True, ignoreMechAlreadyExistsError=True)
         self.simConfig = cfg
         self.netParams = netParams
 
@@ -539,7 +539,6 @@ def saveToIndexFile(self, srcPath, dstPath, exportNetParamsAsPython, exportSimCo
                       exportNetParamsAsPython=exportNetParamsAsPython,
                       exportSimConfigAsPython=exportSimConfigAsPython)
 
-
     def importModel(self, modelParameters):
         """ Imports a model stored in form of Python files.
 
@@ -602,7 +601,7 @@ def importModel(self, modelParameters):
 
     def importNeuroML(self, modelParameters):
         from netpyne_ui.helpers import neuroml
-       
+
 
         try:
             # Get Current dir
@@ -611,9 +610,9 @@ def importNeuroML(self, modelParameters):
             with redirect_stdout(sys.__stdout__):
                 # NetParams
                 filename = str(modelParameters["fileName"])
-               
+
                 json_fname = neuroml.convertNeuroML2(filename, compileMod=modelParameters["compileMod"])
-                   
+
             return self.loadModel(args=dict(
                 compileMod=True,
                 modFolder=os.path.dirname(json_fname),
@@ -632,7 +631,7 @@ def importNeuroML(self, modelParameters):
 
     def importLEMS(self, modelParameters):
         from netpyne_ui.helpers import neuroml
-       
+
 
         try:
             # Get Current dir
@@ -641,7 +640,7 @@ def importLEMS(self, modelParameters):
             with redirect_stdout(sys.__stdout__):
                 # NetParams
                 filename = str(modelParameters["fileName"])
-               
+
                 json_fname =  neuroml.convertLEMSSimulation(filename)
 
             return self.loadModel(args=dict(

webapp/components/general/PythonControlledCapability.js

@@ -105,15 +105,15 @@ define((require) => {
 
         componentDidMount () {
           super.componentDidMount();
-          this.UNRELIABLE_SyncDefaultValueWithPython();
+          this.UNRELIABLE_SyncDefaultValueWithPython(100);
         }
 
         /*
          * since we don't know when a component will be synched with python,
          * we can't know when to check if this.state.value should be replaced
          * with this.props.default
          */
-        UNRELIABLE_SyncDefaultValueWithPython (timeInterval = 600, attemps = 0) {
+        UNRELIABLE_SyncDefaultValueWithPython (timeInterval = 60000, attemps = 0) {
           if (attemps < 3) {
             setTimeout(() => {
               if (this.props.default && this.state.value === '') {
@@ -185,7 +185,7 @@ define((require) => {
             && this.state.value === ''
             && this.props.default
           ) {
-            this.UNRELIABLE_SyncDefaultValueWithPython(1000);
+            this.UNRELIABLE_SyncDefaultValueWithPython(100);
           }
         }
 

webapp/components/topbar/Topbar.js

@@ -23,8 +23,8 @@ import ImportExportHLSDialog from './dialogs/ImportExportHLS';
 import ImportCellParamsDialog from './dialogs/ImportCellParams';
 import UploadDownloadFilesDialog from './dialogs/UploadDownloadFiles';
 
-import { TOPBAR_CONSTANTS, MODEL_STATE, DEFAULT_CONFIRMATION_DIALOG_MESSAGE, NETPYNE_COMMANDS  } from '../../constants';
-import { LOAD_TUTORIAL, loadModel } from '../../redux/actions/general';
+import { TOPBAR_CONSTANTS, MODEL_STATE, DEFAULT_CONFIRMATION_DIALOG_MESSAGE, NETPYNE_COMMANDS } from '../../constants';
+import { LOAD_TUTORIAL, registerModelPath, loadModel } from '../../redux/actions/general';
 import OverwriteModel from './dialogs/OverwriteModel';
 
 const styles = () => ({