Eng 585 flows wrap up

data/test_flows/basic_flows.yml

@@ -0,0 +1,10 @@
+flows:
+  foo:
+    description: "A test flow"
+    steps:
+      - action: "utter_test"
+  bar:
+    description: "Another test flow"
+    steps:
+      - action: "utter_greet"
+      - collect: "important_info"

rasa/core/actions/action_clean_stack.py

@@ -14,7 +14,8 @@
 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.steps.constants import END_STEP
+from rasa.shared.core.flows.steps.continuation import ContinueFlowStep
 from rasa.shared.core.trackers import DialogueStateTracker
 
 

rasa/core/policies/flow_policy.py

@@ -44,26 +44,31 @@
     ACTION_SEND_TEXT_NAME,
 )
 from rasa.shared.core.events import Event, SlotSet
-from rasa.shared.core.flows.flow import (
-    END_STEP,
-    ActionFlowStep,
-    BranchFlowStep,
-    ContinueFlowStep,
-    ElseFlowLink,
-    EndFlowStep,
-    Flow,
+from rasa.shared.core.flows.flow_step import (
     FlowStep,
-    FlowsList,
-    GenerateResponseFlowStep,
-    IfFlowLink,
+)
+from rasa.shared.core.flows.flow_step_links import (
+    IfFlowStepLink,
+    ElseFlowStepLink,
+    StaticFlowStepLink,
+)
+from rasa.shared.core.flows.steps.constants import END_STEP
+from rasa.shared.core.flows.steps.continuation import ContinueFlowStep
+from rasa.shared.core.flows.steps.set_slots import SetSlotsFlowStep
+from rasa.shared.core.flows.steps.collect import (
     SlotRejection,
+    CollectInformationFlowStep,
+)
+from rasa.shared.core.flows.steps.generate_response import GenerateResponseFlowStep
+from rasa.shared.core.flows.steps.user_message import (
     StepThatCanStartAFlow,
     UserMessageStep,
-    LinkFlowStep,
-    SetSlotsFlowStep,
-    CollectInformationFlowStep,
-    StaticFlowLink,
 )
+from rasa.shared.core.flows.steps.link import LinkFlowStep
+from rasa.shared.core.flows.steps.action import ActionFlowStep
+from rasa.shared.core.flows.flow import Flow
+from rasa.shared.core.flows.flows_list import FlowsList
+from rasa.shared.core.flows.steps.end import EndFlowStep
 from rasa.core.featurizers.tracker_featurizers import TrackerFeaturizer
 from rasa.core.policies.policy import Policy, PolicyPrediction
 from rasa.engine.graph import ExecutionContext
@@ -364,18 +369,18 @@ def _select_next_step_id(
     ) -> Optional[Text]:
         """Selects the next step id based on the current step."""
         next = current.next
-        if len(next.links) == 1 and isinstance(next.links[0], StaticFlowLink):
+        if len(next.links) == 1 and isinstance(next.links[0], StaticFlowStepLink):
             return next.links[0].target
 
         # evaluate if conditions
         for link in next.links:
-            if isinstance(link, IfFlowLink) and link.condition:
+            if isinstance(link, IfFlowStepLink) and link.condition:
                 if self.is_condition_satisfied(link.condition, tracker):
                     return link.target
 
         # evaluate else condition
         for link in next.links:
-            if isinstance(link, ElseFlowLink):
+            if isinstance(link, ElseFlowStepLink):
                 return link.target
 
         if next.links:
@@ -672,8 +677,8 @@ def run_step(
             structlogger.debug("flow.step.run.user_message")
             return ContinueFlowWithNextStep()
 
-        elif isinstance(step, BranchFlowStep):
-            structlogger.debug("flow.step.run.branch")
+        elif type(step) is FlowStep:
+            structlogger.debug("flow.step.run.base_flow_step")
             return ContinueFlowWithNextStep()
 
         elif isinstance(step, GenerateResponseFlowStep):

rasa/core/processor.py

@@ -17,7 +17,7 @@
 from rasa.engine.storage.storage import ModelMetadata
 from rasa.model import get_latest_model
 from rasa.plugin import plugin_manager
-from rasa.shared.core.flows.flow import FlowsList
+from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.data import TrainingType
 import rasa.shared.utils.io
 import rasa.core.actions.action

rasa/dialogue_understanding/commands/can_not_handle_command.py

@@ -4,7 +4,7 @@
 from typing import Any, Dict, List
 from rasa.dialogue_understanding.commands import Command
 from rasa.shared.core.events import Event
-from rasa.shared.core.flows.flow import FlowsList
+from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
 
 

rasa/dialogue_understanding/commands/cancel_flow_command.py

@@ -10,7 +10,7 @@
 from rasa.dialogue_understanding.stack.dialogue_stack import DialogueStack
 from rasa.dialogue_understanding.stack.frames import UserFlowStackFrame
 from rasa.shared.core.events import Event
-from rasa.shared.core.flows.flow import FlowsList
+from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.dialogue_understanding.stack.utils import top_user_flow_frame
 

rasa/dialogue_understanding/commands/chit_chat_answer_command.py

@@ -6,7 +6,7 @@
 from rasa.dialogue_understanding.patterns.chitchat import ChitchatPatternFlowStackFrame
 from rasa.dialogue_understanding.stack.dialogue_stack import DialogueStack
 from rasa.shared.core.events import Event
-from rasa.shared.core.flows.flow import FlowsList
+from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
 
 

rasa/dialogue_understanding/commands/clarify_command.py

@@ -8,7 +8,7 @@
 from rasa.dialogue_understanding.patterns.clarify import ClarifyPatternFlowStackFrame
 from rasa.dialogue_understanding.stack.dialogue_stack import DialogueStack
 from rasa.shared.core.events import Event
-from rasa.shared.core.flows.flow import FlowsList
+from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
 
 structlogger = structlog.get_logger()

rasa/dialogue_understanding/commands/command.py

@@ -4,7 +4,7 @@
 import dataclasses
 from typing import Any, Dict, List
 from rasa.shared.core.events import Event
-from rasa.shared.core.flows.flow import FlowsList
+from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
 import rasa.shared.utils.common
 

rasa/dialogue_understanding/commands/correct_slots_command.py

@@ -16,7 +16,10 @@
     UserFlowStackFrame,
 )
 from rasa.shared.core.events import Event
-from rasa.shared.core.flows.flow import END_STEP, ContinueFlowStep, FlowStep, FlowsList
+from rasa.shared.core.flows.flow_step import FlowStep
+from rasa.shared.core.flows.steps.constants import END_STEP
+from rasa.shared.core.flows.steps.continuation import ContinueFlowStep
+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/commands/error_command.py

@@ -10,7 +10,7 @@
 )
 from rasa.dialogue_understanding.stack.dialogue_stack import DialogueStack
 from rasa.shared.core.events import Event
