Support Future OVOS Changes, Minerva Testing/Benchmarking (#562)

Co-authored-by: Daniel McKnight <[email protected]>
NeonGeckoCom · Oct 11, 2023 · bea6675 · bea6675
1 parent a270fd5
commit bea6675
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 6 deletions.
diff --git a/neon_core/skills/patched_common_query.py b/neon_core/skills/patched_common_query.py
@@ -41,6 +41,8 @@
 
 from mycroft.skills.intent_services.base import IntentMatch
 from mycroft.skills.skill_data import CoreResources
+
+# TODO: Timeout from config
 # TODO: Port to ovos-core
 EXTENSION_TIME = 10
 MIN_RESPONSE_WAIT = 3

diff --git a/neon_core/skills/patched_plugin_loader.py b/neon_core/skills/patched_plugin_loader.py
@@ -77,8 +77,12 @@ def _create_skill_instance(self, skill_module=None):
                 # skill_id and bus kwargs.
                 # these skills only have skill_id and bus available in initialize,
                 # not in __init__
-                if not self.instance._is_fully_initialized:
-                    self.instance._startup(self.bus, self.skill_id)
+                try:
+                    if not self.instance.is_fully_initialized:
+                        self.instance._startup(self.bus, self.skill_id)
+                except AttributeError:
+                    if not self.instance._is_fully_initialized:
+                        self.instance._startup(self.bus, self.skill_id)
             except Exception as e:
                 LOG.exception(f'Skill __init__ failed with {e}')
                 self.instance = None

diff --git a/requirements/core_modules.txt b/requirements/core_modules.txt
@@ -3,4 +3,4 @@ neon_messagebus~=1.1
 neon_enclosure~=1.6
 neon_speech~=4.1,>=4.1.1a3
 neon_gui~=1.2,>=1.2.2
-neon_audio~=1.3,>=1.3.3a12
+neon_audio~=1.3,>=1.3.3a13
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -1,2 +1,3 @@
 neon-cli-client~=0.2
-neon-mana-utils~=0.2,>=0.2.1
+neon-mana-utils~=0.2,>=0.2.1
+neon-minerva~=0.0.0,>=0.0.1a4
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -4,7 +4,7 @@ ovos-core~=0.0.7
 ovos-plugin-common-play~=0.0.5
 
 # utils
-neon-utils[audio,network]~=1.6,>=1.6.3a2
+neon-utils[audio,network]~=1.6,>=1.6.3a3
 # TODO: Audio extra patching dependency resolution
 ovos-utils~=0.0.35
 ovos-bus-client~=0.0.5

diff --git a/requirements/skills_default.txt b/requirements/skills_default.txt
@@ -15,4 +15,4 @@ neon-skill-wikipedia~=1.0,>=1.0.1
 neon-skill-free_music_archive~=1.0
 neon-skill-local_music~=2.0
 # neon-skill-holidays~=0.0.0a1
-neon-skill-fallback_llm~=1.0,>=1.0.1a1
+neon-skill-fallback_llm~=1.0,>=1.0.1a2