Fix/optional adapt (#19)

* remove old files * fix/optional_adapt Co-authored-by: jarbasai <[email protected]>
OpenVoiceOS · May 7, 2022 · c4f755f · c4f755f
1 parent 48b9c47
commit c4f755f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/ovos_workshop/app.py b/ovos_workshop/app.py
@@ -2,7 +2,7 @@
 from os import listdir
 from os.path import isdir, exists
 
-from adapt.intent import IntentBuilder, Intent
+
 from mycroft_bus_client.message import dig_for_message
 from ovos_utils import get_handler_name
 from ovos_utils.configuration import read_mycroft_config
@@ -40,6 +40,11 @@ def pronounce_number(n, *args, **kwargs):
 
     def extract_number(*args, **kwargs):
         return None
+try:
+    from adapt.intent import IntentBuilder, Intent
+except ImportError:
+    # adapt is optional, OVOSAbstractApplication might not use intents
+    IntentBuilder = Intent = None
 
 
 class OVOSAbstractApplication:
@@ -856,10 +861,10 @@ def _register_decorated(self):
 
     def register_intent_layer(self, layer_name, intent_list):
         for intent_file in intent_list:
-            if isinstance(intent_file, IntentBuilder):
+            if IntentBuilder is not None and isinstance(intent_file, IntentBuilder):
                 intent = intent_file.build()
                 name = intent.name
-            elif isinstance(intent_file, Intent):
+            elif Intent is not None and isinstance(intent_file, Intent):
                 name = intent_file.name
             else:
                 name = f'{self.skill_id}:{intent_file}'
@@ -926,12 +931,12 @@ def register_intent(self, intent_parser, handler):
                            file to parse utterance for the handler.
             handler (func): function to register with intent
         """
-        if isinstance(intent_parser, IntentBuilder):
+        if IntentBuilder is not None and isinstance(intent_parser, IntentBuilder):
             intent_parser = intent_parser.build()
         if (isinstance(intent_parser, str) and
                 intent_parser.endswith('.intent')):
             return self.register_intent_file(intent_parser, handler)
-        elif not isinstance(intent_parser, Intent):
+        elif not Intent or not isinstance(intent_parser, Intent):
             raise ValueError('"' + str(intent_parser) + '" is not an Intent')
 
         return self._register_adapt_intent(intent_parser, handler)

diff --git a/screenshots/audio_service.png b/screenshots/audio_service.png
diff --git a/screenshots/missing_seekbar.png b/screenshots/missing_seekbar.png
diff --git a/screenshots/simple_video.png b/screenshots/simple_video.png