Merge pull request #647 from MetaCell/feature/643

Feature/643 fix 'Model' > 'Simulate Network' also instantiates the model

Author: ddelpiano

netpyne_ui/netpyne_geppetto.py

@@ -305,17 +305,18 @@ def simulateNetPyNEModelInGeppetto(self, args):
                         return self.simulate_single_model(experiment, use_prev_inst)
                 except Exception:
                     experiment.state = model.ExperimentState.ERROR
-                    message = ("Unknown error during simulation of Experiment. SimulationId %i" % sim_id)
+                    message = f"Unknown error during simulation of Experiment. SimulationId {sim_id}"
                     logging.exception(message)
-                    return utils.getJSONError("Unknown error during simulation of Experiment", sys.exc_info(), { "sim_id": sim_id})
+                    # return utils.getJSONError("Unknown error during simulation of Experiment", sys.exc_info(), { "sim_id": sim_id})
+                    return utils.getJSONError("Unknown error during simulation of Experiment", sys.exc_info())
 
             else:
                 return self.simulate_single_model(use_prev_inst=use_prev_inst)
 
         except Exception as e :
-            message = ("Error while simulating the NetPyNE model: %s. SimulationId %f" % (e, sim_id))
+            message = f"Error while simulating the NetPyNE model: {e}. SimulationId {sim_id}"
             logging.exception(message)
-            return utils.getJSONError(message, sys.exc_info(), { "sim_id": sim_id})
+            return utils.getJSONError(message, sys.exc_info())
 
     def _prepare_simulation_files(self, experiment: model.Experiment = None, use_prev_inst: bool = False) -> str:
         """Prepares template files and netpyne model files for a single simulation """

webapp/components/topbar/menuConfiguration.js

@@ -14,6 +14,7 @@ import {
   setTheme,
 } from '../../redux/actions/general';
 import {
+  MODEL_STATE,
   TOPBAR_CONSTANTS, THEMES, TUTORIALS_LIST,
 } from '../../constants';
 import { openLaunchDialog } from '../../redux/actions/experiments';
@@ -328,7 +329,8 @@ export const getModelMenu = (props) => (
           ? [openLaunchDialog()]
           // TODO: (#263) this logic causes issues by potentially simulating
           //  old instance with modified netParams and simConfig
-          : [props.modelState ? createAndSimulateNetwork : simulateNetwork],
+          // : [props.modelState ? createAndSimulateNetwork : simulateNetwork],
+          : [props.modelState === MODEL_STATE.NOT_INSTANTIATED ? createAndSimulateNetwork : simulateNetwork()],
       },
     },
     {