Merge branch 'develop' into program-persistence

Author: previ

.circleci/config.yml

@@ -0,0 +1,53 @@
+# Python CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-python/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: coderbot/python-gpac:3.5
+      
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      # Download and cache dependencies
+      - restore_cache:
+          keys:
+          - v1-dependencies-{{ checksum "requirements_stub.txt" }}
+          # fallback to using the latest cache if no exact match is found
+          - v1-dependencies-
+
+      - run:
+          name: install dependencies
+          command: |
+            python3 -m venv venv
+            . venv/bin/activate
+            pip install -r requirements_stub.txt
+
+      - save_cache:
+          paths:
+            - ./venv
+          key: v1-dependencies-{{ checksum "requirements_stub.txt" }}
+        
+      # run tests!
+      - run:
+          name: run tests
+          command: |
+            . venv/bin/activate
+            export PYTHONPATH=./stub
+            mkdir test-reports
+            python3 -m unittest test/coderbot_test.py 2>&1 | tee test-reports/test_report.txt
+            #python3 -m unittest test/cnn_test.py 2>&1 | tee test-reports/test_report.txt
+            python3 -m unittest test/camera_test.py 2>&1 | tee test-reports/test_report.txt
+            echo "test complete"
+      - store_artifacts:
+          path: test-reports/
+          destination: tr1
+
+      - store_test_results:
+          path: test-reports/
+

README.md

@@ -42,5 +42,6 @@ Once started, the backend will expose a number of endpoints:
 - Legacy JQuery web application: [localhost:5000/old](http://localhost:5000/old);
 - API v2: [localhost:5000/v2](http://localhost:5000/v2);
 - New Vue web application: [localhost:5000/](http://localhost:5000/) (assuming a [vue-app](https://github.com/coderbotorg/vue-app) build is placed in the `dist/` folder);
+- Documentation: [localhost:5000/docs](http://localhost:5000/docs) assuming a [docs](https://github.com/coderbotorg/docs) build is placed in the `cb_docs/` folder);
 - Swagger UI dynamic documentation of the API v2: [localhost:5000/v2/ui/index.html](http://localhost:5000/v2/ui/index.html) (once you cloned the [swagger-ui](https://github.com/coderbotorg/swagger-ui) repository inside the backend folder).
 

main.py

@@ -68,13 +68,21 @@
 def serve_vue_app(filename):
     """
     Serve (a build of) the new Vue application
-    "dist" is the output of `npm run build` from the 'vue-app 'repository
+    "dist" is the output of `npm run build` from the 'vue-app' repository
     """
     return send_from_directory('dist', filename)
 
+@app.route('/docs/<path:filename')
+def serve_docs_app(filename):
+    """
+    Serve (a build of) the documentation
+    'cb_docs' is the output of `npx vuepress build pages/` 
+    from the 'docs' repository
+    """
+    return send_from_directory('cb_docs', filename)
+
 @app.route('/')
 def redirect_vue_app():
-
     return redirect('/vue/index.html', code=302)
 
 ## Legacy API and web application

requirements_stub.txt

@@ -23,7 +23,7 @@ jsonschema==2.6.0
 Markdown==2.6.11
 MarkupSafe==1.0
 numpy==1.14.3
-opencv-contrib-python
+opencv-contrib-python==3.4.3.18
 pigpio==1.40.post1
 Pillow==5.1.0
 protobuf==3.6.1

stub/pigpio.py

@@ -1,7 +1,10 @@
-from test.pigpio_mock import PIGPIOMock
+#from test.pigpio_mock import PIGPIOMock
 
-pi = PIGPIOMock
 INPUT=1
 OUTPUT=2
 RISING_EDGE=1
 EITHER_EDGE=2
+
+class pi:
+    def __init__(self, host="localhost", port=8888):
+        pass

test/audio_test.py

@@ -0,0 +1,31 @@
+import unittest
+import os
+import test.pyaudio_mock
+import pyaudio
+import audio
+
+FILENAME = "test.wav"
+
+class AudioTest(unittest.TestCase):
+    def setUp(self):
+        pyaudio.PyAudio = test.pyaudio_mock.PyAudioMock
+        self.audio = audio.Audio.get_instance()
+   
+    def tearDown(self):
+        pass
+
+    def test_say(self):
+        self.audio.say("this is a test")
+        self.assertTrue(True)
+
+    def test_record_to_file(self):        
+        self.audio.record_to_file(FILENAME, 3)
+        self.assertTrue(os.path.isfile(os.path.join(audio.SOUNDDIR, FILENAME)))
+
+    def test_play(self):
+        self.audio.play(FILENAME)
+        self.assertTrue(True)
+
+    def test_hear(self):
+        self.assertTrue(True)
+

test/pyaudio_mock.py

@@ -0,0 +1,31 @@
+import unittest.mock
+import time
+import io
+import logging
+import numpy
+
+logger = logging.getLogger()
+
+class PyAudioMock(object):
+    """Implements PyAudio mock class
+    PyAudio is the library used to access the integrated audio output and external audio source (microphone)
+    """
+
+    def __init__(self):
+        pass
+
+    def open(self, format, channels, rate, frames_per_buffer, stream_callback):
+        return self
+
+    def stop_stream(self):
+        pass
+
+    def close(self):
+        pass
+
+    def terminate(self):
+        pass
+
+    def get_sample_size(format):
+        return format * 16
+