0.0.14

.github/workflows/coverage.yml

@@ -28,9 +28,14 @@ jobs:
       run: |
         sudo apt install libssl-dev libfann-dev portaudio19-dev libpulse-dev
         pip install -r requirements/test.txt
+        pip install ./test/end2end/session/skill-ovos-hello-world
+        pip install ./test/end2end/session/skill-ovos-fallback-unknown
+        pip install ./test/end2end/session/skill-ovos-fallback-unknownv1
+        pip install ./test/end2end/session/skill-converse_test
     - name: Generate coverage report
       run: |
-        pytest --cov=./ovos_workshop --cov-report=xml
+        pytest --cov=./ovos_workshop --cov-report xml test/unittests
+        pytest --cov-append --cov=ovos_workshop --cov-report xml test/end2end
     - name: Upload coverage to Codecov
       uses: codecov/codecov-action@v3
       with:

.gitignore

@@ -18,3 +18,4 @@ dist
 
 # Created by unit tests
 .pytest_cache/
+/.gtm/

ovos_workshop/app.py

@@ -1,9 +1,9 @@
 from os.path import isdir, join
 from typing import Optional
 from ovos_config.locations import get_xdg_config_save_path
-from ovos_utils.messagebus import get_mycroft_bus
+from ovos_bus_client.util import get_mycroft_bus
 from ovos_utils.log import log_deprecation
-from ovos_utils.gui import GUIInterface
+from ovos_bus_client.apis.gui import GUIInterface
 from ovos_bus_client.client.client import MessageBusClient
 from ovos_workshop.resource_files import locate_lang_directories
 from ovos_workshop.skills.ovos import OVOSSkill
@@ -28,26 +28,26 @@ def __init__(self, skill_id: str, bus: Optional[MessageBusClient] = None,
         @param enable_settings_manager: if True, enables a SettingsManager for
             this application to manage default settings and backend sync
         """
-        super().__init__(skill_id=skill_id, bus=bus, gui=gui,
-                         resources_dir=resources_dir,
-                         enable_settings_manager=enable_settings_manager,
-                         **kwargs)
-        self.skill_id = skill_id
         self._dedicated_bus = False
         if bus:
             self._dedicated_bus = False
         else:
             self._dedicated_bus = True
             bus = get_mycroft_bus()
-        self._startup(bus, skill_id)
+
+        super().__init__(skill_id=skill_id, bus=bus, gui=gui,
+                         resources_dir=resources_dir,
+                         enable_settings_manager=enable_settings_manager,
+                         **kwargs)
+
         if settings:
-            log_deprecation(f"Settings should be set in {self._settings_path}. "
+            log_deprecation(f"Settings should be set in {self.settings_path}. "
                             f"Passing `settings` to __init__ is not supported.",
                             "0.1.0")
             self.settings.merge(settings)
 
     @property
-    def _settings_path(self) -> str:
+    def settings_path(self) -> str:
         """
         Overrides the default path to put settings in `apps` subdirectory.
         """

ovos_workshop/decorators/compat.py

@@ -0,0 +1,44 @@
+from functools import wraps
+
+
+def backwards_compat(classic_core=None, pre_008=None, no_core=None):
+    """
+    Decorator to run a different method if specific ovos-core versions are detected
+    """
+
+    def backwards_compat_decorator(func):
+        is_classic = False
+        is_old = False
+        is_standalone = True
+        try:
+            from mycroft.version import CORE_VERSION_STR  # all classic mycroft and ovos versions
+            is_classic = True
+            is_standalone = False
+
+            try:
+                from ovos_core.version import OVOS_VERSION_MINOR  # ovos-core >= 0.0.8
+                is_classic = False
+            except ImportError:
+                is_old = True
+                try:
+                    from mycroft.version import OVOS_VERSION_MINOR  # ovos-core <= 0.0.7
+                    is_classic = False
+                except:
+                    is_standalone = True
+
+        except:
+            is_standalone = True
+
+        @wraps(func)
+        def func_wrapper(*args, **kwargs):
+            if is_classic and callable(classic_core):
+                return classic_core(*args, **kwargs)
+            if is_old and callable(pre_008):
+                return pre_008(*args, **kwargs)
+            if is_standalone and callable(no_core):
+                return no_core(*args, **kwargs)
+            return func(*args, **kwargs)
+
+        return func_wrapper
+
+    return backwards_compat_decorator

ovos_workshop/decorators/layers.py

@@ -4,7 +4,6 @@
 
 from ovos_bus_client import MessageBusClient
 from ovos_utils.log import LOG
-from ovos_workshop.skills.base import BaseSkill
 
 
 def dig_for_skill(max_records: int = 10) -> Optional[object]:
@@ -13,17 +12,20 @@ def dig_for_skill(max_records: int = 10) -> Optional[object]:
     @param max_records: maximum number of records in the stack to check
     @return: Skill or AbstractApplication instance if found
     """
+
+    from ovos_workshop.skills.ovos import OVOSSkill
+
     stack = inspect.stack()[1:]  # First frame will be this function call
     stack = stack if len(stack) <= max_records else stack[:max_records]
     for record in stack:
         args = inspect.getargvalues(record.frame)
         if args.locals.get("self"):
             obj = args.locals["self"]
-            if isinstance(obj, BaseSkill):
+            if isinstance(obj, OVOSSkill):
                 return obj
         elif args.locals.get("args"):
             for obj in args.locals["args"]:
-                if isinstance(obj, BaseSkill):
+                if isinstance(obj, OVOSSkill):
                     return obj
     return None
 
@@ -170,7 +172,7 @@ def bind(self, skill: object):
         return self
 
     @property
-    def skill(self) -> BaseSkill:
+    def skill(self):
         return self._skill
 
     @property