-from rasa.shared.core.flows.flow import FlowsList
+from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
 
 structlogger = structlog.get_logger()

rasa/dialogue_understanding/commands/handle_code_change_command.py

@@ -10,7 +10,7 @@
 from rasa.dialogue_understanding.stack.dialogue_stack import DialogueStack
 from rasa.shared.core.constants import DIALOGUE_STACK_SLOT
 from rasa.shared.core.events import Event, SlotSet
-from rasa.shared.core.flows.flow import FlowsList
+from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.dialogue_understanding.stack.utils import top_user_flow_frame
 

rasa/dialogue_understanding/commands/human_handoff_command.py

@@ -4,7 +4,7 @@
 from typing import Any, Dict, List
 from rasa.dialogue_understanding.commands import Command
 from rasa.shared.core.events import Event
-from rasa.shared.core.flows.flow import FlowsList
+from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
 
 

rasa/dialogue_understanding/commands/knowledge_answer_command.py

@@ -6,7 +6,7 @@
 from rasa.dialogue_understanding.patterns.search import SearchPatternFlowStackFrame
 from rasa.dialogue_understanding.stack.dialogue_stack import DialogueStack
 from rasa.shared.core.events import Event
-from rasa.shared.core.flows.flow import FlowsList
+from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
 
 

rasa/dialogue_understanding/commands/set_slot_command.py

@@ -8,7 +8,7 @@
 from rasa.dialogue_understanding.stack.dialogue_stack import DialogueStack
 from rasa.dialogue_understanding.stack.utils import filled_slots_for_active_flow
 from rasa.shared.core.events import Event, SlotSet
-from rasa.shared.core.flows.flow import FlowsList
+from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
 
 structlogger = structlog.get_logger()

rasa/dialogue_understanding/commands/start_flow_command.py

@@ -15,7 +15,7 @@
     user_flows_on_the_stack,
 )
 from rasa.shared.core.events import Event
-from rasa.shared.core.flows.flow import FlowsList
+from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
 
 structlogger = structlog.get_logger()

rasa/dialogue_understanding/generator/command_generator.py

@@ -1,7 +1,7 @@
 from typing import List, Optional
 import structlog
 from rasa.dialogue_understanding.commands import Command
-from rasa.shared.core.flows.flow import FlowsList
+from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.shared.nlu.training_data.message import Message
 from rasa.shared.nlu.constants import COMMANDS

