Merge pull request #292 from MetaCell/feature/277

Feature/277: Fix reloading workspace mod files

Author: Lucas Rebscher

.dockerignore

@@ -2,19 +2,24 @@ org.geppetto.frontend.jupyter
 pygeppetto
 .vscode
 .ipynb_checkpoints
-netpyne_ui/geppetto
+
 *.egg-info
 notebook.ipynb
 .git
-netpyne
+
 Dockerfile
 Dockerfile_base
 Dockerfile_dev
-webapp/node_modules
+node_modules
 webapp/build
 webapp/geppetto-client
-netpyne_workspace
-tests
+workspace
+.idea
 k8s
-src
-x86_64
+/src
+x86_64
+app.log
+/.pytest_cache
+.jupyter-config
+**/*.pyc
+**/__pycache__

.gitignore

@@ -13,7 +13,7 @@ init.py
 webapp/node_modules
 webapp/geppetto-client
 webapp/build
-netpyne_workspace
+workspace
 tests/frontend/e2e/node_modules
 Dockerfile_mini
 npm*

Dockerfile

@@ -28,4 +28,6 @@ RUN python install.py ${BUILD_ARGS}
 
 WORKDIR ${INSTALLATION_FOLDER}
 
+RUN pip install -r requirements-test.txt
+RUN pytest tests/backend
 CMD /bin/bash -c "jupyter notebook --NotebookApp.default_url=/geppetto --NotebookApp.token='' --library=netpyne_ui --NotebookApp.disable_check_xsrf=True"

jupyter_hub/Dockerfile_spawner

@@ -21,7 +21,7 @@ RUN /bin/bash -c "source activate snakes && python --version"
 RUN /bin/bash -c "source activate snakes && exec python install.py branch $netpyneuiBranch"
 WORKDIR /home/jovyan
 RUN git clone https://github.com/Neurosim-lab/netpyne_workspace
-WORKDIR /home/jovyan/netpyne_workspace
+WORKDIR /home/jovyan/workspace
 RUN ln -sfn /home/jovyan/work/NetPyNE-UI-$netpyneuiBranch/netpyne_ui/tests tests
 
 # Copy jupyterhub_config

netpyne_ui/constants.py

@@ -1,12 +1,19 @@
 import os
 
 UPLOAD_FOLDER_NAME = 'uploads'
-NETPYNE_WORKDIR = 'netpyne_workspace'
+NETPYNE_WORKDIR = 'workspace'
 
 ALLOWED_EXTENSIONS = ["py", "zip", "gz", ".tar.gz", "pdf", "txt", "xls", "png", "jpeg", "hoc"]
+HERE = os.path.dirname(os.path.abspath(__file__))
+ROOT = os.path.dirname(HERE)
+UPLOAD_FOLDER_PATH = os.path.join(ROOT, NETPYNE_WORKDIR, UPLOAD_FOLDER_NAME)
+NETPYNE_WORKDIR_PATH = os.path.join(ROOT, NETPYNE_WORKDIR)
 
-UPLOAD_FOLDER_PATH = os.path.join(os.getcwd(), NETPYNE_WORKDIR, UPLOAD_FOLDER_NAME)
-NETPYNE_WORKDIR_PATH = os.path.join(os.getcwd(), NETPYNE_WORKDIR)
+if not os.path.exists(NETPYNE_WORKDIR_PATH):
+    NETPYNE_WORKDIR_PATH = os.path.join(os.getcwd(), NETPYNE_WORKDIR)
+
+if not os.path.exists(NETPYNE_WORKDIR_PATH):
+    raise Exception(f"Workdir path {NETPYNE_WORKDIR_PATH} does not exist")
 
 if not os.path.exists(UPLOAD_FOLDER_PATH):
     os.makedirs(UPLOAD_FOLDER_PATH)