Merge branch '2.0.x' into #5974/restart_action_doesnt_run_session_start

Author: joejuzl

CHANGELOG.mdx

@@ -16,6 +16,15 @@ https://github.com/RasaHQ/rasa/tree/master/changelog/ . -->
 
 <!-- TOWNCRIER -->
 
+## [2.0.6] - 2020-11-10
+                       
+
+### Bugfixes
+- [#6629](https://github.com/rasahq/rasa/issues/6629): Fixed a bug that occurred when setting multiple Sanic workers in combination with a custom [Lock Store](lock-stores.mdx). Previously, if the number was set higher than 1 and you were using a custom lock store, it would reject because of a strict check to use a [Redis Lock Store](lock-stores.mdx#redislockstore).
+- [#7176](https://github.com/rasahq/rasa/issues/7176): Fixed a bug in the [`TwoStageFallback`](fallback-handoff.mdx#two-stage-fallback) action which
+  reverted too many events after the user successfully rephrased.
+
+
 ## [2.0.5] - 2020-11-10
 
 

pyproject.toml

@@ -9,7 +9,7 @@ exclude = "((.eggs | .git | .pytest_cache | build | dist))"
 
 [tool.poetry]
 name = "rasa"
-version = "2.0.5"
+version = "2.0.6"
 description = "Open source machine learning framework to automate text- and voice-based conversations: NLU, dialogue management, connect to Slack, Facebook, and more - Create chatbots and voice assistants"
 authors = [ "Rasa Technologies GmbH <hi@rasa.com>",]
 maintainers = [ "Tom Bocklisch <tom@rasa.com>",]

rasa/core/actions/two_stage_fallback.py

@@ -102,31 +102,8 @@ async def deactivate(
         if _two_fallbacks_in_a_row(tracker) or _second_affirmation_failed(tracker):
             return await self._give_up(output_channel, nlg, tracker, domain)
 
-        return await self._revert_fallback_events(
-            output_channel, nlg, tracker, domain, events_so_far
-        ) + _message_clarification(tracker)
-
-    async def _revert_fallback_events(
-        self,
-        output_channel: OutputChannel,
-        nlg: NaturalLanguageGenerator,
-        tracker: DialogueStateTracker,
-        domain: Domain,
-        events_so_far: List[Event],
-    ) -> List[Event]:
-        revert_events = [UserUtteranceReverted(), UserUtteranceReverted()]
-
-        temp_tracker = DialogueStateTracker.from_events(
-            tracker.sender_id, tracker.applied_events() + events_so_far + revert_events
-        )
-
-        while temp_tracker.latest_message and not await self.is_done(
-            output_channel, nlg, temp_tracker, domain, []
-        ):
-            temp_tracker.update(revert_events[-1])
-            revert_events.append(UserUtteranceReverted())
-
-        return revert_events
+        # revert fallback events
+        return [UserUtteranceReverted()] + _message_clarification(tracker)
 
     async def _give_up(
         self,
@@ -163,7 +140,9 @@ def _last_n_intent_names(
     intent_names = []
     for i in range(number_of_last_intent_names):
         message = tracker.get_last_event_for(
-            UserUttered, skip=i, event_verbosity=EventVerbosity.AFTER_RESTART
+            (UserUttered, UserUtteranceReverted),
+            skip=i,
+            event_verbosity=EventVerbosity.AFTER_RESTART,
         )
         if isinstance(message, UserUttered):
             intent_names.append(message.intent.get("name"))

rasa/core/channels/slack.py

@@ -205,9 +205,9 @@ def _raise_deprecation_warnings(self) -> None:
             rasa.shared.utils.io.raise_deprecation_warning(
                 "Your slack bot is missing a configured signing secret. Running a "
                 "bot without a signing secret is deprecated and will be removed in "
-                "the next release (2.1.0). You should add a `slack_signing_secret` "
+                "the next release (2.2.0). You should add a `slack_signing_secret` "
                 "parameter to your channel configuration.",
-                warn_until_version="2.1.0",
+                warn_until_version="2.2.0",
                 docs=DOCS_URL_CONNECTORS_SLACK,
             )
 

rasa/shared/core/trackers.py

@@ -663,7 +663,7 @@ def export_stories_to_file(self, export_path: Text = "debug_stories.yml") -> Non
 
     def get_last_event_for(
         self,
-        event_type: Type[Event],
+        event_type: Union[Type[Event], Tuple[Type, ...]],
         action_names_to_exclude: List[Text] = None,
         skip: int = 0,
         event_verbosity: EventVerbosity = EventVerbosity.APPLIED,

rasa/version.py

@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "2.0.5"
+__version__ = "2.0.6"

tests/core/actions/test_two_stage_fallback.py

@@ -2,13 +2,15 @@
 
 import pytest
 
+from rasa.core.processor import MessageProcessor
 from rasa.shared.constants import DEFAULT_NLU_FALLBACK_INTENT_NAME
 from rasa.core.actions.two_stage_fallback import TwoStageFallbackAction
 from rasa.core.channels import CollectingOutputChannel
 from rasa.shared.core.domain import Domain
 from rasa.shared.core.events import (
     ActionExecuted,
     UserUttered,
+    SlotSet,
     ActiveLoop,
     BotUttered,
     UserUtteranceReverted,
@@ -45,10 +47,17 @@ def _two_stage_clarification_request() -> List[Event]:
     return [ActionExecuted(ACTION_TWO_STAGE_FALLBACK_NAME), BotUttered("please affirm")]
 
 
-async def test_ask_affirmation():
-    tracker = DialogueStateTracker.from_events(
-        "some-sender", evts=_message_requiring_fallback()
-    )
+@pytest.mark.parametrize(
+    "events",
+    [
+        _message_requiring_fallback(),
+        _message_requiring_fallback()
+        + [UserUtteranceReverted()]
+        + _message_requiring_fallback(),
+    ],
+)
+async def test_ask_affirmation(events: List[Event]):
+    tracker = DialogueStateTracker.from_events("some-sender", evts=events)
     domain = Domain.empty()
     action = TwoStageFallbackAction()
 
@@ -64,10 +73,13 @@ async def test_ask_affirmation():
     assert isinstance(events[1], BotUttered)
 
 
-async def test_1st_affirmation_is_successful():
+async def test_1st_affirmation_is_successful(default_processor: MessageProcessor):
     tracker = DialogueStateTracker.from_events(
         "some-sender",
         evts=[
+            ActionExecuted(ACTION_LISTEN_NAME),
+            UserUttered("my name is John", {"name": "say_name", "confidence": 1.0}),
+            SlotSet("some_slot", "example_value"),
             # User sends message with low NLU confidence
             *_message_requiring_fallback(),
             ActiveLoop(ACTION_TWO_STAGE_FALLBACK_NAME),
@@ -81,18 +93,18 @@ async def test_1st_affirmation_is_successful():
     domain = Domain.empty()
     action = TwoStageFallbackAction()
 
-    events = await action.run(
+    await default_processor._run_action(
+        action,
+        tracker,
         CollectingOutputChannel(),
         TemplatedNaturalLanguageGenerator(domain.templates),
-        tracker,
-        domain,
     )
 
-    for events in events:
-        tracker.update(events, domain)
-
     applied_events = tracker.applied_events()
     assert applied_events == [
+        ActionExecuted(ACTION_LISTEN_NAME),
+        UserUttered("my name is John", {"name": "say_name", "confidence": 1.0}),
+        SlotSet("some_slot", "example_value"),
         ActionExecuted(ACTION_LISTEN_NAME),
         UserUttered("hi", {"name": "greet", "confidence": 1.0}),
     ]
@@ -164,10 +176,13 @@ async def test_ask_rephrase_after_failed_affirmation():
     assert bot_utterance.text == rephrase_text
 
 
-async def test_ask_rephrasing_successful():
+async def test_ask_rephrasing_successful(default_processor: MessageProcessor):
     tracker = DialogueStateTracker.from_events(
         "some-sender",
         evts=[
+            ActionExecuted(ACTION_LISTEN_NAME),
+            UserUttered("my name is John", {"name": "say_name", "confidence": 1.0}),
+            SlotSet("some_slot", "example_value"),
             # User sends message with low NLU confidence
             *_message_requiring_fallback(),
             ActiveLoop(ACTION_TWO_STAGE_FALLBACK_NAME),
@@ -186,18 +201,18 @@ async def test_ask_rephrasing_successful():
     domain = Domain.empty()
     action = TwoStageFallbackAction()
 
-    events = await action.run(
+    await default_processor._run_action(
+        action,
+        tracker,
         CollectingOutputChannel(),
         TemplatedNaturalLanguageGenerator(domain.templates),
-        tracker,
-        domain,
     )
 
-    for event in events:
-        tracker.update(event)
-
     applied_events = tracker.applied_events()
     assert applied_events == [
+        ActionExecuted(ACTION_LISTEN_NAME),
+        UserUttered("my name is John", {"name": "say_name", "confidence": 1.0}),
+        SlotSet("some_slot", "example_value"),
         ActionExecuted(ACTION_LISTEN_NAME),
         UserUttered("hi", {"name": "greet"}),
     ]
@@ -236,10 +251,13 @@ async def test_ask_affirm_after_rephrasing():
     assert isinstance(events[0], BotUttered)
 
 
-async def test_2nd_affirm_successful():
+async def test_2nd_affirm_successful(default_processor: MessageProcessor):
     tracker = DialogueStateTracker.from_events(
         "some-sender",
         evts=[
+            ActionExecuted(ACTION_LISTEN_NAME),
+            UserUttered("my name is John", {"name": "say_name", "confidence": 1.0}),
+            SlotSet("some_slot", "example_value"),
             # User sends message with low NLU confidence
             *_message_requiring_fallback(),
             ActiveLoop(ACTION_TWO_STAGE_FALLBACK_NAME),
@@ -262,19 +280,19 @@ async def test_2nd_affirm_successful():
     domain = Domain.empty()
     action = TwoStageFallbackAction()
 
-    events = await action.run(
+    await default_processor._run_action(
+        action,
+        tracker,
         CollectingOutputChannel(),
         TemplatedNaturalLanguageGenerator(domain.templates),
-        tracker,
-        domain,
     )
 
-    for event in events:
-        tracker.update(event)
-
     applied_events = tracker.applied_events()
 
     assert applied_events == [
+        ActionExecuted(ACTION_LISTEN_NAME),
+        UserUttered("my name is John", {"name": "say_name", "confidence": 1.0}),
+        SlotSet("some_slot", "example_value"),
         ActionExecuted(ACTION_LISTEN_NAME),
         UserUttered("hi", {"name": "greet"}),
     ]