Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Downgrade OCP for ovos-core/NeonCore compat. #150

Merged
merged 2 commits into from
Oct 27, 2023
Merged

Downgrade OCP for ovos-core/NeonCore compat. #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4c43ef
Downgrade OCP for ovos-core/NeonCore compat.
NeonDaniel Oct 27, 2023
7f69f54
Disable OCP to troubleshoot API test failures in GHA
NeonDaniel Oct 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions neon_audio/service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ class NeonPlaybackService(PlaybackService):
def __init__(self, ready_hook=on_ready, error_hook=on_error,
stopping_hook=on_stopping, alive_hook=on_alive,
started_hook=on_started, watchdog=lambda: None,
audio_config=None, daemonic=False, bus=None):
audio_config=None, daemonic=False, bus=None,
disable_ocp=False):
"""
Creates a Speech service thread
:param ready_hook: function callback when service is ready
Expand All @@ -78,6 +79,7 @@ def __init__(self, ready_hook=on_ready, error_hook=on_error,
:param audio_config: global core configuration override
:param daemonic: if True, run this thread as a daemon
:param bus: Connected MessageBusClient
:param disable_ocp: if True, disable OVOS Common Play service
"""
if audio_config:
LOG.info("Updating global config with passed config")
Expand All @@ -97,7 +99,8 @@ def __init__(self, ready_hook=on_ready, error_hook=on_error,
from neon_audio.tts.neon import NeonPlaybackThread
ovos_audio.service.PlaybackThread = NeonPlaybackThread
PlaybackService.__init__(self, ready_hook, error_hook, stopping_hook,
alive_hook, started_hook, watchdog, bus)
alive_hook, started_hook, watchdog, bus,
disable_ocp)
LOG.debug(f'Initialized tts={self._tts_hash} | '
f'fallback={self._fallback_tts_hash}')
create_signal("neon_speak_api") # Create signal so skills use API
Expand Down
4 changes: 2 additions & 2 deletions requirements/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ click-default-group~=1.2
ovos-bus-client~=0.0.3

# Default OCP backend + plugins
ovos-plugin-common-play==0.0.6a9
# TODO: Pinned to latest available version with no alpha deps
ovos-plugin-common-play==0.0.6a2
# TODO: Pinned to latest compatible version with no alpha deps (a9 conflicts with ovos-core)
ovos-ocp-m3u-plugin~=0.0.1
ovos-ocp-rss-plugin~=0.0.2
ovos-ocp-files-plugin~=0.13
Expand Down
3 changes: 2 additions & 1 deletion tests/api_method_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ def on_ready():
ready_event.set()

cls.audio_service = NeonPlaybackService(daemonic=True, bus=cls.bus,
ready_hook=on_ready)
ready_hook=on_ready,
disable_ocp=True)
assert cls.audio_service.config == _TEST_CONFIG
cls.audio_service.start()
if not ready_event.wait(30):
Expand Down
Loading