Web tornado server

accompaniator_web/base_app/forms.py

@@ -4,9 +4,9 @@
 
 
 class FeedbackForm(forms.ModelForm):
-    song_name = forms.CharField()
-    rating = forms.Select()
+    song_name = forms.CharField(widget=forms.HiddenInput(), required=False)
+    mark = forms.IntegerField(widget=forms.HiddenInput(), required=False, initial=-1)
 
     class Meta:
         model = Feedback
-        fields = ('song_name', 'rating',)
+        fields = ('song_name', 'mark',)

accompaniator_web/base_app/migrations/0003_auto_20180522_0732.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.0.2 on 2018-05-22 07:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base_app', '0002_feedback_song_name'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='feedback',
+            old_name='rating',
+            new_name='mark',
+        ),
+    ]

accompaniator_web/base_app/models.py

@@ -4,4 +4,4 @@
 class Feedback(models.Model):
     song_name = models.CharField(max_length=32)
     session_key = models.CharField(max_length=32)
-    rating = models.SmallIntegerField()
+    mark = models.SmallIntegerField()

accompaniator_web/base_app/views.py

@@ -44,11 +44,12 @@ def results(request):
 
     if request.method == 'POST':
         form = FeedbackForm(request.POST, request.FILES)
+        print(form)
         if form.is_valid():
             instance = form.save(commit=False)
             instance.session_key = session_key
             instance.save()
-            return HttpResponseRedirect('/results')
+            return HttpResponseRedirect('/home')
 
         else:
             print(form.errors)

accompaniator_web/static/js/home.js

@@ -16,7 +16,7 @@ var state = "init";
 var delay = [];
 var send_queve = [];
 var text_ws;
