From 84a92e5327997815488276021e5498f7681ab2d7 Mon Sep 17 00:00:00 2001 From: schneefux Date: Sun, 8 Jun 2014 20:39:35 -0700 Subject: Stop hardcoding /home/jasper and abstract out mic.say for multiplatform support --- client/g2p.py | 11 ++++++----- client/main.py | 3 ++- client/mic.py | 13 ++++++------- client/speaker.py | 35 +++++++++++++++++++++++++++++++++++ client/start.sh | 2 +- client/test.py | 8 +++++++- 6 files changed, 57 insertions(+), 15 deletions(-) create mode 100644 client/speaker.py (limited to 'client') diff --git a/client/g2p.py b/client/g2p.py index 06fef14..6d72bfe 100644 --- a/client/g2p.py +++ b/client/g2p.py @@ -4,6 +4,7 @@ import re TEMP_FILENAME = "g2ptemp" PHONE_MATCH = re.compile(r' (.*) ') +PHONETISAURUS_PATH = os.environ['JASPER_HOME'] + "/phonetisaurus" def parseLine(line): @@ -16,7 +17,7 @@ def parseOutput(output): def translateWord(word): out = subprocess.check_output(['phonetisaurus-g2p', '--model=%s' % - os.path.expanduser("~/phonetisaurus/g014b2b.fst"), '--input=%s' % word]) + PHONETISAURUS_PATH + "/g014b2b.fst", '--input=%s' % word]) return parseLine(out) @@ -34,8 +35,8 @@ def translateWords(words): def translateFile(input_filename, output_filename=None): - out = subprocess.check_output(['phonetisaurus-g2p', '--model=%s' % os.path.expanduser( - "~/phonetisaurus/g014b2b.fst"), '--input=%s' % input_filename, '--words', '--isfile']) + out = subprocess.check_output(['phonetisaurus-g2p', '--model=%s' % + PHONETISAURUS_PATH + "/g014b2b.fst", '--input=%s' % input_filename, '--words', '--isfile']) out = parseOutput(out) if output_filename: @@ -51,5 +52,5 @@ def translateFile(input_filename, output_filename=None): if __name__ == "__main__": - translateFile(os.path.expanduser("~/phonetisaurus/sentences.txt"), - os.path.expanduser("~/phonetisaurus/dictionary.dic")) + translateFile(PHONETISAURUS_PATH + "/phonetisaurus/sentences.txt", + PHONETISAURUS_PATH + "/phonetisaurus/dictionary.dic") diff --git a/client/main.py b/client/main.py index c5805c4..35ef715 100644 --- a/client/main.py +++ b/client/main.py @@ -1,5 +1,6 @@ import yaml import sys +import speaker from conversation import Conversation @@ -20,7 +21,7 @@ if __name__ == "__main__": profile = yaml.safe_load(open("profile.yml", "r")) - mic = Mic("languagemodel.lm", "dictionary.dic", + mic = Mic(speaker.newSpeaker(), "languagemodel.lm", "dictionary.dic", "languagemodel_persona.lm", "dictionary_persona.dic") mic.say("How can I be of service?") diff --git a/client/mic.py b/client/mic.py index d746ba1..0c41df9 100644 --- a/client/mic.py +++ b/client/mic.py @@ -22,17 +22,18 @@ class Mic: speechRec = None speechRec_persona = None - def __init__(self, lmd, dictd, lmd_persona, dictd_persona, lmd_music=None, dictd_music=None): + def __init__(self, speaker, lmd, dictd, lmd_persona, dictd_persona, lmd_music=None, dictd_music=None): """ Initiates the pocketsphinx instance. Arguments: + speaker -- used to output audio lmd -- filename of the full language model dictd -- filename of the full dictionary (.dic) lmd_persona -- filename of the 'Persona' language model (containing, e.g., 'Jasper') dictd_persona -- filename of the 'Persona' dictionary (.dic) """ - + self.speaker = speaker hmdir = "/usr/local/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k" if lmd_music and dictd_music: @@ -237,7 +238,7 @@ class Mic: if THRESHOLD == None: THRESHOLD = self.fetchThreshold() - os.system("aplay -D hw:1,0 ../static/audio/beep_hi.wav") + self.speaker.playSound("../static/audio/beep_hi.wav") # prepare recording stream audio = pyaudio.PyAudio() @@ -267,7 +268,7 @@ class Mic: if average < THRESHOLD * 0.8: break - os.system("aplay -D hw:1,0 ../static/audio/beep_lo.wav") + self.speaker.playSound("beep_lo.wav") # save the audio data stream.stop_stream() @@ -291,6 +292,4 @@ class Mic: def say(self, phrase, OPTIONS=" -vdefault+m3 -p 40 -s 160 --stdout > say.wav"): # alter phrase before speaking phrase = alteration.clean(phrase) - - os.system("espeak " + json.dumps(phrase) + OPTIONS) - os.system("aplay -D hw:1,0 say.wav") + self.speaker.say(phrase) diff --git a/client/speaker.py b/client/speaker.py new file mode 100644 index 0000000..304b426 --- /dev/null +++ b/client/speaker.py @@ -0,0 +1,35 @@ +""" +A Speaker handles output from Jasper to the user. +""" +import os, json + +class PiSpeaker: + + @classmethod + def isAvailable(cls): + return os.system("which espeak") == 0 + + def say(self, phrase, OPTIONS=" -vdefault+m3 -p 40 -s 160 --stdout > say.wav"): + os.system("espeak " + json.dumps(phrase) + OPTIONS) + self.playSound("say.wav") + + def playSound(self, filename): + os.system("aplay -D hw:1,0 " + filename) + +class MacSpeaker: + + @classmethod + def isAvailable(cls): + return os.system("which say") == 0 + + def say(self, phrase): + os.system("say " + phrase) + + def playSound(self, filename): + os.system("afplay " + filename) + +def newSpeaker(): + for cls in [PiSpeaker, MacSpeaker]: + if cls.isAvailable(): + return cls() + raise ValueError("Platform is not supported") diff --git a/client/start.sh b/client/start.sh index f3eea8b..cc33f9c 100755 --- a/client/start.sh +++ b/client/start.sh @@ -1,3 +1,3 @@ -cd /home/pi/jasper/client/ +cd $JASPER_HOME/jasper/client rm -rf ../old_client python main.py & diff --git a/client/test.py b/client/test.py index 80191ca..fb7d147 100644 --- a/client/test.py +++ b/client/test.py @@ -1,3 +1,8 @@ +import os + +if os.environ.get('JASPER_HOME') is None: + os.environ['JASPER_HOME'] = '/home/pi' + import unittest import argparse from mock import patch @@ -6,6 +11,7 @@ import yaml import test_mic import g2p import brain +import speaker def activeInternet(): @@ -23,7 +29,7 @@ class TestMic(unittest.TestCase): self.time_clip = "../static/audio/time.wav" from mic import Mic - self.m = Mic("languagemodel.lm", "dictionary.dic", + self.m = Mic(speaker.newSpeaker(), "languagemodel.lm", "dictionary.dic", "languagemodel_persona.lm", "dictionary_persona.dic") def testTranscribeJasper(self): -- cgit v1.3.1 From 18c02563c04f77e1732194d74e537787247918b9 Mon Sep 17 00:00:00 2001 From: schneefux Date: Sat, 21 Jun 2014 13:11:56 -0700 Subject: Clean up before pull request. --- boot/boot.py | 3 ++- client/mic.py | 4 ++-- client/speaker.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) (limited to 'client') diff --git a/boot/boot.py b/boot/boot.py index fcaeedd..245bd4d 100755 --- a/boot/boot.py +++ b/boot/boot.py @@ -1,6 +1,7 @@ #!/usr/bin/env python -import os, sys +import os +import sys import urllib2 import yaml import vocabcompiler diff --git a/client/mic.py b/client/mic.py index 0c41df9..f14ebc6 100644 --- a/client/mic.py +++ b/client/mic.py @@ -27,7 +27,7 @@ class Mic: Initiates the pocketsphinx instance. Arguments: - speaker -- used to output audio + speaker -- handles platform-independent audio output lmd -- filename of the full language model dictd -- filename of the full dictionary (.dic) lmd_persona -- filename of the 'Persona' language model (containing, e.g., 'Jasper') @@ -268,7 +268,7 @@ class Mic: if average < THRESHOLD * 0.8: break - self.speaker.playSound("beep_lo.wav") + self.speaker.playSound("../static/audio/beep_lo.wav") # save the audio data stream.stop_stream() diff --git a/client/speaker.py b/client/speaker.py index 304b426..f2d4ab7 100644 --- a/client/speaker.py +++ b/client/speaker.py @@ -1,5 +1,5 @@ """ -A Speaker handles output from Jasper to the user. +A Speaker handles audio output from Jasper to the user """ import os, json -- cgit v1.3.1 From 02f3505cd6d585a24d79cca033f30ce88e972563 Mon Sep 17 00:00:00 2001 From: schneefux Date: Sat, 21 Jun 2014 14:27:05 -0700 Subject: Escape phrases before 'say'ing them in OS X --- boot/test.py | 1 - client/speaker.py | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'client') diff --git a/boot/test.py b/boot/test.py index 4c79f39..b390d5e 100644 --- a/boot/test.py +++ b/boot/test.py @@ -5,7 +5,6 @@ if os.environ.get('JASPER_HOME') is None: import sys import unittest -from sets import Set from mock import patch import vocabcompiler diff --git a/client/speaker.py b/client/speaker.py index f2d4ab7..e7dc075 100644 --- a/client/speaker.py +++ b/client/speaker.py @@ -22,8 +22,11 @@ class MacSpeaker: def isAvailable(cls): return os.system("which say") == 0 + def shellquote(self, s): + return "'" + s.replace("'", "'\\''") + "'" + def say(self, phrase): - os.system("say " + phrase) + os.system("say " + self.shellquote(phrase)) def playSound(self, filename): os.system("afplay " + filename) -- cgit v1.3.1 From 3419eee951be8660f13b5d750a33b8e8ed64b425 Mon Sep 17 00:00:00 2001 From: schneefux Date: Sat, 28 Jun 2014 15:16:57 -0700 Subject: Changes suggested in CR. --- .gitignore | 1 + boot/test.py | 4 ++-- client/mic.py | 4 ++-- client/notifier.py | 2 +- client/speaker.py | 35 +++++++++++++++++++++++++++-------- 5 files changed, 33 insertions(+), 13 deletions(-) (limited to 'client') diff --git a/.gitignore b/.gitignore index 08cf7c5..a5affb2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ env/ client/env client/venv +client/modules/* *.pyc client/active.wav client/passive.wav diff --git a/boot/test.py b/boot/test.py index b390d5e..af5f982 100644 --- a/boot/test.py +++ b/boot/test.py @@ -16,7 +16,7 @@ sys.path.append(mod_path) import g2p -class ListWhereOrderDoesNotMatter(list): +class UnorderedList(list): def __eq__(self, other): return sorted(self) == sorted(other) @@ -41,7 +41,7 @@ class TestVocabCompiler(unittest.TestCase): # 'words' is appended with ['MUSIC', 'SPOTIFY'] # so must be > 2 to have received WORDS from modules - translateWords.assert_called_once_with(ListWhereOrderDoesNotMatter(words)) + translateWords.assert_called_once_with(UnorderedList(words)) self.assertTrue(text2lm.called) os.remove(sentences) os.remove(dictionary) diff --git a/client/mic.py b/client/mic.py index f14ebc6..f4b70df 100644 --- a/client/mic.py +++ b/client/mic.py @@ -238,7 +238,7 @@ class Mic: if THRESHOLD == None: THRESHOLD = self.fetchThreshold() - self.speaker.playSound("../static/audio/beep_hi.wav") + self.speaker.play("../static/audio/beep_hi.wav") # prepare recording stream audio = pyaudio.PyAudio() @@ -268,7 +268,7 @@ class Mic: if average < THRESHOLD * 0.8: break - self.speaker.playSound("../static/audio/beep_lo.wav") + self.speaker.play("../static/audio/beep_lo.wav") # save the audio data stream.stop_stream() diff --git a/client/notifier.py b/client/notifier.py index 341ae04..7e6b0a2 100644 --- a/client/notifier.py +++ b/client/notifier.py @@ -1,5 +1,5 @@ import Queue -from modules import Gmail +#from modules import Gmail from apscheduler.scheduler import Scheduler import logging logging.basicConfig() diff --git a/client/speaker.py b/client/speaker.py index e7dc075..1b1255a 100644 --- a/client/speaker.py +++ b/client/speaker.py @@ -1,22 +1,33 @@ """ A Speaker handles audio output from Jasper to the user -""" -import os, json -class PiSpeaker: +Speaker methods: + say - output 'phrase' as speech + play - play the audio in 'filename' + isAvailable - returns True if the platform supports this implementation +""" +import os +import json +class eSpeakSpeaker: + """ + Uses the eSpeak speech synthesizer included in the Jasper disk image + """ @classmethod def isAvailable(cls): return os.system("which espeak") == 0 def say(self, phrase, OPTIONS=" -vdefault+m3 -p 40 -s 160 --stdout > say.wav"): os.system("espeak " + json.dumps(phrase) + OPTIONS) - self.playSound("say.wav") + self.play("say.wav") - def playSound(self, filename): + def play(self, filename): os.system("aplay -D hw:1,0 " + filename) -class MacSpeaker: +class saySpeaker: + """ + Uses the OS X built-in 'say' command + """ @classmethod def isAvailable(cls): @@ -28,11 +39,19 @@ class MacSpeaker: def say(self, phrase): os.system("say " + self.shellquote(phrase)) - def playSound(self, filename): + def play(self, filename): os.system("afplay " + filename) def newSpeaker(): - for cls in [PiSpeaker, MacSpeaker]: + """ + Returns: + A speaker implementation available on the current platform + + Raises: + ValueError if no speaker implementation is supported on this platform + """ + + for cls in [eSpeakSpeaker, saySpeaker]: if cls.isAvailable(): return cls() raise ValueError("Platform is not supported") -- cgit v1.3.1 From 366bc8847498dacdb69c7f4b78d7c5fe5406de4d Mon Sep 17 00:00:00 2001 From: schneefux Date: Sat, 28 Jun 2014 15:25:17 -0700 Subject: Reverting files that accidentally snuck into commit. --- .gitignore | 1 - client/notifier.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'client') diff --git a/.gitignore b/.gitignore index a5affb2..08cf7c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ env/ client/env client/venv -client/modules/* *.pyc client/active.wav client/passive.wav diff --git a/client/notifier.py b/client/notifier.py index 7e6b0a2..341ae04 100644 --- a/client/notifier.py +++ b/client/notifier.py @@ -1,5 +1,5 @@ import Queue -#from modules import Gmail +from modules import Gmail from apscheduler.scheduler import Scheduler import logging logging.basicConfig() -- cgit v1.3.1