Merge branch 'fix-mapping-policy' into merge-mapping-fix

Author: erohmensing

docs/core/old_core_changelog.rst

@@ -41,6 +41,14 @@ Fixed
 - in interactive learning: only updates entity values if user changes annotation
 
 
+[0.14.1] - 2019-05-02
+^^^^^^^^^^^^^^^^^^^^^
+
+Fixed
+-----
+- fixed MappingPolicy bug upon prediction of ACTION_LISTEN after mapped action
+
+
 [0.14.0] - 2019-04-23
 ^^^^^^^^^^^^^^^^^^^^^
 Added
@@ -62,7 +70,7 @@ Added
 - ``Tracker.active_form`` now includes ``trigger_message`` attribute to allow
   access to message triggering the form
 - ``MappingPolicy`` which can be used to directly map an intent to an action
-  by adding the ``maps_to`` keyword to an intent in the domain.
+  by adding the ``triggers`` keyword to an intent in the domain.
 - default action ``action_back``, which when triggered with ``/back`` allows
   the user to undo their previous message
 
@@ -1005,4 +1013,3 @@ First released version.
 .. _`master`: https://github.com/RasaHQ/rasa_core/
 
 .. _`Semantic Versioning`: http://semver.org/
-

rasa/core/policies/mapping_policy.py

@@ -61,7 +61,7 @@ def predict_action_probabilities(self,
                 prediction[idx] = 1
         elif tracker.latest_action_name == action and action is not None:
             latest_action = tracker.get_last_event_for(ActionExecuted)
-            assert latest_action.name == action
+            assert latest_action.action_name == action
 
             if latest_action.policy == type(self).__name__:
                 # this ensures that we only predict listen, if we predicted

tests/core/test_domain.py

@@ -254,12 +254,12 @@ def test_merge_yaml_domains():
     ([{'greet': {'use_entities': False}}, 'goodbye'],
         {'greet': {'use_entities': False},
          'goodbye': {'use_entities': True}}),
-    ([{'greet': {'maps_to': 'utter_goodbye'}}, 'goodbye'],
-        {'greet': {'use_entities': True, 'maps_to': 'utter_goodbye'},
+    ([{'greet': {'triggers': 'utter_goodbye'}}, 'goodbye'],
+        {'greet': {'use_entities': True, 'triggers': 'utter_goodbye'},
          'goodbye': {'use_entities': True}}),
-    ([{'greet': {'maps_to': 'utter_goodbye', 'use_entities': False}},
+    ([{'greet': {'triggers': 'utter_goodbye', 'use_entities': False}},
       {'goodbye': {'use_entities': False}}],
-     {'greet': {'use_entities': False, 'maps_to': 'utter_goodbye'},
+     {'greet': {'use_entities': False, 'triggers': 'utter_goodbye'},
       'goodbye': {'use_entities': False}})])
 def test_collect_intent_properties(intent_list, intent_properties):
     assert Domain.collect_intent_properties(intent_list) == intent_properties