From 23602d8f3ef9781a1304b6e8beeb69126fadacad Mon Sep 17 00:00:00 2001 From: builderjer Date: Fri, 25 Aug 2023 07:46:44 -0600 Subject: [PATCH 1/8] 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" From 622c0b94fba42909fc55d54adbd92ab6c49747cd Mon Sep 17 00:00:00 2001 From: builderjer Date: Fri, 25 Aug 2023 07:48:48 -0600 Subject: [PATCH 2/8] change upload for testing --- .github/workflows/raspbian-ovos.yaml | 2 +- stage-finalize/EXPORT_IMAGE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/raspbian-ovos.yaml b/.github/workflows/raspbian-ovos.yaml index 125a2cd..40d7302 100644 --- 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-finalize/EXPORT_IMAGE b/stage-finalize/EXPORT_IMAGE index 47a1ffa..9e3baab 100644 --- 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" From 65cc8d2b0446e8bf6bb078a59fa02c9e09a838da Mon Sep 17 00:00:00 2001 From: builderjer Date: Fri, 25 Aug 2023 09:02:02 -0600 Subject: [PATCH 3/8] fix fann? --- stage-audio/01-speech/02-run-chroot.sh | 1 - stage-prep/02-install-packages/01-packages | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/stage-audio/01-speech/02-run-chroot.sh b/stage-audio/01-speech/02-run-chroot.sh index a9b46f9..f727be5 100755 --- a/stage-audio/01-speech/02-run-chroot.sh +++ b/stage-audio/01-speech/02-run-chroot.sh @@ -6,4 +6,3 @@ 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-prep/02-install-packages/01-packages b/stage-prep/02-install-packages/01-packages index 266adf3..6b786c7 100644 --- 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 From 10284b83836a14f3daec0fc8322797801fce6899 Mon Sep 17 00:00:00 2001 From: builderjer Date: Fri, 25 Aug 2023 10:01:19 -0600 Subject: [PATCH 4/8] fix wget downloads --- stage-audio/01-speech/01-run.sh | 2 +- stage-audio/02-voice/01-run.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stage-audio/01-speech/01-run.sh b/stage-audio/01-speech/01-run.sh index a00af52..dba2ebc 100755 --- a/stage-audio/01-speech/01-run.sh +++ b/stage-audio/01-speech/01-run.sh @@ -20,7 +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 -P "${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/" 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/02-voice/01-run.sh b/stage-audio/02-voice/01-run.sh index fb5f95c..fa48338 100755 --- a/stage-audio/02-voice/01-run.sh +++ b/stage-audio/02-voice/01-run.sh @@ -5,9 +5,9 @@ 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 -P "${ROOTFS_DIR}/home/ovos/.local/share/openwakeword/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/" -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" +wget https://github.com/OpenVoiceOS/precise-lite-models/blob/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" From c551e6a3d3305075ac960627bd19f0fca6fd0a48 Mon Sep 17 00:00:00 2001 From: builderjer Date: Sat, 26 Aug 2023 08:21:30 -0600 Subject: [PATCH 5/8] fixes - ww download - tts downloads...I hope --- stage-audio/01-speech/01-run.sh | 6 +++++- stage-audio/02-voice/01-run.sh | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/stage-audio/01-speech/01-run.sh b/stage-audio/01-speech/01-run.sh index dba2ebc..6d1b912 100755 --- a/stage-audio/01-speech/01-run.sh +++ b/stage-audio/01-speech/01-run.sh @@ -21,7 +21,11 @@ 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 -P "${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" +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/02-voice/01-run.sh b/stage-audio/02-voice/01-run.sh index fa48338..04f8a27 100755 --- a/stage-audio/02-voice/01-run.sh +++ b/stage-audio/02-voice/01-run.sh @@ -5,9 +5,10 @@ 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 -P "${ROOTFS_DIR}/home/ovos/.local/share/openwakeword/" +wget https://github.com/dscripka/openWakeWord/raw/main/openwakeword/resources/models/hey_mycroft_v0.1.tflite -P "${ROOTFS_DIR}/home/ovos/.local/share/openwakeword/" -wget https://github.com/OpenVoiceOS/precise-lite-models/blob/master/wakewords/en/hey_mycroft.tflite -P "${ROOTFS_DIR}/home/ovos/.local/share/precise_lite/" + +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" From cc7468e6150fe9297de7bd6c5296baf963af26f4 Mon Sep 17 00:00:00 2001 From: builderjer Date: Sat, 26 Aug 2023 08:27:50 -0600 Subject: [PATCH 6/8] fix mycroft.conf --- stage-core/01-ovos-core/files/mycroft.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage-core/01-ovos-core/files/mycroft.conf b/stage-core/01-ovos-core/files/mycroft.conf index 98463c0..71c6a89 100644 --- a/stage-core/01-ovos-core/files/mycroft.conf +++ b/stage-core/01-ovos-core/files/mycroft.conf @@ -22,7 +22,7 @@ }, "hey_mycroft_openwakeword": { "module": "ovos-ww-plugin-openwakeword", - "models": ["/home/ovos/.local/share/openwakeword/hey_mycroft_v0.1.onnx"] + "models": ["/home/ovos/.local/share/openwakeword/hey_mycroft_v0.1.onnx"], "threshold": 0.4, "fallback_ww": "hey_mycroft_vosk" }, From ef16cd0d8b6af973cf3bd90d6c3e974c5ba9d548 Mon Sep 17 00:00:00 2001 From: builderjer Date: Sat, 26 Aug 2023 08:29:00 -0600 Subject: [PATCH 7/8] fix mycroft.conf --- stage-core/01-ovos-core/files/mycroft.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage-core/01-ovos-core/files/mycroft.conf b/stage-core/01-ovos-core/files/mycroft.conf index 71c6a89..81e220d 100644 --- a/stage-core/01-ovos-core/files/mycroft.conf +++ b/stage-core/01-ovos-core/files/mycroft.conf @@ -22,7 +22,7 @@ }, "hey_mycroft_openwakeword": { "module": "ovos-ww-plugin-openwakeword", - "models": ["/home/ovos/.local/share/openwakeword/hey_mycroft_v0.1.onnx"], + "models": ["/home/ovos/.local/share/openwakeword/hey_mycroft_v0.1.tflite"], "threshold": 0.4, "fallback_ww": "hey_mycroft_vosk" }, From 576e101969ea05674ca8888e9a211721c7fca432 Mon Sep 17 00:00:00 2001 From: builderjer Date: Sat, 26 Aug 2023 13:01:07 -0600 Subject: [PATCH 8/8] roll back to ovos-tts-plugin-server from ovos-tts-plugin-piper until I can figure out the model issue --- stage-core/01-ovos-core/files/mycroft.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stage-core/01-ovos-core/files/mycroft.conf b/stage-core/01-ovos-core/files/mycroft.conf index 81e220d..b3e60b2 100644 --- a/stage-core/01-ovos-core/files/mycroft.conf +++ b/stage-core/01-ovos-core/files/mycroft.conf @@ -41,7 +41,7 @@ } }, "tts": { - "module": "ovos-tts-plugin-piper", + "module": "ovos-tts-plugin-server", "ovos-tts-plugin-piper": { "model": "alan-low" },