Skip to content

Commit

Permalink
Add neon-minerva to dev dependencies
Browse files Browse the repository at this point in the history
Update audio module to handle skill metrics
Annotate future CQS changes
Add forwards-compat with ovos-workshop changes
Update neon-utils for patching forwards-compat.
  • Loading branch information
NeonDaniel committed Oct 10, 2023
1 parent a270fd5 commit d0f17fd
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 5 deletions.
2 changes: 2 additions & 0 deletions neon_core/skills/patched_common_query.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions neon_core/skills/patched_plugin_loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion requirements/core_modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -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.1a3
2 changes: 1 addition & 1 deletion requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d0f17fd

Please sign in to comment.