From 200d00e3f81ff12c5401941989b8b53b44d201fb Mon Sep 17 00:00:00 2001
From: Philipp Schmidt <tdhd@users.noreply.github.com>
Date: Tue, 1 Aug 2017 20:49:24 +0200
Subject: [PATCH 1/2] add django channels plugin and basic websocket handler

---
 django/dkg/cancer/consumers.py             | 10 ++++++++++
 django/dkg/cancer/routing.py               |  6 ++++++
 django/dkg/cancer/templates/cancer/bs.html | 13 +++++++++++++
 django/dkg/dkg/settings.py                 | 12 +++++++++++-
 django/requirements.txt                    |  3 ++-
 5 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 django/dkg/cancer/consumers.py
 create mode 100644 django/dkg/cancer/routing.py

diff --git a/django/dkg/cancer/consumers.py b/django/dkg/cancer/consumers.py
new file mode 100644
index 0000000..1181048
--- /dev/null
+++ b/django/dkg/cancer/consumers.py
@@ -0,0 +1,10 @@
+from django.http import HttpResponse
+from channels.handler import AsgiHandler
+
+
+def ws_message(message):
+    # ASGI WebSocket packet-received and send-packet message types
+    # both have a "text" key for their textual data.
+    message.reply_channel.send({
+        "text": message.content['text'],
+    })
diff --git a/django/dkg/cancer/routing.py b/django/dkg/cancer/routing.py
new file mode 100644
index 0000000..9031236
--- /dev/null
+++ b/django/dkg/cancer/routing.py
@@ -0,0 +1,6 @@
+from channels.routing import route
+from cancer.consumers import ws_message
+
+channel_routing = [
+    route("websocket.receive", ws_message),
+]
diff --git a/django/dkg/cancer/templates/cancer/bs.html b/django/dkg/cancer/templates/cancer/bs.html
index a36fe36..c7f980f 100644
--- a/django/dkg/cancer/templates/cancer/bs.html
+++ b/django/dkg/cancer/templates/cancer/bs.html
@@ -25,6 +25,19 @@
             integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
             crossorigin="anonymous"></script>
 
+    <script>
+        // Note that the path doesn't matter for routing; any WebSocket
+        // connection gets bumped over to WebSocket consumers
+        socket = new WebSocket("ws://" + window.location.host + "/chat/");
+        socket.onmessage = function(e) {
+            alert(e.data);
+        }
+        socket.onopen = function() {
+            socket.send("hello world");
+        }
+        // Call onopen directly if socket is already open
+        if (socket.readyState == WebSocket.OPEN) socket.onopen();
+    </script>
     <script>
         var labeller_name = 'dkg-test';
 