-var server_name = 'ws://demos.kaazing.com/echo';
+var server_name = 'ws://localhost:8110/ws'; // 'ws://demos.kaazing.com/echo'; for testing
 TextWS();
 
 function startUserMedia(stream) {
@@ -40,9 +40,12 @@ function TextWS() {
     text_ws.onmessage = function (ev) {
         msg = ev.data;
         console.log(msg)
-        if (typeof(msg) == "string") {
+        if (msg[0] != "R") {
             text_ws.send(msg);
         }
+        else{
+            Push(msg);
+        }
     };
     text_ws.onclose = function () {
         TextWS();
@@ -51,6 +54,7 @@ function TextWS() {
 
 
 function Push(blob) {
+    if (blob)
     var url = URL.createObjectURL(blob);
     var au = document.createElement('audio');
 
@@ -203,6 +207,7 @@ function Stop() {
         state = 'record';
     }, 1000);
     ws.close();
+    text_ws.close();
 }
 
 
@@ -213,7 +218,11 @@ function Recording() {
             var s = ev.data;
             _now = new Date().getTime();
             //console.log("Delay is", _now - delay.pop(), "ms.");
-            Push(s);
+            if (s[0] == "R") {
+                Push(s);
+            }else{
+                text_ws.send(s);
+            }
         };
         queve = [];
         frames = [];

accompaniator_web/static/js/result.js

@@ -10,5 +10,5 @@ function star(num, star) {
         for (var i = num + 1; i <= 5; i++) {
             document.getElementById("star" + i).innerHTML = '<img src="../../static/img/star_dark.png" width="70px" height="70px">';
         }
-        document.getElementById("mark").innerHTML = num;
+        document.getElementById("id_mark").value = num;
 }

accompaniator_web/templates/base_app/results.html

@@ -15,34 +15,35 @@
                         <h1>Оцените нас</h1>
                     </div>
                 </div>
-                <div class="row">
-                    <p><span id="mark" style="display: none">00:00</span></p>
-                </div>
                 <div class="row">
 
 
                     <div class="col-sm-6 col-sm-offset-2">
-                      <ul class="myinline">
-                          {% for i in stars_range %}
+                        <ul class="myinline">
+                            {% for i in stars_range %}
                                 <li><a id="star{{ i }}" href="javascript:void(0);"
                                        onclick="star({{ i }}, this)">
                                     <img src="{% static 'img/star_dark.png' %}" width="70px" height="70px"></a></li>
 
                             {% endfor %}
 
                         </ul>
-                    <br/>
+                        <br/>
                     </div>
                 </div>
 
                 <div class="row">
-                    <p><span id="mark1" style="display: none">00:00</span></p>
-                </div>
-                <div class="row">
+                    <form action="{% url 'results' %}" id='post_results' method="post">
+                        {% csrf_token %}
+                        {{ feedback_form }}
+<!--                        <input type="hidden" id="mark" value="-1"/>-->
+                    </form>
                     <div class="col-sm-1 col-sm-offset-4">
-                        <a href="{% url 'home' %}">
-                            <button type="button" class="btn btn-primary">По новой</button>
-                        </a>
+
+                        <button type="button" class="btn btn-primary"
+                                onclick="document.getElementById('post_results').submit()">По новой
+                        </button>
+
                     </div>
                 </div>
 

accompaniator_web/tornado_server.py

@@ -0,0 +1,96 @@
+# import sys
+# sys.path.append("../")
+import numpy as np
+import io
+import scipy.io.wavfile
+
+import tornado.websocket
+from tornado import ioloop
+from tornado.web import url
+
+from production import accompanist
+from multiprocessing import Queue, Process
+
+from datetime import datetime
+import time
+
+buffer_size = 256
+time_between_delay_measurings_in_secs = 1.5
+
+
+def send_time_stamps(websocket):
+    while websocket.running is True:
+        now = datetime.now()
+        output = now.strftime("%Y-%m-%d %H:%M:%S")
+        try:
+            websocket.write_message(output, binary=False)
+        except tornado.iostream.StreamClosedError or tornado.websocket.WebSocketClosedError:
+            break
+        time.sleep(time_between_delay_measurings_in_secs)
+
+
+class WebSocketHandler(tornado.websocket.WebSocketHandler):
+
+    def check_origin(self, origin):
+        return True
+
+    def initialize(self):
+        self.in_queue = Queue()
+        self.accompanist = None
+        self.last_sent_time_stamp = None
+        self.running = False
+
+    def open(self):
+        self.accompanist = accompanist.Accompanist()
+        self.accompanist.set_websocket(self)
+        self.accompanist.set_queue_in(self.in_queue)
+
+        self.accompanist.run()
+
+        self.running = True
+        self.time_send_process = Process(target=send_time_stamps, args=(self,))
+        self.time_send_process.start()
+
+    def on_message(self, message):
+        if 'RIFF' in str(message):
+            s = io.BytesIO(message)
+            _, samplesints = scipy.io.wavfile.read(s)
+            samples = samplesints.astype(np.float32, order='C') / 32768.0
+            for i in range(0, len(samples) // buffer_size - 1):
+                self.in_queue.put(samples[i * buffer_size:(i + 1) * buffer_size])
+
+        else:  # it's a time string!
+            time_stamp = datetime.strptime(message, "%Y-%m-%d %H:%M:%S")
+            delay = (datetime.now() - time_stamp).total_seconds()
+            self.accompanist.set_web_delay(delay)
+
+    def on_close(self):
+        print("stopping")
+        self.running = False
+        self.time_send_process.join()
+        self.accompanist.stop()
+        print("stopped")
+
+    def send_audio(self, message):
+        print("delay ok!")
+        output = io.BytesIO()
+        scipy.io.wavfile.write(output, 44100, message)
+        try:
+            self.write_message(output.getvalue(), binary=True)
+        except tornado.iostream.StreamClosedError or tornado.websocket.WebSocketClosedError:
+            print("Caught this fucker")
+
+    def send_time(self):
+        pass
+
+
+def main():
+    app = tornado.web.Application([url(r"/ws", WebSocketHandler)])
+    return app
+
+
+if __name__ == "__main__":
+    app = main()
+    http_server = tornado.httpserver.HTTPServer(app)
+    http_server.listen(8110, address='0.0.0.0')
+    ioloop.IOLoop.instance().start()

docker/accompaniator/Dockerfile

@@ -30,3 +30,4 @@ ADD . /build/
 
 RUN mv asound.conf /etc/asound.conf
 RUN cat ./.bashrc >> ~/.bashrc
+RUN mv piano_and_ultrasound.sf2 /piano_and_ultrasound.sf2

docker/accompaniator/requirements.txt

@@ -22,4 +22,6 @@ coverage
 tqdm
 
 # Web stuff
-django
+django
+tornado
+six

docker/accompaniator/startup.sh

@@ -11,7 +11,7 @@ else
 fi
 
 cd accompaniator
-git checkout ACCOMPANIST-154_site_on_django
+git checkout web_tornado_server
 cd accompaniator_web
 
 # Start django
@@ -24,4 +24,15 @@ else
   echo "Django ran successfully"
 fi
 
+# Start tornado
+cd ..
+nohup python -m accompaniator_web.tornado_server &
+status=$?
+if [ $status -ne 0 ]; then
+  echo "Failed to start tornado: $status"
+  exit $status
+else
+  echo "Tornado ran successfully"
+fi
+
 bash

docker/docker-compose.yml

@@ -11,10 +11,9 @@ services:
       - /tmp/.X11-unix:/tmp/.X11-unix
       - /run/dbus/:/run/dbus/:rw
       - /dev/shm:/dev/shm
-    ports:
-      - 8000:8000
 
   accompaniator-dev:
+    tty: true
     image: accompaniator-dev
     build: accompaniator-dev
     devices:
@@ -25,6 +24,7 @@ services:
       - /dev/shm:/dev/shm
       - ./../:/build/accompaniator
     ports:
+      - 8110:8110
       - 8000:8000
 
   accompaniator-prod:
@@ -37,6 +37,7 @@ services:
       - /run/dbus/:/run/dbus/:rw
       - /dev/shm:/dev/shm
     ports:
+      - 8110:8110
       - 8000:8000
 
   accompaniator-test: