Merge pull request RasaHQ#4977 from RasaHQ/update-session-keep-predicting

Update when to predict another action

Author: ricwo

rasa/core/processor.py

@@ -480,9 +480,19 @@ def is_action_limit_reached():
 
     # noinspection PyUnusedLocal
     @staticmethod
-    def should_predict_another_action(action_name, events) -> bool:
-        is_listen_action = action_name == ACTION_LISTEN_NAME
-        return not is_listen_action
+    def should_predict_another_action(action_name: Text, events: List[Event]) -> bool:
+        """Determine whether the processor should predict another action.
+
+        Args:
+            action_name: Name of the latest executed action.
+            events: List of events returned by the latest executed action.
+
+        Returns:
+            `False` if `action_name` is `ACTION_LISTEN_NAME` or
+            `ACTION_SESSION_START_NAME`, otherwise `True`.
+        """
+
+        return action_name not in (ACTION_LISTEN_NAME, ACTION_SESSION_START_NAME)
 
     @staticmethod
     async def _send_bot_messages(

tests/core/test_processor.py

@@ -13,6 +13,7 @@
 
 from rasa.core import jobs
 from rasa.core.actions.action import ACTION_LISTEN_NAME, ACTION_SESSION_START_NAME
+
 from rasa.core.agent import Agent
 from rasa.core.channels.channel import CollectingOutputChannel, UserMessage
 from rasa.core.domain import SessionConfig
@@ -472,3 +473,23 @@ async def test_handle_message_with_session_start(
         SlotSet(entity, slot_2[entity]),
         ActionExecuted(ACTION_LISTEN_NAME),
     ]
+
+
+# noinspection PyProtectedMember
+@pytest.mark.parametrize(
+    "action_name, should_predict_another_action",
+    [
+        (ACTION_LISTEN_NAME, False),
+        (ACTION_SESSION_START_NAME, False),
+        ("utter_greet", True),
+    ],
+)
+async def test_should_predict_another_action(
+    default_processor: MessageProcessor,
+    action_name: Text,
+    should_predict_another_action: bool,
+):
+    assert (
+        default_processor.should_predict_another_action(action_name, [])
+        == should_predict_another_action
+    )