X-Git-Url: https://wannabe.guru.org/gitweb/?a=blobdiff_plain;f=google_assistant.py;h=4a3a58f5947ab335e26ac2fa1c7ce22afd841a93;hb=e8fbbb7306430478dec55d2c963eed116d8330cc;hp=ec5f6a4c85e17ed0fb2eaaf4f2f22d8ee2ebf300;hpb=31c81f6539969a5eba864d3305f9fb7bf716a367;p=python_utils.git diff --git a/google_assistant.py b/google_assistant.py index ec5f6a4..4a3a58f 100644 --- a/google_assistant.py +++ b/google_assistant.py @@ -1,7 +1,9 @@ #!/usr/bin/env python3 +"""A module to serve as a local client library around HTTP calls to +the Google Assistant via a local gateway.""" + import logging -import sys import warnings from typing import NamedTuple, Optional @@ -33,6 +35,8 @@ parser.add_argument( class GoogleResponse(NamedTuple): + """A response wrapper.""" + success: bool response: str audio_url: str @@ -57,7 +61,7 @@ def ask_google(cmd: str, *, recognize_speech=True) -> GoogleResponse: is True, perform speech recognition on the audio response from Google so as to translate it into text (best effort, YMMV). """ - logging.debug(f"Asking google: '{cmd}'") + logging.debug("Asking google: '%s'", cmd) payload = { "command": cmd, "user": config.config['google_assistant_username'], @@ -70,12 +74,13 @@ def ask_google(cmd: str, *, recognize_speech=True) -> GoogleResponse: audio_transcription: Optional[str] = "" if r.status_code == 200: j = r.json() + logger.debug(j) success = bool(j["success"]) response = j["response"] if success else j["error"] if success: logger.debug('Google request succeeded.') if len(response) > 0: - logger.debug(f"Google said: '{response}'") + logger.debug("Google said: '%s'", response) audio = f"{config.config['google_assistant_bridge']}{j['audio']}" if recognize_speech: recognizer = sr.Recognizer() @@ -91,7 +96,7 @@ def ask_google(cmd: str, *, recognize_speech=True) -> GoogleResponse: audio_transcription = recognizer.recognize_google( speech, ) - logger.debug(f"Transcription: '{audio_transcription}'") + logger.debug("Transcription: '%s'", audio_transcription) except sr.UnknownValueError as e: logger.exception(e) msg = 'Unable to parse Google assistant\'s response.' @@ -113,4 +118,3 @@ def ask_google(cmd: str, *, recognize_speech=True) -> GoogleResponse: audio_url=audio, audio_transcription=audio_transcription, ) - sys.exit(-1)