Merge pull request #52 from OpenVoiceOS/release-0.2.18a1

Release 0.2.18a1

Author: JarbasAl

CHANGELOG.md

@@ -1,32 +1,16 @@
 # Changelog
 
-## [0.2.17a1](https://github.com/OpenVoiceOS/ovos-skill-dictation/tree/0.2.17a1) (2025-06-07)
+## [0.2.18a1](https://github.com/OpenVoiceOS/ovos-skill-dictation/tree/0.2.18a1) (2025-06-07)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-dictation/compare/0.2.16a2...0.2.17a1)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-dictation/compare/V0.2.17...0.2.18a1)
 
 **Merged pull requests:**
 
-- fix: automations [\#49](https://github.com/OpenVoiceOS/ovos-skill-dictation/pull/49) ([JarbasAl](https://github.com/JarbasAl))
+- fix: workshop 6.0.0 compat [\#51](https://github.com/OpenVoiceOS/ovos-skill-dictation/pull/51) ([JarbasAl](https://github.com/JarbasAl))
 
-## [0.2.16a2](https://github.com/OpenVoiceOS/ovos-skill-dictation/tree/0.2.16a2) (2025-06-07)
+## [V0.2.17](https://github.com/OpenVoiceOS/ovos-skill-dictation/tree/V0.2.17) (2025-06-07)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-dictation/compare/0.2.16a1...0.2.16a2)
-
-**Merged pull requests:**
-
-- Fix/session [\#47](https://github.com/OpenVoiceOS/ovos-skill-dictation/pull/47) ([JarbasAl](https://github.com/JarbasAl))
-
-## [0.2.16a1](https://github.com/OpenVoiceOS/ovos-skill-dictation/tree/0.2.16a1) (2025-06-05)
-
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-dictation/compare/V0.2.15...0.2.16a1)
-
-**Merged pull requests:**
-
-- gl/translate [\#45](https://github.com/OpenVoiceOS/ovos-skill-dictation/pull/45) ([gitlocalize-app[bot]](https://github.com/apps/gitlocalize-app))
-
-## [V0.2.15](https://github.com/OpenVoiceOS/ovos-skill-dictation/tree/V0.2.15) (2025-05-06)
-
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-dictation/compare/0.2.15...V0.2.15)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-skill-dictation/compare/0.2.17...V0.2.17)
 
 
 

__init__.py

@@ -74,7 +74,9 @@ def stop_dictation(self, message=None):
         name = self.dictation_sessions[sess.session_id]["file_name"] or time.time()
         with open(f"{path}/{name}.txt", "w") as f:
             f.write("\n".join(self.dictation_sessions[sess.session_id]["dictation_stack"]))
-        self.gui.show_text(f"saved to {path}/{name}.txt")
+
+        if sess.session_id == "default":
+            self.gui.show_text(f"saved to {path}/{name}.txt")
 
         self.dictation_sessions[sess.session_id]["dictating"] = False
 
@@ -94,6 +96,10 @@ def handle_stop_dictation_intent(self, message):
             self.speak_dialog("not_dictating")
         self.stop_dictation(message)
 
+    def can_stop(self, message: Message) -> bool:
+        session = SessionManager.get(message)
+        return session.session_id in self.dictation_sessions and self.dictation_sessions[session.session_id]["dictating"]
+
     def stop_session(self, session: Session):
         if session.session_id in self.dictation_sessions and \
                 self.dictation_sessions[session.session_id]["dictating"]:
@@ -102,14 +108,6 @@ def stop_session(self, session: Session):
             return True
         return False
 
-    def stop(self):
-        sess = SessionManager.get()
-        if sess.session_id in self.dictation_sessions and \
-                self.dictation_sessions[sess.session_id]["dictating"]:
-            self.stop_session(sess)
-            return True
-        return False
-
     def can_answer(self, message: Message) -> bool:
         """
         Determines if the skill can handle the given utterances in the specified language in the converse method.
@@ -119,47 +117,14 @@ def can_answer(self, message: Message) -> bool:
         Returns:
             True if the skill can handle the query during converse; otherwise, False.
         """
-        sess = SessionManager.get(message)
-        if sess.session_id in self.dictation_sessions and \
-                self.dictation_sessions[sess.session_id]["dictating"]:
-            return True
-        return False
+        return self.can_stop(message) # same logic
 
     def converse(self, message):
         utterance = message.data["utterances"][0]
         sess = SessionManager.get(message)
-        if sess.session_id in self.dictation_sessions and \
-                self.dictation_sessions[sess.session_id]["dictating"]:
-            if self.voc_match(utterance, "StopKeyword"):
-                self.handle_stop_dictation_intent(message)
-            else:
+        if self.voc_match(utterance, "StopKeyword"):
+            self.handle_stop_dictation_intent(message)
+        else:
+            if sess.session_id == "default":
                 self.gui.show_text(utterance)
-                self.dictation_sessions[sess.session_id]["dictation_stack"].append(utterance)
-            return True
-        return False
-
-
-if __name__ == "__main__":
-    from ovos_utils.fakebus import FakeBus
-
-
-    # print speak for debugging
-    def spk(utt, *args, **kwargs):
-        print(utt)
-
-
-    s = DictationSkill(skill_id="fake.test", bus=FakeBus())
-    s.speak = spk
-
-    s.handle_stop_dictation_intent(Message(""))
-    # I am not dictating at this moment
-    s.handle_start_dictation_intent(Message(""))
-    # ok, i am ready for dictation
-    s.converse(Message("", {"utterances": ["test"]}))
-    s.converse(Message("", {"utterances": ["test"]}))
-    s.converse(Message("", {"utterances": ["test"]}))
-    s.converse(Message("", {"utterances": ["stop"]}))
-    # dictation stopped
-    s.converse(Message("", {"utterances": ["test"]}))
-
-    assert s.dictation_stack == ['test', 'test', 'test']
+            self.dictation_sessions[sess.session_id]["dictation_stack"].append(utterance)

requirements.txt

@@ -1 +1 @@
-ovos-workshop>=5.0.0,<6.0.0
+ovos-workshop>=6.0.0,<7.0.0

version.py

@@ -1,6 +1,6 @@
 # START_VERSION_BLOCK
 VERSION_MAJOR = 0
 VERSION_MINOR = 2
-VERSION_BUILD = 17
-VERSION_ALPHA = 0
+VERSION_BUILD = 18
+VERSION_ALPHA = 1
 # END_VERSION_BLOCK