Skip to content

Commit 3a3e319

Browse files
authored
Merge branch 'dev' into feat/stop-1-conformance
2 parents 6ff7ea8 + 723c9c0 commit 3a3e319

6 files changed

Lines changed: 66 additions & 6 deletions

File tree

.github/workflows/opm_check.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: OPM Plugin Check
2+
on:
3+
push:
4+
branches: [master]
5+
pull_request:
6+
branches: [dev]
7+
workflow_dispatch:
8+
9+
jobs:
10+
opm_check:
11+
uses: OpenVoiceOS/gh-automations/.github/workflows/opm-check.yml@dev
12+
secrets: inherit
13+
with:
14+
system_deps: 'swig libssl-dev portaudio19-dev libpulse-dev libfann-dev'
15+
install_extras: 'mycroft,plugins,skills-essential,lgpl,test'
16+
python_version: '3.11'
17+
plugin_type: 'pipeline'

CHANGELOG.md

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,46 @@
11
# Changelog
22

3+
## [2.2.4a3](https://github.com/OpenVoiceOS/ovos-core/tree/2.2.4a3) (2026-06-28)
4+
5+
[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/2.2.4a1...2.2.4a3)
6+
7+
**Merged pull requests:**
8+
9+
- test\(e2e\): fix transient test\_fallback\_match meta mismatch on dev [\#792](https://github.com/OpenVoiceOS/ovos-core/pull/792) ([JarbasAl](https://github.com/JarbasAl))
10+
- ci: wire shared opm-check workflow \(opm.pipeline entry-points\) [\#787](https://github.com/OpenVoiceOS/ovos-core/pull/787) ([JarbasAl](https://github.com/JarbasAl))
11+
12+
## [2.2.4a1](https://github.com/OpenVoiceOS/ovos-core/tree/2.2.4a1) (2026-06-28)
13+
14+
[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/2.2.3a1...2.2.4a1)
15+
16+
**Merged pull requests:**
17+
18+
- fix: lift ovos-spec-tools upper bound \(spec-tools 1.x\) [\#790](https://github.com/OpenVoiceOS/ovos-core/pull/790) ([JarbasAl](https://github.com/JarbasAl))
19+
20+
## [2.2.3a1](https://github.com/OpenVoiceOS/ovos-core/tree/2.2.3a1) (2026-06-27)
21+
22+
[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/2.2.2a1...2.2.3a1)
23+
24+
**Merged pull requests:**
25+
26+
- fix\(deps\): allow ovos-workshop 9.x \(widen \<9.0.0 -\> \<10.0.0\) [\#779](https://github.com/OpenVoiceOS/ovos-core/pull/779) ([JarbasAl](https://github.com/JarbasAl))
27+
28+
## [2.2.2a1](https://github.com/OpenVoiceOS/ovos-core/tree/2.2.2a1) (2026-06-27)
29+
30+
[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/2.2.1a1...2.2.2a1)
31+
32+
**Merged pull requests:**
33+
34+
- fix: allow latest padacioso \(widen cap to \<3.0.0\) [\#782](https://github.com/OpenVoiceOS/ovos-core/pull/782) ([JarbasAl](https://github.com/JarbasAl))
35+
36+
## [2.2.1a1](https://github.com/OpenVoiceOS/ovos-core/tree/2.2.1a1) (2026-06-27)
37+
38+
[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/2.2.0a2...2.2.1a1)
39+
40+
**Merged pull requests:**
41+
42+
- fix: guard optional None blacklisted\_skills/intents \(SESSION-1 §3\) [\#780](https://github.com/OpenVoiceOS/ovos-core/pull/780) ([JarbasAl](https://github.com/JarbasAl))
43+
344
## [2.2.0a2](https://github.com/OpenVoiceOS/ovos-core/tree/2.2.0a2) (2026-06-26)
445

546
[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/2.2.0a1...2.2.0a2)

ovos_core/intent_services/service.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -472,11 +472,11 @@ def handle_utterance(self, message: Message):
472472
match = match_func(utterances, intent_lang, message)
473473
if match:
474474
LOG.info(f"{pipeline} match ({intent_lang}): {match}")
475-
if match.skill_id and match.skill_id in sess.blacklisted_skills:
475+
if match.skill_id and match.skill_id in (sess.blacklisted_skills or []):
476476
LOG.debug(
477477
f"ignoring match, skill_id '{match.skill_id}' blacklisted by Session '{sess.session_id}'")
478478
continue
479-
if isinstance(match, IntentHandlerMatch) and match.match_type in sess.blacklisted_intents:
479+
if isinstance(match, IntentHandlerMatch) and match.match_type in (sess.blacklisted_intents or []):
480480
LOG.debug(
481481
f"ignoring match, intent '{match.match_type}' blacklisted by Session '{sess.session_id}'")
482482
continue

ovos_core/version.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# START_VERSION_BLOCK
22
VERSION_MAJOR = 2
33
VERSION_MINOR = 2
4-
VERSION_BUILD = 0
5-
VERSION_ALPHA = 2
4+
VERSION_BUILD = 4
5+
VERSION_ALPHA = 3
66
# END_VERSION_BLOCK
77

88
# for compat with old imports

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ dependencies = [
1919
"ovos_bus_client>=2.5.1a1,<3.0.0",
2020
"ovos-plugin-manager>=2.5.0a1,<3.0.0",
2121
"ovos-config>=0.0.13,<3.0.0",
22-
"ovos-workshop>=8.3.0a1,<9.0.0",
22+
"ovos-workshop>=8.3.0a1,<10.0.0",
2323
"rapidfuzz>=3.6,<4.0",
2424
"ovos-spec-tools[langcodes]>=0.11.0a1,<1.0.0",
2525
]
@@ -71,7 +71,7 @@ plugins = [
7171
"ovos-adapt-parser>=1.3.3a1, <2.0.0",
7272
"ovos_ocp_pipeline_plugin>=1.1.21a5, <2.0.0",
7373
"ovos-persona>=0.9.0a7,<1.0.0",
74-
"padacioso>=1.0.0, <2.0.0",
74+
"padacioso>=1.0.0,<3.0.0",
7575
"keyword-template-matcher>=0.1.1,<1.0.0",
7676
"ahocorasick-ner>=0.1.1,<1.0.0",
7777
]

test/end2end/test_fallback.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ def _run_fallback_match(self, namespace: str) -> None:
8080
data={"lang": session.lang,
8181
"expect_response": False,
8282
"meta": {
83+
"dialog": "unknown",
84+
"data": {},
8385
"skill": self.skill_id
8486
}},
8587
context={"skill_id": self.skill_id}),

0 commit comments

Comments
 (0)