From 06f8d60d26eeb3ef7f1dcca015feffb91b1ff244 Mon Sep 17 00:00:00 2001
From: Mathieu B <m4th1eu@protonmail.com>
Date: Fri, 30 Jul 2021 12:31:59 +0200
Subject: [PATCH] Fixed issue where self was None on skill handle

---
 jarvis/skills/__init__.py       |  9 +++++---
 jarvis/skills/intent_manager.py | 41 +++++++++++++++++++++++++--------
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/jarvis/skills/__init__.py b/jarvis/skills/__init__.py
index b8f238f..f738540 100644
--- a/jarvis/skills/__init__.py
+++ b/jarvis/skills/__init__.py
@@ -69,7 +69,9 @@ class SkillRegistering(type):
                         if intent_type == 'adapt':
                             intent = properties[0]
                             intent_name = intent.name
-                            intent_manager.intents_handlers_adapt[f"{intent_name}"] = [getattr(cls, key), name]
+
+                            intent_manager.intents_handlers_adapt[f"{intent_name}"] = [getattr(cls, key), name, key,
+                                                                                       attrs['__module__']]
                         elif intent_type == 'padatious':
                             intent_file = properties[0]
                             intent_name = properties[1]
@@ -77,8 +79,9 @@ class SkillRegistering(type):
                             intent_category = str(attrs['__module__']).split('.')[2]
                             skill_folder = str(attrs['__module__']).split('.')[3]
 
-                            intent_manager.intents_handlers_padatious[f"{intent_name}"] = [getattr(cls, key),
+                            intent_manager.intents_handlers_padatious[f"{intent_name}"] = [key,
                                                                                            get_array_for_intent_file(
                                                                                                intent_file,
                                                                                                intent_category,
-                                                                                               skill_folder)]
+                                                                                               skill_folder),
+                                                                                           attrs['__module__']]
diff --git a/jarvis/skills/intent_manager.py b/jarvis/skills/intent_manager.py
index 0ebec99..c339a7c 100644
--- a/jarvis/skills/intent_manager.py
+++ b/jarvis/skills/intent_manager.py
@@ -1,6 +1,8 @@
 from adapt.engine import DomainIntentDeterminationEngine
 from padatious import IntentContainer
 
+from jarvis.utils import utils
+
 adapt_engine = DomainIntentDeterminationEngine()
 padatious_intents_container = IntentContainer('intent_cache')
 
@@ -47,13 +49,31 @@ def process_handlers():
 
 
 def handle(intent_name, data):
-    if intent_name in intents_handlers_adapt:
-        method = intents_handlers_adapt.get(intent_name)[0]
-        method(None, data)
+    module_path_str = None
+    handler_method_name = None
 
+    if intent_name in intents_handlers_adapt:
+        # something like handler_play_song_spotify (used to call the handler method from the skill imported below)
+        handler_method_name = intents_handlers_adapt.get(intent_name)[2]
+
+        # something like jarvis.skill.entertainment.spotify (used to import the create_skill method to create a new object)
+        module_path_str = intents_handlers_adapt.get(intent_name)[3]
     if intent_name in intents_handlers_padatious:
-        method = intents_handlers_padatious.get(intent_name)[0]
-        method(None, data)
+        # something like handler_play_song_spotify (used to call the handler method from the skill imported below)
+        handler_method_name = intents_handlers_padatious.get(intent_name)[0]
+
+        # something like jarvis.skill.entertainment.spotify (used to import the create_skill method to create a new object)
+        module_path_str = intents_handlers_padatious.get(intent_name)[2]
+
+    if module_path_str is not None and handler_method_name is not None:
+        # import the create_skill method from the skill using the skill module path
+        create_skill_method = utils.import_method_from_string(module_path_str, "create_skill")
+
+        # create a new object of the right skill for the utterance
+        skill = create_skill_method()
+
+        # import and call the handler method from the skill
+        getattr(skill, handler_method_name)(data=data)
 
 
 def recognise(sentence):
@@ -65,12 +85,13 @@ def recognise(sentence):
             best_intents = adapt_engine.determine_intent(sentence, 100)
             best_intent = next(best_intents)
 
-            print(best_intent)  # DEBUG
+            # print(best_intent)  # DEBUG
 
             # TODO: add data for adapt
-            handle(best_intent['intent_type'], [])
+            handle(best_intent['intent_type'], data={'utterance': sentence})
         except StopIteration as e:
-            print("No match... (Adapt)")
+            pass
+            # print("No match... (Adapt)")
 
     if len(intents_handlers_padatious) > 0:
         result = padatious_intents_container.calc_intent(sentence)
@@ -87,4 +108,6 @@ def recognise(sentence):
             data.update(result.matches)  # adding the matches from padatious to the data
             handle(result.name, data)
         else:
-            print("No match... (Padatious)")
+            pass
+            # print("No match... (Padatious)")
+    print()