Merge branch 'master' into rasa-run-model-server

CHANGELOG.rst

@@ -15,6 +15,8 @@ Added
 
 Changed
 -------
+- recommended syntax for empty ``use_entities`` and ``ignore_entities`` in the domain file
+  has been updated from ``False`` or ``None`` to an empty list (``[]``)
 
 
 Removed

data/test_domains/default_unfeaturized_entities.yml

@@ -4,6 +4,7 @@ intents:
  - goodbye: {use_entities: None}
  - thank: {use_entities: False}
  - ask: {use_entities: True}
+ - why: {use_entities: []}
 
 entities:
  - name

data/test_stories/stories_unfeaturized_entities.md

@@ -13,3 +13,5 @@
     - utter_default
 * ask{"name": "Peter", "unrelated_recognized_entity": "whatever", "other": "foo"}
     - utter_default
+* why{"name": "Peter", "unrelated_reognized_entity": "whatever", "other": "foo"}
+	- utter_default

docs/core/domains.rst

@@ -273,14 +273,14 @@ Ignoring entities for certain intents
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 If you want all entities to be ignored for certain intents, you can
-add the ``use_entities: None`` parameter to the intent in your domain
+add the ``use_entities: []`` parameter to the intent in your domain
 file like this:
 
 .. code-block:: yaml
 
   intents:
     - greet:
-        use_entities: None
+        use_entities: []
 
 To ignore some entities or explicitly take only certain entities
 into account you can use this syntax:

examples/formbot/domain.yml

@@ -1,8 +1,8 @@
 intents:
   - request_restaurant:
-      use_entities: false
+      use_entities: []
   - chitchat:
-      use_entities: false
+      use_entities: []
   - inform
   - affirm
   - deny

rasa/core/schemas/domain.yml

@@ -6,7 +6,9 @@ mapping:
     - type: "map"
       mapping:
         use_entities:
-          type: "bool"
+          type: "any"
+        ignore_entities:
+          type: "any"
       allowempty: True
     - type: "str"
   entities:

tests/core/test_domain.py

@@ -128,6 +128,8 @@ async def test_create_train_data_unfeaturized_entities():
 
     assert hashed == [
         "[{}]",
+        '[{"intent_why": 1.0, "prev_utter_default": 1.0}]',
+        '[{"intent_why": 1.0, "prev_action_listen": 1.0}]',
         '[{"intent_thank": 1.0, "prev_utter_default": 1.0}]',
         '[{"intent_thank": 1.0, "prev_action_listen": 1.0}]',
         '[{"intent_greet": 1.0, "prev_utter_greet": 1.0}]',