From 9bc20638ba5ff5a3ccbbc9838eafb99bc7646eb9 Mon Sep 17 00:00:00 2001 From: Mathieu Date: Thu, 14 Oct 2021 08:01:15 +0200 Subject: [PATCH 1/4] Renamed tts folder to stt (i mixed up the two) --- jarvis/utils/{tts => stt}/vosk/__init__.py | 0 jarvis/utils/{tts => stt}/vosk/model/AUTHORS | 0 jarvis/utils/{tts => stt}/vosk/model/Gr.fst | Bin jarvis/utils/{tts => stt}/vosk/model/HCLr.fst | Bin jarvis/utils/{tts => stt}/vosk/model/LICENSE | 0 jarvis/utils/{tts => stt}/vosk/model/README.md | 0 .../utils/{tts => stt}/vosk/model/disambig_tid.int | 0 jarvis/utils/{tts => stt}/vosk/model/final.mdl | Bin .../{tts => stt}/vosk/model/ivector/final.dubm | Bin .../utils/{tts => stt}/vosk/model/ivector/final.ie | Bin .../utils/{tts => stt}/vosk/model/ivector/final.mat | Bin .../vosk/model/ivector/global_cmvn.stats | 0 .../vosk/model/ivector/online_cmvn.conf | 0 .../{tts => stt}/vosk/model/ivector/splice.conf | 0 jarvis/utils/{tts => stt}/vosk/model/mfcc.conf | 0 .../utils/{tts => stt}/vosk/model/word_boundary.int | 0 jarvis/utils/{tts => stt}/vosk/model_en/README | 0 .../utils/{tts => stt}/vosk/model_en/am/final.mdl | Bin .../utils/{tts => stt}/vosk/model_en/conf/mfcc.conf | 0 .../{tts => stt}/vosk/model_en/conf/model.conf | 0 .../utils/{tts => stt}/vosk/model_en/graph/Gr.fst | Bin .../utils/{tts => stt}/vosk/model_en/graph/HCLr.fst | Bin .../vosk/model_en/graph/disambig_tid.int | 0 .../vosk/model_en/graph/phones/word_boundary.int | 0 .../{tts => stt}/vosk/model_en/ivector/final.dubm | Bin .../{tts => stt}/vosk/model_en/ivector/final.ie | Bin .../{tts => stt}/vosk/model_en/ivector/final.mat | Bin .../vosk/model_en/ivector/global_cmvn.stats | 0 .../vosk/model_en/ivector/online_cmvn.conf | 0 .../{tts => stt}/vosk/model_en/ivector/splice.conf | 0 30 files changed, 0 insertions(+), 0 deletions(-) rename jarvis/utils/{tts => stt}/vosk/__init__.py (100%) rename jarvis/utils/{tts => stt}/vosk/model/AUTHORS (100%) rename jarvis/utils/{tts => stt}/vosk/model/Gr.fst (100%) rename jarvis/utils/{tts => stt}/vosk/model/HCLr.fst (100%) rename jarvis/utils/{tts => stt}/vosk/model/LICENSE (100%) rename jarvis/utils/{tts => stt}/vosk/model/README.md (100%) rename jarvis/utils/{tts => stt}/vosk/model/disambig_tid.int (100%) rename jarvis/utils/{tts => stt}/vosk/model/final.mdl (100%) rename jarvis/utils/{tts => stt}/vosk/model/ivector/final.dubm (100%) rename jarvis/utils/{tts => stt}/vosk/model/ivector/final.ie (100%) rename jarvis/utils/{tts => stt}/vosk/model/ivector/final.mat (100%) rename jarvis/utils/{tts => stt}/vosk/model/ivector/global_cmvn.stats (100%) rename jarvis/utils/{tts => stt}/vosk/model/ivector/online_cmvn.conf (100%) rename jarvis/utils/{tts => stt}/vosk/model/ivector/splice.conf (100%) rename jarvis/utils/{tts => stt}/vosk/model/mfcc.conf (100%) rename jarvis/utils/{tts => stt}/vosk/model/word_boundary.int (100%) rename jarvis/utils/{tts => stt}/vosk/model_en/README (100%) rename jarvis/utils/{tts => stt}/vosk/model_en/am/final.mdl (100%) rename jarvis/utils/{tts => stt}/vosk/model_en/conf/mfcc.conf (100%) rename jarvis/utils/{tts => stt}/vosk/model_en/conf/model.conf (100%) rename jarvis/utils/{tts => stt}/vosk/model_en/graph/Gr.fst (100%) rename jarvis/utils/{tts => stt}/vosk/model_en/graph/HCLr.fst (100%) rename jarvis/utils/{tts => stt}/vosk/model_en/graph/disambig_tid.int (100%) rename jarvis/utils/{tts => stt}/vosk/model_en/graph/phones/word_boundary.int (100%) rename jarvis/utils/{tts => stt}/vosk/model_en/ivector/final.dubm (100%) rename jarvis/utils/{tts => stt}/vosk/model_en/ivector/final.ie (100%) rename jarvis/utils/{tts => stt}/vosk/model_en/ivector/final.mat (100%) rename jarvis/utils/{tts => stt}/vosk/model_en/ivector/global_cmvn.stats (100%) rename jarvis/utils/{tts => stt}/vosk/model_en/ivector/online_cmvn.conf (100%) rename jarvis/utils/{tts => stt}/vosk/model_en/ivector/splice.conf (100%) diff --git a/jarvis/utils/tts/vosk/__init__.py b/jarvis/utils/stt/vosk/__init__.py similarity index 100% rename from jarvis/utils/tts/vosk/__init__.py rename to jarvis/utils/stt/vosk/__init__.py diff --git a/jarvis/utils/tts/vosk/model/AUTHORS b/jarvis/utils/stt/vosk/model/AUTHORS similarity index 100% rename from jarvis/utils/tts/vosk/model/AUTHORS rename to jarvis/utils/stt/vosk/model/AUTHORS diff --git a/jarvis/utils/tts/vosk/model/Gr.fst b/jarvis/utils/stt/vosk/model/Gr.fst similarity index 100% rename from jarvis/utils/tts/vosk/model/Gr.fst rename to jarvis/utils/stt/vosk/model/Gr.fst diff --git a/jarvis/utils/tts/vosk/model/HCLr.fst b/jarvis/utils/stt/vosk/model/HCLr.fst similarity index 100% rename from jarvis/utils/tts/vosk/model/HCLr.fst rename to jarvis/utils/stt/vosk/model/HCLr.fst diff --git a/jarvis/utils/tts/vosk/model/LICENSE b/jarvis/utils/stt/vosk/model/LICENSE similarity index 100% rename from jarvis/utils/tts/vosk/model/LICENSE rename to jarvis/utils/stt/vosk/model/LICENSE diff --git a/jarvis/utils/tts/vosk/model/README.md b/jarvis/utils/stt/vosk/model/README.md similarity index 100% rename from jarvis/utils/tts/vosk/model/README.md rename to jarvis/utils/stt/vosk/model/README.md diff --git a/jarvis/utils/tts/vosk/model/disambig_tid.int b/jarvis/utils/stt/vosk/model/disambig_tid.int similarity index 100% rename from jarvis/utils/tts/vosk/model/disambig_tid.int rename to jarvis/utils/stt/vosk/model/disambig_tid.int diff --git a/jarvis/utils/tts/vosk/model/final.mdl b/jarvis/utils/stt/vosk/model/final.mdl similarity index 100% rename from jarvis/utils/tts/vosk/model/final.mdl rename to jarvis/utils/stt/vosk/model/final.mdl diff --git a/jarvis/utils/tts/vosk/model/ivector/final.dubm b/jarvis/utils/stt/vosk/model/ivector/final.dubm similarity index 100% rename from jarvis/utils/tts/vosk/model/ivector/final.dubm rename to jarvis/utils/stt/vosk/model/ivector/final.dubm diff --git a/jarvis/utils/tts/vosk/model/ivector/final.ie b/jarvis/utils/stt/vosk/model/ivector/final.ie similarity index 100% rename from jarvis/utils/tts/vosk/model/ivector/final.ie rename to jarvis/utils/stt/vosk/model/ivector/final.ie diff --git a/jarvis/utils/tts/vosk/model/ivector/final.mat b/jarvis/utils/stt/vosk/model/ivector/final.mat similarity index 100% rename from jarvis/utils/tts/vosk/model/ivector/final.mat rename to jarvis/utils/stt/vosk/model/ivector/final.mat diff --git a/jarvis/utils/tts/vosk/model/ivector/global_cmvn.stats b/jarvis/utils/stt/vosk/model/ivector/global_cmvn.stats similarity index 100% rename from jarvis/utils/tts/vosk/model/ivector/global_cmvn.stats rename to jarvis/utils/stt/vosk/model/ivector/global_cmvn.stats diff --git a/jarvis/utils/tts/vosk/model/ivector/online_cmvn.conf b/jarvis/utils/stt/vosk/model/ivector/online_cmvn.conf similarity index 100% rename from jarvis/utils/tts/vosk/model/ivector/online_cmvn.conf rename to jarvis/utils/stt/vosk/model/ivector/online_cmvn.conf diff --git a/jarvis/utils/tts/vosk/model/ivector/splice.conf b/jarvis/utils/stt/vosk/model/ivector/splice.conf similarity index 100% rename from jarvis/utils/tts/vosk/model/ivector/splice.conf rename to jarvis/utils/stt/vosk/model/ivector/splice.conf diff --git a/jarvis/utils/tts/vosk/model/mfcc.conf b/jarvis/utils/stt/vosk/model/mfcc.conf similarity index 100% rename from jarvis/utils/tts/vosk/model/mfcc.conf rename to jarvis/utils/stt/vosk/model/mfcc.conf diff --git a/jarvis/utils/tts/vosk/model/word_boundary.int b/jarvis/utils/stt/vosk/model/word_boundary.int similarity index 100% rename from jarvis/utils/tts/vosk/model/word_boundary.int rename to jarvis/utils/stt/vosk/model/word_boundary.int diff --git a/jarvis/utils/tts/vosk/model_en/README b/jarvis/utils/stt/vosk/model_en/README similarity index 100% rename from jarvis/utils/tts/vosk/model_en/README rename to jarvis/utils/stt/vosk/model_en/README diff --git a/jarvis/utils/tts/vosk/model_en/am/final.mdl b/jarvis/utils/stt/vosk/model_en/am/final.mdl similarity index 100% rename from jarvis/utils/tts/vosk/model_en/am/final.mdl rename to jarvis/utils/stt/vosk/model_en/am/final.mdl diff --git a/jarvis/utils/tts/vosk/model_en/conf/mfcc.conf b/jarvis/utils/stt/vosk/model_en/conf/mfcc.conf similarity index 100% rename from jarvis/utils/tts/vosk/model_en/conf/mfcc.conf rename to jarvis/utils/stt/vosk/model_en/conf/mfcc.conf diff --git a/jarvis/utils/tts/vosk/model_en/conf/model.conf b/jarvis/utils/stt/vosk/model_en/conf/model.conf similarity index 100% rename from jarvis/utils/tts/vosk/model_en/conf/model.conf rename to jarvis/utils/stt/vosk/model_en/conf/model.conf diff --git a/jarvis/utils/tts/vosk/model_en/graph/Gr.fst b/jarvis/utils/stt/vosk/model_en/graph/Gr.fst similarity index 100% rename from jarvis/utils/tts/vosk/model_en/graph/Gr.fst rename to jarvis/utils/stt/vosk/model_en/graph/Gr.fst diff --git a/jarvis/utils/tts/vosk/model_en/graph/HCLr.fst b/jarvis/utils/stt/vosk/model_en/graph/HCLr.fst similarity index 100% rename from jarvis/utils/tts/vosk/model_en/graph/HCLr.fst rename to jarvis/utils/stt/vosk/model_en/graph/HCLr.fst diff --git a/jarvis/utils/tts/vosk/model_en/graph/disambig_tid.int b/jarvis/utils/stt/vosk/model_en/graph/disambig_tid.int similarity index 100% rename from jarvis/utils/tts/vosk/model_en/graph/disambig_tid.int rename to jarvis/utils/stt/vosk/model_en/graph/disambig_tid.int diff --git a/jarvis/utils/tts/vosk/model_en/graph/phones/word_boundary.int b/jarvis/utils/stt/vosk/model_en/graph/phones/word_boundary.int similarity index 100% rename from jarvis/utils/tts/vosk/model_en/graph/phones/word_boundary.int rename to jarvis/utils/stt/vosk/model_en/graph/phones/word_boundary.int diff --git a/jarvis/utils/tts/vosk/model_en/ivector/final.dubm b/jarvis/utils/stt/vosk/model_en/ivector/final.dubm similarity index 100% rename from jarvis/utils/tts/vosk/model_en/ivector/final.dubm rename to jarvis/utils/stt/vosk/model_en/ivector/final.dubm diff --git a/jarvis/utils/tts/vosk/model_en/ivector/final.ie b/jarvis/utils/stt/vosk/model_en/ivector/final.ie similarity index 100% rename from jarvis/utils/tts/vosk/model_en/ivector/final.ie rename to jarvis/utils/stt/vosk/model_en/ivector/final.ie diff --git a/jarvis/utils/tts/vosk/model_en/ivector/final.mat b/jarvis/utils/stt/vosk/model_en/ivector/final.mat similarity index 100% rename from jarvis/utils/tts/vosk/model_en/ivector/final.mat rename to jarvis/utils/stt/vosk/model_en/ivector/final.mat diff --git a/jarvis/utils/tts/vosk/model_en/ivector/global_cmvn.stats b/jarvis/utils/stt/vosk/model_en/ivector/global_cmvn.stats similarity index 100% rename from jarvis/utils/tts/vosk/model_en/ivector/global_cmvn.stats rename to jarvis/utils/stt/vosk/model_en/ivector/global_cmvn.stats diff --git a/jarvis/utils/tts/vosk/model_en/ivector/online_cmvn.conf b/jarvis/utils/stt/vosk/model_en/ivector/online_cmvn.conf similarity index 100% rename from jarvis/utils/tts/vosk/model_en/ivector/online_cmvn.conf rename to jarvis/utils/stt/vosk/model_en/ivector/online_cmvn.conf diff --git a/jarvis/utils/tts/vosk/model_en/ivector/splice.conf b/jarvis/utils/stt/vosk/model_en/ivector/splice.conf similarity index 100% rename from jarvis/utils/tts/vosk/model_en/ivector/splice.conf rename to jarvis/utils/stt/vosk/model_en/ivector/splice.conf From c5dec4c83b366d08e9b97a0520b03f1a707f1942 Mon Sep 17 00:00:00 2001 From: Mathieu Date: Thu, 14 Oct 2021 08:52:56 +0200 Subject: [PATCH 2/4] Moved languages.json and spacy.json to utils/config/ as they do not need to be user-modifiable --- jarvis/{ => utils}/config/languages.json | 0 jarvis/{ => utils}/config/spacy.json | 0 jarvis/utils/languages_utils.py | 6 +++--- 3 files changed, 3 insertions(+), 3 deletions(-) rename jarvis/{ => utils}/config/languages.json (100%) rename jarvis/{ => utils}/config/spacy.json (100%) diff --git a/jarvis/config/languages.json b/jarvis/utils/config/languages.json similarity index 100% rename from jarvis/config/languages.json rename to jarvis/utils/config/languages.json diff --git a/jarvis/config/spacy.json b/jarvis/utils/config/spacy.json similarity index 100% rename from jarvis/config/spacy.json rename to jarvis/utils/config/spacy.json diff --git a/jarvis/utils/languages_utils.py b/jarvis/utils/languages_utils.py index fda9c4b..8e3894f 100644 --- a/jarvis/utils/languages_utils.py +++ b/jarvis/utils/languages_utils.py @@ -21,11 +21,11 @@ def get_language_only_country(): def get_language_full_name(name=None): """ - Return for exemple french for fr-fr, english for en-en, etc (savec in languages.json in the config folder) + Return for exemple french for fr-fr, english for en-en, etc (saved in languages.json in the config folder) Return english if the language isn't found in the languages.json file """ - config_json = json.load(open(path + "/config/languages.json", encoding='utf-8', mode='r')) + config_json = json.load(open(path + "/utils/config/languages.json", encoding='utf-8', mode='r')) if name is None: name = get_language() @@ -37,7 +37,7 @@ def get_language_full_name(name=None): def get_spacy_model(language=None): - spacy_model = json.load(open(path + "/config/spacy.json", encoding='utf-8', mode='r')) + spacy_model = json.load(open(path + "/utils/config/spacy.json", encoding='utf-8', mode='r')) if language is None: language = get_language() From 462c39936c044c2cee8e705ab4cd46d56269de23 Mon Sep 17 00:00:00 2001 From: Mathieu Date: Thu, 14 Oct 2021 08:58:44 +0200 Subject: [PATCH 3/4] Removed unused configurations values from config.json --- jarvis/config/config.json | 4 +--- jarvis/main.py | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/jarvis/config/config.json b/jarvis/config/config.json index f48fc90..6d17ea3 100644 --- a/jarvis/config/config.json +++ b/jarvis/config/config.json @@ -1,7 +1,5 @@ { "PORT": 5000, - "12HOURS-FORMAT": false, "LANGUAGE": "fr-fr", - "TTS_VOICE": "marytts:upmc-pierre-hsmm", - "PAUSE_MUSIC_AFTER_HOTWORD": true + "TTS_VOICE": "marytts:upmc-pierre-hsmm" } diff --git a/jarvis/main.py b/jarvis/main.py index 03c603c..1bda34b 100644 --- a/jarvis/main.py +++ b/jarvis/main.py @@ -18,7 +18,7 @@ def start(): # Supported : English French German Hungarian Italian Portuguese Swedish lingua_franca.load_language(lang=languages_utils.get_language_only_country()) - # Tests + # Register all skills WikipediaSkill().register() JokesSkill().register() SpotifySkill().register() @@ -29,7 +29,6 @@ def start(): HomeAssistantSkill().register() MovieMaster().register() - # TODO: movies master skill # TODO: calculator skill # TODO: google/ddg help skill # TODO: unit converter skill From de91f18a687b282d529f6e186b15427bcfda84b4 Mon Sep 17 00:00:00 2001 From: Mathieu Date: Thu, 14 Oct 2021 11:49:49 +0200 Subject: [PATCH 4/4] Added ideas from Google Assistants (TODOS) --- todo_ideas_google.txt | 47 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 todo_ideas_google.txt diff --git a/todo_ideas_google.txt b/todo_ideas_google.txt new file mode 100644 index 0000000..6ee9a45 --- /dev/null +++ b/todo_ideas_google.txt @@ -0,0 +1,47 @@ +Ok Google souviens-toi que j’ai mis les clés [ou n’importe quel objet] à l’entrée [ou n’importe quel autre endroit] +Ok Google, où sont mes clés ? + + + +Ok Google, où se trouve mon smartphone / iPhone ? + + + +Ok Google, rappelle-moi de rappeler ma mère à 18 heures + + + +Ok Google, comment dit-on merci en Chinois mandarin ? +Ok Google, traduis “je t’aime” en japonais + + +Ok Google, appairage Bluetooth +Ok Google, déconnecte le Bluetooth + + +Ok Google, mets le minuteur sur 5 minutes +Ok Google, combien de temps reste-t-il sur le minuteur ? +Ok Google, arrête/annule le minuteur +Ok Google, stop (lorsque le minuteur sonne) + + + +Ok Google, mets une alarme à [heure] +Ok Google, annule l’alarme + + + +Ok Google, quelle est la définition de [mot] + + + +Ok Google, raconte-moi quelque chose d’intéressant + + + +Ok Google, parle à Akinator + + + +Ok Google, raconte-moi une histoire +