From c0cdcbcc6b50c4f2bad3d126956c9b0a3bc97ee2 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Tue, 3 Mar 2026 08:53:23 -0800 Subject: [PATCH 1/6] Disable translation plugin which is returning 5xx errors --- neon_core/configuration/neon.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neon_core/configuration/neon.yaml b/neon_core/configuration/neon.yaml index e9bb867bc..2a072058b 100644 --- a/neon_core/configuration/neon.yaml +++ b/neon_core/configuration/neon.yaml @@ -4,7 +4,7 @@ enable_old_audioservice: True # Plugin Configuration utterance_transformers: neon_utterance_translator_plugin: - active: True + active: False enable_detector: True neon_utterance_normalizer_plugin: active: True From 4aba123ac480793094bb97401033a26cadceb22a Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Tue, 3 Mar 2026 08:53:35 -0800 Subject: [PATCH 2/6] Update default skills to match Alpha deployment config --- requirements/skills_default.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/skills_default.txt b/requirements/skills_default.txt index 6bb7da1a2..f9d134fbf 100644 --- a/requirements/skills_default.txt +++ b/requirements/skills_default.txt @@ -1,14 +1,14 @@ skill-ddg~=0.0.2 -neon-skill-alerts~=3.0,>=3.0.1 +neon-skill-alerts~=3.0,>=3.0.2a1 neon-skill-caffeinewiz~=2.0,>=2.0.1a3 neon-skill-data_controls~=2.0,>=2.0.3 neon-skill-fallback_wolfram_alpha~=3.0 neon-skill-personal~=1.0,>=1.0.4a2 neon-skill-speak~=2.0,>=2.0.4a1 -neon-skill-speed_test~=1.0,>=1.0.5a2 -neon-skill-spelling~=1.1,>=1.1.1 +neon-skill-speed_test~=1.0,>=1.0.5a3 +neon-skill-spelling~=1.1,>=1.1.2a2 neon-skill-stock~=2.0,>=2.0.1a2 -neon-skill-support_helper~=1.2,>=1.2.5a1 +neon-skill-support_helper~=1.2,>=1.2.5a2 neon-skill-user_settings~=1.1 neon-skill-weather~=3.1,>=3.1.1a2 ovos-skill-wikipedia~=0.0 From 0df7668c2109add11d390d5f841410d77592d990 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Tue, 3 Mar 2026 08:58:07 -0800 Subject: [PATCH 3/6] Add `setuptools` dependency to address GHA failures --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 58ac4687a..88ff140c6 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,6 +1,5 @@ ovos-core[lgpl]~=0.2 - neon-utils[network]~=1.14 ovos-utils~=0.0,>=0.0.38 ovos-bus-client~=0.0,>=0.0.10 @@ -16,6 +15,7 @@ psutil~=5.6 click~=8.0 click-default-group~=1.2 +setuptools # Used for patching skill settings mock~=5.0 From 1e1074ab41d591b3cf0bdf118207b5693d0c9dc9 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Tue, 3 Mar 2026 09:08:16 -0800 Subject: [PATCH 4/6] Remove test that depends on utterance translator being active --- test/test_skills_module.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/test_skills_module.py b/test/test_skills_module.py index 283002ded..331cfe584 100644 --- a/test/test_skills_module.py +++ b/test/test_skills_module.py @@ -306,9 +306,9 @@ def _handle_languages_response(msg): # Patch things real_config = self.intent_service.language_config - self.assertIn("neon_utterance_translator_plugin", - self.intent_service.transformers.loaded_modules, - self.intent_service.transformers.loaded_modules) + # self.assertIn("neon_utterance_translator_plugin", + # self.intent_service.transformers.loaded_modules, + # self.intent_service.transformers.loaded_modules) translator = self.intent_service.transformers.loaded_modules.get( 'neon_utterance_translator_plugin') real_plug = translator.translator From 76719cc5c6d0c30b3bde881a7a12c2a9fa7c2368 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Tue, 3 Mar 2026 09:12:54 -0800 Subject: [PATCH 5/6] Patch setuptools to ensure `pkg_resources` is available for backwards-compat. imports --- requirements/requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 88ff140c6..efbfe41a5 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -13,9 +13,11 @@ ovos-classifiers # TODO: Remove when run_neon.py is deprecated psutil~=5.6 +# TODO: Patching `setuptools` imports +setuptools<82.0 + click~=8.0 click-default-group~=1.2 -setuptools # Used for patching skill settings mock~=5.0 From 47dd8f6925313087b34fff4d7834ce879ca9a7d8 Mon Sep 17 00:00:00 2001 From: Daniel McKnight Date: Tue, 3 Mar 2026 09:29:41 -0800 Subject: [PATCH 6/6] Replace utterance transformer test with test config patching --- test/test_skills_module.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/test/test_skills_module.py b/test/test_skills_module.py index 331cfe584..1aeec77cd 100644 --- a/test/test_skills_module.py +++ b/test/test_skills_module.py @@ -195,6 +195,10 @@ def setUpClass(cls) -> None: importlib.reload(ovos_config) assert ovos_config.config.Configuration.default.path == meta['default_config_path'] + # Patch configuration + ovos_config.config.Configuration()[ + 'utterance_transformers']['neon_utterance_translator_plugin'] = {"active": True} + from neon_core.skills.intent_service import NeonIntentService cls.intent_service = NeonIntentService(cls.bus) assert set(cls.intent_service.config['utterance_transformers'].keys()) \ @@ -306,9 +310,9 @@ def _handle_languages_response(msg): # Patch things real_config = self.intent_service.language_config - # self.assertIn("neon_utterance_translator_plugin", - # self.intent_service.transformers.loaded_modules, - # self.intent_service.transformers.loaded_modules) + self.assertIn("neon_utterance_translator_plugin", + self.intent_service.transformers.loaded_modules, + self.intent_service.transformers.loaded_modules) translator = self.intent_service.transformers.loaded_modules.get( 'neon_utterance_translator_plugin') real_plug = translator.translator