Restore mimic (#82)

* fix mycroft.conf * roll back to ovos-tts-plugin-server from ovos-tts-plugin-piper until I can figure out the model issue
OpenVoiceOS · Aug 26, 2023 · bec5122 · bec5122
1 parent fbef378
commit bec5122
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 13 deletions.
diff --git a/.github/workflows/raspbian-ovos.yaml b/.github/workflows/raspbian-ovos.yaml
@@ -130,6 +130,6 @@ jobs:
           password: ${{ secrets.PASSWORD }}
           port: ${{ secrets.SSH_PORT }}
           source: "${{ steps.build.outputs.image-path }}"
-          target: "raspbian/development"
+          target: "raspbian/development/.testing"
           strip_components: 4
 
diff --git a/stage-audio/01-speech/01-run.sh b/stage-audio/01-speech/01-run.sh
@@ -20,9 +20,12 @@ 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/"
-tar -xvzf "${ROOTFS_DIR}/home/ovos/.local/share/piper_tts/voice-en-gb-alan-low/voice-en-gb-alan-low.tar.gz"
+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/"
+on_chroot << EOF
+
+tar -xvzf /home/ovos/.local/share/piper_tts/voice-en-gb-alan-low/voice-en-gb-alan-low.tar.gz
+
+EOF
 
 install -v -m 0644 files/ovos-audio.service "${ROOTFS_DIR}/etc/systemd/user/ovos-audio.service"
 install -v -m 0755 files/ovos-systemd-audio "${ROOTFS_DIR}/usr/libexec/ovos-systemd-audio"

diff --git a/stage-audio/01-speech/02-run-chroot.sh b/stage-audio/01-speech/02-run-chroot.sh
@@ -3,5 +3,6 @@ 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
@@ -3,12 +3,12 @@
 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/raw/main/openwakeword/resources/models/hey_mycroft_v0.1.tflite -P "${ROOTFS_DIR}/home/ovos/.local/share/openwakeword/"
 
-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/raw/master/wakewords/en/hey_mycroft.tflite -P "${ROOTFS_DIR}/home/ovos/.local/share/precise_lite/"
 
 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
@@ -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.tflite"],
             "threshold": 0.4,
             "fallback_ww": "hey_mycroft_vosk"
             },
@@ -40,8 +41,10 @@
             }
         },
     "tts": {
-        "module": "ovos-tts-plugin-piper",
-        "ovos-tts-plugin-piper": {},
+        "module": "ovos-tts-plugin-server",
+        "ovos-tts-plugin-piper": {
+            "model": "alan-low"
+            },
         "fallback_module": "ovos-tts-plugin-mimic",
         "ovos-tts-plugin-mimic": {
             "voice": "ap"

diff --git a/stage-finalize/EXPORT_IMAGE b/stage-finalize/EXPORT_IMAGE
@@ -3,4 +3,4 @@ if [ "${USE_QEMU}" = "1" ]; then
 export IMG_SUFFIX="${IMG_SUFFIX}-qemu"
 fi
 
-ARCHIVE_FILENAME="raspbian-ovos-dev_"$(date +%s)
+ARCHIVE_FILENAME="raspbian-ovos-dev_mimic"
diff --git a/stage-prep/02-install-packages/01-packages b/stage-prep/02-install-packages/01-packages
@@ -1,5 +1,5 @@
 python3-dev swig libssl-dev libfann-dev portaudio19-dev libpulse-dev
-python3-pip python3-wheel python3-setuptools
+python3-pip python3-wheel python3-setuptools python3-fann2
 pulseaudio
 mpg123
 git