From ae5ef640cd95d13c3a0c66d6e038505487856b01 Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Mon, 23 Sep 2024 17:51:20 +0100 Subject: [PATCH 1/3] fix:wait while speaking (#238) * fix:wait while speaking didnt realize bools were considered a type of int ``` isinstance(True, int) True isinstance(False, int) True ``` * fix:wait while speaking didnt realize bools were considered a type of int ``` isinstance(True, int) True isinstance(False, int) True ``` --- ovos_workshop/skills/ovos.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ovos_workshop/skills/ovos.py b/ovos_workshop/skills/ovos.py index 1c3614f9..328179b0 100644 --- a/ovos_workshop/skills/ovos.py +++ b/ovos_workshop/skills/ovos.py @@ -1677,7 +1677,7 @@ def speak(self, utterance: str, expect_response: bool = False, self.bus.emit(m) if wait: - timeout = wait if isinstance(wait, int) else 15 + timeout = 15 if isinstance(wait, bool) else wait sess = SessionManager.get(m) sess.is_speaking = True SessionManager.wait_while_speaking(timeout, sess) @@ -1724,7 +1724,7 @@ def _play_audio_old(self, filename: str, instant: bool = False, "uri": filename # new namespace })) if wait: - timeout = wait if isinstance(wait, int) else 30 + timeout = 30 if isinstance(wait, bool) else wait sess = SessionManager.get(message) sess.is_speaking = True SessionManager.wait_while_speaking(timeout, sess) @@ -1769,7 +1769,7 @@ def play_audio(self, filename: str, instant: bool = False, self.bus.emit(message.forward(mtype, data)) if wait: - timeout = wait if isinstance(wait, int) else 30 + timeout = 30 if isinstance(wait, bool) else wait sess = SessionManager.get(message) sess.is_speaking = True SessionManager.wait_while_speaking(timeout, sess) From 9739804c08774dd3346a07b0a53d996c8b337000 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Mon, 23 Sep 2024 16:51:36 +0000 Subject: [PATCH 2/3] Increment Version to 0.1.3a1 --- ovos_workshop/version.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ovos_workshop/version.py b/ovos_workshop/version.py index 815acd1d..98468119 100644 --- a/ovos_workshop/version.py +++ b/ovos_workshop/version.py @@ -1,6 +1,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 0 VERSION_MINOR = 1 -VERSION_BUILD = 2 -VERSION_ALPHA = 0 +VERSION_BUILD = 3 +VERSION_ALPHA = 1 # END_VERSION_BLOCK From b139141ae6b853533227eb5a32c683a2bb16e368 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Mon, 23 Sep 2024 16:52:01 +0000 Subject: [PATCH 3/3] Update Changelog --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 323394fd..02ed2e38 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,12 @@ # Changelog -## [0.1.2a1](https://github.com/OpenVoiceOS/OVOS-workshop/tree/0.1.2a1) (2024-09-11) +## [0.1.3a1](https://github.com/OpenVoiceOS/OVOS-workshop/tree/0.1.3a1) (2024-09-23) -[Full Changelog](https://github.com/OpenVoiceOS/OVOS-workshop/compare/0.1.1...0.1.2a1) +[Full Changelog](https://github.com/OpenVoiceOS/OVOS-workshop/compare/0.1.2...0.1.3a1) **Merged pull requests:** -- fix:backend\_client\_version\_compat [\#232](https://github.com/OpenVoiceOS/OVOS-workshop/pull/232) ([JarbasAl](https://github.com/JarbasAl)) +- fix:wait while speaking [\#238](https://github.com/OpenVoiceOS/OVOS-workshop/pull/238) ([JarbasAl](https://github.com/JarbasAl))