Merge pull request #547 from OpenVoiceOS/release-0.0.9a1

Release 0.0.9a1
OpenVoiceOS · Sep 18, 2024 · 362fa85 · 362fa85
2 parents d7ef229 + 342f4f0
commit 362fa85
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 2,025 deletions.
diff --git a/.github/workflows/license_tests.yml b/.github/workflows/license_tests.yml
@@ -37,7 +37,7 @@ jobs:
           requirements: 'requirements-all.txt'
           fail: 'Copyleft,Other,Error'
           fails-only: true
-          exclude: '^(precise-runner|fann2|tqdm|bs4|sonopy|caldav|recurring-ical-events|x-wr-timezone).*'
+          exclude: '^(precise-runner|fann2|tqdm|bs4|sonopy|caldav|recurring-ical-events|x-wr-timezone|zeroconf|mutagen).*'
           exclude-license: '^(Mozilla).*$'
       - name: Print report
         if: ${{ always() }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/ovos_core/intent_services/ocp_service.py b/ovos_core/intent_services/ocp_service.py
@@ -604,7 +604,11 @@ def handle_play_intent(self, message: Message):
             if not player.ocp_available:
                 self.legacy_play(results, query, message=message)
             else:
-                self.ocp_api.play(results, query, source_message=message)
+                self.ocp_api.play(tracks=[best], utterance=query, source_message=message)
+            self.ocp_api.populate_search_results(tracks=results,
+                                                 replace=True,
+                                                 sort_by_conf=False,  # already sorted
+                                                 source_message=message)
 
     def handle_open_intent(self, message: Message):
         LOG.info("Requesting OCP homescreen")

diff --git a/ovos_core/version.py b/ovos_core/version.py
@@ -1,8 +1,8 @@
 # START_VERSION_BLOCK
 VERSION_MAJOR = 0
 VERSION_MINOR = 0
-VERSION_BUILD = 8
-VERSION_ALPHA = 0
+VERSION_BUILD = 9
+VERSION_ALPHA = 1
 # END_VERSION_BLOCK
 
 # for compat with old imports

diff --git a/requirements/requirements.txt b/requirements/requirements.txt
@@ -7,7 +7,7 @@ padacioso>=0.1.0,<1.0.0
 adapt-parser>=1.0.0, <2.0.0
 
 ovos-utils>=0.0.38,<1.0.0
-ovos_bus_client>=0.0.9,<1.0.0
+ovos_bus_client>=0.1.0,<1.0.0
 ovos-plugin-manager>=0.0.26,<1.0.0
 ovos-config>=0.0.13,<1.0.0
 ovos-lingua-franca>=0.4.7,<1.0.0

diff --git a/test/end2end/routing/test_session.py b/test/end2end/routing/test_session.py
@@ -156,6 +156,7 @@ def wait_for_n_messages(n):
             "ovos.common_play.reset",
             "add_context",  # NowPlaying context
             "ovos.common_play.play",  # OCP api,
+            "ovos.common_play.search.populate",
             "ovos.utterance.handled"  # handle_utterance returned (intent service)
         ]
         wait_for_n_messages(len(expected_messages))

diff --git a/test/end2end/session/test_blacklist.py b/test/end2end/session/test_blacklist.py
@@ -197,6 +197,7 @@ def wait_for_n_messages(n):
             "ovos.common_play.reset",
             "add_context",  # NowPlaying context
             "ovos.common_play.play",  # OCP api
+            "ovos.common_play.search.populate",
             "ovos.utterance.handled"  # handle_utterance returned (intent service)
         ]
         wait_for_n_messages(len(expected_messages))

diff --git a/test/end2end/session/test_ocp.py b/test/end2end/session/test_ocp.py
@@ -288,6 +288,7 @@ def wait_for_n_messages(n):
             "ovos.common_play.reset",
             "add_context",  # NowPlaying context
             "ovos.common_play.play",  # OCP api,
+            "ovos.common_play.search.populate",
             "ovos.utterance.handled"  # handle_utterance returned (intent service)
         ]
         wait_for_n_messages(len(expected_messages))
@@ -297,7 +298,7 @@ def wait_for_n_messages(n):
         for idx, m in enumerate(messages):
             self.assertEqual(m.msg_type, expected_messages[idx])
 
-        play = messages[-2]
+        play = messages[-3]
         self.assertEqual(play.data["media"]["uri"], "https://fake_4.mp3")
 
     def test_unk_media_match(self):
@@ -429,6 +430,7 @@ def wait_for_n_messages(n):
             "ovos.common_play.reset",
             "add_context",  # NowPlaying context
             "ovos.common_play.play",  # OCP api
+            "ovos.common_play.search.populate",
             "ovos.utterance.handled"  # handle_utterance returned (intent service)
         ]
         wait_for_n_messages(len(expected_messages))
@@ -504,6 +506,7 @@ def wait_for_n_messages(n):
             "ovos.common_play.reset",
             "add_context",  # NowPlaying context
             'mycroft.audio.service.play',  # LEGACY api
+            "ovos.common_play.search.populate",
             "ovos.utterance.handled",  # handle_utterance returned (intent service)
         ]
         wait_for_n_messages(len(expected_messages))