changes as requested by PR

Author: enicolasgomez

netpyne_ui/netpyne_geppetto.py

@@ -293,15 +293,15 @@ def simulateNetPyNEModelInGeppetto(self, args):
                     experiment.state = model.ExperimentState.ERROR
                     message = ("Unknown error during simulation of Experiment. SimulationId %i" % sim_id)
                     logging.exception(message)
-                    return utils.getJSONError("Unknown error during simulation of Experiment", sys.exc_info())
+                    return utils.getJSONError("Unknown error during simulation of Experiment", sys.exc_info(), { "sim_id": sim_id})
 
             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))
             logging.exception(message)
-            return utils.getJSONError(message, sys.exc_info())
+            return utils.getJSONError(message, sys.exc_info(), { "sim_id": sim_id})
 
     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/Utils.js

@@ -195,6 +195,9 @@ const Utils = {
       } else if (Object.prototype.hasOwnProperty.call(parsedData, 'websocket')) {
         error.message = parsedData.websocket;
       }
+      if (Object.prototype.hasOwnProperty.call(parsedData, 'additional_info')) {
+        error.additionalInfo = parsedData.additional_info ;
+      }
       return error;
     }
     return null;

webapp/redux/middleware/middleware.js

@@ -39,6 +39,7 @@ export const processError = (response) => {
     return {
       errorMessage: parsedResponse.message,
       errorDetails: parsedResponse.details,
+      additionalInfo: parsedResponse.additionalInfo
     };
   }
   return false;
@@ -106,32 +107,25 @@ const simulateNetwork = (payload) => createSimulateBackendCall(
   GEPPETTO.Resources.RUNNING_SIMULATION,
 );
 
-class ErrorDialogManager {
-  errorTag = 'SimulationId ';
-  errorIds = [];
-  addId(id){ this.errorIds.push(id); }
-  getErrorId(s) {
-    let errorId = 0 ;
-    const i = s.indexOf(this.errorTag);
-    if (i > -1)
-      errorId = parseFloat(s.substring(i + this.errorTag.length, s.length-1));
-    return errorId ;
-  }
-  shouldLaunch(s) {
-    const errorId = this.getErrorId(s);
-    if (this.errorIds.indexOf(errorId) == -1 && errorId > 0)
-    {
-      this.errorIds.push(errorId);
+class PythonMessageFilter {
+  errorIds = new Set();
+  shouldLaunch(e) {    
+    const errorId = e.additionalInfo?.sim_id ;
+    if (!errorId)
       return true ;
+    if (errorId)
+    {
+      if(this.errorIds.has(errorId))
+        return false ;
+      else {
+        this.errorIds.add(errorId);
+        return true ;
+      }
     }
-    if (errorId == 0)
-      return true ;
-    if (this.errorIds.indexOf(errorId) >= 0)
-      return false;
   }
 }
 
-const errorDialogManager = new ErrorDialogManager();
+const errorMessageFilter = new PythonMessageFilter();
 
 export default (store) => (next) => (action) => {
   const switchLayoutAction = (edit = true, reset = true) => {
@@ -156,7 +150,7 @@ export default (store) => (next) => (action) => {
 
   const pythonErrorCallback = (error) => {
     console.debug(Utils.getPlainStackTrace(error.errorDetails));
-    if (errorDialogManager.shouldLaunch(error.errorMessage))
+    if (errorMessageFilter.shouldLaunch(error))
       return next(openBackendErrorDialog(error));
     else  
       return next(action);