From 738324f4f115b74638d2b219b6afefa37ce67b69 Mon Sep 17 00:00:00 2001 From: JarbasAi Date: Sat, 23 Sep 2023 03:24:31 +0100 Subject: [PATCH] compat --- ovos_workshop/skills/base.py | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/ovos_workshop/skills/base.py b/ovos_workshop/skills/base.py index a357aef..259eeb4 100644 --- a/ovos_workshop/skills/base.py +++ b/ovos_workshop/skills/base.py @@ -1013,6 +1013,10 @@ def __get_response_v1(self): Returns: str: user's response or None on a timeout """ + srcm = dig_for_message() or Message("", context={"source": "skills", + "skill_id": self.skill_id}) + self.bus.emit(srcm.forward("skill.converse.get_response.enable", + {"skill_id": self.skill_id})) # TODO: Support `message` signature like default? def converse(utterances, lang=None): @@ -1041,9 +1045,12 @@ def converse(utterances, lang=None): converse.finished = True converse.response = self.__response # external override self.converse = self.__original_converse + self.bus.emit(srcm.forward("skill.converse.get_response.disable", + {"skill_id": self.skill_id})) return converse.response # get response V2 + @backwards_compat(classic_core=__get_response_v1, pre_008=__get_response_v1) def __get_response(self): """Helper to get a response from the user @@ -1056,30 +1063,8 @@ def __get_response(self): srcm = dig_for_message() or Message("", context={"source": "skills", "skill_id": self.skill_id}) - # in ovos-core < 0.0.8 we reassign the converse method itself - is_old = False - try: - from mycroft.version import OVOS_VERSION_MAJOR, OVOS_VERSION_MINOR, OVOS_VERSION_BUILD, OVOS_VERSION_ALPHA - if OVOS_VERSION_MAJOR == 0 and OVOS_VERSION_MINOR == 0 and OVOS_VERSION_BUILD <= 8 and OVOS_VERSION_ALPHA < 5: - is_old = True - except ImportError: - try: - # classic mycroft-core / not ovos - from mycroft.version import CORE_VERSION_MAJOR - is_old = True - except ImportError: - # standalone usage without core - pass - self.bus.emit(srcm.forward("skill.converse.get_response.enable", {"skill_id": self.skill_id})) - - if is_old: # NOT SAFE for multiple users at same time - res = self.__get_response_v1() - self.bus.emit(srcm.forward("skill.converse.get_response.disable", - {"skill_id": self.skill_id})) - return res - self._activate() utterances = []