Merge fee8ffa into 4c1fbcb

msm/msm

@@ -46,7 +46,7 @@ else
   fi
 fi
 
-default_skills="skill-alarm skill-audio-record skill-configuration skill-date-time skill-desktop-launcher skill-ip skill-joke skill-hello-world skill-media skill-npr-news skill-naptime skill-pairing skill-personal skill-playback-control skill-reminder skill-installer skill-singing skill-speak skill-spelling skill-stop skill-stock skill-volume skill-weather skill-wiki skill-wolfram-alpha skill-mark1-demo"
+default_skills="skill-alarm skill-audio-record skill-configuration skill-date-time skill-desktop-launcher skill-ip skill-joke skill-hello-world skill-media skill-npr-news skill-naptime skill-pairing skill-personal skill-playback-control skill-reminder skill-installer skill-singing skill-speak skill-spelling skill-stop skill-stock skill-volume skill-weather skill-wiki fallback-wolfram-alpha skill-mark1-demo"
 
 echo "#######  Mycroft Skill Manager #######"
 

mycroft/client/speech/main.py

@@ -62,8 +62,8 @@ def handle_utterance(event):
     ws.emit(Message('recognizer_loop:utterance', event))
 
 
-def handle_multi_utterance_intent_failure(event):
-    logger.info("Failed to find intent on multiple intents.")
+def handle_complete_intent_failure(event):
+    logger.info("Failed to find intent.")
     # TODO: Localize
     data = {'utterance':
             "Sorry, I didn't catch that. Please rephrase your request."}
@@ -126,9 +126,7 @@ def main():
     loop.on('recognizer_loop:record_end', handle_record_end)
     loop.on('recognizer_loop:no_internet', handle_no_internet)
     ws.on('open', handle_open)
-    ws.on(
-        'multi_utterance_intent_failure',
-        handle_multi_utterance_intent_failure)
+    ws.on('complete_intent_failure', handle_complete_intent_failure)
     ws.on('recognizer_loop:sleep', handle_sleep)
     ws.on('recognizer_loop:wake_up', handle_wake_up)
     ws.on('mycroft.mic.mute', handle_mic_mute)

mycroft/configuration/mycroft.conf

@@ -84,7 +84,7 @@
     // TODO: Old unused kludge, remove from code
     "stop_threshold": 2.0,
     // blacklisted skills to not load
-    "blacklisted_skills": ["skill-media", "send_sms"]
+    "blacklisted_skills": ["skill-media", "send_sms", "skill-wolfram-alpha"]
   },
 
   // Address of the REMOTE server

mycroft/skills/core.py

@@ -14,12 +14,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Mycroft Core.  If not, see <http://www.gnu.org/licenses/>.
-
-
 import abc
 import imp
 import time
 
+import operator
 import os.path
 import re
 import time
@@ -191,6 +190,8 @@ class MycroftSkill(object):
     def __init__(self, name=None, emitter=None):
         self.name = name or self.__class__.__name__
 
+    def __init__(self, name, emitter=None):
+        self.name = name
         self.bind(emitter)
         self.config_core = ConfigurationManager.get()
         self.config = self.config_core.get(self.name)
@@ -399,3 +400,50 @@ def shutdown(self):
         except:
             logger.error("Failed to stop skill: {}".format(self.name),
                          exc_info=True)
+
+
+class FallbackSkill(MycroftSkill):
+    fallback_handlers = {}
+
+    def __init__(self, name, emitter=None):
+        MycroftSkill.__init__(self, name, emitter)
+
+    @classmethod
+    def make_intent_failure_handler(cls, ws):
+        """Goes through all fallback handlers until one returns true"""
+
+        def handler(message):
+            for _, handler in sorted(cls.fallback_handlers.items(),
+                                     key=operator.itemgetter(0)):
+                try:
+                    if handler(message):
+                        return
+                except Exception as e:
+                    logger.info('Exception in fallback: ' + str(e))
+            ws.emit(Message('complete_intent_failure'))
+            logger.warn('No fallback could handle intent.')
+
+        return handler
+
+    @classmethod
+    def register_fallback(cls, handler, priority):
+        """
+        Register a function to be called as a general info fallback
+        Fallback should receive message and return
+        a boolean (True if succeeded or False if failed)
+
+        Lower priority gets run first
+        0 for high priority 100 for low priority
+        """
+        while priority in cls.fallback_handlers:
+            priority += 1
+
+        cls.fallback_handlers[priority] = handler
+
+    @classmethod
+    def remove_fallback(cls, handler_to_del):
+        for priority, handler in cls.fallback_handlers.items():
+            if handler == handler_to_del:
+                del cls.fallback_handlers[priority]
+                return
+        logger.warn('Could not remove fallback!')

mycroft/skills/intent_service.py

@@ -63,16 +63,11 @@ def handle_utterance(self, message):
             reply = message.reply(
                 best_intent.get('intent_type'), best_intent)
             self.emitter.emit(reply)
-        elif len(utterances) == 1:
+        else:
             self.emitter.emit(Message("intent_failure", {
                 "utterance": utterances[0],
                 "lang": lang
             }))
-        else:
-            self.emitter.emit(Message("multi_utterance_intent_failure", {
-                "utterances": utterances,
-                "lang": lang
-            }))
 
     def handle_register_vocab(self, message):
         start_concept = message.data.get('start')

mycroft/skills/main.py

@@ -30,7 +30,7 @@
 from mycroft.messagebus.client.ws import WebsocketClient
 from mycroft.messagebus.message import Message
 from mycroft.skills.core import load_skill, create_skill_descriptor, \
-    MainModule, SKILLS_DIR
+    MainModule, SKILLS_DIR, FallbackSkill
 from mycroft.skills.intent_service import IntentService
 from mycroft.util import connected
 from mycroft.util.log import getLogger
@@ -117,6 +117,8 @@ def _load_skills():
 
     check_connection()
 
+    ws.on('intent_failure', FallbackSkill.make_intent_failure_handler(ws))
+
     # Create skill_manager listener and invoke the first time
     ws.on('skill_manager', skills_manager)
     ws.on('mycroft.internet.connected', install_default_skills)