Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix:bracket_expansion #618

Merged
merged 4 commits into from
Dec 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ovos_core/intent_services/stop_service.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions requirements/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading