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

enable ocp with utils 0.0.38 compat #491

Merged
merged 8 commits into from
Jun 2, 2024
Merged

enable ocp with utils 0.0.38 compat #491

merged 8 commits into from
Jun 2, 2024

Conversation

JarbasAl
Copy link
Member

@JarbasAl JarbasAl commented Jun 2, 2024

closes #490

removes the need for a special flag to enable OCP pipeline, now it's just like other pipelines and needs only to be added to "pipeline" config, instead of requiring an additional boolean flag

NOTE: enabling OCP by default needs OpenVoiceOS/ovos-config#96 , this PR just allows it to import with utils <=0.0.38

@JarbasAl JarbasAl added the refactor code refactor without functional changes label Jun 2, 2024
@JarbasAl JarbasAl requested review from goldyfruit, mikejgray, builderjer and a team June 2, 2024 14:29
@JarbasAl JarbasAl added the packaging dependency updates or packaging changes label Jun 2, 2024
@JarbasAl JarbasAl requested a review from NeonDaniel June 2, 2024 14:30
JarbasAl added a commit to NeonJarbas/ovos-config that referenced this pull request Jun 2, 2024
@JarbasAl JarbasAl added this to the 0.0.8 milestone Jun 2, 2024
Copy link

codecov bot commented Jun 2, 2024

Codecov Report

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

Project coverage is 73.18%. Comparing base (7f743bc) to head (4ef1a87).
Report is 1 commits behind head on dev.

Files Patch % Lines
ovos_core/intent_services/ocp_service.py 48.33% 124 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##              dev     #491      +/-   ##
==========================================
- Coverage   74.97%   73.18%   -1.79%     
==========================================
  Files          15       15              
  Lines        2821     3051     +230     
==========================================
+ Hits         2115     2233     +118     
- Misses        706      818     +112     
Flag Coverage Δ
unittests 73.18% <48.76%> (-1.79%) ⬇️

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 merged commit 5bd3530 into dev Jun 2, 2024
2 of 3 checks passed
@JarbasAl JarbasAl deleted the packaging/default_ocp branch June 2, 2024 16:51
JarbasAl added a commit to OpenVoiceOS/ovos-ocp-audio-plugin that referenced this pull request Jun 2, 2024
since OpenVoiceOS/ovos-core#491 and OpenVoiceOS/ovos-config#96 this is effectively dead code

all NLP matching is dropped in this PR
JarbasAl added a commit to OpenVoiceOS/ovos-ocp-audio-plugin that referenced this pull request Jun 2, 2024
* 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
JarbasAl added a commit to OpenVoiceOS/ovos-config that referenced this pull request Jun 4, 2024
* feat/ocp_pipeline

* feat/OCP_backends

* Update mycroft.conf

* Update mycroft.conf

* Update mycroft.conf

* Update mycroft.conf

* "adapt_low",

* Update mycroft.conf

* Update mycroft.conf

* remove deprecated flag

got rid of it OpenVoiceOS/ovos-core#491

---------

