Merge pull request #549 from MetaCell/feature/fix-experiment-manager

fix experiment manager

Author: enicolasgomez

netpyne_ui/experiments.py

@@ -74,7 +74,7 @@ def edit_experiment(name: str, experiment: dict):
 
     if exp.state != model.ExperimentState.DESIGN:
         raise ExperimentsError(
-            f"Can only edit experiment in f{model.ExperimentState.DESIGN} state"
+            f"Can only edit experiment in {model.ExperimentState.DESIGN} state"
         )
 
     updated_exp = from_dict(model.Experiment, experiment)

netpyne_ui/netpyne_geppetto.py

@@ -90,7 +90,7 @@ def getData(self):
     def getModelAsJson(self):
         # TODO: netpyne should offer a method asJSON (#240)
         # that returns the JSON model without dumping to to disk.
-        obj = netpyne_utils.replaceFuncObj(self.netParams.__dict__)
+        obj = netpyne_utils.replaceFuncObj({"netParams": self.netParams.__dict__, "simConfig": self.simConfig.__dict__})
         obj = netpyne_utils.replaceDictODict(obj)
         return obj
 
@@ -218,7 +218,7 @@ def simulate_experiment_trials(self, experiment: model.Experiment):
         else:
             message = f"Experiment {experiment.name} finished, you can view the results in the Experiment Manager."
 
-        return utils.getJSONError(message, "")
+        return dict(message=message)
 
     def simulate_single_model(self, experiment: model.Experiment = None, use_prev_inst: bool = False):
         if experiment:
@@ -235,7 +235,7 @@ def simulate_single_model(self, experiment: model.Experiment = None, use_prev_in
             if self.run_config.asynchronous:
                 message = "Experiment is pending! " \
                   f"Results will be stored in your workspace at ./{os.path.join(constants.EXPERIMENTS_FOLDER, experiment.name)}"
-                return utils.getJSONError(message, "")
+                return dict(message=message)
             else:
                 sim.load(f'{constants.MODEL_OUTPUT_FILENAME}.json')
                 self.geppetto_model = self.model_interpreter.getGeppettoModel(sim)
@@ -374,7 +374,7 @@ def _prepare_batch_files(self, experiment: model.Experiment) -> str:
         exp.params = self.experiments.process_params(exp.params)
 
         netParams = copy.deepcopy(self.netParams)
-        netParams.mapping = {p.mapsTo: p.mapsTo.split('.') for p in exp.params}
+        netParams.mapping = {p.mapsTo.replace('netParams.', ''): p.mapsTo.split('.')[1::] for p in exp.params if 'netParams' in p.mapsTo}
 
         simCfg = copy.copy(self.simConfig)
         simCfg.saveJson = True

netpyne_ui/templates/batch.py

@@ -46,9 +46,9 @@ def run_batch(experiment):
     params = specs.ODict()
     grouped_params = []
     for param in experiment["params"]:
-        params[param["mapsTo"]] = param["values"]
+        params[param["mapsTo"].replace("simConfig.", "")] = param["values"]
         if param["inGroup"]:
-            grouped_params.append(param["mapsTo"])
+            grouped_params.append(param["mapsTo"].replace("simConfig.", ""))
 
     with open("netParams.json", "r") as f:
         net_params = json.load(f)

netpyne_ui/templates/run.py

@@ -50,5 +50,5 @@ def run_sim():
     print("Experiment failed ...")
     print(e)
 
-    update_state(exp, "ERRROR")
+    update_state(exp, "ERROR")
     sys.exit(1)

package-lock.json

@@ -6,6 +6,7 @@
     "embedderURL": ["/"],
     "rootRedirect":"",
     "noTest": false,
+    "customSplash": "geppetto/build/static/splash.gif",
     "extensions": {
         "geppetto-default/ComponentsInitialization": false,
         "geppetto-netpyne/ComponentsInitialization": true