RasaHQ · tmbo · Dec 16, 2020 · Sep 16, 2020 · Sep 16, 2020 · Sep 16, 2020
diff --git a/changelog/6410.removal.md b/changelog/6410.removal.md
@@ -0,0 +1,5 @@
+`Domain.random_template_for` is deprecated and will be removed in Rasa Open Source 
+3.0.0. You can alternatively use the `TemplatedNaturalLanguageGenerator`.
+
+`Domain.action_names` is deprecated and will be removed in Rasa Open Source 
+3.0.0. Please use `Domain.action_names_or_texts` instead.
diff --git a/changelog/7436.improvement.md b/changelog/7436.improvement.md
@@ -0,0 +1,4 @@
+Make `rasa data validate stories` work for end-to-end.
+
+The `rasa data validate stories` function now considers the tokenized user text instead of the plain text that is part of a state. 
+This is closer to what Rasa Core actually uses to distinguish states and thus captures more story structure problems.
diff --git a/data/test_dialogues/default.json b/data/test_dialogues/default.json
@@ -45,7 +45,8 @@
         "text": "Hi my name is Peter"
       },
       "text": "Hi my name is Peter",
-      "timestamp": 1551953035.076376
+      "timestamp": 1551953035.076376,
+      "use_text_for_featurization": false
     },
     {
       "py/object": "rasa.shared.core.events.SlotSet",

diff --git a/data/test_dialogues/formbot.json b/data/test_dialogues/formbot.json
@@ -5,6 +5,7 @@
     {
       "py/object":"rasa.shared.core.events.ActionExecuted",
       "action_name":"action_listen",
+      "action_text": null,
       "confidence":null,
       "policy":null,
       "timestamp":1551884035.892855,
@@ -32,11 +33,13 @@
         "text":"Hi I'm desperate to talk to you"
       },
       "text":"Hi I'm desperate to talk to you",
-      "timestamp":1551884050.259948
+      "timestamp":1551884050.259948,
+      "use_text_for_featurization": false
     },
     {
       "py/object":"rasa.shared.core.events.ActionExecuted",
       "action_name":"utter_greet",
+      "action_text": null,
       "confidence":1.0,
       "policy":"policy_2_MemoizationPolicy",
       "timestamp":1551884060.466681,
@@ -55,6 +58,7 @@
     {
       "py/object":"rasa.shared.core.events.ActionExecuted",
       "action_name":"action_listen",
+      "action_text": null,
       "confidence":1.0,
       "policy":"policy_2_MemoizationPolicy",
       "timestamp":1551884061.9350882,
@@ -104,11 +108,13 @@
         "text":"I'm looking for an indian restaurant...in Bombay"
       },
       "text":"I'm looking for an indian restaurant...in Bombay",
-      "timestamp":1551884090.9653602
+      "timestamp":1551884090.9653602,
+      "use_text_for_featurization": false
     },
     {
       "py/object":"rasa.shared.core.events.ActionExecuted",
       "action_name":"restaurant_form",
+      "action_text": null,
       "confidence":1.0,
       "policy":"policy_2_MemoizationPolicy",
       "timestamp":1551884095.542748,
@@ -117,6 +123,7 @@
     {
       "py/object":"rasa.shared.core.events.ActionExecuted",
       "action_name":"utter_slots_values",
+      "action_text": null,
       "confidence":1.0,
       "policy":"policy_2_MemoizationPolicy",
       "timestamp":1551884097.570883,
@@ -135,6 +142,7 @@
     {
       "py/object":"rasa.shared.core.events.ActionExecuted",
       "action_name":"action_listen",
+      "action_text": null,
       "confidence":1.0,
       "policy":"policy_2_MemoizationPolicy",
       "timestamp":1551884098.8006358,
@@ -162,11 +170,13 @@
         "text":"Let's just pretend everything went correctly"
       },
       "text":"Let's just pretend everything went correctly",
-      "timestamp":1551884208.092693
+      "timestamp":1551884208.092693,
+      "use_text_for_featurization": false
     },
     {
       "py/object":"rasa.shared.core.events.ActionExecuted",
       "action_name":"action_deactivate_loop",
+      "action_text": null,
       "confidence":null,
       "policy":null,
       "timestamp":1551884214.951055,
@@ -186,6 +196,7 @@
     {
       "py/object":"rasa.shared.core.events.ActionExecuted",
       "action_name":"action_listen",
+      "action_text": null,
       "confidence":0.7680902069097734,
       "policy":"policy_0_TEDPolicy",
       "timestamp":1551884216.705635,

diff --git a/data/test_dialogues/moodbot.json b/data/test_dialogues/moodbot.json
@@ -59,7 +59,8 @@
         "text":"Hi talk to me"
       },
       "text":"Hi talk to me",
-      "timestamp":1551883971.410778
+      "timestamp":1551883971.410778,
+      "use_text_for_featurization": false
     },
     {
       "py/object":"rasa.shared.core.events.ActionExecuted",
@@ -146,7 +147,8 @@
         "text":"Super sad"
       },
       "text":"Super sad",
-      "timestamp":1551883982.540276
+      "timestamp":1551883982.540276,
+      "use_text_for_featurization": false
     },
     {
       "py/object":"rasa.shared.core.events.ActionExecuted",
@@ -243,7 +245,8 @@
         "text":"No"
       },
       "text":"No",