Co-authored-by: JarbasAi <jarbasai@mailfence.com>
Co-authored-by: JarbasAI <33701864+JarbasAl@users.noreply.github.com>
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>
JarbasAl added a commit to OpenVoiceOS/ovos-config that referenced this pull request Sep 3, 2024
* document transformer plugins (#93)

* derprecated util

* derprecated util

* defaults/transformer_plugins

document transformer plugins and enable utterance normalizer by default

* Increment Version to 0.0.13a1

* Update Changelog

* Create LICENSE

* update/stop_pipeline (#94)

* update/stop_pipeline

add stop to the pipeline by default

companion to OpenVoiceOS/ovos-core#391

* Update mycroft.conf

* Update mycroft.conf

* Increment Version to 0.0.13a2

* Update Changelog

* default utterance plugins (#99)

enable https://github.com/OpenVoiceOS/ovos-utterance-corrections-plugin and https://github.com/OpenVoiceOS/ovos-utterance-plugin-cancel by default if installed

* adjust adapt matcher pipeline defaults (#100)

* Increment Version to 0.0.13a3

* Increment Version to 0.0.13a4

* Update Changelog

* Update Changelog

* Update mycroft.conf (#95)

* Increment Version to 0.0.13a5

* Update Changelog

* readd low adapt matches (intent pipeline) (#101)

* readd low adapt matches

* adjust common_qa

* adjust pipeline

* Increment Version to 0.0.13a6

* Update Changelog

* Create dependabot.yml

* fix/remove_broken_patch (#107)

* fix/remove_broken_patch

patch for mycroft-era `Configuration.get`  (now `Configuration()`) is broken and causes .get to behave weirdly

```
  self.config = dict(Configuration()) # below is False, like in mycroft.conf
        self.config = Configuration() # below is None ????
        self.audio_enabled = self.config.get("enable_old_audioservice")
```

* bad test

* signal breaking change

ripping out a broken patch that we dont use anywhere, but technically a breaking change. 

who knows how many places are not actually reading config...

bumping to 0.1.0 in case anything depends on the broken behaviour

* Update version.py

* Increment Version to 0.0.13a7

* Update Changelog

* fix: "adapt_medium" before padatious (#110)

reprioritize pipeline components

* Increment Version to 0.0.13a8

* Update Changelog

* improve env vars handling (#54)

* Update meta.py

improve env vars handling

* typo

* os.env priority

* Update meta.py

* Increment Version to 0.0.13a9

* Update Changelog

* Update ovos-bus-client requirement from ~=0.0.3 to ~=0.0.8 in /requirements (#106)

Updates the requirements on [ovos-bus-client](https://github.com/OpenVoiceOS/ovos-bus-client) to permit the latest version.
- [Release notes](https://github.com/OpenVoiceOS/ovos-bus-client/releases)
- [Changelog](https://github.com/OpenVoiceOS/ovos-bus-client/blob/dev/CHANGELOG.md)
- [Commits](OpenVoiceOS/ovos-bus-client@V0.0.3...V0.0.8)

---
updated-dependencies:
- dependency-name: ovos-bus-client
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Increment Version to 0.0.13a10

* Update Changelog

* Update ovos-backend-client requirement from <0.1.0 to <0.2.0 in /requirements (#104)

Updates the requirements on [ovos-backend-client](https://github.com/OpenVoiceOS/ovos-backend-client) to permit the latest version.
- [Release notes](https://github.com/OpenVoiceOS/ovos-backend-client/releases)
- [Changelog](https://github.com/OpenVoiceOS/ovos-backend-client/blob/dev/CHANGELOG.md)
- [Commits](OpenVoiceOS/ovos-backend-client@V0.0.1a4...V0.1.0)

---
updated-dependencies:
- dependency-name: ovos-backend-client
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Increment Version to 0.0.13a11

* Update Changelog

* Update mycroft.conf (#112)

remove unimplemented duck_while_listening, docs for non existing features are misleading

change default lang detect plugin to use public servers (no extra deps)

disable mpris by default in OCP, as that seems to be the cause of many issues in core 0.0.7

* Increment Version to 0.0.13a12

* Update Changelog

* move to vosk (#124)

* move to vosk

move from pocketsphinx to vosk

companion to OpenVoiceOS/ovos-dinkum-listener#113

* Update mycroft.conf

* Increment Version to 0.0.13a13

* Update Changelog

* feat/ocp_pipeline (#96)

* feat/ocp_pipeline

* feat/OCP_backends

* Update mycroft.conf

* Update mycroft.conf

* Update mycroft.conf

* Update mycroft.conf

* "adapt_low",

* Update mycroft.conf

* Update mycroft.conf

* remove deprecated flag

got rid of it OpenVoiceOS/ovos-core#491

---------

Co-authored-by: JarbasAi <jarbasai@mailfence.com>
Co-authored-by: JarbasAI <33701864+JarbasAl@users.noreply.github.com>

* Increment Version to 0.0.13a14

* Update Changelog

* fix/typo (#126)

missing an X in pocketsphinX 

#124

* Increment Version to 0.0.13a15

* Update Changelog

* Update python-dateutil requirement from ~=2.6 to ~=2.9 in /requirements (#115)

Updates the requirements on [python-dateutil](https://github.com/dateutil/dateutil) to permit the latest version.
- [Release notes](https://github.com/dateutil/dateutil/releases)
- [Changelog](https://github.com/dateutil/dateutil/blob/master/NEWS)
- [Commits](dateutil/dateutil@2.6.0...2.9.0.post0)

---
updated-dependencies:
- dependency-name: python-dateutil
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Increment Version to 0.0.13a16

* Update Changelog

* fix: unbound local var (#127)

* fix: resolve unbound local variable

Closes #118

* chore: clean up issues identified by linter

* revert rename

* tidy up workflows

* bump pytest

* Increment Version to 0.0.13a17

* Update Changelog

* better listener defaults (#133)

use instant_listen by default, avoids OpenVoiceOS/ovos-dinkum-listener#107 until fixed

enabled remove_silence by default, further making the above a better default  (as listen sound gets removed by silero vad), safe to do since OpenVoiceOS/ovos-dinkum-listener#122

* Increment Version to 0.0.13a18

* Update Changelog

* fix config set (#134)

fix #73 
fix #59

* Increment Version to 0.0.13a19

* Update Changelog

* Update mycroft.conf (#136)

* Update mycroft.conf

add adapt/padatious default values

* Update mycroft.conf

* Update mycroft.conf

* Update mycroft.conf

* Update mycroft.conf

* Increment Version to 0.0.13a20

* Update Changelog

* feat: add /usr/share as a config location (#128)

/usr/share/<application name> is becoming more and more common for
applications to store their default configuration in.
Either the application itself or distributions can use this location to
ship a config that users will not touch, and instead they are expected
to overwrite (parts of) the config in /etc/<application name>. This
means this config file can be safely updated with new required values
without having to worry about overwriting user-made change.

This is useful in general but especially in case of immutable
distributions who don't touch anything in /etc and /home

* Increment Version to 0.0.13a21

* Update Changelog

* revert to single thread (#137)

use single_thread for padatious by default

* Increment Version to 0.0.13a22

* Update Changelog

* tweak OCP defaults (#139)

default to keyword matching instead of using the new classifier (companion to OpenVoiceOS/ovos-core#502)

reduce min_score from 50 to 40 so more results are considered

* Increment Version to 0.0.13a23

* Update Changelog

* document audio options (#141)

* document audio options

document some more ovos-audio options

* Update mycroft.conf

* Increment Version to 0.0.13a24

* Update Changelog

* document "common_query" config options (#143)

* Increment Version to 0.0.13a25

* Update Changelog

* document "fake_barge_in" (#144)

document "fake_barge_in"

* Increment Version to 0.0.13a26

* Update Changelog

* deprecate/ovos_conf (#138)

* deprecate/ovos_conf

move exclusively to env vars, ovos.conf file is of very limited use, also not a standard pattern and very uncommon in other projects, it just causes confusion to users and distro packagers

(i also simply don't like it and don't want to maintain it :P )

* tests

* fix test

* Increment Version to 0.0.13a27

* Update Changelog

* Increment Version to 0.1.0

* Update Changelog

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: JarbasAI <33701864+JarbasAl@users.noreply.github.com>
Co-authored-by: JarbasAl <JarbasAl@users.noreply.github.com>
Co-authored-by: Swen Gross <25036977+emphasize@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: NeonJarbas <59943014+NeonJarbas@users.noreply.github.com>
Co-authored-by: JarbasAi <jarbasai@mailfence.com>
Co-authored-by: Mike <mike@graywind.org>
Co-authored-by: Bart Ribbers <bribbers@disroot.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
packaging dependency updates or packaging changes refactor code refactor without functional changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

allow ocp pipeline with ovos-utils <=0.0.38
1 participant