0.0.7 (#126)

* 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]> Co-authored-by: JarbasAi <[email protected]> Co-authored-by: JarbasAl <[email protected]> Co-authored-by: JarbasAI <[email protected]>
OpenVoiceOS · Sep 3, 2024 · 49bde43 · 49bde43
1 parent c4d9ab6
commit 49bde43
Show file tree

Hide file tree

Showing 25 changed files with 532 additions and 865 deletions.
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -60,6 +60,10 @@ jobs:
           # NOTE: additional pytest invocations should also add the --cov-append flag
           #       or they will overwrite previous invocations' coverage reports
           #       (for an example, see OVOS Skill Manager's workflow)
+      - name: Run unittests with ovos-utils 0.0.38
+        run: |
+          pip install ovos-utils==0.0.38
+          pytest --cov=ovos_plugin_common_play --cov-report xml test/unittests
       - name: Upload coverage
         env:
           CODECOV_TOKEN: ${{secrets.CODECOV_TOKEN}}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,160 +1,93 @@
 # Changelog
 
-## [V0.0.6a16](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.6a16) (2024-01-18)
+## [V0.0.7a11](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.7a11) (2024-08-06)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.6a15...V0.0.6a16)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.7a10...V0.0.7a11)
 
 **Fixed bugs:**
 
