From 23602d8f3ef9781a1304b6e8beeb69126fadacad Mon Sep 17 00:00:00 2001
From: builderjer <builderjer@gmail.com>
Date: Fri, 25 Aug 2023 07:46:44 -0600
Subject: [PATCH] maybe?

---
 stage-audio/01-speech/01-run.sh            | 3 +--
 stage-audio/01-speech/02-run-chroot.sh     | 2 ++
 stage-audio/02-voice/01-run.sh             | 7 +++----
 stage-core/01-ovos-core/files/mycroft.conf | 7 +++++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/stage-audio/01-speech/01-run.sh b/stage-audio/01-speech/01-run.sh
index 485e0cc..a00af52 100755
--- a/stage-audio/01-speech/01-run.sh
+++ b/stage-audio/01-speech/01-run.sh
@@ -20,8 +20,7 @@ install -v -d -m 0755 "${ROOTFS_DIR}/home/ovos/.local/share"
 install -v -d -m 0755 "${ROOTFS_DIR}/home/ovos/.local/share/piper_tts"
 install -v -d -m 0755 "${ROOTFS_DIR}/home/ovos/.local/share/piper_tts/voice-en-gb-alan-low"
 
-wget https://github.com/rhasspy/piper/releases/download/v0.0.2/voice-en-gb-alan-low.tar.gz
-mv voice-en-gb-alan-low.tar.gz "${ROOTFS_DIR}/home/ovos/.local/share/piper_tts/voice-en-gb-alan-low/"
+wget https://github.com/rhasspy/piper/releases/download/v0.0.2/voice-en-gb-alan-low.tar.gz -P "${ROOTFS_DIR}/home/ovos/.local/share/piper_tts/voice-en-gb-alan-low/voice-en-gb-alan-low.tar.gz"
 tar -xvzf "${ROOTFS_DIR}/home/ovos/.local/share/piper_tts/voice-en-gb-alan-low/voice-en-gb-alan-low.tar.gz"
 
 install -v -m 0644 files/ovos-audio.service "${ROOTFS_DIR}/etc/systemd/user/ovos-audio.service"
diff --git a/stage-audio/01-speech/02-run-chroot.sh b/stage-audio/01-speech/02-run-chroot.sh
index a74cac6..a9b46f9 100755
--- a/stage-audio/01-speech/02-run-chroot.sh
+++ b/stage-audio/01-speech/02-run-chroot.sh
@@ -3,5 +3,7 @@ pip3 install git+https://github.com/builderjer/ovos-tts-plugin-piper
 pip3 install git+https://github.com/OpenVoiceOS/ovos-tts-server-plugin
 pip3 install git+https://github.com/OpenVoiceOS/ovos-tts-plugin-mimic
 
+pip3 install espeak_phonemizer
+
 pip3 install padatious
 pip3 install fann2==1.0.7
diff --git a/stage-audio/02-voice/01-run.sh b/stage-audio/02-voice/01-run.sh
index d895203..fb5f95c 100755
--- a/stage-audio/02-voice/01-run.sh
+++ b/stage-audio/02-voice/01-run.sh
@@ -3,12 +3,11 @@
 install -v -d -m 0755 "${ROOTFS_DIR}/home/ovos/.local/share"
 
 install -v -d -m 0755 "${ROOTFS_DIR}/home/ovos/.local/share/openwakeword"
+install -v -d -m 0755 "${ROOTFS_DIR}/home/ovos/.local/share/precise_lite"
 
-wget https://github.com/dscripka/openWakeWord/blob/main/openwakeword/resources/models/hey_mycroft_v0.1.onnx
+wget https://github.com/dscripka/openWakeWord/blob/main/openwakeword/resources/models/hey_mycroft_v0.1.onnx -P "${ROOTFS_DIR}/home/ovos/.local/share/openwakeword/hey_mycroft_v0.1.onnx"
 
-install -v -m 0644 hey_mycroft_v0.1.onnx "${ROOTFS_DIR}/home/ovos/.local/share/openwakeword/"
-
-rm hey_mycroft_v0.1.onnx
+wget https://github.com/OpenVoiceOS/precise-lite-models/blob/master/wakewords/en/hey_mycroft.tflite -P "${ROOTFS_DIR}/home/ovos/.local/share/precise_lite/hey_mycroft.tflite"
 
 install -v -m 0644 files/ovos-dinkum-listener.service "${ROOTFS_DIR}/etc/systemd/user/ovos-dinkum-listener.service"
 install -v -m 0755 files/ovos-systemd-dinkum-listener "${ROOTFS_DIR}/usr/libexec/ovos-systemd-dinkum-listener"
diff --git a/stage-core/01-ovos-core/files/mycroft.conf b/stage-core/01-ovos-core/files/mycroft.conf
index 5d2851d..98463c0 100644
--- a/stage-core/01-ovos-core/files/mycroft.conf
+++ b/stage-core/01-ovos-core/files/mycroft.conf
@@ -12,7 +12,7 @@
     "hotwords": {
         "hey_mycroft": {
             "module": "ovos-ww-plugin-precise-lite",
-            "model": "https://github.com/OpenVoiceOS/precise-lite-models/raw/master/wakewords/en/hey_mycroft.tflite",
+            "model": "/home/ovos/.local/share/precise_lite/hey_mycroft.tflite",
             "listen": true,
             "sound": "snd/start_listening.wav",
             "expected_duration": 3,
@@ -22,6 +22,7 @@
             },
         "hey_mycroft_openwakeword": {
             "module": "ovos-ww-plugin-openwakeword",
+            "models": ["/home/ovos/.local/share/openwakeword/hey_mycroft_v0.1.onnx"]
             "threshold": 0.4,
             "fallback_ww": "hey_mycroft_vosk"
             },
@@ -41,7 +42,9 @@
         },
     "tts": {
         "module": "ovos-tts-plugin-piper",
-        "ovos-tts-plugin-piper": {},
+        "ovos-tts-plugin-piper": {
+            "model": "alan-low"
+            },
         "fallback_module": "ovos-tts-plugin-mimic",
         "ovos-tts-plugin-mimic": {
             "voice": "ap"