circular imports

ovos_workshop/decorators/__init__.py

@@ -10,49 +10,6 @@
 from ovos_utils import classproperty
 
 
-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
-
-
 def adds_context(context: str, words: str = ''):
     """
     Decorator to add context to the Adapt context manager.

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/skills/base.py

@@ -52,10 +52,9 @@
 from ovos_utils.parse import match_one
 from ovos_utils.process_utils import RuntimeRequirements
 from ovos_utils.skills import get_non_properties
-from ovos_utils.sound import play_acknowledge_sound
 from ovos_utils import classproperty
 
-from ovos_workshop.decorators import backwards_compat
+from ovos_workshop.decorators.compat import backwards_compat
 from ovos_workshop.decorators.killable import AbortEvent
 from ovos_workshop.decorators.killable import killable_event, \
     AbortQuestion

ovos_workshop/skills/common_query_skill.py

@@ -16,8 +16,8 @@
 
 from ovos_utils.file_utils import resolve_resource_file
 from ovos_utils.log import LOG
-from ovos_workshop.skills.ovos import OVOSSkill, is_classic_core
-from ovos_workshop.decorators import backwards_compat
+from ovos_workshop.skills.ovos import OVOSSkill
+from ovos_workshop.decorators.compat import backwards_compat
 
 
 class CQSMatchLevel(IntEnum):

ovos_workshop/skills/fallback.py

@@ -22,7 +22,7 @@
 from ovos_utils.messagebus import get_handler_name, Message
 from ovos_utils.metrics import Stopwatch
 from ovos_utils.skills import get_non_properties
-from ovos_workshop.decorators import backwards_compat
+from ovos_workshop.decorators.compat import backwards_compat
 from ovos_workshop.permissions import FallbackMode
 from ovos_workshop.skills.ovos import OVOSSkill
 

ovos_workshop/skills/mycroft_skill.py

@@ -20,10 +20,14 @@
 
 from ovos_bus_client import MessageBusClient, Message
 from ovos_utils.log import LOG, log_deprecation, deprecated
-from ovos_workshop.skills.base import BaseSkill, is_classic_core
+from ovos_workshop.skills.base import BaseSkill
 from ovos_utils.sound import play_acknowledge_sound
 
 
+def is_classic_core(): # TODO - use decorator
+    return False
+
+
 class _SkillMetaclass(ABCMeta):
     """
     This metaclass ensures we can load skills like regular python objects.

ovos_workshop/skills/ovos.py

@@ -11,7 +11,7 @@
 from ovos_utils.skills.audioservice import OCPInterface
 from ovos_utils.skills.settings import PrivateSettings
 from ovos_utils.sound import play_audio
-from ovos_workshop.decorators import backwards_compat
+from ovos_workshop.decorators.compat import backwards_compat
 from ovos_workshop.decorators.layers import IntentLayers
 from ovos_workshop.resource_files import SkillResources
 from ovos_workshop.skills.base import BaseSkill