Merge pull request #8 from botfront/feat/templates

Feat/templates

Author: Nathan Zylbersztejn

rasa/core/actions/action.py

@@ -368,6 +368,8 @@ async def _utter_responses(
                     responses += resolved
                 else:
                     responses += [resolved]
+            else:
+                responses += [response]
 
         for response in responses:
             if "template" in response:

rasa/core/domain.py

@@ -110,7 +110,7 @@ def from_yaml(cls, yaml: Text) -> "Domain":
 
     @classmethod
     def from_dict(cls, data: Dict) -> "Domain":
-        utter_templates = cls.collect_templates(data.get("templates", {}))
+        utter_templates = cls.collect_bf_templates(data.get("templates", {}))
         slots = cls.collect_slots(data.get("slots", {}))
         additional_arguments = data.get("config", {})
         intents = data.get("intents", {})
@@ -238,6 +238,15 @@ def collect_intent_properties(
             intent_properties.update(intent)
         return intent_properties
 
+    @staticmethod
+    def collect_bf_templates(
+        yml_templates: Dict[Text, Dict[Text, List[List[Any]]]]
+    ) -> Dict[Text, Dict[Text, List[List[Dict[Text, Any]]]]]:
+        """template name -> lang -> sequence of templates
+        Placeholder for actual validation
+        """
+        return yml_templates
+
     @staticmethod
     def collect_templates(
         yml_templates: Dict[Text, List[Any]]

rasa/core/nlg/template.py

@@ -2,6 +2,7 @@
 import logging
 import re
 from collections import defaultdict
+from rasa.cli.utils import bcolors
 
 from rasa.core.trackers import DialogueStateTracker
 from typing import Text, Any, Dict, Optional, List
@@ -10,14 +11,20 @@
 
 logger = logging.getLogger(__name__)
 
+class InvalidNLGRequest(Exception):
+    def __init__(self, message):
+        self.message = message
+
+    def __str__(self):
+        return bcolors.FAIL + self.message + bcolors.ENDC
 
 class TemplatedNaturalLanguageGenerator(NaturalLanguageGenerator):
     """Natural language generator that generates messages based on templates.
 
     The templates can use variables to customize the utterances based on the
     state of the dialogue."""
 
-    def __init__(self, templates: Dict[Text, List[Dict[Text, Any]]]) -> None:
+    def __init__(self, templates: Dict[Text, Dict[Text, List[List[Dict[Text, Any]]]]]) -> None:
         self.templates = templates
 
     def _templates_for_utter_action(self, utter_action, output_channel):
@@ -71,10 +78,28 @@ async def generate(
         """Generate a response for the requested template."""
 
         filled_slots = tracker.current_slot_values()
-        return self.generate_from_slots(
+        return self.generate_from_bf_template(
             template_name, filled_slots, output_channel, **kwargs
         )
 
+    def generate_from_bf_template(
+        self,
+        template_name: Text,
+        filled_slots: Dict[Text, Any],
+        output_channel: Text,
+        **kwargs: Any
+    ) -> Optional[Dict[Text, Any]]:
+    
+        language = kwargs.get("language", None)
+        if not language:
+            raise InvalidNLGRequest("Generator expected a language to return template")
+        if template_name not in self.templates:
+            return None
+        
+        return [self._fill_template_text(
+            copy.deepcopy(template), filled_slots, **kwargs
+        ) for template in self.templates[template_name][language]]
+
     def generate_from_slots(
         self,
         template_name: Text,