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.

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

feat/legacy_audio_api #456

Merged
merged 15 commits into from
May 10, 2024
Merged

feat/legacy_audio_api #456

merged 15 commits into from
May 10, 2024

Conversation

JarbasAl
Copy link
Member

@JarbasAl JarbasAl commented May 9, 2024

closes #455

makes OCP skills usable without the OCP plugin

NOTE: this requires the OCP stream extractor plugins to be installed in ovos-core container if using docker, instead of ovos-audio/media

test with

{
  // disable old OCP and ensure legacy audio service is enabled
  // cfg for ovos-audio
  "enable_old_audioservice": true,
  "disable_ocp": true,

  // Intent Pipeline / plugins config
  // cfg for ovos-core
  "intents" : {
    // enable OCP pipeline loading explicitly during pre-release phase
    "experimental_ocp_pipeline": true,

    // the pipeline is a ordered set of frameworks to send an utterance too
    // if one of the frameworks fails the next one is used, until an answer is found
    "pipeline": [
        "converse",
        "ocp_high",
        (...)
        "common_qa",
        "ocp_medium",
 	    (...)
        "ocp_fallback",
        "fallback_low"
    ]
  }
}

more info on the legacy system here: https://github.com/OpenVoiceOS/ovos-audio?tab=readme-ov-file#using-legacy-audioservice

@JarbasAl JarbasAl added the enhancement New feature or request label May 9, 2024
@JarbasAl JarbasAl requested review from NeonDaniel and a team May 9, 2024 03:58
@JarbasAl JarbasAl requested a review from mikejgray May 9, 2024 04:09
Copy link

codecov bot commented May 9, 2024

Codecov Report

Attention: Patch coverage is 87.64045% with 11 lines in your changes are missing coverage. Please review.

Project coverage is 73.09%. Comparing base (cf4e244) to head (2887c06).
Report is 1 commits behind head on dev.

Files Patch % Lines
ovos_core/intent_services/ocp_service.py 85.71% 11 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##              dev     #456      +/-   ##
==========================================
+ Coverage   66.70%   73.09%   +6.38%     
==========================================
  Files          15       15              
  Lines        2610     2661      +51     
==========================================
+ Hits         1741     1945     +204     
+ Misses        869      716     -153     
Flag Coverage Δ
unittests 73.09% <87.64%> (+6.38%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@JarbasAl JarbasAl requested a review from NeonDaniel May 10, 2024 03:01
@JarbasAl JarbasAl merged commit 68d63a6 into dev May 10, 2024
9 checks passed
@JarbasAl JarbasAl deleted the feat/legacy_audio_api branch May 10, 2024 04:16
@JarbasAl JarbasAl mentioned this pull request May 10, 2024
@JarbasAl JarbasAl added this to the 0.0.8 milestone May 10, 2024
JarbasAl added a commit to OpenVoiceOS/ovos-ocp-audio-plugin that referenced this pull request May 10, 2024
allow using Classic OCP with the new pipeline

companion to OpenVoiceOS/ovos-core#456
@JarbasAl
Copy link
Member Author

from the new docs https://openvoiceos.github.io/ovos-technical-manual/OCP_pipeline/

image

JarbasAl added a commit to OpenVoiceOS/ovos-ocp-audio-plugin that referenced this pull request May 10, 2024
allow using Classic OCP with the new pipeline

companion to OpenVoiceOS/ovos-core#456
JarbasAl added a commit to OpenVoiceOS/ovos-ocp-audio-plugin that referenced this pull request Sep 3, 2024
* refactor/utils_0.1.0 (#108)

* refactor/utils_0.1.0

* opm imports

* no create .desktop file

* no create .desktop file

* requirements

* requirements

---------

Co-authored-by: JarbasAi <jarbasai@mailfence.com>

* Increment Version to 0.0.7a1

* Update Changelog

* refactor/dry_ocp_imports (#109)

* refactor/dry_ocp_imports

import Playlist and MediaEntry objects from utils 0.1.0

* tests

* tests

* fix/ocp_playlist

allow initing Playlist object as a regular list

---------

Co-authored-by: JarbasAi <jarbasai@mailfence.com>

* Increment Version to 0.0.7a2

* Update Changelog

* feat/experimental_ocp_pipeline (#112)

allow using Classic OCP with the new pipeline

companion to OpenVoiceOS/ovos-core#456

* Increment Version to 0.0.7a3

* Update Changelog

* fix/coexistence_with_pipeline (#115)

* fix/coexistence_with_pipeline

intents were being registered even if pipeline enabled, only the media matchers were taking into account the new flag

this commit moves the check to init instead

* port/SEI report event

report plugins to ovos-core like ovos-media does to help in transition

* fix stop

* Increment Version to 0.0.7a4

* Update Changelog

* fix/playlist handling (#116)

* fix deprecation warnings

* fix type checks

* better log

* support older ovos-utils

* type checking fixes

* typing

* yeah

* Increment Version to 0.0.7a5

* Update Changelog

* fix/playlist_again (#117)

* Increment Version to 0.0.7a6

* Update Changelog

* default to OCP pipeline + support for utils 0.0.38 (#119)

* remove dead code

since OpenVoiceOS/ovos-core#491 and OpenVoiceOS/ovos-config#96 this is effectively dead code

all NLP matching is dropped in this PR

* rm dead code

* drop old tests

* Increment Version to 0.0.7a7

* Update Changelog

* fix/native_sources (#120)

* fix/native_sources

allow usage with voice satellites, without triggering playback on master side

similar to what classic audio service does, but with a decorator to make it more usable

* handle message=None

* fix backend check

* kwarg

* add helper property

* message None

* default val

* missing kwarg

* drop old classifier tests

* drop old classifier tests

* keep your crappy test

* keep your crappy test

* a relevant test now

* Increment Version to 0.0.7a8

* Update Changelog

* fix/play_from_gui (#121)

* fix/play_from_gui

when selecting entries from featured media PluginStream was not being recognized

if audio restarts with GUI opening, playback would fail due to GUI sending malformed data, this commit also works around that issue

* more fixes

* more fixes

* update tests

* restore tst

* keep old OCP bugs around 👍

* fixy fixes

* Increment Version to 0.0.7a9

* Update Changelog

* fix/playlist_handling (#122)

* fix/playlist_handling

fix position of "now playing" handling

fix PluginStream to MediaEntry extraction

fix Playlist of PluginStream

* deprecate extract_stream

* check bounds of idx

* remove test for old ovos-audio version

compat with utils 0.0.38

* fix tests

* Increment Version to 0.0.7a10

* Update Changelog

* Update README.md

* logs/end_of_track (#124)

make it easier to debug issues like  #123

* Increment Version to 0.0.7a11

* Update Changelog

* Increment Version to 0.0.7

* Update Changelog

---------

Co-authored-by: NeonJarbas <59943014+NeonJarbas@users.noreply.github.com>
Co-authored-by: JarbasAi <jarbasai@mailfence.com>
Co-authored-by: JarbasAl <JarbasAl@users.noreply.github.com>
Co-authored-by: JarbasAI <33701864+JarbasAl@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

feat - legacy audio service support (OCP pipeline)
2 participants