From 0d12a4d56ced5bc59893cd33c8c667f9294f99ce Mon Sep 17 00:00:00 2001 From: miro Date: Thu, 10 Oct 2024 02:29:18 +0100 Subject: [PATCH 1/2] fix:usage without skills installed in setups without skills installed the trained event was never emitted, causing OVOS to hang forever and never reporting ready noticed in docker when running skills in standalone mode (individual container per skill) adds a check to see if any skills are installed, to make logs more informative --- ovos_core/skill_manager.py | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/ovos_core/skill_manager.py b/ovos_core/skill_manager.py index eaf9963b74e..fbf28265b11 100644 --- a/ovos_core/skill_manager.py +++ b/ovos_core/skill_manager.py @@ -116,13 +116,16 @@ def __init__(self, bus, watchdog=None, alive_hook=on_alive, started_hook=on_star self._network_skill_timeout = 300 self._allow_state_reloads = True self._logged_skill_warnings = list() + self._detected_installed_skills = bool(find_skill_plugins()) + if not self._detected_installed_skills: + LOG.warning("No installed skills detected! if you are running skills in standalone mode ignore this warning," + " otherwise you probably want to install skills first!") self.config = Configuration() self.skill_loaders = {} self.plugin_skills = {} self.enclosure = EnclosureAPI(bus) - self.initial_load_complete = False self.num_install_retries = 0 self.empty_skill_dirs = set() # Save a record of empty skill dirs. @@ -194,9 +197,7 @@ def _define_message_bus_events(self): self.bus.on('skillmanager.deactivate', self.deactivate_skill) self.bus.on('skillmanager.keep', self.deactivate_except) self.bus.on('skillmanager.activate', self.activate_skill) - self.bus.once('mycroft.skills.initialized', - self.handle_check_device_readiness) - self.bus.once('mycroft.skills.trained', self.handle_initial_training) + self.bus.once('mycroft.skills.initialized', self.handle_check_device_readiness) # Load skills waiting for connectivity self.bus.on("mycroft.network.connected", self.handle_network_connected) @@ -497,16 +498,6 @@ def network_requirements(self): else: LOG.error(f'Priority skill {skill_id} can\'t be found') - def handle_initial_training(self, message): - """Handle the initial intent training completion event. - - This usually only includes offline skills - - Args: - message: Message containing information about the initial training completion. - """ - self.initial_load_complete = True - def run(self): """Run the skill manager thread.""" self.load_priority() @@ -550,10 +541,6 @@ def run(self): 'network_loaded': self._network_loaded.is_set()})) self.bus.emit(Message('mycroft.skills.initialized')) - # wait for initial intents training - LOG.debug("Waiting for initial training") - while not self.initial_load_complete: - sleep(0.5) self.status.set_ready() if self._gui_event.is_set() and self._connected_event.is_set(): @@ -577,14 +564,16 @@ def run(self): def _load_on_network(self): """Load skills that require a network connection.""" - LOG.info('Loading skills that require network...') - self._load_new_skills(network=True, internet=False) + if self._detected_installed_skills: # ensure we have skills is installed + LOG.info('Loading skills that require network...') + self._load_new_skills(network=True, internet=False) self._network_loaded.set() def _load_on_internet(self): """Load skills that require both internet and network connections.""" - LOG.info('Loading skills that require internet (and network)...') - self._load_new_skills(network=True, internet=True) + if self._detected_installed_skills: # ensure we have skills is installed + LOG.info('Loading skills that require internet (and network)...') + self._load_new_skills(network=True, internet=True) self._internet_loaded.set() self._network_loaded.set() @@ -626,8 +615,9 @@ def _unload_on_gui_disconnect(self): def _load_on_startup(self): """Handle offline skills load on startup.""" - LOG.info('Loading offline skills...') - self._load_new_skills(network=False, internet=False) + if self._detected_installed_skills: # ensure we have skills is installed + LOG.info('Loading offline skills...') + self._load_new_skills(network=False, internet=False) def _load_new_skills(self, network=None, internet=None, gui=None): """Handle loading of skills installed since startup. From 575e725cb7b54b6f9acdc05ee19defcae7acde9e Mon Sep 17 00:00:00 2001 From: miro Date: Mon, 14 Oct 2024 01:09:21 +0100 Subject: [PATCH 2/2] fix test --- test/unittests/skills/test_skill_manager.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/unittests/skills/test_skill_manager.py b/test/unittests/skills/test_skill_manager.py index 7737bcb3d6b..0c3d189001b 100644 --- a/test/unittests/skills/test_skill_manager.py +++ b/test/unittests/skills/test_skill_manager.py @@ -103,7 +103,6 @@ def test_instantiate(self): 'skillmanager.keep', 'skillmanager.activate', 'mycroft.skills.initialized', - 'mycroft.skills.trained', 'mycroft.network.connected', 'mycroft.internet.connected', 'mycroft.gui.available',