projects
/
python_utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adds unittest.
[python_utils.git]
/
google_assistant.py
diff --git
a/google_assistant.py
b/google_assistant.py
index 041648ca4f15e9db4ce1b1df2862d948ec450325..b0aabf37095ef986b35b726d02700f55d017f78b 100644
(file)
--- a/
google_assistant.py
+++ b/
google_assistant.py
@@
-1,9
+1,9
@@
#!/usr/bin/env python3
import logging
#!/usr/bin/env python3
import logging
-from typing import NamedTuple
import sys
import warnings
import sys
import warnings
+from typing import NamedTuple, Optional
import requests
import speech_recognition as sr # type: ignore
import requests
import speech_recognition as sr # type: ignore
@@
-21,14
+21,14
@@
parser.add_argument(
type=str,
default="http://kiosk.house:3000",
metavar="URL",
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",
)
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"
,
)
)
@@
-36,7
+36,7
@@
class GoogleResponse(NamedTuple):
success: bool
response: str
audio_url: str
success: bool
response: str
audio_url: str
- audio_transcription:
str
+ audio_transcription:
Optional[str] # None if not available.
def __repr__(self):
return f"""
def __repr__(self):
return f"""
@@
-67,9
+67,10
@@
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:
success = bool(j["success"])
response = j["response"] if success else j["error"]
if success:
@@
-96,7
+97,7
@@
def ask_google(cmd: str, *, recognize_speech=True) -> GoogleResponse:
logger.exception(e)
msg = 'Unable to parse Google assistant\'s response.'
logger.warning(msg)
logger.exception(e)
msg = 'Unable to parse Google assistant\'s response.'
logger.warning(msg)
- warnings.warn(msg)
+ warnings.warn(msg
, stacklevel=3
)
audio_transcription = None
return GoogleResponse(
success=success,
audio_transcription = None
return GoogleResponse(
success=success,