X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=google_assistant.py;h=75ca6432cf76b9f84506aa549855e5cec25e1844;hb=36fea7f15ed17150691b5b3ead75450e575229ef;hp=b34197a3e60d0db9eff5c9cc6609ebe04e581bab;hpb=709370b2198e09f1dbe195fe8813602a3125b7f6;p=python_utils.git diff --git a/google_assistant.py b/google_assistant.py index b34197a..75ca643 100644 --- a/google_assistant.py +++ b/google_assistant.py @@ -2,6 +2,8 @@ import logging from typing import NamedTuple +import sys +import warnings import requests import speech_recognition as sr # type: ignore @@ -19,14 +21,14 @@ parser.add_argument( type=str, default="http://kiosk.house:3000", metavar="URL", - help="How to contact the Google Assistant bridge" + help="How to contact the Google Assistant bridge", ) parser.add_argument( "--google_assistant_username", type=str, metavar="GOOGLE_ACCOUNT", default="scott.gasch", - help="The user account for talking to Google Assistant" + help="The user account for talking to Google Assistant", ) @@ -92,15 +94,25 @@ def ask_google(cmd: str, *, recognize_speech=True) -> GoogleResponse: logger.debug(f"Transcription: '{audio_transcription}'") except sr.UnknownValueError as e: logger.exception(e) - logger.warning('Unable to parse Google assistant\'s response.') + msg = 'Unable to parse Google assistant\'s response.' + logger.warning(msg) + warnings.warn(msg, stacklevel=3) audio_transcription = None + return GoogleResponse( + success=success, + response=response, + audio_url=audio, + audio_transcription=audio_transcription, + ) else: - logger.error( + message = ( f'HTTP request to {url} with {payload} failed; code {r.status_code}' ) - return GoogleResponse( - success=success, - response=response, - audio_url=audio, - audio_transcription=audio_transcription, - ) + logger.error(message) + return GoogleResponse( + success=False, + response=message, + audio_url=audio, + audio_transcription=audio_transcription, + ) + sys.exit(-1)