Fix/intent bus api (#59)

fix intent bus api 

* fix adapt tests

* fix converse tests

* fix intent service interface tests

authored-by: jarbasai <jarbasai@mailfence.com>

Author: NeonJarbas

mycroft/skills/intent_service.py

@@ -13,11 +13,8 @@
 # limitations under the License.
 #
 """Mycroft's intent service, providing intent parsing since forever!"""
-import time
-from threading import Event
-
 from mycroft.configuration import Configuration, setup_locale
-from mycroft.messagebus.message import Message
+from mycroft.messagebus.message import Message, dig_for_message
 from mycroft.metrics import report_timing, Stopwatch
 from mycroft.skills.intent_service_interface import open_intent_envelope
 from mycroft.skills.intent_services import (
@@ -30,7 +27,7 @@
 from mycroft.util.parse import normalize
 
 
-def _get_message_lang(message):
+def _get_message_lang(message=None):
     """Get the language from the message or the default language.
 
     Args:
@@ -39,7 +36,11 @@ def _get_message_lang(message):
     Returns:
         The language code from the message or the default language.
     """
+    message = message or dig_for_message()
+    # TODO read active locale from LF instead
     default_lang = Configuration.get().get('lang', 'en-us')
+    if not message:
+        return default_lang
     return message.data.get('lang', default_lang).lower()
 
 
@@ -136,8 +137,9 @@ def __init__(self, bus):
 
     @property
     def registered_intents(self):
+        lang = _get_message_lang()
         return [parser.__dict__
-                for parser in self.adapt_service.engine.intent_parsers]
+                for parser in self.adapt_service.engines[lang].intent_parsers]
 
     def update_skill_name_dict(self, message):
         """Messagebus handler, updates dict of id to skill name conversions."""
@@ -181,7 +183,7 @@ def reset_converse(self, message):
         """Let skills know there was a problem with speech recognition"""
         lang = _get_message_lang(message)
         setup_locale(lang)  # restore default lang
-        self.converse.converse_with_skills(None, lang, message)
+        self.converse.converse_with_skills([], lang, message)
 
     def do_converse(self, utterances, skill_id, lang, message):
         """DEPRECATED: do not use, method only for api backwards compatibility
@@ -246,7 +248,7 @@ def send_metrics(self, intent, context, stopwatch):
         ident = context['ident'] if 'ident' in context else None
         # Determine what handled the intent
         if intent and intent.intent_service == 'Converse':
-            intent_type = '{}:{}'.format(intent.skill_id, 'converse')
+            intent_type = f'{intent.skill_id}:converse'
         elif intent and intent.intent_service == 'Fallback':
             intent_type = 'fallback'
         elif intent:  # Handled by an other intent parser
@@ -359,7 +361,7 @@ def handle_register_vocab(self, message):
         entity_type = message.data.get('entity_type')
         regex_str = message.data.get('regex')
         alias_of = message.data.get('alias_of')
-        lang = message.data.get('lang')
+        lang = _get_message_lang(message)
         self.adapt_service.register_vocabulary(entity_value, entity_type,
                                                alias_of, regex_str, lang)
         self.registered_vocab.append(message.data)
@@ -433,7 +435,7 @@ def handle_get_intent(self, message):
             message (Message): message containing utterance
         """
         utterance = message.data["utterance"]
-        lang = message.data.get("lang", "en-us")
+        lang = _get_message_lang(message)
         combined = _normalize_all_utterances([utterance])
 
         # Create matchers
@@ -495,7 +497,7 @@ def handle_get_adapt(self, message):
             message (Message): message containing utterance
         """
         utterance = message.data["utterance"]
-        lang = message.data.get("lang", "en-us")
+        lang = _get_message_lang(message)
         combined = _normalize_all_utterances([utterance])
         intent = self.adapt_service.match_intent(combined, lang)
         intent_data = intent.intent_data if intent else None

mycroft/skills/intent_services/converse_service.py

@@ -253,7 +253,7 @@ def converse_with_skills(self, utterances, lang, message):
         Returns:
             IntentMatch if handled otherwise None.
         """
-        utterances = [item for tup in utterances for item in tup]
+        utterances = [item for tup in utterances or [] for item in tup]
         # filter allowed skills
         self._check_converse_timeout()
         # check if any skill wants to handle utterance