-      "timestamp":1551883989.0720608
+      "timestamp":1551883989.0720608,
+      "use_text_for_featurization": false
     },
     {
       "py/object":"rasa.shared.core.events.ActionExecuted",

diff --git a/data/test_trackers/tracker_moodbot.json b/data/test_trackers/tracker_moodbot.json
@@ -37,6 +37,7 @@
       "timestamp": 1517821726.211031,
       "event": "action",
       "name": "action_listen",
+      "action_text": null,
       "policy": null,
       "confidence": null
     },
@@ -75,13 +76,15 @@
       "timestamp": 1517821726.200373,
       "event": "action",
       "name": "utter_greet",
+      "action_text": null,
       "policy": null,
       "confidence": null
     },
     {
       "timestamp": 1517821726.211038,
       "event": "action",
       "name": "action_listen",
+      "action_text": null,
       "policy": null,
       "confidence": null
     },
@@ -120,13 +123,15 @@
       "timestamp": 1517821726.209908,
       "event": "action",
       "name": "utter_happy",
+      "action_text": null,
       "policy": "policy_1_TEDPolicy",
       "confidence": 0.8
     },
     {
       "timestamp": 1517821726.211042,
       "event": "action",
       "name": "action_listen",
+      "action_text": null,
       "policy": "policy_2_MemoizationPolicy",
       "confidence": 1.0
     }

diff --git a/data/test_yaml_stories/stories_e2e.yml b/data/test_yaml_stories/stories_e2e.yml
@@ -0,0 +1,30 @@
+version: "2.0"
+
+stories:
+- story: happy path (intent to action)
+  steps:
+  - intent: greet
+  - action: utter_greet
+  - intent: mood_great
+  - action: utter_happy
+
+- story: sad path (text to text)
+  steps:
+  - user: "[Hello](bla)"
+  - bot: "Welcome to moodbot. How are you feeling today?"
+  - user: "Horrible"
+  - bot: "Oh no! Here is a kitten photo. Did it help?"
+  - user: "Yes"
+  - bot: "Perfect"
+
+- story: sad path 2 (mixed)
+  steps:
+  - intent: greet
+  - action: utter_greet
+  - user: "I'm not happy"
+  - action: utter_cheer_up
+  - action: utter_did_that_help
+  - user: "Not at all"
+  - bot: "Goodbye!"
+
+
diff --git a/data/test_yaml_stories/stories_hybrid_e2e.yml b/data/test_yaml_stories/stories_hybrid_e2e.yml
@@ -0,0 +1,15 @@
+stories:
+- story: My hybrid End-to-End story
+  steps:
+  # Regular story with labels
+  - intent: simple
+  - action: utter_greet
+  # Actual messages are given instead of labels
+  - user: "I am looking for a [Kenyan](cuisine) restaurant"
+  - bot: "good for you"
+  # Regular labeled events
+  - intent: goodbye
+  - action: utter_goodbye
+  # Actual messages are given instead of labels
+  - user: One more thing
+  - bot: What?
diff --git a/data/test_yaml_stories/stories_simple.yml b/data/test_yaml_stories/stories_simple.yml
@@ -0,0 +1,8 @@
+- story: simple_story
+  steps:
+  - intent: greet
+  - action: utter_greet
+  - intent: default
+  - action: utter_default
+  - intent: goodbye
+  - action: utter_goodbye
diff --git a/docs/docs/command-line-interface.mdx b/docs/docs/command-line-interface.mdx
@@ -338,6 +338,10 @@ rasa data validate stories
 :::note
 Running `rasa data validate` does **not** test if your [rules](./rules.mdx) are consistent with your stories. 
 However, during training, the `RulePolicy` checks for conflicts between rules and stories. Any such conflict will abort training.
+
+Also, if you use end-to-end stories, then this might not capture all conflicts. Specifically, if two user inputs
+result in different tokens yet exactly the same featurization, then conflicting actions after these inputs
+may exist but will not be reported by the tool. 
 :::
 
 To interrupt validation even for minor issues such as unused intents or responses, use the `--fail-on-warnings` flag.

