[WIP] Docker build

config.bat

@@ -0,0 +1,9 @@
+@echo off
+
+IF "%~1"=="" (
+	echo "No docker container name given!"
+	EXIT /B 2
+) ELSE (
+	docker run -it --name configuration-inator %1 python config/make_config.py
+	docker commit configuration-inator %1
+)

config.sh

@@ -0,0 +1,7 @@
+#! /bin/bash
+if [$# -eq 0]; then
+	echo "No docker image name given!"
+else
+	docker run -it --name configuration-inator $1 python config/make_config.py;
+	docker commit configuration-inator $1;
+fi

config/make_config.py

@@ -1,8 +1,9 @@
 #!/usr/bin/python
 '''
-Executable script to create the configuration file for the BMI3D code, a text file called '$BMI3D/config_files/config' 
+Executable script to create the configuration file for the BMI3D code, a text file called '$BMI3D/config/config'
 '''
 import os
+import sys
 from collections import OrderedDict
 
 stuff = OrderedDict()
@@ -14,24 +15,32 @@
 stuff['plexon IP address'] = dict(addr='10.0.0.13', port=6000)
 stuff['update_rates'] = dict(hdf_hz=60)
 
+# Add an optional commandline flag to make setup non-interactive
+use_defaults = '-y' in sys.argv or '--use-defaults' in sys.argv
+
 from db import settings
 databases = list(settings.DATABASES.keys())
 
-for dbname in databases:
-    stuff['db_config_%s' % dbname] = dict(data_path='/storage')
+for db_name in databases:
+    stuff[f'db_config_{db_name}'] = dict(data_path='/storage')
 
-config_filename = '$BMI3D/config_files/config'
+config_filename = '$BMI3D/config/config'
 config_fh = open(os.path.expandvars(config_filename), 'w')
 
 for system_name, system_opts in list(stuff.items()):
-    config_fh.write('[%s]\n' % system_name)
+    config_fh.write(f'[{system_name}]\n')
     print(system_name)
     for option, default in list(system_opts.items()):
-        print(option, default)
-        opt_val = input("Enter value for '%s' (default=%s): " % (option, str(default)))
-        if opt_val == '':
+
+        if use_defaults:
+            print(f"  Using default ({default}) for {option}")
             opt_val = default
-        config_fh.write('%s = %s\n' % (option, opt_val))
+        else:
+            opt_val = input(f"  Enter value for '{option}' (default={default}): ")
+            if opt_val == '':
+                opt_val = default
+
+        config_fh.write(f'{option} = {opt_val}\n')
     config_fh.write('\n')
     print() 
 

config/namelist.py

@@ -2,12 +2,17 @@
 Lookup table for features, generators and tasks for experiments
 '''
 
-## Get the list of experiment features
-from .featurelist import features
-
-## Get the list of tasks
-from .tasklist import tasks
+# Get the list of experiment features
+try:
+    from .featurelist import features
+except (ImportError, ModuleNotFoundError):
+    features = {}
 
+# Get the list of tasks
+try:
+    from .tasklist import tasks
+except (ImportError, ModuleNotFoundError):
+    tasks = {}
 
 # Derive generator functions from the tasklist (all generatorfunctions should be staticmethods of a task)
 generator_names = []
@@ -67,4 +72,4 @@ def __getitem__(self, name):
 
 ################################################################################
 ################################################################################
-from .bmilist import *
+# from .bmilist import *

db/__init__.py

@@ -1,2 +1,8 @@
 # from . import websocket
-from .tracker import tasktrack
+from .tracker import tasktrack
+
+# This will make sure the app is always imported when
+# Django starts so that shared_task will use this app.
+from .celery_base import app as celery_app
+
+__all__ = ('celery_app',)

db/celery_base.py

@@ -0,0 +1,22 @@
+from __future__ import absolute_import, unicode_literals
+import os
+from celery import Celery
+
+# set the default Django settings module for the 'celery' program.
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'db.settings')
+
+app = Celery('db')
+
+# Using a string here means the worker doesn't have to serialize
+# the configuration object to child processes.
+# - namespace='CELERY' means all celery-related configuration keys
+#   should have a `CELERY_` prefix.
+app.config_from_object('django.conf:settings', namespace='CELERY')
+
+# Load task modules from all registered Django app configs.
+app.autodiscover_tasks()
+
+
+@app.task(bind=True)
+def debug_task(self):
+    print('Request: {0!r}'.format(self.request))

db/runserver.sh

@@ -15,7 +15,7 @@ if [ -z "$BMI3D" ]
 fi
 
 #Check /storage (exist )
-storage=$(python $BMI3D/config_files/check_storage.py 2>&1)
+storage=$(python $BMI3D/config/check_storage.py 2>&1)
 if [ $storage == 'False' ]; then
     echo "/storage does not exist --> if on Ismore, must mount"
     exit 1
@@ -28,8 +28,8 @@ if [ `ps aux | grep "manage.py runserver" | grep python | wc -l` -gt 0 ]; then
 fi
 
 # Check that a config file is in the correct place, $BMI3D/config
-if [ ! -e $BMI3D/config_files/config ]; then 
-    echo "ERROR: cannot find config file! Did you run $BMI3D/config_files/make_config.py?"
+if [ ! -e $BMI3D/config/config ]; then
+    echo "ERROR: cannot find config file! Did you run $BMI3D/config/make_config.py?"
     exit 1
 fi
 

db/settings.py

@@ -1,4 +1,3 @@
-
 '''
 Django config file mostly auto-generated when a django project is created.
 See https://docs.djangoproject.com/en/dev/intro/tutorial01/ for an introduction
@@ -8,10 +7,7 @@
 import os
 cwd = os.path.split(os.path.abspath(__file__))[0]
 
-import djcelery
-djcelery.setup_loader()
 # Django settings for db project.
-
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
 
@@ -126,7 +122,6 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'djcelery',
     'tracker.apps.TrackerConfig',
     'trainbmi'
 )

db/tracker/__init__.py

@@ -1 +1,2 @@
-default_app_config = "tracker.apps.TrackerConfig"
+default_app_config = "tracker.apps.TrackerConfig"
+

db/tracker/admin.py

@@ -1,20 +1,21 @@
-'''
+"""
 Declare which database tables are visible from Django's default admin interface. 
 
 This file was initially created by Django
-'''
-from tracker.models import Task, Feature, System, TaskEntry, Calibration, DataFile, Subject, Sequence, Generator, AutoAlignment, Decoder
-from django.contrib import admin
-
+"""
 
 
+from db.tracker.models import Task, Feature, System, TaskEntry, Calibration, DataFile, Subject, Sequence, Generator, AutoAlignment, Decoder
+from django.contrib import admin
 from django.db.models.signals import post_delete
 from django.dispatch.dispatcher import receiver
 
+
 @receiver(post_delete, sender=DataFile)
 def _mymodel_delete(sender, instance, **kwargs):
     instance.remove()
-
+
+
 admin.site.register(Task)
 admin.site.register(Feature)
 admin.site.register(System)