WIP Python fixes

.travis.yml

@@ -69,6 +69,8 @@ install:
 - node lib/node/index.js
 
 before_script:
+# python: check for syntax errors or undefined names
+- if [[ $NODE_VERSION == "9.0.0" ]]; then pip install flake8; flake8 . --select=E901,E999,F821,F822,F823; fi;
 # if publishing, do it
 - if [[ $REPUBLISH_BINARY == true ]]; then node-pre-gyp package unpublish; fi;
 - if [[ $PUBLISH_BINARY == true ]]; then node-pre-gyp package publish; fi;

README.md

@@ -258,6 +258,8 @@ To run the Java example script:
 
     cd swig/Python
     make
+    # Set temporary python path to load the compiled module instead of the currently installed one.
+    PYTHONPATH=$(pwd)
 
 SWIG will generate a `_snowboydetect.so` file and a simple (but hard-to-read) python wrapper `snowboydetect.py`. We have provided a higher level python wrapper `snowboydecoder.py` on top of that.
 

examples/Python/demo.py

@@ -1,4 +1,5 @@
-import snowboydecoder
+#!/usr/bin/env python2
+from snowboy import snowboydecoder
 import sys
 import signal
 

examples/Python/demo2.py

@@ -1,4 +1,5 @@
-import snowboydecoder
+#!/usr/bin/env python2
+from snowboy import snowboydecoder
 import sys
 import signal
 

examples/Python/demo3.py

@@ -1,4 +1,5 @@
-import snowboydecoder
+#!/usr/bin/env python2
+from snowboy import snowboydecoder
 import sys
 import wave
 
@@ -37,4 +38,3 @@
     print('Hotword Detected!')
 else:
     print('Hotword Not Detected!')
-

examples/Python/demo4.py

@@ -1,4 +1,6 @@
-import snowboydecoder
+#!/usr/bin/env python2
+from snowboy import snowboydecoder
+from __future__ import print_function
 import sys
 import signal
 import speech_recognition as sr
@@ -18,7 +20,7 @@
 
 
 def audioRecorderCallback(fname):
-    print "converting audio to text"
+    print("converting audio to text")
     r = sr.Recognizer()
     with sr.AudioFile(fname) as source:
         audio = r.record(source)  # read the entire audio file
@@ -29,9 +31,9 @@ def audioRecorderCallback(fname):
         # instead of `r.recognize_google(audio)`
         print(r.recognize_google(audio))
     except sr.UnknownValueError:
-        print "Google Speech Recognition could not understand audio"
+        print("Google Speech Recognition could not understand audio")
     except sr.RequestError as e:
-        print "Could not request results from Google Speech Recognition service; {0}".format(e)
+        print("Could not request results from Google Speech Recognition service; {0}".format(e))
 
     os.remove(fname)
 
@@ -51,8 +53,8 @@ def interrupt_callback():
     return interrupted
 
 if len(sys.argv) == 1:
-    print "Error: need to specify model name"
-    print "Usage: python demo.py your.model"
+    print("Error: need to specify model name")
+    print("Usage: python demo.py your.model")
     sys.exit(-1)
 
 model = sys.argv[1]
@@ -61,7 +63,7 @@ def interrupt_callback():
 signal.signal(signal.SIGINT, signal_handler)
 
 detector = snowboydecoder.HotwordDetector(model, sensitivity=0.38)
-print "Listening... Press Ctrl+C to exit"
+print("Listening... Press Ctrl+C to exit")
 
 # main loop
 detector.start(detected_callback=detectedCallback,
@@ -70,7 +72,3 @@ def interrupt_callback():
                sleep_time=0.01)
 
 detector.terminate()
-
-
-
-

examples/Python/demo_threaded.py

@@ -1,8 +1,15 @@
+from __future__ import print_function
+
 import snowboythreaded
 import sys
 import signal
 import time
 
+try:
+    raw_input          # Python 2
+except NameError:
+    raw_input = input  # Python 3
+
 stop_program = False
 
 # This a demo that shows running Snowboy in another thread
@@ -40,8 +47,8 @@ def signal_handler(signal, frame):
     try:
         num1 = int(raw_input("Enter the first number to add: "))
         num2 = int(raw_input("Enter the second number to add: "))
-        print "Sum of number: {}".format(num1 + num2)
+        print("Sum of number: {}".format(num1 + num2))
     except ValueError:
