diff --git a/Dockerfile b/Dockerfile index 7d9e8924..a08b23a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,7 +52,10 @@ RUN chown $NB_UID . RUN chown -R $NB_UID workspace # Temp fixes for eeg plots -RUN wget -P `pip show LFPykit | grep "Location:" | awk '{print $2"/lfpykit"}'` https://www.parralab.org/nyhead/sa_nyhead.mat +# For lfpykit 0.4 +# RUN wget -P $(pip show LFPykit | grep "Location:" | awk '{print $2"/lfpykit"}') https://www.parralab.org/nyhead/sa_nyhead.mat +# For lpfykit 0.5 +RUN wget --no-check-certificate -P ${FOLDER}/workspace https://www.parralab.org/nyhead/sa_nyhead.mat USER $NB_UID diff --git a/requirements.txt b/requirements.txt index f7a672be..76d34427 100644 --- a/requirements.txt +++ b/requirements.txt @@ -32,6 +32,7 @@ jupyterlab==3.2.4 jupyterthemes==0.20.0 kiwisolver==1.2.0 lesscpy==0.14.0 +lfpykit==0.5 libNeuroML==0.2.50 lxml==4.5.1 Mako==1.1.0 diff --git a/webapp/redux/middleware/plotMiddleware.js b/webapp/redux/middleware/plotMiddleware.js index d0eb0eba..48363a1d 100644 --- a/webapp/redux/middleware/plotMiddleware.js +++ b/webapp/redux/middleware/plotMiddleware.js @@ -35,9 +35,10 @@ const plotFigure = async (plotId, plotMethod, plotType = false, uri = null, them new Promise((resolve, reject) => { setTimeout(() => { resolve(null); - }, 30000); + }, 2 * 60 * 1000); // Timeout set to 2 minutes, previously, 30000 (30s) })]); + // let response = await Utils.evalPythonMessage(NETPYNE_COMMANDS.plotFigure, [plotMethod, plotType, theme], false) console.log('Plot response received for', plotId); if (!response && !uri) { //png plots return null response but they provide a uri so they can be grabbed from the workspace return null;