-- OCP GUI stays up until dismissed after playing a single track [\#98](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/issues/98)
-- settings storage seems to be ambiguous [\#43](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/issues/43)
+- Playlists don't work when progressing naturally, but skips are fine [\#123](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/issues/123)
+- logs/end\_of\_track [\#124](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/124) ([JarbasAl](https://github.com/JarbasAl))
 
-**Merged pull requests:**
-
-- Add upper version pin for ovos-utils [\#106](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/106) ([NeonDaniel](https://github.com/NeonDaniel))
-
-## [V0.0.6a15](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.6a15) (2024-01-10)
-
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.6a14...V0.0.6a15)
-
-**Closed issues:**
-
-- `StreamHandler` initialized on import [\#54](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/issues/54)
-- Emit messagebus event on Intent match [\#20](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/issues/20)
-
-**Merged pull requests:**
-
-- Update news.intent [\#83](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/83) ([timonvanhasselt](https://github.com/timonvanhasselt))
-
-## [V0.0.6a14](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.6a14) (2024-01-08)
-
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.6a13...V0.0.6a14)
-
-**Merged pull requests:**
-
-- allow alpha utils [\#105](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/105) ([JarbasAl](https://github.com/JarbasAl))
-
-## [V0.0.6a13](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.6a13) (2024-01-02)
-
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.6a12...V0.0.6a13)
-
-**Merged pull requests:**
+## [V0.0.7a10](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.7a10) (2024-08-03)
 
-- Update dependencies to stable versions with ovos-core 0.0.7 compat. [\#104](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/104) ([NeonDaniel](https://github.com/NeonDaniel))
-
-## [V0.0.6a12](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.6a12) (2023-12-30)
-
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.6a11...V0.0.6a12)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.7a9...V0.0.7a10)
 
 **Fixed bugs:**
 
-- fix/OCP\_plugins\_loading [\#103](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/103) ([JarbasAl](https://github.com/JarbasAl))
-
-## [V0.0.6a11](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.6a11) (2023-12-29)
-
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.6a10...V0.0.6a11)
-
-**Merged pull requests:**
-
-- Update requirements.txt [\#102](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/102) ([JarbasAl](https://github.com/JarbasAl))
-
-## [V0.0.6a10](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.6a10) (2023-12-29)
-
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.6a9...V0.0.6a10)
-
-**Merged pull requests:**
-
-- bump requirements [\#101](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/101) ([JarbasAl](https://github.com/JarbasAl))
+- fix/playlist\_handling [\#122](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/122) ([JarbasAl](https://github.com/JarbasAl))
 
-## [V0.0.6a9](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.6a9) (2023-10-27)
+## [V0.0.7a9](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.7a9) (2024-07-09)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.6a8...V0.0.6a9)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.7a8...V0.0.7a9)
 
-**Merged pull requests:**
+**Fixed bugs:**
 
-- Update requirements to stable versions [\#100](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/100) ([NeonDaniel](https://github.com/NeonDaniel))
+- fix/play\_from\_gui [\#121](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/121) ([JarbasAl](https://github.com/JarbasAl))
 
-## [V0.0.6a8](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.6a8) (2023-09-12)
+## [V0.0.7a8](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.7a8) (2024-06-06)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.6a7...V0.0.6a8)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.7a7...V0.0.7a8)
 
-**Implemented enhancements:**
+**Fixed bugs:**
 
-- Add standalone launcher [\#97](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/97) ([Ramblurr](https://github.com/Ramblurr))
+- fix/native\_sources [\#120](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/120) ([JarbasAl](https://github.com/JarbasAl))
 
-## [V0.0.6a7](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.6a7) (2023-08-21)
+## [V0.0.7a7](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.7a7) (2024-06-02)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.6a6...V0.0.6a7)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.7a6...V0.0.7a7)
 
 **Merged pull requests:**
 
-- OCPQuery: Only check if the gui is connected once [\#96](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/96) ([Ramblurr](https://github.com/Ramblurr))
+- default to OCP pipeline + support for utils 0.0.38 [\#119](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/119) ([JarbasAl](https://github.com/JarbasAl))
 
-## [V0.0.6a6](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.6a6) (2023-08-21)
+## [V0.0.7a6](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.7a6) (2024-05-28)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.6a5...V0.0.6a6)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.7a5...V0.0.7a6)
 
 **Fixed bugs:**
 
-- Allow `PlaybackType.SKILL` search results to be played when there is no GUI [\#95](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/95) ([Ramblurr](https://github.com/Ramblurr))
-
-**Closed issues:**
-
-- OCP search results are not processed fast enough because `is_gui_connected(..)` takes too long [\#93](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/issues/93)
-- OCP skills supporting PlaybackType.SKILL cannot be played when there is no GUI [\#92](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/issues/92)
+- fix/playlist\_again [\#117](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/117) ([JarbasAl](https://github.com/JarbasAl))
 
-**Merged pull requests:**
-
-- Handle race condition between `ovos.common_play.query.response` and `ovos.common_play.skill.search_end` [\#94](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/94) ([Ramblurr](https://github.com/Ramblurr))
-
-## [V0.0.6a5](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.6a5) (2023-07-19)
+## [V0.0.7a5](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.7a5) (2024-05-25)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.6a4...V0.0.6a5)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.7a4...V0.0.7a5)
 
-**Merged pull requests:**
+**Fixed bugs:**
 
-- Update GUI to pass resource names instead of paths [\#90](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/90) ([NeonDaniel](https://github.com/NeonDaniel))
+- fix playlist handling [\#116](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/116) ([JarbasAl](https://github.com/JarbasAl))
 
-## [V0.0.6a4](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.6a4) (2023-07-13)
+## [V0.0.7a4](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.7a4) (2024-05-25)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.6a3...V0.0.6a4)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.7a3...V0.0.7a4)
 
 **Fixed bugs:**
 
-- fix/support for ui directories param [\#87](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/87) ([JarbasAl](https://github.com/JarbasAl))
-
-## [V0.0.6a3](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.6a3) (2023-07-12)
+- fix/coexistence\_with\_pipeline [\#115](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/115) ([JarbasAl](https://github.com/JarbasAl))
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.6a2...V0.0.6a3)
+## [V0.0.7a3](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.7a3) (2024-05-10)
 
-**Merged pull requests:**
-
-- Update requirements.txt [\#86](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/86) ([JarbasAl](https://github.com/JarbasAl))
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.7a2...V0.0.7a3)
 
-## [V0.0.6a2](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.6a2) (2023-06-14)
+**Implemented enhancements:**
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.6a1...V0.0.6a2)
+- feat/experimental\_ocp\_pipeline [\#112](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/112) ([JarbasAl](https://github.com/JarbasAl))
 
-**Closed issues:**
+## [V0.0.7a2](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.7a2) (2024-01-25)
 
-- All media play requests loop \(silently\) until ovos restart [\#84](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/issues/84)
-- self.active\_backend is undefined when fallback is triggered [\#82](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/issues/82)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.7a1...V0.0.7a2)
 
 **Merged pull requests:**
 
-- Refactor init to resolve deprecation warnings [\#85](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/85) ([NeonDaniel](https://github.com/NeonDaniel))
+- refactor/dry\_ocp\_imports [\#109](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/109) ([NeonJarbas](https://github.com/NeonJarbas))
 
-## [V0.0.6a1](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.6a1) (2023-04-23)
-
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.5...V0.0.6a1)
-
-**Implemented enhancements:**
+## [V0.0.7a1](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/tree/V0.0.7a1) (2024-01-25)
 
-- Replace mycroft\_bus\_client with ovos\_bus\_client [\#80](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/80) ([goldyfruit](https://github.com/goldyfruit))
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/compare/V0.0.6...V0.0.7a1)
 
 **Merged pull requests:**
 
-- Fix automation typos [\#77](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/77) ([NeonDaniel](https://github.com/NeonDaniel))
+- refactor/utils\_0.1.0 [\#108](https://github.com/OpenVoiceOS/ovos-ocp-audio-plugin/pull/108) ([NeonJarbas](https://github.com/NeonJarbas))
 
 
 

diff --git a/README.md b/README.md
@@ -36,6 +36,8 @@ mycroft.conf
 
 ## Standalone Mode
 
+> **DEPRECATED**: valid for ovos-core 0.0.7 only!
+
 Normally OCP is initialized and started by [ovos-audio](https://github.com/OpenVoiceOS/ovos-audio).
 
 However, in some situations you may want to run OCP in standalone mode.

diff --git a/ovos_plugin_common_play/__init__.py b/ovos_plugin_common_play/__init__.py
@@ -1,11 +1,12 @@
 from pprint import pformat
+
 from ovos_bus_client import Message
 from ovos_utils.log import LOG
+from ovos_workshop.decorators.ocp import *
 
-from ovos_plugin_common_play.ocp import OCP, OCP_ID
-from ovos_plugin_common_play.ocp.status import *
-from ovos_plugin_common_play.ocp.utils import extract_metadata
+from ovos_plugin_common_play.ocp import OCP
 from ovos_plugin_common_play.ocp.base import OCPAudioPlayerBackend
+from ovos_plugin_common_play.ocp.constants import OCP_ID
 
 
 class OCPAudioBackend(OCPAudioPlayerBackend):
@@ -24,6 +25,10 @@ def __init__(self, config, bus=None, name='ovos.common_play'):
                     self.handle_receive_meta)
         self.create_ocp(self.config)
 
+    @property
+    def player(self):
+        return self.ocp.player
+
     def create_ocp(self, config: dict):
         self.config = config
         self.config.setdefault("mode", "auto")

diff --git a/ovos_plugin_common_play/launcher.py b/ovos_plugin_common_play/launcher.py
@@ -1,8 +1,10 @@
 #!/usr/bin/env python3
 from ovos_bus_client import MessageBusClient
-from ovos_plugin_common_play.ocp import OCP, OCP_ID
 from ovos_utils import wait_for_exit_signal
 
+from ovos_plugin_common_play.ocp import OCP
+from ovos_plugin_common_play.ocp.constants import OCP_ID
+
 
 def main():
     """