added a ton of tests

RasaHQ · Oct 27, 2023 · 92476ca · 92476ca
1 parent 8f64d6a
commit 92476ca
Show file tree

Hide file tree

Showing 4 changed files with 297 additions and 32 deletions.
diff --git a/rasa/core/policies/flow_policy.py b/rasa/core/policies/flow_policy.py
@@ -138,7 +138,9 @@ def predict_action_probabilities(
 
         # create executor and predict next action
         try:
-            prediction = flow_executor.advance_flows(tracker, domain, flows)
+            prediction = flow_executor.advance_flows(
+                tracker, domain.action_names_or_texts, flows
+            )
             return self._create_prediction_result(
                 prediction.action_name,
                 domain,
@@ -162,7 +164,9 @@ def predict_action_probabilities(
             # we retry, with the internal error frame on the stack
             event = updated_stack.persist_as_event()
             tracker.update(event)
-            prediction = flow_executor.advance_flows(tracker, domain, flows)
+            prediction = flow_executor.advance_flows(
+                tracker, domain.action_names_or_texts, flows
+            )
             collected_events = [event] + (prediction.events or [])
             return self._create_prediction_result(
                 prediction.action_name,

diff --git a/rasa/core/policies/flows/flow_executor.py b/rasa/core/policies/flows/flow_executor.py
@@ -61,7 +61,6 @@
     CollectInformationFlowStep,
     StaticFlowLink,
 )
-from rasa.shared.core.domain import Domain
 from rasa.shared.core.trackers import (
     DialogueStateTracker,
 )
@@ -299,14 +298,16 @@ def _reset_slot(slot_name: Text, dialogue_tracker: DialogueStateTracker) -> None
 
 
 def advance_flows(
-    tracker: DialogueStateTracker, domain: Domain, flows: FlowsList
+    tracker: DialogueStateTracker, available_actions: List[str], flows: FlowsList
 ) -> FlowActionPrediction:
     """Advance the flows.
 
     Either start a new flow or advance the current flow.
 
     Args:
         tracker: The tracker to get the next action for.
+        available_actions: The actions that are available in the domain.
+        flows: All flows.
 
     Returns:
     The predicted action and the events to run.
@@ -317,7 +318,7 @@ def advance_flows(
         return FlowActionPrediction(None, 0.0)
 
     previous_stack = stack.as_dict()
-    prediction = select_next_action(stack, tracker, domain, flows)
+    prediction = select_next_action(stack, tracker, available_actions, flows)
     if previous_stack != stack.as_dict():
         # we need to update dialogue stack to persist the state of the executor
         if not prediction.events:
@@ -329,7 +330,7 @@ def advance_flows(
 def select_next_action(
     stack: DialogueStack,
     tracker: DialogueStateTracker,
-    domain: Domain,
+    available_actions: List[str],
     flows: FlowsList,
 ) -> FlowActionPrediction:
     """Select the next action to execute.
@@ -340,7 +341,10 @@ def select_next_action(
     advanced. If there are no more flows, the action listen is predicted.
 
     Args:
+        stack: The stack to get the next action for.
         tracker: The tracker to get the next action for.
+        available_actions: The actions that are available in the domain.
+        flows: All flows.
 
     Returns:
         The next action to execute, the events that should be applied to the
@@ -390,7 +394,7 @@ def select_next_action(
                     current_flow,
                     stack,
                     tracker,
-                    domain.action_names_or_texts,
+                    available_actions,
                     flows,
                 )
                 tracker.update_with_events(step_result.events)

diff --git a/tests/cli/test_rasa_evaluate_markers.py b/tests/cli/test_rasa_evaluate_markers.py
@@ -10,7 +10,6 @@
 from rasa.shared.core.events import ActionExecuted, SlotSet, UserUttered
 from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.shared.core.constants import ACTION_SESSION_START_NAME
-from rasa.shared.core.domain import Domain
 from rasa.core.tracker_store import SQLTrackerStore
 from rasa.cli.evaluate import STATS_SESSION_SUFFIX, STATS_OVERALL_SUFFIX
 from tests.conftest import write_endpoint_config_to_yaml