From f7e3d5d21edda724040676d4fd77cffe94ef8deb Mon Sep 17 00:00:00 2001
From: JarbasAI <33701864+JarbasAl@users.noreply.github.com>
Date: Fri, 6 Dec 2024 15:24:15 +0000
Subject: [PATCH] fix:bracket_expansion (#618)

* fix:bracket_expansion

pull https://github.com/OpenVoiceOS/ovos-utils/pull/317 into dependencies

* Update build_tests.yml

* failing tests

* Update requirements.txt
---
 .github/workflows/build_tests.yml         | 2 +-
 ovos_core/intent_services/stop_service.py | 4 ++--
 requirements/requirements.txt             | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_tests.yml b/.github/workflows/build_tests.yml
index 9f2211ab0b79..ffb1cc8dab7d 100644
--- a/.github/workflows/build_tests.yml
+++ b/.github/workflows/build_tests.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       max-parallel: 2
       matrix:
-        python-version: [3.8, 3.9, "3.10", "3.11]
+        python-version: [3.8, 3.9, "3.10", "3.11"]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
diff --git a/ovos_core/intent_services/stop_service.py b/ovos_core/intent_services/stop_service.py
index f9ba7f17b0b9..651597136aa3 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 21591cb0cec3..d65560c69756 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -5,10 +5,10 @@ combo-lock>=0.2.2, <0.4
 
 padacioso>=1.0.0, <2.0.0
 ovos-adapt-parser>=1.0.5, <2.0.0
-ovos_ocp_pipeline_plugin>=1.0.7, <2.0.0
+ovos_ocp_pipeline_plugin==1.0.7
 ovos-common-query-pipeline-plugin>=1.0.5, <2.0.0
 
-ovos-utils>=0.3.5,<1.0.0
+ovos-utils[extras]>=0.6.0,<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