Merge pull request #305 from OpenVoiceOS/release-3.1.2a2

Release 3.1.2a2

CHANGELOG.md

@@ -1,12 +1,20 @@
 # Changelog
 
-## [3.1.1a1](https://github.com/OpenVoiceOS/OVOS-workshop/tree/3.1.1a1) (2024-11-21)
+## [3.1.2a2](https://github.com/OpenVoiceOS/OVOS-workshop/tree/3.1.2a2) (2024-12-06)
 
-[Full Changelog](https://github.com/OpenVoiceOS/OVOS-workshop/compare/3.1.0...3.1.1a1)
+[Full Changelog](https://github.com/OpenVoiceOS/OVOS-workshop/compare/3.1.2a1...3.1.2a2)
 
 **Merged pull requests:**
 
-- fix: update deprecated imports from ovos-utils [\#300](https://github.com/OpenVoiceOS/OVOS-workshop/pull/300) ([JarbasAl](https://github.com/JarbasAl))
+- requirements: ovos-utils version [\#304](https://github.com/OpenVoiceOS/OVOS-workshop/pull/304) ([JarbasAl](https://github.com/JarbasAl))
+
+## [3.1.2a1](https://github.com/OpenVoiceOS/OVOS-workshop/tree/3.1.2a1) (2024-11-25)
+
+[Full Changelog](https://github.com/OpenVoiceOS/OVOS-workshop/compare/3.1.1...3.1.2a1)
+
+**Merged pull requests:**
+
+- Update ovos-config requirement from \<1.0.0,\>=0.0.12 to \>=0.0.12,\<2.0.0 in /requirements [\#302](https://github.com/OpenVoiceOS/OVOS-workshop/pull/302) ([dependabot[bot]](https://github.com/apps/dependabot))
 
 
 

ovos_workshop/app.py

@@ -3,7 +3,6 @@
 from ovos_config.locations import get_xdg_config_save_path
 from ovos_bus_client.util import get_mycroft_bus
 from ovos_utils.lang import standardize_lang_tag
-from ovos_utils.log import log_deprecation
 from ovos_bus_client.apis.gui import GUIInterface
 from ovos_bus_client.client.client import MessageBusClient
 from ovos_workshop.resource_files import locate_lang_directories

ovos_workshop/resource_files.py

@@ -25,7 +25,7 @@
 from langcodes import tag_distance
 from ovos_config.locations import get_xdg_data_save_path
 from ovos_utils import flatten_list
-from ovos_utils.bracket_expansion import expand_options
+from ovos_utils.bracket_expansion import expand_template
 from ovos_utils.dialog import MustacheDialogRenderer, load_dialogs
 from ovos_utils.log import LOG
 
@@ -430,7 +430,7 @@ def load(self) -> List[List[str]]:
         vocabulary = []
         if self.file_path is not None:
             for line in self._read():
-                vocabulary.append(expand_options(line.lower()))
+                vocabulary.append(expand_template(line.lower()))
         return vocabulary
 
 
@@ -453,7 +453,7 @@ def load(self, entities: bool = True) -> List[str]:
         if self.file_path is not None:
             for line in self._read():
                 line = line.replace("{{", "{").replace("}}", "}")
-                intents.extend(flatten_list(expand_options(line.lower())))
+                intents.extend(flatten_list(expand_template(line.lower())))
             if not entities:
                 intents = [re.sub(r'{.*?}\s?', '', intent).strip() for intent in intents]
             elif self.data:

ovos_workshop/skills/ovos.py

@@ -1553,16 +1553,20 @@ def _on_event_end(self, message: Message, handler_info: str,
         Store settings (if changed) and indicate that the skill handler has
         completed.
         """
-        if self.settings != self._initial_settings:
-            self.settings.store()
-            self._initial_settings = copy(self.settings)
         if handler_info:
             msg_type = handler_info + '.complete'
             message.context["skill_id"] = self.skill_id
             self.bus.emit(message.forward(msg_type, skill_data))
         if is_intent:
             self.bus.emit(message.forward("ovos.utterance.handled", skill_data))
 
+        try:
+            if self.settings != self._initial_settings:
+                self.settings.store()
+                self._initial_settings = copy(self.settings)
+        except Exception as e:
+            LOG.error(f"Failed to update settings.json : {e}")
+
     def _on_event_error(self, error: str, message: Message, handler_info: str,
                         skill_data: dict, speak_errors: bool):
         """Speak and log the error."""

ovos_workshop/version.py

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

requirements/requirements.txt

@@ -1,6 +1,6 @@
-ovos-utils>= 0.2.1,<1.0.0
+ovos-utils>= 0.6.0,<1.0.0
 ovos_bus_client>=0.0.8,<2.0.0
-ovos-config>=0.0.12,<1.0.0
+ovos-config>=0.0.12,<2.0.0
 ovos-solver-yes-no-plugin>=0.0.1,<1.0.0
 ovos-number-parser>=0.0.1,<1.0.0
 rapidfuzz