Increase timeout.

[python_utils.git] / google_assistant.py

diff --git a/google_assistant.py b/google_assistant.py
index 75ca6432cf76b9f84506aa549855e5cec25e1844..adfdca49afb99bc3862611649ad5661ab558249c 100644 (file)
--- a/google_assistant.py
+++ b/google_assistant.py
@@ -1,9 +1,12 @@
 #!/usr/bin/env python3
 
 #!/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 logging

-from typing import NamedTuple
-import sys

 import warnings
 import warnings

+from dataclasses import dataclass
+from typing import Optional

 
 import requests
 import speech_recognition as sr  # type: ignore
 
 import requests
 import speech_recognition as sr  # type: ignore


@@ -32,11 +35,14 @@ parser.add_argument(
 )
 
 
 )
 
 

-class GoogleResponse(NamedTuple):
-    success: bool
-    response: str
-    audio_url: str
-    audio_transcription: str
+@dataclass
+class GoogleResponse:
+    """A response wrapper."""
+
+    success: bool = False
+    response: str = ''
+    audio_url: str = ''
+    audio_transcription: Optional[str] = None  # None if not available.

 
     def __repr__(self):
         return f"""
 
     def __repr__(self):
         return f"""


@@ -57,7 +63,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).
     """
     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'],
     payload = {
         "command": cmd,
         "user": config.config['google_assistant_username'],


@@ -67,15 +73,16 @@ def ask_google(cmd: str, *, recognize_speech=True) -> GoogleResponse:
     success = False
     response = ""
     audio = ""
     success = False
     response = ""
     audio = ""

-    audio_transcription = ""
+    audio_transcription: Optional[str] = ""

     if r.status_code == 200:
         j = r.json()
     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:
         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()
         audio = f"{config.config['google_assistant_bridge']}{j['audio']}"
         if recognize_speech:
             recognizer = sr.Recognizer()


@@ -91,7 +98,7 @@ def ask_google(cmd: str, *, recognize_speech=True) -> GoogleResponse:
                     audio_transcription = recognizer.recognize_google(
                         speech,
                     )
                     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.'
                 except sr.UnknownValueError as e:
                     logger.exception(e)
                     msg = 'Unable to parse Google assistant\'s response.'


@@ -105,9 +112,7 @@ def ask_google(cmd: str, *, recognize_speech=True) -> GoogleResponse:
             audio_transcription=audio_transcription,
         )
     else:
             audio_transcription=audio_transcription,
         )
     else:

-        message = (
-            f'HTTP request to {url} with {payload} failed; code {r.status_code}'
-        )
+        message = f'HTTP request to {url} with {payload} failed; code {r.status_code}'

         logger.error(message)
         return GoogleResponse(
             success=False,
         logger.error(message)
         return GoogleResponse(
             success=False,


@@ -115,4 +120,3 @@ def ask_google(cmd: str, *, recognize_speech=True) -> GoogleResponse:
             audio_url=audio,
             audio_transcription=audio_transcription,
         )
             audio_url=audio,
             audio_transcription=audio_transcription,
         )

-        sys.exit(-1)