Moved flow steps, step sequence and step links out of the main flow file

rasa/core/actions/action_clean_stack.py

@@ -14,7 +14,7 @@
 from rasa.shared.core.constants import ACTION_CLEAN_STACK, DIALOGUE_STACK_SLOT
 from rasa.shared.core.domain import Domain
 from rasa.shared.core.events import Event, SlotSet
-from rasa.shared.core.flows.flow import ContinueFlowStep, END_STEP
+from rasa.shared.core.flows.flow_step import ContinueFlowStep, END_STEP
 from rasa.shared.core.trackers import DialogueStateTracker
 
 

rasa/core/policies/flow_policy.py

@@ -44,13 +44,12 @@
     ACTION_SEND_TEXT_NAME,
 )
 from rasa.shared.core.events import Event, SlotSet
-from rasa.shared.core.flows.flow import (
+from rasa.shared.core.flows.flow_step import (
     END_STEP,
     ActionFlowStep,
     BranchFlowStep,
     ContinueFlowStep,
     ElseFlowLink,
-    Flow,
     FlowStep,
     GenerateResponseFlowStep,
     IfFlowLink,
@@ -62,8 +61,9 @@
     CollectInformationFlowStep,
     StaticFlowLink,
 )
+from rasa.shared.core.flows.flow import Flow
 from rasa.shared.core.flows.flows_list import FlowsList
-from rasa.shared.core.flows.flow import EndFlowStep
+from rasa.shared.core.flows.flow_step import EndFlowStep
 from rasa.core.featurizers.tracker_featurizers import TrackerFeaturizer
 from rasa.core.policies.policy import Policy, PolicyPrediction
 from rasa.engine.graph import ExecutionContext

rasa/dialogue_understanding/commands/correct_slots_command.py

@@ -16,7 +16,7 @@
     UserFlowStackFrame,
 )
 from rasa.shared.core.events import Event
-from rasa.shared.core.flows.flow import END_STEP, ContinueFlowStep, FlowStep
+from rasa.shared.core.flows.flow_step import END_STEP, ContinueFlowStep, FlowStep
 from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
 import rasa.dialogue_understanding.stack.utils as utils

rasa/dialogue_understanding/generator/llm_command_generator.py

@@ -23,11 +23,11 @@
 from rasa.engine.recipes.default_recipe import DefaultV1Recipe
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
-from rasa.shared.core.flows.flow import (
-    Flow,
+from rasa.shared.core.flows.flow_step import (
     FlowStep,
     CollectInformationFlowStep,
 )
+from rasa.shared.core.flows.flow import Flow
 from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.shared.core.slots import (

rasa/dialogue_understanding/patterns/cancel.py

@@ -18,7 +18,7 @@
 from rasa.shared.core.constants import ACTION_CANCEL_FLOW
 from rasa.shared.core.domain import Domain
 from rasa.shared.core.events import Event
-from rasa.shared.core.flows.flow import END_STEP, ContinueFlowStep
+from rasa.shared.core.flows.flow_step import END_STEP, ContinueFlowStep
 from rasa.shared.core.trackers import DialogueStateTracker
 
 

rasa/dialogue_understanding/patterns/collect_information.py

@@ -5,7 +5,7 @@
 from rasa.dialogue_understanding.stack.dialogue_stack import DialogueStackFrame
 from rasa.shared.constants import RASA_DEFAULT_FLOW_PATTERN_PREFIX
 from rasa.dialogue_understanding.stack.frames import PatternFlowStackFrame
-from rasa.shared.core.flows.flow import SlotRejection
+from rasa.shared.core.flows.flow_step import SlotRejection
 
 FLOW_PATTERN_COLLECT_INFORMATION = (
     RASA_DEFAULT_FLOW_PATTERN_PREFIX + "collect_information"

rasa/dialogue_understanding/patterns/correction.py

@@ -7,7 +7,7 @@
 )
 from rasa.dialogue_understanding.stack.dialogue_stack import DialogueStack
 from rasa.shared.constants import RASA_DEFAULT_FLOW_PATTERN_PREFIX
-from rasa.shared.core.flows.flow import (
+from rasa.shared.core.flows.flow_step import (
     START_STEP,
 )
 from rasa.shared.core.trackers import (
@@ -30,7 +30,7 @@
     SlotSet,
 )
 from rasa.core.nlg import NaturalLanguageGenerator
-from rasa.shared.core.flows.flow import END_STEP, ContinueFlowStep
+from rasa.shared.core.flows.flow_step import END_STEP, ContinueFlowStep
 
 structlogger = structlog.get_logger()
 

rasa/dialogue_understanding/processor/command_processor.py

@@ -28,7 +28,7 @@
 )
 from rasa.shared.core.constants import FLOW_HASHES_SLOT
 from rasa.shared.core.events import Event, SlotSet
-from rasa.shared.core.flows.flow import (
+from rasa.shared.core.flows.flow_step import (
     CollectInformationFlowStep,
 )
 from rasa.shared.core.flows.flows_list import FlowsList

rasa/dialogue_understanding/stack/frames/flow_stack_frame.py

@@ -4,7 +4,8 @@
 from typing import Any, Dict, Optional
 
 from rasa.dialogue_understanding.stack.frames import DialogueStackFrame
-from rasa.shared.core.flows.flow import START_STEP, Flow, FlowStep
+from rasa.shared.core.flows.flow_step import START_STEP, FlowStep
+from rasa.shared.core.flows.flow import Flow
 from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.exceptions import RasaException
 

rasa/dialogue_understanding/stack/utils.py

@@ -5,7 +5,7 @@
 from rasa.dialogue_understanding.stack.frames import BaseFlowStackFrame
 from rasa.dialogue_understanding.stack.dialogue_stack import DialogueStack
 from rasa.dialogue_understanding.stack.frames import UserFlowStackFrame
-from rasa.shared.core.flows.flow import END_STEP, ContinueFlowStep
+from rasa.shared.core.flows.flow_step import END_STEP, ContinueFlowStep
 from rasa.shared.core.flows.flows_list import FlowsList