Merge branch 'development' of https://github.com/MetaCell/netpyne-ui into feature/417

Author: ddelpiano

requirements.txt

@@ -20,6 +20,7 @@ ipython-genutils==0.2.0
 ipywidgets==7.5.1
 jedi==0.17.0
 Jinja2==2.11.2
+jsonpickle==2.1.0
 jsonschema==3.2.0
 jupyter==1.0.0
 jupyter-client==6.1.3

webapp/components/experiments/ExperimentEdit.js

@@ -26,7 +26,6 @@ import ParameterMenu from './ParameterMenu';
 import useStyles from './ExperimentEditStyle';
 import * as ExperimentHelper from './ExperimentHelper';
 import DialogBox from '../general/DialogBox';
-
 const RANGE_VALUE = 0;
 const SUPPORTED_TYPES = [REAL_TYPE.INT, REAL_TYPE.FLOAT, REAL_TYPE.STR, REAL_TYPE.BOOL];
 const MAX_TRIALS = 100;
@@ -198,7 +197,7 @@ const ExperimentEdit = (props) => {
   const experiments = useSelector((state) => state.experiments.experiments);
 
   let numberOfTrials = 1;
-
+  // const dispatch = useDispatch();
   const validateParameter = (param) => {
     let updatedParam = param;
     if (param.type === LIST) {

webapp/redux/middleware/middleware.js

@@ -1,4 +1,6 @@
+/* eslint-disable no-nested-ternary */
 /* eslint-disable lines-between-class-members */
+/* eslint-disable consistent-return */
 import {
   CLONE_EXPERIMENT,
   GET_EXPERIMENTS,
@@ -8,6 +10,7 @@ import {
 } from 'root/redux/actions/experiments';
 import { NETPYNE_COMMANDS } from 'root/constants';
 import * as GeppettoActions from '@metacell/geppetto-meta-client/common/actions';
+import * as ExperimentsApi from 'root/api/experiments';
 import {
   UPDATE_CARDS,
   CREATE_NETWORK,
@@ -21,16 +24,15 @@ import {
   RESET_MODEL,
   showNetwork,
   MODEL_LOADED,
-  changeInstanceColor,
   addInstancesToCanvas,
-  removeInstancesFromCanvas,
 } from '../actions/general';
 import { openBackendErrorDialog } from '../actions/errors';
 import { closeDrawerDialogBox } from '../actions/drawer';
 import Utils from '../../Utils';
 import { downloadJsonResponse, downloadPythonResponse } from './utils';
 import * as Constants from '../../constants';
 
+const SUPPORTED_TYPES = [Constants.REAL_TYPE.INT, Constants.REAL_TYPE.FLOAT, Constants.REAL_TYPE.STR, Constants.REAL_TYPE.BOOL];
 let previousLayout = {
   edit: undefined,
   network: undefined,
@@ -119,7 +121,7 @@ const simulateNetwork = (payload) => createSimulateBackendCall(
 class PythonMessageFilter {
   errorIds = new Set();
   shouldLaunch (e) {
-    const errorId = e.additionalInfo?.sim_id ;
+    const errorId = e.additionalInfo?.sim_id;
     if (!errorId) {
       return true;
     }
@@ -214,26 +216,107 @@ export default (store) => (next) => (action) => {
       break;
     }
     case CREATE_NETWORK: {
-      instantiateNetwork({})
-        .then(toNetworkCallback(false), pythonErrorCallback);
+      let allParams = true;
+      ExperimentsApi.getParameters()
+        .then((params) => {
+          const flattened = Utils.flatten(params);
+          const paramKeys = Object.keys(flattened);
+
+          const filteredKeys = paramKeys.filter((key) => {
+          // TODO: avoid to fetch field twice!
+            const field = Utils.getMetadataField(`netParams.${key}`);
+            if (field && SUPPORTED_TYPES.includes(field.type)) {
+              return true;
+            }
+            return false;
+          });
+          const expData = store.getState().experiments;
+          expData?.inDesign?.params?.forEach((param) => {
+            if (!filteredKeys.includes(param.mapsTo)) {
+              pythonErrorCallback(
+                {
+                  errorDetails: 'Missing Parameters',
+                  errorMessage: 'Error',
+                },
+              );
+              allParams = false;
+            }
+          });
+          if (allParams) {
+            instantiateNetwork({})
+              .then(toNetworkCallback(false), pythonErrorCallback);
+          }
+        }, pythonErrorCallback);
       break;
     }
     case CREATE_SIMULATE_NETWORK: {
-      const payload = { allTrials: false, simId: new Date().getTime() };
-      simulateNetwork(payload)
-        .then(toNetworkCallback(false), pythonErrorCallback);
+      let allParams = true;
+      ExperimentsApi.getParameters()
+        .then((params) => {
+          const flattened = Utils.flatten(params);
+          const paramKeys = Object.keys(flattened);
+
+          const filteredKeys = paramKeys.filter((key) => {
+          // TODO: avoid to fetch field twice!
+            const field = Utils.getMetadataField(`netParams.${key}`);
+            if (field && SUPPORTED_TYPES.includes(field.type)) {
+              return true;
+            }
+            return false;
+          });
+          const expData = store.getState().experiments;
+          expData?.inDesign?.params?.forEach((param) => {
+            if (!filteredKeys.includes(param.mapsTo)) {
+              pythonErrorCallback(
+                {
+                  errorDetails: 'Missing Parameters',
+                  errorMessage: 'Error',
+                },
+              );
+              allParams = false;
+            }
+          });
+          if (allParams) {
+            simulateNetwork({ allTrials: false })
+              .then(toNetworkCallback(false), pythonErrorCallback);
+          }
+        }, pythonErrorCallback);
       break;
     }
-    case SIMULATE_NETWORK:
-      // eslint-disable-next-line no-case-declarations
-      const payload = {
-        allTrials: action.payload,
-        simId: new Date().getTime(),
-        usePrevInst: false,
-      };
-      simulateNetwork(payload)
-        .then(toNetworkCallback(false), pythonErrorCallback);
+    case SIMULATE_NETWORK: {
+      let allParams = true;
+      ExperimentsApi.getParameters()
+        .then((params) => {
+          const flattened = Utils.flatten(params);
+          const paramKeys = Object.keys(flattened);
+
+          const filteredKeys = paramKeys.filter((key) => {
+          // TODO: avoid to fetch field twice!
+            const field = Utils.getMetadataField(`netParams.${key}`);
+            if (field && SUPPORTED_TYPES.includes(field.type)) {
+              return true;
+            }
+            return false;
+          });
+          const expData = store.getState().experiments;
+          expData?.inDesign?.params?.forEach((param) => {
+            if (!filteredKeys.includes(param.mapsTo)) {
+              pythonErrorCallback(
+                {
+                  errorDetails: 'Missing Parameters',
+                  errorMessage: 'Error',
+                },
+              );
+              allParams = false;
+            }
+          });
+          if (allParams) {
+            simulateNetwork({ allTrials: action.payload, usePrevInst: false })
+              .then(toNetworkCallback(false), pythonErrorCallback);
+          }
+        }, pythonErrorCallback);
       break;
+    }
     case PYTHON_CALL: {
       const callback = (response) => {
         switch (action.cmd) {