Merge pull request #573 from OpenVoiceOS/release-0.2.5a1

Release 0.2.5a1
OpenVoiceOS · Oct 18, 2024 · 8a0a53e · 8a0a53e
2 parents a26b7b7 + 9a41444
commit 8a0a53e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,12 @@
 # Changelog
 
-## [0.2.4a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.2.4a1) (2024-10-16)
+## [0.2.5a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.2.5a1) (2024-10-18)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.2.3...0.2.4a1)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.2.4...0.2.5a1)
 
 **Merged pull requests:**
 
-- fix:standardize\_lang [\#568](https://github.com/OpenVoiceOS/ovos-core/pull/568) ([JarbasAl](https://github.com/JarbasAl))
+- fix:fallback match [\#572](https://github.com/OpenVoiceOS/ovos-core/pull/572) ([JarbasAl](https://github.com/JarbasAl))
 
 
 

diff --git a/ovos_core/intent_services/fallback_service.py b/ovos_core/intent_services/fallback_service.py
@@ -98,17 +98,20 @@ def _collect_fallback_skills(self, message: Message,
         def handle_ack(msg):
             skill_id = msg.data["skill_id"]
             if msg.data.get("can_handle", True):
-                if skill_id in self.registered_fallbacks:
+                if skill_id in in_range:
                     fallback_skills.append(skill_id)
-                LOG.info(f"{skill_id} will try to handle fallback")
+                    LOG.info(f"{skill_id} will try to handle fallback")
+                else:
+                    LOG.debug(f"{skill_id} is out of range, skipping")
             else:
-                LOG.info(f"{skill_id} will NOT try to handle fallback")
+                LOG.debug(f"{skill_id} does NOT WANT to try to handle fallback")
             skill_ids.append(skill_id)
 
         if in_range:  # no need to search if no skills available
             self.bus.on("ovos.skills.fallback.pong", handle_ack)
 
             LOG.info("checking for FallbackSkillsV2 candidates")
+            message.data["range"] = (fb_range.start, fb_range.stop)
             # wait for all skills to acknowledge they want to answer fallback queries
             self.bus.emit(message.forward("ovos.skills.fallback.ping",
                                           message.data))

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

diff --git a/test/end2end/session/test_fallback.py b/test/end2end/session/test_fallback.py
@@ -349,7 +349,7 @@ def wait_for_n_messages(n):
         # confirm all expected messages are sent
         expected_messages = [
             "recognizer_loop:utterance",
-            # FallbackV2
+            # Fallback High
             "ovos.skills.fallback.ping",
             "ovos.skills.fallback.pong",
             "ovos.skills.fallback.pong",
@@ -361,6 +361,11 @@ def wait_for_n_messages(n):
             f"ovos.skills.fallback.{self.skill_id2}.response",
             f"ovos.skills.fallback.{self.skill_id2}.killed",  # killable_event decorator response
 
+            # Fallback Medium
+            "ovos.skills.fallback.ping",
+            "ovos.skills.fallback.pong",
+            "ovos.skills.fallback.pong",
+
             # skill executing
             f"ovos.skills.fallback.{self.skill_id}.request",
             f"ovos.skills.fallback.{self.skill_id}.start",