diff options
| -rwxr-xr-x | jasper.py | 114 |
1 files changed, 50 insertions, 64 deletions
@@ -3,6 +3,10 @@ import os import sys import traceback import shutil +import logging +logging.basicConfig() +logger = logging.getLogger() + import yaml import argparse @@ -24,8 +28,12 @@ from client.conversation import Conversation parser = argparse.ArgumentParser(description='Test suite for the Jasper client code.') parser.add_argument('--local', action='store_true', help='Use text input instead of a real microphone') parser.add_argument('--no-network-check', action='store_true', help='Disable the network connection check') +parser.add_argument('--debug', action='store_true', help='Show debug messages') args = parser.parse_args() +if args.debug: + logger.setLevel(logging.DEBUG) + if args.local: from client.local_mic import Mic else: @@ -48,49 +56,40 @@ else: path = "/usr/local/lib/" os.environ["PATH"] = path -speaker = speak.newSpeaker() - - -def testConnection(): - if Diagnostics.check_network_connection(): - print "CONNECTED TO INTERNET" - else: - print "COULD NOT CONNECT TO NETWORK" - speaker.say( - "Warning: I was unable to connect to a network. Parts of the system may not work correctly, depending on your setup.") - +class Jasper(object): + def __init__(self): + # Read config + config_file = os.path.abspath(os.path.join(client_path, 'profile.yml')) + logger.debug("Trying to read config file: '%s'", config_file) + with open(config_file, "r") as f: + self.config = yaml.safe_load(f) -def fail(message): - traceback.print_exc() - speaker.say(message) - sys.exit(1) + try: + api_key = self.config['keys']['GOOGLE_SPEECH'] + except KeyError: + api_key = None + try: + stt_engine_type = self.config['stt_engine'] + except KeyError: + logger.warning("stt_engine not specified in profile, defaulting to 'sphinx'") + stt_engine_type = "sphinx" -def configure(): - try: - print "COMPILING DICTIONARY" - vocabcompiler.compile( - "sentences.txt", "dictionary.dic", "languagemodel.lm") - print "STARTING CLIENT PROGRAM" + # Compile dictionary + sentences, dictionary, languagemodel = [os.path.abspath(os.path.join(client_path, filename)) for filename in ("sentences.txt", "dictionary.dic", "languagemodel.lm")] + vocabcompiler.compile(sentences, dictionary, languagemodel) - except OSError: - print "BOOT FAILURE: OSERROR" - fail( - "There was a problem starting Jasper. You may be missing the language model and associated files. Please read the documentation to configure your Raspberry Pi.") - - except IOError: - print "BOOT FAILURE: IOERROR" - fail( - "There was a problem starting Jasper. You may have set permissions incorrectly on some part of the filesystem. Please read the documentation to configure your Raspberry Pi.") + # Initialize Mic + self.mic = Mic(speak.newSpeaker(), stt.PocketSphinxSTT(), stt.newSTTEngine(stt_engine_type, api_key=api_key)) - except: - print "BOOT FAILURE" - fail( - "There was a problem starting Jasper. Please read the documentation to configure your Raspberry Pi.") + def run(self): + addendum = "" + if 'first_name' in self.config: + addendum = ", %s" % self.config["first_name"] + self.mic.say("How can I be of service%s?" % addendum) -old_client = os.path.abspath(os.path.join(os.pardir, "old_client")) -if os.path.exists(old_client): - shutil.rmtree(old_client) + conversation = Conversation("JASPER", self.mic, self.config) + conversation.handleForever() if __name__ == "__main__": @@ -99,32 +98,19 @@ if __name__ == "__main__": print " Copyright 2013 Shubhro Saha & Charlie Marsh " print "===========================================================" - - speaker.say("Hello.... I am Jasper... Please wait one moment.") - if not args.no_network_check: - testConnection() - configure() - - profile = yaml.safe_load(open("profile.yml", "r")) + if not args.no_network_check and not Diagnostics.check_network_connection(): + logger.warning("Network not connected. This may prevent Jasper from running properly.") try: - api_key = profile['keys']['GOOGLE_SPEECH'] - except KeyError: - api_key = None - - try: - stt_engine_type = profile['stt_engine'] - except KeyError: - print "stt_engine not specified in profile, defaulting to PocketSphinx" - stt_engine_type = "sphinx" - - mic = Mic(speaker, stt.PocketSphinxSTT(), - stt.newSTTEngine(stt_engine_type, api_key=api_key)) - - addendum = "" - if 'first_name' in profile: - addendum = ", %s" % profile["first_name"] - mic.say("How can I be of service%s?" % addendum) - - conversation = Conversation("JASPER", mic, profile) - conversation.handleForever() + app = Jasper() + except IOError: + logger.exception("Can't read config file.") + sys.exit(1) + except OSError: + logger.exception("Language model or associated files missing.") + sys.exit(1) + except Exception(): + logger.exception("Unknown error occured") + sys.exit(1) + + app.run() |