-        print "You did not enter a number."
+        print("You did not enter a number.")
 
 threaded_detector.terminate()

examples/Python3/demo.py

@@ -1,6 +1,9 @@
-import snowboydecoder
+#!/usr/bin/env python3
+from __future__ import print_function
+from snowboy import snowboydecoder
 import sys
 import signal
+import os
 
 interrupted = False
 
@@ -14,22 +17,33 @@ def interrupt_callback():
     global interrupted
     return interrupted
 
-if len(sys.argv) == 1:
-    print("Error: need to specify model name")
-    print("Usage: python demo.py your.model")
-    sys.exit(-1)
+def main():
+    if len(sys.argv) < 2:
+        print("Using default alexa model.")
+        model = os.path.join(snowboydecoder.TOP_DIR, 'resources/alexa/alexa-avs-sample-app/alexa.umdl')
+    elif len(sys.argv) > 2:
+        print("Error: need to specify 1 model name")
+        print("Usage: python demo.py your.model")
+        sys.exit(-1)
+    else:
+        model = sys.argv[1]
 
-model = sys.argv[1]
+    if not os.path.isfile(model):
+        print("Error: Not a valid model.")
+        sys.exit(-1)
 
-# capture SIGINT signal, e.g., Ctrl+C
-signal.signal(signal.SIGINT, signal_handler)
+    # capture SIGINT signal, e.g., Ctrl+C
+    signal.signal(signal.SIGINT, signal_handler)
 
-detector = snowboydecoder.HotwordDetector(model, sensitivity=0.5)
-print('Listening... Press Ctrl+C to exit')
+    detector = snowboydecoder.HotwordDetector(model, sensitivity=0.5, apply_frontend=True)
+    print('Listening... Press Ctrl+C to exit')
 
-# main loop
-detector.start(detected_callback=snowboydecoder.play_audio_file,
-               interrupt_check=interrupt_callback,
-               sleep_time=0.03)
+    # main loop
+    detector.start(detected_callback=snowboydecoder.play_audio_file,
+                   interrupt_check=interrupt_callback,
+                   sleep_time=0.03)
 
-detector.terminate()
+    detector.terminate()
+
+if __name__ == "__main__":
+    main()

examples/Python3/demo2.py

@@ -1,4 +1,6 @@
-import snowboydecoder
+#!/usr/bin/env python3
+from __future__ import print_function
+from snowboy import snowboydecoder
 import sys
 import signal
 
@@ -16,26 +18,30 @@ def interrupt_callback():
     global interrupted
     return interrupted
 
-if len(sys.argv) != 3:
-    print("Error: need to specify 2 model names")
-    print("Usage: python demo.py 1st.model 2nd.model")
-    sys.exit(-1)
+def main():
+    if len(sys.argv) != 3:
+        print("Error: need to specify 2 model names")
+        print("Usage: python demo.py 1st.model 2nd.model")
+        sys.exit(-1)
 
-models = sys.argv[1:]
+    models = sys.argv[1:]
 
-# capture SIGINT signal, e.g., Ctrl+C
-signal.signal(signal.SIGINT, signal_handler)
+    # capture SIGINT signal, e.g., Ctrl+C
+    signal.signal(signal.SIGINT, signal_handler)
 
-sensitivity = [0.5]*len(models)
-detector = snowboydecoder.HotwordDetector(models, sensitivity=sensitivity)
-callbacks = [lambda: snowboydecoder.play_audio_file(snowboydecoder.DETECT_DING),
-             lambda: snowboydecoder.play_audio_file(snowboydecoder.DETECT_DONG)]
-print('Listening... Press Ctrl+C to exit')
+    sensitivity = [0.5]*len(models)
+    detector = snowboydecoder.HotwordDetector(models, sensitivity=sensitivity)
+    callbacks = [lambda: snowboydecoder.play_audio_file(snowboydecoder.DETECT_DING),
+                 lambda: snowboydecoder.play_audio_file(snowboydecoder.DETECT_DONG)]
+    print('Listening... Press Ctrl+C to exit')
 
-# main loop
-# make sure you have the same numbers of callbacks and models
-detector.start(detected_callback=callbacks,
-               interrupt_check=interrupt_callback,
-               sleep_time=0.03)
+    # main loop
+    # make sure you have the same numbers of callbacks and models
+    detector.start(detected_callback=callbacks,
+                   interrupt_check=interrupt_callback,
+                   sleep_time=0.03)
 
