From 4ff552c857f9cec890863b9062dbaba44713afba Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Thu, 25 Apr 2024 15:15:14 -0700 Subject: [PATCH 01/11] Troubleshoot ovos-utils 0.0.X dependency resolution Update minimum ovos-core dependency Troubleshooting ovos-utils dependency resolution Fix typo in version spec Troubleshooting dependency resolution with ovos-core Pin ovos-workshop for ovos-utils compat. Pin OCP for ovos-utils compat. Loosen dependencies to allow for ovos-utils 0.0.X Update neon-enclosure dependency spec Update neon-audio to resolve ovos-utils compat bugs Update neon-utils and about skill to resolve ovos-utils compat bugs Troubleshoot dependency resolution Update `mana` dependency to allow ovos-utils 0.1 Update remaining dependencies to validate ovos-utils 0.1 compat. Update dependencies to validate ovos-utils 0.1 compat. Update neon-transformers to release spec Validate neon-transformers fix Update ovos-core to include backwards-compat import fix Update skills to support ovos-utils 0.1 Update core modules to support ovos-utils 0.1 Update dependencies Update dependencies to allow ovos-utils 0.1 Update ovos-core dependency Update ovos-core dependency spec to work around missing PyPI releases Update ovos-core dependency spec Update skills to resolve logged warnings Update ovos-core dependency to include backwards-compat. patches Troubleshoot missing dependency Update dependencies for valid resolution Test ovos-core 0.0.8 compat. remove ovos-utils test dependency that is not compatible with ovos-core Update neon-utterance-translator-plugin version to support ovos-utils 0.1 Add ovos-utils 0.1.0aX test dependency --- requirements/core_modules.txt | 8 ++++---- requirements/dev.txt | 2 +- requirements/local_speech_processing.txt | 2 +- requirements/pi.txt | 9 ++++---- requirements/requirements.txt | 26 +++++++++++++----------- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/requirements/core_modules.txt b/requirements/core_modules.txt index b72c13cda..8189fefa5 100644 --- a/requirements/core_modules.txt +++ b/requirements/core_modules.txt @@ -1,6 +1,6 @@ # neon core modules -neon-messagebus~=2.0,>=2.0.1 -neon-enclosure~=1.7 +neon-messagebus~=2.0,>=2.0.2a6 +neon-enclosure~=1.7,>=1.7.1a1 neon-speech~=4.4,>=4.4.1 -neon-gui~=1.3 -neon-audio~=1.5,>=1.5.1 +neon-gui~=1.3,>=1.3.2 +neon-audio~=1.5,>=1.5.2a4 diff --git a/requirements/dev.txt b/requirements/dev.txt index e93cc1306..33f2fb3c0 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,3 +1,3 @@ neon-cli-client~=0.2 -neon-mana-utils~=0.2,>=0.2.1 +neon-mana-utils~=0.2,>=0.2.3a2 neon-minerva~=0.1 \ No newline at end of file diff --git a/requirements/local_speech_processing.txt b/requirements/local_speech_processing.txt index aed0d3456..c38ea46f4 100644 --- a/requirements/local_speech_processing.txt +++ b/requirements/local_speech_processing.txt @@ -1,6 +1,6 @@ neon-stt-plugin-deepspeech-stream-local~=2.0 neon-stt-plugin-nemo~=0.0 -neon-tts-plugin-coqui~=0.8 +neon-tts-plugin-coqui~=0.8,>=0.8.1a1 onnxruntime!=1.16.0 # TODO: Patching https://github.com/microsoft/onnxruntime/issues/17631 # TODO: Local language plugin diff --git a/requirements/pi.txt b/requirements/pi.txt index 9c331d657..786828377 100644 --- a/requirements/pi.txt +++ b/requirements/pi.txt @@ -8,7 +8,7 @@ sdnotify~=0.3 # Default debug client neon-cli-client~=0.3 -neon-mana-utils~=0.2,>=0.2.2 +neon-mana-utils~=0.2,>=0.2.3a2 # Default plugins ovos-vad-plugin-silero~=0.0.1 @@ -22,20 +22,19 @@ ovos-ww-plugin-openwakeword~=0.2 neon-stt-plugin-google-cloud-streaming~=1.0,>=1.0.1 neon-tts-plugin-coqui-remote~=0.0.3 -neon-stt-plugin-nemo~=0.0.4 +neon-stt-plugin-nemo~=0.0.4,>=0.0.5a2 ovos-tts-plugin-server==0.0.2a12 # Fallback plugins -neon-tts-plugin-coqui~=0.8 +neon-tts-plugin-coqui~=0.8,>=0.8.1a1 ovos-stt-plugin-vosk~=0.1,>=0.1.4 # PHAL Plugins neon-phal-plugin-monitoring~=0.0.2 neon-phal-plugin-audio-receiver~=0.0.4 neon-phal-plugin-reset~=0.4,>=0.4.1 -neon-phal-plugin-core-updater~=1.3 neon-phal-plugin-device-updater~=0.2 -neon-phal-plugin-fan~=0.1 +neon-phal-plugin-fan~=0.1,>=0.1.1a1 neon-phal-plugin-switches~=0.0.5 neon-phal-plugin-linear_led~=0.2,>=0.2.3 neon-phal-plugin-gui-network-client~=0.0.5 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 225aae82e..ae6378542 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,14 +1,17 @@ # ovos-core version pinned for compat. with patches in NeonCore -ovos-core==0.0.7 +ovos-core[mycroft,lgpl]>=0.0.8a95 # padacioso==0.1.3a2 neon-utils[network,audio]~=1.10,>=1.10.2a1 # TODO: audio for alpha resolution ovos-utils~=0.0,>=0.0.38 -ovos-bus-client~=0.0.8 -neon-transformers~=0.2 +#ovos-bus-client~=0.0.8 +ovos-bus-client@git+https://github.com/openvoiceos/ovos-bus-client@PATCH_OvosUtilsCompat +neon-transformers~=0.2,>=0.2.1a4 ovos-config~=0.0.12 ovos-plugin-manager~=0.0.25 +# TODO: ovos-backend-client pinned for stable release +ovos-backend-client==0.1.1a5 psutil~=5.6 click~=8.0 @@ -19,15 +22,14 @@ mock~=5.0 # default plugins neon-lang-plugin-libretranslate~=0.2 -neon-utterance-translator-plugin~=0.2 +neon-utterance-translator-plugin~=0.2,>=0.2.1a1 neon-utterance-normalizer-plugin~=0.1 -requests~=2.29 +# TODO: Below adding support for ovos-utils 0.1.0 +#neon-mq-connector>=0.7.2a2 +#ovos-utils>=0.1.0a17 -# TODO: Patching dependencies ovos-core[skills,skills_lgpl] extra deps -ovos-backend-client~=0.1,>=0.1.1a2 -adapt-parser~=0.5 -padacioso~=0.1 -ovos-phal-plugin-connectivity-events~=0.0.1 -padatious~=0.4.8 -fann2==1.0.7 +## TODO: Below supporting resolution of ovos-utils<0.1.0 +ovos-plugin-common-play==0.0.6 +# ovos-workshop==0.0.16a4 +ovos-workshop@git+https://github.com/openvoiceos/ovos-workshop@PATCH_OvosUtilsCompat \ No newline at end of file From 2bbcf761a5a86989399354f5e528275a9a74f662 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 6 May 2024 17:28:01 -0700 Subject: [PATCH 02/11] Troubleshoot config patching in tests --- test/test_skills_module.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/test_skills_module.py b/test/test_skills_module.py index 883972ba1..11b8fcb5b 100644 --- a/test/test_skills_module.py +++ b/test/test_skills_module.py @@ -175,6 +175,10 @@ def setUpClass(cls) -> None: os.environ["OVOS_CONFIG_BASE_FOLDER"] = "neon" os.environ["OVOS_CONFIG_FILENAME"] = "neon.yaml" use_neon_core(init_config_dir)() + import ovos_config + import importlib + importlib.reload(ovos_config.config) + importlib.reload(ovos_config) from neon_core.skills.intent_service import NeonIntentService cls.intent_service = NeonIntentService(cls.bus) From 4606ebb7a7d5cf81de572a98634a03cbdaea0544 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 6 May 2024 17:53:35 -0700 Subject: [PATCH 03/11] Troubleshoot test failure --- test/test_skills_module.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/test_skills_module.py b/test/test_skills_module.py index 11b8fcb5b..3faa52eac 100644 --- a/test/test_skills_module.py +++ b/test/test_skills_module.py @@ -109,12 +109,13 @@ def ready_hook(): daemonic=True) from neon_core.configuration import Configuration self.assertEqual(service.config, Configuration()) + self.assertIsInstance(Configuration()["location"]["timezone"], dict) self.assertTrue(all(config['skills'][x] == service.config['skills'][x] for x in config['skills'])) service.bus = FakeBus() service.bus.connected_event = Event() service.start() - started.wait(30) + started.wait(60) self.assertTrue(service.config['skills']['auto_update']) # install_default.assert_called_once() From 3400ceacf12d6b27f21943f256c9357835f6e3de Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 6 May 2024 18:01:17 -0700 Subject: [PATCH 04/11] Update configuration patching in tests --- test/test_skills_module.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/test/test_skills_module.py b/test/test_skills_module.py index 3faa52eac..fb24d74bb 100644 --- a/test/test_skills_module.py +++ b/test/test_skills_module.py @@ -88,11 +88,15 @@ def test_neon_skills_service(self, run): # from mycroft.util.process_utils import ProcessState config = {"skills": { - "disable_osm": False, - "auto_update": True, - "directory": join(dirname(__file__), "skill_module_skills"), - "run_gui_file_server": True - } + "disable_osm": False, + "auto_update": True, + "directory": join(dirname(__file__), "skill_module_skills"), + "run_gui_file_server": True + }, + "location": {"timezone": {"code": "America/Los_Angeles", + "name": "Pacific Standard Time", + "dstOffset": 3600000, + "offset": -28800000}} } started = Event() @@ -200,7 +204,7 @@ def test_save_utterance_transcription(self): "lang": "en-us"}, {"timing": {"transcribed": transcribe_time}}) self.intent_service._save_utterance_transcription(test_message) - self.intent_service.transcript_service.write_transcript.\ + self.intent_service.transcript_service.write_transcript. \ assert_called_once_with(None, test_message.data["utterances"][0], transcribe_time, None) @@ -252,11 +256,10 @@ def mod_2_parse(utterances, lang): valid_parsers = {"cancel", "entity_parser", "translator"} self.assertTrue(all([p for p in valid_parsers if p in - self.intent_service.transformers.loaded_modules])) + self.intent_service.transformers.loaded_modules])) @patch("mycroft.skills.intent_service.IntentService.handle_utterance") def test_handle_utterance(self, patched): - test_message_invalid = Message("test", {"utterances": [' ', ' ']}) self.intent_service.handle_utterance(test_message_invalid) patched.assert_not_called() From ac1b75c55a7bdf99f5b6ef93036faf57e1e843c7 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 6 May 2024 18:07:23 -0700 Subject: [PATCH 05/11] Update configuration patching in tests --- test/test_skills_module.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/test_skills_module.py b/test/test_skills_module.py index fb24d74bb..5a066639e 100644 --- a/test/test_skills_module.py +++ b/test/test_skills_module.py @@ -96,7 +96,10 @@ def test_neon_skills_service(self, run): "location": {"timezone": {"code": "America/Los_Angeles", "name": "Pacific Standard Time", "dstOffset": 3600000, - "offset": -28800000}} + "offset": -28800000}, + "coordinate": {"latitude": 47.482880, + "longitude": -122.217064} + } } started = Event() From a0a1dadf569c4dd7a980e20c1072c8e3e7f32de6 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Mon, 6 May 2024 18:12:38 -0700 Subject: [PATCH 06/11] Update configuration patching in tests --- test/test_skills_module.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/test/test_skills_module.py b/test/test_skills_module.py index 5a066639e..50a1e5688 100644 --- a/test/test_skills_module.py +++ b/test/test_skills_module.py @@ -98,8 +98,15 @@ def test_neon_skills_service(self, run): "dstOffset": 3600000, "offset": -28800000}, "coordinate": {"latitude": 47.482880, - "longitude": -122.217064} - } + "longitude": -122.217064}, + "city": {"code": "Renton", + "name": "Renton", + "state": {"code": "WA", "name": "Washington", + "country": {"code": "US", + "name": "United States"} + } + } + }, } started = Event() From d4854ccb0bc10d020b3f17f46476bb22da8440d9 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Tue, 7 May 2024 15:52:21 -0700 Subject: [PATCH 07/11] Update ovos-bus-client dependency --- requirements/requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index ae6378542..7e0f81dd9 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -5,8 +5,7 @@ ovos-core[mycroft,lgpl]>=0.0.8a95 neon-utils[network,audio]~=1.10,>=1.10.2a1 # TODO: audio for alpha resolution ovos-utils~=0.0,>=0.0.38 -#ovos-bus-client~=0.0.8 -ovos-bus-client@git+https://github.com/openvoiceos/ovos-bus-client@PATCH_OvosUtilsCompat +ovos-bus-client~=0.0.8,>=0.0.9a20 neon-transformers~=0.2,>=0.2.1a4 ovos-config~=0.0.12 ovos-plugin-manager~=0.0.25 From d111bcc41b029c8bd5b52786b64eed6368ab1172 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Tue, 7 May 2024 15:58:41 -0700 Subject: [PATCH 08/11] Fix invalid dependency spec --- requirements/core_modules.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/core_modules.txt b/requirements/core_modules.txt index 8189fefa5..0fd928489 100644 --- a/requirements/core_modules.txt +++ b/requirements/core_modules.txt @@ -2,5 +2,5 @@ neon-messagebus~=2.0,>=2.0.2a6 neon-enclosure~=1.7,>=1.7.1a1 neon-speech~=4.4,>=4.4.1 -neon-gui~=1.3,>=1.3.2 +neon-gui~=1.3,>=1.3.1a1 neon-audio~=1.5,>=1.5.2a4 From e6ad5a05f6a752c03eda42ca9b46a1d40bac4a02 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Wed, 8 May 2024 10:11:33 -0700 Subject: [PATCH 09/11] Update to test ovos-utils 0.0.X resolution with latest changes --- requirements/requirements.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 7e0f81dd9..e40b74f85 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -26,9 +26,7 @@ neon-utterance-normalizer-plugin~=0.1 # TODO: Below adding support for ovos-utils 0.1.0 #neon-mq-connector>=0.7.2a2 -#ovos-utils>=0.1.0a17 ## TODO: Below supporting resolution of ovos-utils<0.1.0 ovos-plugin-common-play==0.0.6 -# ovos-workshop==0.0.16a4 -ovos-workshop@git+https://github.com/openvoiceos/ovos-workshop@PATCH_OvosUtilsCompat \ No newline at end of file +ovos-utils~=0.0.38 From f77534c4e631581a468cafbe704d42fa6fd1fe75 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Wed, 8 May 2024 15:18:24 -0700 Subject: [PATCH 10/11] Update dependencies to resolve init errors --- requirements/core_modules.txt | 2 +- requirements/requirements.txt | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/requirements/core_modules.txt b/requirements/core_modules.txt index 0fd928489..5b4ed1ce5 100644 --- a/requirements/core_modules.txt +++ b/requirements/core_modules.txt @@ -3,4 +3,4 @@ neon-messagebus~=2.0,>=2.0.2a6 neon-enclosure~=1.7,>=1.7.1a1 neon-speech~=4.4,>=4.4.1 neon-gui~=1.3,>=1.3.1a1 -neon-audio~=1.5,>=1.5.2a4 +neon-audio~=1.5,>=1.5.2a5 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index e40b74f85..c6a20cb60 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -2,13 +2,14 @@ ovos-core[mycroft,lgpl]>=0.0.8a95 # padacioso==0.1.3a2 -neon-utils[network,audio]~=1.10,>=1.10.2a1 +neon-utils[network,audio]~=1.10,>=1.10.2a2 # TODO: audio for alpha resolution ovos-utils~=0.0,>=0.0.38 ovos-bus-client~=0.0.8,>=0.0.9a20 neon-transformers~=0.2,>=0.2.1a4 ovos-config~=0.0.12 -ovos-plugin-manager~=0.0.25 +#ovos-plugin-manager~=0.0.25 +ovos-plugin-manager@git+https://github.com/openvoiceos/ovos-plugin-manager@FIX_OvosUtils0.0.xCompat # TODO: ovos-backend-client pinned for stable release ovos-backend-client==0.1.1a5 psutil~=5.6 From 79749c5c7df2a7efea14041cf2cc97cf05e25678 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Thu, 9 May 2024 12:13:27 -0700 Subject: [PATCH 11/11] Update ovos-plugin-manager to stable spec --- requirements/requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index c6a20cb60..18ac6d220 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -8,8 +8,7 @@ ovos-utils~=0.0,>=0.0.38 ovos-bus-client~=0.0.8,>=0.0.9a20 neon-transformers~=0.2,>=0.2.1a4 ovos-config~=0.0.12 -#ovos-plugin-manager~=0.0.25 -ovos-plugin-manager@git+https://github.com/openvoiceos/ovos-plugin-manager@FIX_OvosUtils0.0.xCompat +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