From e1151527d42315d24d42ba2bdd5d4fe7956e153a Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Wed, 20 Sep 2023 09:52:01 -0700 Subject: [PATCH 1/4] Specify WebRTC VAD for Mark2 to work around Silero issue Update dependencies to remove pinned versions and resolve compat. bugs --- neon_core/configuration/mark_2/neon.yaml | 2 +- requirements/requirements.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/neon_core/configuration/mark_2/neon.yaml b/neon_core/configuration/mark_2/neon.yaml index eb988d3c4..17bd27bcd 100644 --- a/neon_core/configuration/mark_2/neon.yaml +++ b/neon_core/configuration/mark_2/neon.yaml @@ -28,7 +28,7 @@ confirm_listening: true listener: VAD: silence_method: vad_only - module: ovos-vad-plugin-silero + module: ovos-vad-plugin-webrtcvad mute_during_output: false instant_listen: true speech_begin: 0.5 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index f8e5ddd4a..fc8a2186f 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,6 +1,6 @@ # mycroft ovos-core~=0.0.7 -ovos-workshop~=0.0.12 +ovos-workshop==0.0.12 # TODO: 0.0.13a1 introduces bug in NeonFallbackSkill # padacioso==0.1.3a2 ovos-plugin-common-play~=0.0.5 @@ -9,8 +9,8 @@ neon-utils[network]~=1.6,>=1.6.2 ovos-utils~=0.0.35 ovos-bus-client~=0.0.5 neon-transformers~=0.2 -ovos-config==0.0.11a9 # TODO: Pinned for stable release -ovos-skills-manager==0.0.13a4 # TODO: Pinned for stable release +ovos-config~=0.0.11a9 +ovos-skills-manager~=0.0.13a4 # TODO: Deprecate usage ovos-plugin-manager~=0.0.21 ovos-backend-client~=0.0.6 psutil~=5.6 @@ -29,7 +29,7 @@ requests < 2.30.0 # TODO: Patching dependencies ovos-core[skills,skills_lgpl] extra deps adapt-parser~=0.5 padacioso~=0.1 -ovos-lingua-franca==0.4.8a6 # TODO: Pinned for stable release +ovos-lingua-franca~=0.4.8a6 ovos-phal-plugin-connectivity-events~=0.0.1 padatious~=0.4.8 fann2==1.0.7 \ No newline at end of file From 87c48917cbbd280ae399e17c288882f4e998dd9c Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Wed, 20 Sep 2023 10:32:09 -0700 Subject: [PATCH 2/4] Patch onnxruntime breaking change https://github.com/microsoft/onnxruntime/issues/17631 --- requirements/local_speech_processing.txt | 2 +- requirements/pi.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements/local_speech_processing.txt b/requirements/local_speech_processing.txt index 4f8eea027..08ac77353 100644 --- a/requirements/local_speech_processing.txt +++ b/requirements/local_speech_processing.txt @@ -1,7 +1,7 @@ neon-stt-plugin-deepspeech-stream-local~=2.0 neon-stt-plugin-nemo~=0.0 neon-tts-plugin-coqui~=0.7,>=0.7.1 - +onnx!=1.16.0 # TODO: Patching https://github.com/microsoft/onnxruntime/issues/17631 # TODO: Local language plugin # Fallback diff --git a/requirements/pi.txt b/requirements/pi.txt index 46a072a38..4492b1600 100644 --- a/requirements/pi.txt +++ b/requirements/pi.txt @@ -12,6 +12,7 @@ neon-mana-utils~=0.2,>=0.2.2 # Default plugins ovos-vad-plugin-silero~=0.0.1 +onnx!=1.16.0 # TODO: Patching https://github.com/microsoft/onnxruntime/issues/17631 ovos-ww-plugin-precise~=0.1 ovos-ww-plugin-precise-lite[tflite]~=0.1,>=0.1.2 ovos-ww-plugin-vosk~=0.1,>=0.1.1 From 2b90ba1140ddc2c5ccb8d7f1de872afdae092c7f Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Wed, 20 Sep 2023 12:32:04 -0700 Subject: [PATCH 3/4] Fix typo in onnxruntime dependency spec --- requirements/local_speech_processing.txt | 2 +- requirements/pi.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/local_speech_processing.txt b/requirements/local_speech_processing.txt index 08ac77353..ad62a113d 100644 --- a/requirements/local_speech_processing.txt +++ b/requirements/local_speech_processing.txt @@ -1,7 +1,7 @@ neon-stt-plugin-deepspeech-stream-local~=2.0 neon-stt-plugin-nemo~=0.0 neon-tts-plugin-coqui~=0.7,>=0.7.1 -onnx!=1.16.0 # TODO: Patching https://github.com/microsoft/onnxruntime/issues/17631 +onnxruntime!=1.16.0 # TODO: Patching https://github.com/microsoft/onnxruntime/issues/17631 # TODO: Local language plugin # Fallback diff --git a/requirements/pi.txt b/requirements/pi.txt index 4492b1600..39244c290 100644 --- a/requirements/pi.txt +++ b/requirements/pi.txt @@ -12,7 +12,7 @@ neon-mana-utils~=0.2,>=0.2.2 # Default plugins ovos-vad-plugin-silero~=0.0.1 -onnx!=1.16.0 # TODO: Patching https://github.com/microsoft/onnxruntime/issues/17631 +onnxruntime!=1.16.0 # TODO: Patching https://github.com/microsoft/onnxruntime/issues/17631 ovos-ww-plugin-precise~=0.1 ovos-ww-plugin-precise-lite[tflite]~=0.1,>=0.1.2 ovos-ww-plugin-vosk~=0.1,>=0.1.1 From a865c215af5410cbe05527ae6b0919580020125b Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Wed, 20 Sep 2023 14:29:18 -0700 Subject: [PATCH 4/4] Roll back config workaround for onnxruntime bug --- neon_core/configuration/mark_2/neon.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/configuration/mark_2/neon.yaml b/neon_core/configuration/mark_2/neon.yaml index 17bd27bcd..eb988d3c4 100644 --- a/neon_core/configuration/mark_2/neon.yaml +++ b/neon_core/configuration/mark_2/neon.yaml @@ -28,7 +28,7 @@ confirm_listening: true listener: VAD: silence_method: vad_only - module: ovos-vad-plugin-webrtcvad + module: ovos-vad-plugin-silero mute_during_output: false instant_listen: true speech_begin: 0.5