From 7794b7468290e77cae2152cc6753ccd7e1983e5c Mon Sep 17 00:00:00 2001 From: miro Date: Fri, 6 Dec 2024 13:38:34 +0000 Subject: [PATCH] fix:bracket_expansion pull https://github.com/OpenVoiceOS/ovos-utils/pull/317 into dependencies --- ovos_core/intent_services/stop_service.py | 4 ++-- requirements/requirements.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ovos_core/intent_services/stop_service.py b/ovos_core/intent_services/stop_service.py index f9ba7f17b0b..651597136aa 100644 --- a/ovos_core/intent_services/stop_service.py +++ b/ovos_core/intent_services/stop_service.py @@ -11,7 +11,7 @@ from ovos_config.config import Configuration from ovos_plugin_manager.templates.pipeline import PipelineMatch, PipelinePlugin 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.lang import standardize_lang_tag from ovos_utils.log import LOG from ovos_utils.parse import match_one @@ -33,7 +33,7 @@ def load_resource_files(self): self._voc_cache[lang2] = {} for f in os.listdir(f"{base}/{lang}"): with open(f"{base}/{lang}/{f}", encoding="utf-8") as fi: - lines = [expand_options(l) for l in fi.read().split("\n") + lines = [expand_template(l) for l in fi.read().split("\n") if l.strip() and not l.startswith("#")] n = f.split(".", 1)[0] self._voc_cache[lang2][n] = flatten_list(lines) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 21591cb0cec..548a218951f 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -8,7 +8,7 @@ ovos-adapt-parser>=1.0.5, <2.0.0 ovos_ocp_pipeline_plugin>=1.0.7, <2.0.0 ovos-common-query-pipeline-plugin>=1.0.5, <2.0.0 -ovos-utils>=0.3.5,<1.0.0 +ovos-utils[extras]>=0.6.0a1,<1.0.0 ovos_bus_client>=0.1.4,<2.0.0 ovos-plugin-manager>=0.5.6,<1.0.0 ovos-config>=0.0.13,<2.0.0