Merge pull request #493 from MetaCell/feature/437-model-validation-improvements

Feature/437 model validation improvements

Author: enicolasgomez

netpyne_ui/netpyne_geppetto.py

@@ -879,16 +879,18 @@ def deleteParam(self, model, label):
                 # side effect on other rules
                 if "popParams" in model:
                     self.propagate_field_rename("pop", None, label)
-                    self.propagate_field_rename("cellModel", None, rule['cellModel'])
-                    self.propagate_field_rename("cellType", None, rule['cellType'])
+                    if 'cellModel' in rule:
+                      self.propagate_field_rename("cellModel", None, rule['cellModel'])
+                    if 'cellType' in rule:
+                      self.propagate_field_rename("cellType", None, rule['cellType'])
 
                 elif "stimSourceParams" in model:
 
                     self.propagate_field_rename("source", None, label)
                 elif "synMechParams" in model:
                     self.propagate_field_rename("synMech", None, label)
             return True
-        except Exception:
+        except Exception as e :
             logging.exception(f"Error while deleting parameter: {label}")
             return False
 
@@ -966,7 +968,7 @@ def propagate(self, model, label, cond, new, old):
                 for plot in analysis.keys():
                     if cond in analysis[plot].keys():
                         for index, item in enumerate(analysis[plot][cond]):
-                            if isinstance(item, str):
+                            if isinstance(item, str) or isinstance(item, int):
                                 if item == old:
                                     if new == None:
                                         analysis[plot][cond].remove(item)
@@ -984,11 +986,11 @@ def propagate(self, model, label, cond, new, old):
             else:
                 obj = getattr(self.netParams, model)
                 for key in obj.keys():
-                    if label in list(obj[key][cond].keys()):
+                    if cond in obj[key] and label in list(obj[key][cond].keys()):
                         if isinstance(obj[key][cond][label], str):
                             if old == obj[key][cond][label]:
                                 if new == '' or new == None:
-                                    obj[key].pop(label)
+                                    obj[key][cond].pop(label)
                                 else:
                                     obj[key][cond][label] = new
                         elif isinstance(obj[key][cond][label], list):