From abd409ed042c380ed5e31c80f07003a7683d895d Mon Sep 17 00:00:00 2001 From: JarbasAI <33701864+JarbasAl@users.noreply.github.com> Date: Tue, 22 Oct 2024 00:12:48 +0100 Subject: [PATCH 1/3] fix:improve stop (#260) also stop ongoing TTS partial fix, TODO in code for later --- ovos_workshop/skills/ovos.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ovos_workshop/skills/ovos.py b/ovos_workshop/skills/ovos.py index ad9c2d86..35717807 100644 --- a/ovos_workshop/skills/ovos.py +++ b/ovos_workshop/skills/ovos.py @@ -1237,6 +1237,12 @@ def _handle_session_stop(self, message: Message): except Exception as e: data["error"] = str(e) self.log.exception(f'Failed to stop skill: {self.skill_id}: {e}') + if data["result"] and sess.session_id == "default": + # TODO - track if speech is coming from this skill! + # this is not currently tracked + self.bus.emit(message.reply("mycroft.audio.speech.stop", + {"skill_id": self.skill_id})) + self.bus.emit(message.reply(f"{self.skill_id}.stop.response", data)) def __handle_stop(self, message): @@ -1247,7 +1253,7 @@ def __handle_stop(self, message): self.bus.emit(message.forward(self.skill_id + ".stop")) sess = SessionManager.get(message) try: - stopped = self.stop_session(sess) or self.stop() + stopped = self.stop_session(sess) or self.stop() or False LOG.debug(f"{self.skill_id} stopped: {stopped}") if stopped: self.bus.emit(message.reply("mycroft.stop.handled", From 1c0aece7b0d1554179ac1a0af695e4f536c3b537 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Mon, 21 Oct 2024 23:13:03 +0000 Subject: [PATCH 2/3] Increment Version to 1.0.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 fd1e64f1..cf2e7fda 100644 --- a/ovos_workshop/version.py +++ b/ovos_workshop/version.py @@ -1,6 +1,6 @@ # START_VERSION_BLOCK VERSION_MAJOR = 1 VERSION_MINOR = 0 -VERSION_BUILD = 2 -VERSION_ALPHA = 0 +VERSION_BUILD = 3 +VERSION_ALPHA = 1 # END_VERSION_BLOCK From 871ce8c38ccf550d50f36cf0100042bd75d71117 Mon Sep 17 00:00:00 2001 From: JarbasAl Date: Mon, 21 Oct 2024 23:13:34 +0000 Subject: [PATCH 3/3] Update Changelog --- CHANGELOG.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1263346..a8bfafbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,12 @@ # Changelog -## [1.0.2a1](https://github.com/OpenVoiceOS/OVOS-workshop/tree/1.0.2a1) (2024-10-18) +## [1.0.3a1](https://github.com/OpenVoiceOS/OVOS-workshop/tree/1.0.3a1) (2024-10-21) -[Full Changelog](https://github.com/OpenVoiceOS/OVOS-workshop/compare/1.0.1...1.0.2a1) - -**Fixed bugs:** - -- lingua franca does not support standardized lang codes, it needs lower case [\#256](https://github.com/OpenVoiceOS/OVOS-workshop/issues/256) +[Full Changelog](https://github.com/OpenVoiceOS/OVOS-workshop/compare/1.0.2...1.0.3a1) **Merged pull requests:** -- fix:lingua\_franca [\#257](https://github.com/OpenVoiceOS/OVOS-workshop/pull/257) ([JarbasAl](https://github.com/JarbasAl)) +- fix:improve stop [\#260](https://github.com/OpenVoiceOS/OVOS-workshop/pull/260) ([JarbasAl](https://github.com/JarbasAl))