diff --git a/docs/docs/policies.mdx b/docs/docs/policies.mdx
@@ -277,6 +277,10 @@ However, additional parameters exist that can be adapted.
 |                                 |                  | Requires `evaluate_on_number_of_examples > 0` and            |
 |                                 |                  | `evaluate_every_number_of_epochs > 0`                        |
 +---------------------------------+------------------+--------------------------------------------------------------+
+| featurizers                     | []               | List of featurizer names (alias names). Only features        |
+|                                 |                  | coming from the listed names are used. If list is empty      |
+|                                 |                  | all available features are used.                             |
++---------------------------------+------------------+--------------------------------------------------------------+
 ```
 
 :::note

diff --git a/docs/docs/setting-up-ci-cd.mdx b/docs/docs/setting-up-ci-cd.mdx
@@ -59,6 +59,10 @@ always good to run this check before training a model. By including the
 :::note
 Running `rasa data validate` does **not** test if your [rules](./rules.mdx) are consistent with your stories. 
 However, during training, the `RulePolicy` checks for conflicts between rules and stories. Any such conflict will abort training.
+
+Also, if you use end-to-end stories, then this might not capture all conflicts. Specifically, if two user inputs
+result in different tokens yet exactly the same featurization, then conflicting actions after these inputs
+may exist but will not be reported by the tool. 
 :::
 
 To read more about the validator and all of the available options, see [the documentation for 

diff --git a/examples/e2ebot/config.yml b/examples/e2ebot/config.yml
@@ -0,0 +1,16 @@
+language: en
+pipeline:
+  - name: WhitespaceTokenizer
+    intent_tokenization_flag: True
+  - name: RegexFeaturizer
+  - name: LexicalSyntacticFeaturizer
+  - name: CountVectorsFeaturizer
+  - name: CountVectorsFeaturizer
+    analyzer: char_wb
+    min_ngram: 1
+    max_ngram: 4
+  - name: DIETClassifier
+    epochs: 200
+policies:
+- name: TEDPolicy
+  epochs: 200
diff --git a/examples/e2ebot/data/nlu.yml b/examples/e2ebot/data/nlu.yml
@@ -0,0 +1,48 @@
+version: "2.0"
+
+nlu:
+- intent: greet
+  examples: |
+    - hey
+    - hello
+    - hi
+    - hello there
+    - good morning
+    - good evening
+    - moin
+    - hey there
+    - let's go
+    - hey dude
+    - goodmorning
+    - goodevening
+    - good afternoon
+
+
+- intent: affirm
+  examples: |
+    - yes
+    - y
+    - indeed
+    - of course
+    - that sounds good
+    - correct
+    - yeah
+
+- intent: deny
+  examples: |
+    - no
+    - n
+    - never
+    - I don't think so
+    - don't like that
+    - no way
+    - had better not
+
+- intent: search_restaurant
+  examples: |
+    - I'm looking for some food
+    - show me a place to eat
+    - where should I eat tonight?
+    - list restaurants
+    - food
+    - I'm hungry
diff --git a/examples/e2ebot/data/stories.yml b/examples/e2ebot/data/stories.yml
@@ -0,0 +1,38 @@
+version: "2.0"
+
+stories:
+- story: accepts suggestion
+  steps:
+  - intent: greet
+  - action: utter_greet
+  - intent: search_restaurant
+  - action: utter_suggest_cuisine
+  - intent: affirm
+  - action: utter_search_restaurants
+
+- story: accepts 3rd suggestion
+  steps:
+  - intent: search_restaurant
+  - action: utter_suggest_cuisine
+  - intent: deny
+  - action: utter_suggest_cuisine
+  - intent: deny
+  - action: utter_suggest_cuisine
+  - intent: affirm
+  - action: utter_search_restaurants
+
+- story: accepts suggestion, indirectly
+  steps:
+  - intent: greet
+  - action: utter_greet
+  - intent: search_restaurant
+  - action: utter_suggest_cuisine
+  - user: "I can always go for sushi"
+  - action: utter_search_restaurants
+
+- story: rejects suggestion, indirectly
+  steps:
+  - intent: search_restaurant
+  - action: utter_suggest_cuisine
+  - user: "I had that yesterday"
+  - action: utter_suggest_cuisine
diff --git a/examples/e2ebot/domain.yml b/examples/e2ebot/domain.yml
@@ -0,0 +1,23 @@
+version: "2.0"
+
+actions:
+ - utter_greet
+ - utter_suggest_cuisine
+ - utter_search_restaurants
+
+intents:
+ - greet
+ - affirm
+ - deny
+ - search_restaurant
+
+responses:
+  utter_greet:
+  - text: "hi!"
+  utter_suggest_cuisine:
+  - text: "how about greek food?"
+  - text: "how about chinese food?"
+  - text: "how about italian food?"
+  - text: "how about sushi?"
+  utter_search_restaurants:
+  - text: "great! here's what I found ..."