Merge branch 'master' into master

.gitignore

@@ -80,7 +80,11 @@ failed_stories.md
 errors.json
 pip-wheel-metadata/*
 events.db
+events.db-shm
+events.db-wal
 rasa.db
+rasa.db-shm
+rasa.db-wal
 *.swp
 *.coverage*
 env

changelog/4088.feature.rst

@@ -0,0 +1 @@
+Add story structure validation functionality (e.g. `rasa data validate stories --max-history 5`).

changelog/5174.doc.rst

@@ -0,0 +1 @@
+Updated the documentation to properly suggest not to explicitly add utterance actions to the domain.

changelog/5189.doc.rst

@@ -0,0 +1 @@
+Added user guide for reminders and external events, including ``reminderbot`` demo.

changelog/5189.misc.rst

@@ -0,0 +1 @@
+Added `db-shm` and `db-wal` files to `.gitignore`

changelog/5201.bugfix.rst

@@ -0,0 +1,6 @@
+Fixed incorrectly raised Error encountered in pipelines with a ``ResponseSelector`` and NLG.
+
+When NLU training data is split before NLU pipeline comparison, 
+NLG responses were not also persisted and therefore training for a pipeline including the ``ResponseSelector`` would fail.
+
+NLG responses are now persisted along with NLU data to a ``/train`` directory in the ``run_x/xx%_exclusion`` folder.

changelog/5292.enhancement.rst

@@ -0,0 +1 @@
+Added ``followlinks=True`` to os.walk calls, to allow the use of symlinks in training, NLU and domain data.

changelog/5317.improvement.rst

@@ -0,0 +1,10 @@
+Events exported using ``rasa export`` receive a message header if published through a
+``PikaEventBroker``. The header is added to the message's ``BasicProperties.headers``
+under the ``rasa-export-process-id`` key
+(``rasa.core.constants.RASA_EXPORT_PROCESS_ID_HEADER_NAME``). The value is a
+UUID4 generated at each call of ``rasa export``. The resulting header is a key-value
+pair that looks as follows:
+
+.. code-block:: text
+
+  'rasa-export-process-id': 'd3b3d3ffe2bd4f379ccf21214ccfb261'

data/test_domains/default.yml

@@ -19,8 +19,3 @@ responses:
     - text: goodbye :(
   utter_default:
     - text: default message
-
-actions:
-  - utter_default
-  - utter_greet
-  - utter_goodbye

data/test_domains/default_unfeaturized_entities.yml

@@ -19,8 +19,3 @@ responses:
     - goodbye :(
   utter_default:
     - default message
-
-actions:
-  - utter_default
-  - utter_greet
-  - utter_goodbye

data/test_domains/default_with_mapping.yml

@@ -21,8 +21,3 @@ responses:
     - text: goodbye :(
   utter_default:
     - text: default message
-
-actions:
-  - utter_default
-  - utter_greet
-  - utter_goodbye

data/test_domains/default_with_slots.yml

@@ -30,8 +30,3 @@ responses:
     - text: "bye bye 😢"
   utter_default:   # utterance sent by action_default_fallback
     - text: "sorry, I didn't get that, can you rephrase it?"
-
-actions:
-  - utter_default
-  - utter_greet
-  - utter_goodbye

data/test_domains/duplicate_entities.yml

@@ -23,7 +23,3 @@ responses:
   utter_default:
     - text: default message
 
-actions:
-  - utter_default
-  - utter_greet
-  - utter_goodbye

data/test_domains/duplicate_intents.yml

@@ -22,11 +22,6 @@ responses:
   utter_default:
     - text: default message
 
-actions:
-  - utter_default
-  - utter_greet
-  - utter_goodbye
-
 session_config:
   session_expiration_time: 60
   carry_over_slots_to_new_session: true

data/test_domains/duplicate_templates.yml

@@ -21,8 +21,3 @@ responses:
     - text: default message
   utter_greet:
       - text: hey there!
-
-actions:
-  - utter_default
-  - utter_greet
-  - utter_goodbye

data/test_domains/form.yml

@@ -24,12 +24,8 @@ responses:
     - text: goodbye :(
   utter_default:
     - text: default message
-
-actions:
-  - utter_default
-  - utter_greet
-  - utter_goodbye
-  - utter_ask_continue
+  utter_ask_continue:
+    - text: should I continue?
 
 forms:
   - some_form

data/test_domains/missing_text_for_templates.yml

@@ -10,8 +10,3 @@ responses:
     - goodbye :(
   utter_default:
     - default message
-
-actions:
-  - utter_default
-  - utter_greet
-  - utter_goodbye

data/test_multi_domain/data/GreetBot/domain.yml

@@ -2,10 +2,6 @@ intents:
   - greet
   - goodbye
 
-actions:
-- utter_greet
-- utter_goodbye
-
 responses:
   utter_greet:
     - text: "Hey! How are you?"

data/test_multi_domain/data/MoodBot/domain.yml

@@ -4,11 +4,6 @@ intents:
   - mood_great
   - mood_unhappy
 
-actions:
-- utter_did_that_help
-- utter_happy
-- utter_cheer_up
-
 responses:
   utter_cheer_up:
   - text: "Here is something to cheer you up:"

data/test_multi_domain/domain.yml

@@ -1,9 +1,6 @@
 intents:
   - goodbye
 
-actions:
-- utter_goodbye
-
 responses:
   utter_goodbye:
     - text: "Bye"

data/test_stories/stories_conflicting_1.md

@@ -0,0 +1,15 @@
+## story 1
+* greet
+  - utter_greet
+* greet
+  - utter_greet
+* greet
+  - utter_greet
+
+## story 2
+* default
+  - utter_greet
+* greet
+  - utter_greet
+* greet
+  - utter_default

data/test_stories/stories_conflicting_2.md

@@ -0,0 +1,14 @@
+## greetings
+* greet
+  - utter_greet
+> check_greet
+
+## happy path
+> check_greet
+* default
+  - utter_default
+
+## problem
+> check_greet
+* default
+  - utter_goodbye

data/test_stories/stories_conflicting_3.md

@@ -0,0 +1,14 @@
+## greetings
+* greet
+  - utter_greet
+> check_greet
+
+## happy path
+> check_greet
+* default OR greet
+  - utter_default
+
+## problem
+> check_greet
+* greet
+  - utter_goodbye

data/test_stories/stories_conflicting_4.md

@@ -0,0 +1,17 @@
+## story 1
+* greet
+  - utter_greet
+* greet
+  - slot{"cuisine": "German"}
+  - utter_greet
+* greet
+  - utter_greet
+
+## story 2
+* greet
+  - utter_greet
+* greet
+  - slot{"cuisine": "German"}
+  - utter_greet
+* greet
+  - utter_default

data/test_stories/stories_conflicting_5.md

@@ -0,0 +1,16 @@
+## story 1
+* greet
+  - utter_greet
+* greet
+  - utter_greet
+  - slot{"cuisine": "German"}
+* greet
+  - utter_greet
+
+## story 2
+* greet
+  - utter_greet
+* greet
+  - utter_greet
+* greet
+  - utter_default

data/test_stories/stories_conflicting_6.md

@@ -0,0 +1,22 @@
+## story 1
+* greet
+  - utter_greet
+
+## story 2
+* greet
+  - utter_default
+
+## story 3
+* greet
+  - utter_default
+* greet
+
+## story 4
+* greet
+  - utter_default
+* default
+
+## story 5
+* greet
+  - utter_default
+* goodbye

docs/_static/spec/rasa.yml

@@ -1119,7 +1119,7 @@ components:
           type: array
           items:
             type: string
-          example: ['utter_greet', 'utter_goodbye', 'action_listen']
+          example: ['action_greet', 'action_goodbye', 'action_listen']
 
     BotMessage:
       type: object
@@ -1420,13 +1420,6 @@ components:
           - mood_great
           - mood_unhappy
 
-        actions:
-          - utter_greet
-          - utter_cheer_up
-          - utter_did_that_help
-          - utter_happy
-          - utter_goodbye
-
         responses:
           utter_greet:
           - text: "Hey! How are you?"

docs/core/domains.rst

@@ -20,7 +20,7 @@ for the things your bot can say.
 An example of a Domain
 ----------------------
 
-As an example, the ``DefaultDomain`` has the following yaml definition:
+As an example, the domain created by ``rasa init`` has the following yaml definition:
 
 
 .. literalinclude:: ../../rasa/cli/initial_project/domain.yml
@@ -29,7 +29,20 @@ As an example, the ``DefaultDomain`` has the following yaml definition:
 **What does this mean?**
 
 Your NLU model will define the ``intents`` and ``entities`` that you
-need to include in the domain.
+need to include in the domain. The ``entities`` section lists all entities
+extracted by any :ref:`entity extractor<entity-extraction>` in your
+NLU pipeline.
+
+For example:
+
+.. code-block:: yaml
+
+         entities:
+            - PERSON          # entity extracted by SpacyEntityExtractor
+            - time            # entity extracted by DucklingHTTPExtractor
+            - membership_type # custom entity extracted by CRFEntityExtractor
+            - priority        # custom entity extracted by CRFEntityExtractor
+
 
 :ref:`slots` hold information you want to keep track of during a conversation.
 A categorical slot called ``risk_level`` would be