rasa/dialogue_understanding/generator/llm_command_generator.py

@@ -23,12 +23,12 @@
 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,
-    FlowsList,
-    CollectInformationFlowStep,
 )
+from rasa.shared.core.flows.steps.collect import 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 (
     BooleanSlot,

rasa/dialogue_understanding/patterns/cancel.py

@@ -18,7 +18,8 @@
 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.steps.constants import END_STEP
+from rasa.shared.core.flows.steps.continuation import 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.steps.collect import SlotRejection
 
 FLOW_PATTERN_COLLECT_INFORMATION = (
     RASA_DEFAULT_FLOW_PATTERN_PREFIX + "collect_information"

rasa/dialogue_understanding/patterns/correction.py

@@ -7,9 +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 (
-    START_STEP,
-)
+from rasa.shared.core.flows.steps.constants import START_STEP, END_STEP
 from rasa.shared.core.trackers import (
     DialogueStateTracker,
 )
@@ -30,7 +28,7 @@
     SlotSet,
 )
 from rasa.core.nlg import NaturalLanguageGenerator
-from rasa.shared.core.flows.flow import END_STEP, ContinueFlowStep
+from rasa.shared.core.flows.steps.continuation import ContinueFlowStep
 
 structlogger = structlog.get_logger()
 

rasa/dialogue_understanding/processor/command_processor.py

@@ -28,10 +28,8 @@
 )
 from rasa.shared.core.constants import FLOW_HASHES_SLOT
 from rasa.shared.core.events import Event, SlotSet
-from rasa.shared.core.flows.flow import (
-    FlowsList,
-    CollectInformationFlowStep,
-)
+from rasa.shared.core.flows.steps.collect import CollectInformationFlowStep
+from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.shared.nlu.constants import COMMANDS
 

rasa/dialogue_understanding/processor/command_processor_component.py

@@ -7,7 +7,7 @@
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
 from rasa.shared.core.events import Event
-from rasa.shared.core.flows.flow import FlowsList
+from rasa.shared.core.flows.flows_list import FlowsList
 from rasa.shared.core.trackers import DialogueStateTracker
 
 

rasa/dialogue_understanding/stack/frames/flow_stack_frame.py

@@ -4,7 +4,10 @@
 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, FlowsList
+from rasa.shared.core.flows.flow_step import FlowStep
+from rasa.shared.core.flows.steps.constants import START_STEP
+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,9 @@
 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, FlowsList
+from rasa.shared.core.flows.steps.constants import END_STEP
+from rasa.shared.core.flows.steps.continuation import ContinueFlowStep
+from rasa.shared.core.flows.flows_list import FlowsList
 
 
 def top_flow_frame(

rasa/graph_components/providers/flows_provider.py

@@ -8,9 +8,9 @@
 from rasa.shared.importers.importer import TrainingDataImporter
 from rasa.shared.core.flows.yaml_flows_io import YAMLFlowsReader, YamlFlowsWriter
 
-from rasa.shared.core.flows.flow import FlowsList
+from rasa.shared.core.flows.flows_list import FlowsList
 
-FLOWS_PERSITENCE_FILE_NAME = "flows.yml"
+FLOWS_PERSISTENCE_FILE_NAME = "flows.yml"
 
 
 class FlowsProvider(GraphComponent):
@@ -50,7 +50,7 @@ def load(
         """Creates provider using a persisted version of itself."""
         with model_storage.read_from(resource) as resource_directory:
             flows = YAMLFlowsReader.read_from_file(
-                resource_directory / FLOWS_PERSITENCE_FILE_NAME
+                resource_directory / FLOWS_PERSISTENCE_FILE_NAME
             )
         return cls(model_storage, resource, flows)
 
@@ -59,7 +59,7 @@ def _persist(self, flows: FlowsList) -> None:
         with self._model_storage.write_to(self._resource) as resource_directory:
             YamlFlowsWriter.dump(
                 flows.underlying_flows,
-                resource_directory / FLOWS_PERSITENCE_FILE_NAME,
+                resource_directory / FLOWS_PERSISTENCE_FILE_NAME,
             )
 
     def provide_train(self, importer: TrainingDataImporter) -> FlowsList:

rasa/server.py

@@ -1378,7 +1378,7 @@ async def get_flows(request: Request) -> HTTPResponse:
         """Get all the flows currently stored by the agent."""
         processor = app.ctx.agent.processor
         flows = processor.get_flows()
-        return response.json(flows.as_json())
+        return response.json(flows.as_json_list())
 
     @app.get("/domain")
     @requires_auth(app, auth_token)