Merge pull request #581 from OpenVoiceOS/release-0.2.6a1

Release 0.2.6a1

CHANGELOG.md

@@ -1,12 +1,12 @@
 # Changelog
 
-## [0.2.5a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.2.5a1) (2024-10-18)
+## [0.2.6a1](https://github.com/OpenVoiceOS/ovos-core/tree/0.2.6a1) (2024-11-02)
 
-[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.2.4...0.2.5a1)
+[Full Changelog](https://github.com/OpenVoiceOS/ovos-core/compare/0.2.5...0.2.6a1)
 
 **Merged pull requests:**
 
-- fix:fallback match [\#572](https://github.com/OpenVoiceOS/ovos-core/pull/572) ([JarbasAl](https://github.com/JarbasAl))
+- fix:move code to dependencies [\#571](https://github.com/OpenVoiceOS/ovos-core/pull/571) ([JarbasAl](https://github.com/JarbasAl))
 
 
 

mycroft/skills/common_play_skill.py

@@ -158,17 +158,14 @@ def __handle_play_start(self, message):
         data = message.data.get("callback_data")
 
         # Stop any currently playing audio
-        if self.audioservice and self.audioservice.is_playing:
-            self.audioservice.stop()
+        self.stop()
+
         message.context["skill_id"] = self.skill_id
-        self.bus.emit(message.forward("mycroft.stop"))
 
         # Save for CPS_play() later, e.g. if phrase includes modifiers like
         # "... on the chromecast"
         self.play_service_string = phrase
 
-        self.activate()
-
         # Invoke derived class to provide playback data
         self.CPS_start(phrase, data)
 

mycroft/skills/intent_services/__init__.py

@@ -1,14 +1,14 @@
-from ovos_core.intent_services import AdaptService,\
-    ConverseService, \
-    CommonQAService, \
-    FallbackService, \
-    PadaciosoService
-from ovos_core.intent_services import IntentMatch
-from mycroft.skills.intent_services.adapt_service import AdaptIntent, IntentBuilder, Intent
+from ovos_core.intent_services.fallback_service import FallbackService
+from ovos_core.intent_services.converse_service import ConverseService
+from ovos_adapt.opm import AdaptPipeline as AdaptService
+from padacioso.opm import PadaciosoPipeline as PadaciosoService
+from ovos_commonqa.opm import CommonQAService
+from ovos_plugin_manager.templates.pipeline import IntentMatch
+from ovos_workshop.intents import Intent as AdaptIntent, IntentBuilder, Intent
 
 try:
-    from ovos_core.intent_services.padatious_service import PadatiousService, PadatiousMatcher
+    from ovos_padatious.opm import PadatiousPipeline as PadatiousService, PadatiousMatcher
 except ImportError:
     from ovos_utils.log import LOG
     LOG.warning("padatious not installed")
-    from ovos_core.intent_services.padacioso_service import PadaciosoService as PadatiousService
+    from padacioso.opm import PadaciosoPipeline as PadatiousService

mycroft/skills/intent_services/adapt_service.py

@@ -13,10 +13,11 @@
 # limitations under the License.
 #
 """An intent parsing service using the Adapt parser."""
-from ovos_adapt.context import ContextManagerFrame
 from ovos_adapt.engine import IntentDeterminationEngine
 from ovos_workshop.intents import IntentBuilder, Intent
-from ovos_adapt.opm import ContextManager, AdaptPipeline as AdaptService
+from ovos_adapt.opm import AdaptPipeline as AdaptService
+from ovos_bus_client.session import IntentContextManagerFrame as ContextManagerFrame, \
+    IntentContextManager as ContextManager
 
 
 class AdaptIntent(IntentBuilder):

mycroft/skills/intent_services/commonqa_service.py

@@ -1,2 +1,2 @@
-from ovos_core.intent_services.commonqa_service import CommonQAService
+from ovos_commonqa.opm import CommonQAService
 EXTENSION_TIME = 10

mycroft/skills/intent_services/padatious_service.py

@@ -13,5 +13,5 @@
 # limitations under the License.
 #
 """Intent service wrapping padatious."""
-from ovos_core.intent_services.padatious_service import PadatiousMatcher, PadatiousService, PadatiousIntent
+from ovos_padatious.opm import PadatiousMatcher, PadatiousPipeline as PadatiousService, PadatiousIntent