Merge pull request #27 from OpenVoiceOS/release-1.0.5a1

Release 1.0.5a1

CHANGELOG.md

@@ -1,12 +1,12 @@
 # Changelog
 
-## [1.0.4a1](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/tree/1.0.4a1) (2024-10-31)
+## [1.0.5a1](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/tree/1.0.5a1) (2024-11-02)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/compare/1.0.3...1.0.4a1)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/compare/1.0.4...1.0.5a1)
 
 **Merged pull requests:**
 
-- fix:workshop2\_compat [\#24](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/pull/24) ([JarbasAl](https://github.com/JarbasAl))
+- fix: correct pipeline parent class [\#26](https://github.com/OpenVoiceOS/ovos-ocp-pipeline-plugin/pull/26) ([JarbasAl](https://github.com/JarbasAl))
 
 
 

ocp_pipeline/opm.py

@@ -14,7 +14,7 @@
 from ovos_bus_client.session import SessionManager
 from ovos_config import Configuration
 from ovos_plugin_manager.ocp import available_extractors
-from ovos_plugin_manager.templates.pipeline import IntentHandlerMatch, ConfidenceMatcherPipeline
+from ovos_plugin_manager.templates.pipeline import IntentHandlerMatch, ConfidenceMatcherPipeline, PipelineStageMatcher
 from ovos_utils.lang import standardize_lang_tag, get_language_dir
 from ovos_utils.log import LOG, deprecated, log_deprecation
 from ovos_utils.messagebus import FakeBus
@@ -1070,12 +1070,12 @@ def match_legacy(self, utterances: List[str], lang: str, message: Message = None
         return MycroftCPSLegacyPipeline(self.bus, self.config).match(utterances, lang, message)
 
 
-class MycroftCPSLegacyPipeline(ConfidenceMatcherPipeline, OVOSAbstractApplication):
+class MycroftCPSLegacyPipeline(PipelineStageMatcher, OVOSAbstractApplication):
     def __init__(self, bus: Optional[Union[MessageBusClient, FakeBus]] = None,
                  config: Optional[Dict] = None):
         OVOSAbstractApplication.__init__(self, bus=bus or FakeBus(),
                                          skill_id=OCP_ID, resources_dir=f"{dirname(__file__)}")
-        ConfidenceMatcherPipeline.__init__(self, bus, config)
+        PipelineStageMatcher.__init__(self, bus, config)
         self.mycroft_cps = LegacyCommonPlay(self.bus)
         OCPPipelineMatcher.load_intent_files()
         self.add_event("ocp:legacy_cps", self.handle_legacy_cps, is_intent=True)
@@ -1111,12 +1111,6 @@ def match(self, utterances: List[str], lang: str, message: Message = None) -> Op
                                       skill_id=OCP_ID,
                                       utterance=utterance)
 
-    def match_medium(self, utterances: List[str], lang: str, message: Message = None) -> Optional[IntentHandlerMatch]:
-        return None
-
-    def match_low(self, utterances: List[str], lang: str, message: Message = None) -> Optional[IntentHandlerMatch]:
-        return None
-
     def handle_legacy_cps(self, message: Message):
         """intent handler for legacy CPS matches"""
         utt = message.data["query"]

ocp_pipeline/version.py

@@ -1,6 +1,6 @@
 # START_VERSION_BLOCK
 VERSION_MAJOR = 1
 VERSION_MINOR = 0
-VERSION_BUILD = 4
-VERSION_ALPHA = 0
+VERSION_BUILD = 5
+VERSION_ALPHA = 1
 # END_VERSION_BLOCK