feat/pipeline_plugins_opm

.github/workflows/build_tests.yml

@@ -30,7 +30,8 @@ jobs:
       - name: Install System Dependencies
         run: |
           sudo apt-get update
-          sudo apt install python3-dev swig libssl-dev libfann-dev portaudio19-dev libpulse-dev
+          sudo apt install python3-dev swig libssl-dev libfann-dev portaudio19-dev libpulse-dev python3-fann2
+          python -m pip install build wheel
       - name: Build Source Packages
         run: |
           python setup.py sdist

.github/workflows/license_tests.yml

@@ -37,7 +37,7 @@ jobs:
           requirements: 'requirements-all.txt'
           fail: 'Copyleft,Other,Error'
           fails-only: true
-          exclude: '^(precise-runner|fann2|tqdm|bs4|sonopy|caldav|recurring-ical-events|x-wr-timezone|zeroconf|mutagen).*'
+          exclude: '^(precise-runner|fann2|ovos-adapt-parser|ovos-padatious|tqdm|bs4|sonopy|caldav|recurring-ical-events|x-wr-timezone|zeroconf|mutagen).*'
           exclude-license: '^(Mozilla).*$'
       - name: Print report
         if: ${{ always() }}

mycroft/skills/intent_services/adapt_service.py

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

ovos_core/intent_services/__init__.py

@@ -13,18 +13,19 @@
 # limitations under the License.
 #
 from typing import Tuple, Callable
+
+from ovos_adapt.opm import AdaptPipeline as AdaptService
 from ovos_bus_client.message import Message
 from ovos_bus_client.session import SessionManager
 from ovos_bus_client.util import get_message_lang
 from ovos_config.config import Configuration
 from ovos_config.locale import setup_locale, get_valid_languages, get_full_lang_code
+from padacioso.opm import PadaciosoPipeline as PadaciosoService
 
-from ovos_core.intent_services.adapt_service import AdaptService
 from ovos_core.intent_services.commonqa_service import CommonQAService
 from ovos_core.intent_services.converse_service import ConverseService
 from ovos_core.intent_services.fallback_service import FallbackService
 from ovos_core.intent_services.ocp_service import OCPPipelineMatcher
-from ovos_core.intent_services.padacioso_service import PadaciosoService
 from ovos_core.intent_services.stop_service import StopService
 from ovos_core.transformers import MetadataTransformersService, UtteranceTransformersService
 from ovos_utils.log import LOG, deprecated, log_deprecation
@@ -56,7 +57,7 @@ def __init__(self, bus, config=None):
             if self.config["padatious"].get("disabled"):
                 LOG.info("padatious forcefully disabled in config")
             else:
-                from ovos_core.intent_services.padatious_service import PadatiousService
+                from ovos_padatious.opm import PadatiousPipeline as PadatiousService
                 self.padatious_service = PadatiousService(bus, self.config["padatious"])
         except ImportError:
             LOG.error(f'Failed to create padatious intent handlers, padatious not installed')