diff --git a/django/dkg/dkg/settings.py b/django/dkg/dkg/settings.py
index 85d41db..7897767 100644
--- a/django/dkg/dkg/settings.py
+++ b/django/dkg/dkg/settings.py
@@ -37,7 +37,8 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'cancer'
+    'cancer',
+    'channels'
 ]
 
 MIDDLEWARE = [
@@ -137,3 +138,12 @@
 
 # label pruning normalized value counts threshold
 LABEL_PRUNING_VALUE_COUNTS_THRESHOLD = 0.66
+
+
+# django channels config
+CHANNEL_LAYERS = {
+    "default": {
+        "BACKEND": "asgiref.inmemory.ChannelLayer",
+        "ROUTING": "cancer.routing.channel_routing",
+    },
+}
diff --git a/django/requirements.txt b/django/requirements.txt
index 891eb1b..784bc47 100644
--- a/django/requirements.txt
+++ b/django/requirements.txt
@@ -1,5 +1,6 @@
-Django==1.11
+Django==1.11.4
 numpy==1.12.1
 pandas==0.19.2
 scikit-learn==0.18.1
 scipy==0.19.0
+channels==1.1.6

From a5f103bfd19420ea48e0c66aecfa4b65c8cb0713 Mon Sep 17 00:00:00 2001
From: Philipp Schmidt <tdhd@users.noreply.github.com>
Date: Tue, 1 Aug 2017 23:31:51 +0200
Subject: [PATCH 2/2] WIP: add WS connect/disconnect handlers + parallel
 execution of model selection

---
 django/dkg/cancer/consumers.py             | 10 ++++++++++
 django/dkg/cancer/json_api/endpoints.py    | 15 +++++++++++++--
 django/dkg/cancer/routing.py               |  4 +++-
 django/dkg/cancer/templates/cancer/bs.html | 10 +++++-----
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/django/dkg/cancer/consumers.py b/django/dkg/cancer/consumers.py
index 1181048..57725fe 100644
--- a/django/dkg/cancer/consumers.py
+++ b/django/dkg/cancer/consumers.py
@@ -8,3 +8,13 @@ def ws_message(message):
     message.reply_channel.send({
         "text": message.content['text'],
     })
+
+
+def ws_connect(message):
+    message.reply_channel.send({
+        "text": 'connected',
+    })
+
+
+def ws_disconnect(message):
+    print message.content
diff --git a/django/dkg/cancer/json_api/endpoints.py b/django/dkg/cancer/json_api/endpoints.py
index 101dd27..429334c 100644
--- a/django/dkg/cancer/json_api/endpoints.py
+++ b/django/dkg/cancer/json_api/endpoints.py
@@ -47,13 +47,24 @@ def train(request):
     persistence.save_batch(request_body['articles'])
     articles_with_keywords_and_probas = persistence.load_data()
 
-    # retrain model and save to disk
-    cancer.model_api.model.train_model(
+    import concurrent.futures
+    executor = concurrent.futures.ThreadPoolExecutor(max_workers=4)
+    # retrain model and save to disc
+    training_future = executor.submit(
+        cancer.model_api.model.train_model,
         articles_with_keywords_and_probas,
         django.conf.settings.MODEL_PATH,
         django.conf.settings.LABEL_CODES_PATH
     )
 
+    def meh(future):
+        print future.result()
+        return 1
+
+    training_future.add_done_callback(meh)
+
+    # TODO: send notification (ws) to client, that model training is done
+
     return HttpResponse(status=200)
 
 
diff --git a/django/dkg/cancer/routing.py b/django/dkg/cancer/routing.py
index 9031236..00e6f76 100644
--- a/django/dkg/cancer/routing.py
+++ b/django/dkg/cancer/routing.py
@@ -1,6 +1,8 @@
 from channels.routing import route
-from cancer.consumers import ws_message
+from cancer.consumers import ws_message, ws_connect, ws_disconnect
 
 channel_routing = [
     route("websocket.receive", ws_message),
+    route("websocket.connect", ws_connect),
+    route("websocket.disconnect", ws_disconnect),
 ]
diff --git a/django/dkg/cancer/templates/cancer/bs.html b/django/dkg/cancer/templates/cancer/bs.html
index c7f980f..0805aa0 100644
--- a/django/dkg/cancer/templates/cancer/bs.html
+++ b/django/dkg/cancer/templates/cancer/bs.html
@@ -28,15 +28,15 @@
     <script>
         // Note that the path doesn't matter for routing; any WebSocket
         // connection gets bumped over to WebSocket consumers
-        socket = new WebSocket("ws://" + window.location.host + "/chat/");
+        socket = new WebSocket("ws://" + window.location.host + "/events/");
         socket.onmessage = function(e) {
             alert(e.data);
         }
-        socket.onopen = function() {
-            socket.send("hello world");
-        }
+        //socket.onopen = function() {
+        //    socket.send("hello world");
+        //}
         // Call onopen directly if socket is already open
-        if (socket.readyState == WebSocket.OPEN) socket.onopen();
+        //if (socket.readyState == WebSocket.OPEN) socket.onopen();
     </script>
     <script>
         var labeller_name = 'dkg-test';