From 1fcaf7a64aceed05749828d02d4bf284187806ee Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 13 Sep 2024 15:52:28 -0700 Subject: [PATCH 1/8] Pin OPM to troubleshoot audio output bug --- requirements/core_modules.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/requirements/core_modules.txt b/requirements/core_modules.txt index 53729aed3..aea9b1a2d 100644 --- a/requirements/core_modules.txt +++ b/requirements/core_modules.txt @@ -3,5 +3,8 @@ neon-messagebus~=2.0,>=2.0.2a6 neon-enclosure~=1.7,>=1.7.1a2 neon-speech~=4.4,>=4.4.1 neon-gui~=1.3,>=1.3.1a1 + +# TODO: Patching breaking change in ovos-audio/OPM neon-audio==1.5.2a6 -ovos-audio==0.0.2a42 \ No newline at end of file +ovos-audio==0.0.2a42 +ovos-plugin-manager==0.0.26a19 \ No newline at end of file From 39ee47c595328df3a256ead0703bb44a579da69e Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 13 Sep 2024 17:14:12 -0700 Subject: [PATCH 2/8] Pin last stable neon_audio --- requirements/core_modules.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/requirements/core_modules.txt b/requirements/core_modules.txt index aea9b1a2d..6c33eaa5b 100644 --- a/requirements/core_modules.txt +++ b/requirements/core_modules.txt @@ -3,8 +3,4 @@ neon-messagebus~=2.0,>=2.0.2a6 neon-enclosure~=1.7,>=1.7.1a2 neon-speech~=4.4,>=4.4.1 neon-gui~=1.3,>=1.3.1a1 - -# TODO: Patching breaking change in ovos-audio/OPM -neon-audio==1.5.2a6 -ovos-audio==0.0.2a42 -ovos-plugin-manager==0.0.26a19 \ No newline at end of file +neon-audio~=1.5.1 \ No newline at end of file From f6a0546d614a1fe287028ae7a9f8a4b690177fd0 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 13 Sep 2024 17:40:17 -0700 Subject: [PATCH 3/8] Troubleshoot dependency resolution --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index ed818c3ca..bf5b80ab1 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -8,7 +8,7 @@ ovos-utils~=0.0,>=0.0.38 ovos-bus-client~=0.0.8,>=0.0.9a25 neon-transformers~=0.2,>=0.2.1a4 ovos-config~=0.0.12,>=0.0.13a27 -ovos-plugin-manager~=0.0.25,>=0.0.26a19 +ovos-plugin-manager==0.0.26a20 # TODO: ovos-backend-client pinned for stable release ovos-backend-client==0.1.1a5 psutil~=5.6 From 9180156ba200f3a1a6e806a7241b3abd30922215 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Fri, 13 Sep 2024 17:45:33 -0700 Subject: [PATCH 4/8] Troubleshoot dependency resolution --- requirements/requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index bf5b80ab1..5ca3104fc 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,5 +1,5 @@ # ovos-core version pinned for compat. with patches in NeonCore -ovos-core[mycroft,lgpl]>=0.0.8a95 +ovos-core[mycroft,lgpl]>=0.0.8a95,<=0.0.8a100 # padacioso==0.1.3a2 neon-utils[network,audio]~=1.11,>=1.11.1a3 @@ -8,7 +8,7 @@ ovos-utils~=0.0,>=0.0.38 ovos-bus-client~=0.0.8,>=0.0.9a25 neon-transformers~=0.2,>=0.2.1a4 ovos-config~=0.0.12,>=0.0.13a27 -ovos-plugin-manager==0.0.26a20 +ovos-plugin-manager~=0.0.25,>=0.0.26a19 # TODO: ovos-backend-client pinned for stable release ovos-backend-client==0.1.1a5 psutil~=5.6 From e2f61cb442b25adeafbc7814e3c0ee8dab857e1e Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 16 Sep 2024 10:57:19 -0700 Subject: [PATCH 5/8] Update neon-audio to validate fix Update default config to use old audioservice --- neon_core/configuration/neon.yaml | 3 +++ requirements/core_modules.txt | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/neon_core/configuration/neon.yaml b/neon_core/configuration/neon.yaml index 5ae7827bf..ca9e00d61 100644 --- a/neon_core/configuration/neon.yaml +++ b/neon_core/configuration/neon.yaml @@ -1,3 +1,6 @@ +# TODO: Below adding intermediate support for ovos-audio 0.x +enable_old_audioservice: True + # Plugin Configuration utterance_transformers: neon_utterance_translator_plugin: diff --git a/requirements/core_modules.txt b/requirements/core_modules.txt index 6c33eaa5b..98f1be866 100644 --- a/requirements/core_modules.txt +++ b/requirements/core_modules.txt @@ -3,4 +3,5 @@ neon-messagebus~=2.0,>=2.0.2a6 neon-enclosure~=1.7,>=1.7.1a2 neon-speech~=4.4,>=4.4.1 neon-gui~=1.3,>=1.3.1a1 -neon-audio~=1.5.1 \ No newline at end of file +#neon-audio~=1.5.1 +neon-audio@git+https://github.com/neongeckocom/neon_audio@FIX_NoPlayback \ No newline at end of file From 9b537c4bf84883e5485aff16893c47a3636a1117 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 16 Sep 2024 11:13:32 -0700 Subject: [PATCH 6/8] More dependency resolution troubleshooting --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 5ca3104fc..282a99ebe 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,5 +1,5 @@ # ovos-core version pinned for compat. with patches in NeonCore -ovos-core[mycroft,lgpl]>=0.0.8a95,<=0.0.8a100 +ovos-core[mycroft,lgpl]>=0.0.8a95,<=0.0.8a99 # padacioso==0.1.3a2 neon-utils[network,audio]~=1.11,>=1.11.1a3 From 8a7d5c7e8803e4d6fc69795c1218c32a00859c3a Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 16 Sep 2024 11:15:02 -0700 Subject: [PATCH 7/8] More dependency resolution troubleshooting --- requirements/core_modules.txt | 3 ++- requirements/requirements.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/requirements/core_modules.txt b/requirements/core_modules.txt index 98f1be866..8ec7c330f 100644 --- a/requirements/core_modules.txt +++ b/requirements/core_modules.txt @@ -4,4 +4,5 @@ neon-enclosure~=1.7,>=1.7.1a2 neon-speech~=4.4,>=4.4.1 neon-gui~=1.3,>=1.3.1a1 #neon-audio~=1.5.1 -neon-audio@git+https://github.com/neongeckocom/neon_audio@FIX_NoPlayback \ No newline at end of file +neon-audio@git+https://github.com/neongeckocom/neon_audio@FIX_NoPlayback +ovos-audio<=0.2.0 \ No newline at end of file diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 282a99ebe..5ca3104fc 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,5 +1,5 @@ # ovos-core version pinned for compat. with patches in NeonCore -ovos-core[mycroft,lgpl]>=0.0.8a95,<=0.0.8a99 +ovos-core[mycroft,lgpl]>=0.0.8a95,<=0.0.8a100 # padacioso==0.1.3a2 neon-utils[network,audio]~=1.11,>=1.11.1a3 From ef95ee0cc7d554fff74a1cc16b75a69c0cd70958 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 16 Sep 2024 13:10:14 -0700 Subject: [PATCH 8/8] Update neon-audio to pip spec --- requirements/core_modules.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/requirements/core_modules.txt b/requirements/core_modules.txt index 8ec7c330f..a684b1fee 100644 --- a/requirements/core_modules.txt +++ b/requirements/core_modules.txt @@ -3,6 +3,4 @@ neon-messagebus~=2.0,>=2.0.2a6 neon-enclosure~=1.7,>=1.7.1a2 neon-speech~=4.4,>=4.4.1 neon-gui~=1.3,>=1.3.1a1 -#neon-audio~=1.5.1 -neon-audio@git+https://github.com/neongeckocom/neon_audio@FIX_NoPlayback -ovos-audio<=0.2.0 \ No newline at end of file +neon-audio~=1.5.1,>=1.5.2a10 \ No newline at end of file