-detector.terminate()
+    detector.terminate()
+
+if __name__ == "__main__":
+    main()

examples/Python3/demo3.py

@@ -1,4 +1,6 @@
-import snowboydecoder
+#!/usr/bin/env python3
+from __future__ import print_function
+from snowboy import snowboydecoder
 import sys
 import wave
 
@@ -12,29 +14,31 @@
 # Should print:
 #  Hotword Not Detected!
 
+def main():
+    if len(sys.argv) != 3:
+        print("Error: need to specify wave file name and model name")
+        print("Usage: python demo3.py wave_file model_file")
+        sys.exit(-1)
 
-if len(sys.argv) != 3:
-    print("Error: need to specify wave file name and model name")
-    print("Usage: python demo3.py wave_file model_file")
-    sys.exit(-1)
+    wave_file = sys.argv[1]
+    model_file = sys.argv[2]
 
-wave_file = sys.argv[1]
-model_file = sys.argv[2]
+    f = wave.open(wave_file)
+    assert f.getnchannels() == 1, "Error: Snowboy only supports 1 channel of audio (mono, not stereo)"
+    assert f.getframerate() == 16000, "Error: Snowboy only supports 16K sampling rate"
+    assert f.getsampwidth() == 2, "Error: Snowboy only supports 16bit per sample"
+    data = f.readframes(f.getnframes())
+    f.close()
 
-f = wave.open(wave_file)
-assert f.getnchannels() == 1, "Error: Snowboy only supports 1 channel of audio (mono, not stereo)"
-assert f.getframerate() == 16000, "Error: Snowboy only supports 16K sampling rate"
-assert f.getsampwidth() == 2, "Error: Snowboy only supports 16bit per sample"
-data = f.readframes(f.getnframes())
-f.close()
+    sensitivity = 0.5
+    detection = snowboydecoder.HotwordDetector(model_file, sensitivity=sensitivity)
 
-sensitivity = 0.5
-detection = snowboydecoder.HotwordDetector(model_file, sensitivity=sensitivity)
+    ans = detection.detector.RunDetection(data)
 
-ans = detection.detector.RunDetection(data)
-
-if ans == 1:
-    print('Hotword Detected!')
-else:
-    print('Hotword Not Detected!')
+    if ans == 1:
+        print('Hotword Detected!')
+    else:
+        print('Hotword Not Detected!')
 
+if __name__ == "__main__":
+    main()

examples/Python3/demo4.py

@@ -1,4 +1,6 @@
-import snowboydecoder
+#!/usr/bin/env python3
+from __future__ import print_function
+from snowboy import snowboydecoder
 import sys
 import signal
 import speech_recognition as sr
@@ -49,27 +51,27 @@ def interrupt_callback():
     global interrupted
     return interrupted
 
-if len(sys.argv) == 1:
-    print("Error: need to specify model name")
-    print("Usage: python demo.py your.model")
-    sys.exit(-1)
+def main():
+    if len(sys.argv) != 2:
+        print("Error: need to specify 1 model name")
+        print("Usage: python demo.py your.model")
+        sys.exit(-1)
 
-model = sys.argv[1]
+    model = sys.argv[1]
 
-# capture SIGINT signal, e.g., Ctrl+C
-signal.signal(signal.SIGINT, signal_handler)
-
-detector = snowboydecoder.HotwordDetector(model, sensitivity=0.38)
-print('Listening... Press Ctrl+C to exit')
-
-# main loop
-detector.start(detected_callback=detectedCallback,
-               audio_recorder_callback=audioRecorderCallback,
-               interrupt_check=interrupt_callback,
-               sleep_time=0.01)
-
-detector.terminate()
+    # capture SIGINT signal, e.g., Ctrl+C
+    signal.signal(signal.SIGINT, signal_handler)
 
+    detector = snowboydecoder.HotwordDetector(model, sensitivity=0.38)
+    print('Listening... Press Ctrl+C to exit')
 
+    # main loop
+    detector.start(detected_callback=detectedCallback,
+                   audio_recorder_callback=audioRecorderCallback,
+                   interrupt_check=interrupt_callback,
+                   sleep_time=0.01)
 
+    detector.terminate()
 
+if __name__ == "__main__":
+    main()