rasa-pro 3.12.0.dev2__py3-none-any.whl → 3.12.0.dev3__py3-none-any.whl

rasa/nlu/tokenizers/whitespace_tokenizer.py

@@ -1,11 +1,11 @@
 from __future__ import annotations
+
 from typing import Any, Dict, List, Optional, Text
 
 import regex
 
 import rasa.shared.utils.io
 import rasa.utils.io
-
 from rasa.engine.graph import ExecutionContext
 from rasa.engine.recipes.default_recipe import DefaultV1Recipe
 from rasa.engine.storage.resource import Resource

rasa/nlu/utils/bilou_utils.py

@@ -1,29 +1,29 @@
 import logging
 import operator
-from collections import defaultdict, Counter
-from typing import List, Tuple, Text, Optional, Dict, Any, TYPE_CHECKING
+from collections import Counter, defaultdict
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Text, Tuple
 
 from rasa.nlu.constants import (
-    TOKENS_NAMES,
     BILOU_ENTITIES,
     BILOU_ENTITIES_GROUP,
     BILOU_ENTITIES_ROLE,
+    TOKENS_NAMES,
 )
 from rasa.shared.nlu.constants import (
-    TEXT,
     ENTITIES,
-    ENTITY_ATTRIBUTE_START,
     ENTITY_ATTRIBUTE_END,
-    ENTITY_ATTRIBUTE_TYPE,
     ENTITY_ATTRIBUTE_GROUP,
     ENTITY_ATTRIBUTE_ROLE,
+    ENTITY_ATTRIBUTE_START,
+    ENTITY_ATTRIBUTE_TYPE,
     NO_ENTITY_TAG,
+    TEXT,
 )
 
 if TYPE_CHECKING:
     from rasa.nlu.tokenizers.tokenizer import Token
-    from rasa.shared.nlu.training_data.training_data import TrainingData
     from rasa.shared.nlu.training_data.message import Message
+    from rasa.shared.nlu.training_data.training_data import TrainingData
 
 logger = logging.getLogger(__name__)
 

rasa/nlu/utils/hugging_face/registry.py

@@ -6,42 +6,42 @@ from typing import Dict, Text, Type
 logging.getLogger("transformers.file_utils").setLevel(logging.WARNING)
 
 from transformers import (  # noqa: E402
-    TFPreTrainedModel,
+    BertTokenizer,
+    CamembertTokenizer,
+    # XLMTokenizer,
+    DistilBertTokenizer,
+    GPT2Tokenizer,
+    OpenAIGPTTokenizer,
+    PreTrainedTokenizer,
+    RobertaTokenizer,
     TFBertModel,
-    TFOpenAIGPTModel,
-    TFGPT2Model,
-    TFXLNetModel,
+    TFCamembertModel,
     # TFXLMModel,
     TFDistilBertModel,
+    TFGPT2Model,
+    TFOpenAIGPTModel,
+    TFPreTrainedModel,
     TFRobertaModel,
-    TFCamembertModel,
-    PreTrainedTokenizer,
-    BertTokenizer,
-    OpenAIGPTTokenizer,
-    GPT2Tokenizer,
+    TFXLNetModel,
     XLNetTokenizer,
-    # XLMTokenizer,
-    DistilBertTokenizer,
-    RobertaTokenizer,
-    CamembertTokenizer,
 )
+
 from rasa.nlu.utils.hugging_face.transformers_pre_post_processors import (  # noqa: E402
+    bert_embeddings_post_processor,
+    bert_tokens_cleaner,
     bert_tokens_pre_processor,
+    camembert_tokens_pre_processor,
+    gpt2_tokens_cleaner,
+    gpt_embeddings_post_processor,
     gpt_tokens_pre_processor,
-    xlnet_tokens_pre_processor,
+    openaigpt_tokens_cleaner,
+    roberta_embeddings_post_processor,
     roberta_tokens_pre_processor,
-    bert_embeddings_post_processor,
-    gpt_embeddings_post_processor,
     xlnet_embeddings_post_processor,
-    roberta_embeddings_post_processor,
-    bert_tokens_cleaner,
-    openaigpt_tokens_cleaner,
-    gpt2_tokens_cleaner,
     xlnet_tokens_cleaner,
-    camembert_tokens_pre_processor,
+    xlnet_tokens_pre_processor,
 )
 
-
 model_class_dict: Dict[Text, Type[TFPreTrainedModel]] = {
     "bert": TFBertModel,
     "gpt": TFOpenAIGPTModel,

rasa/nlu/utils/hugging_face/transformers_pre_post_processors.py

@@ -1,4 +1,5 @@
-from typing import List, Tuple, Text
+from typing import List, Text, Tuple
+
 import numpy as np
 
 

rasa/nlu/utils/mitie_utils.py

@@ -1,9 +1,10 @@
 from __future__ import annotations
+
 import typing
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Text
 
-from rasa.engine.graph import GraphComponent, ExecutionContext
+from rasa.engine.graph import ExecutionContext, GraphComponent
 from rasa.engine.recipes.default_recipe import DefaultV1Recipe
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage

rasa/nlu/utils/pattern_utils.py

@@ -2,8 +2,8 @@ import re
 from typing import Dict, List, Text, Union
 
 import rasa.shared.utils.io
-from rasa.shared.nlu.training_data.training_data import TrainingData
 from rasa.shared.exceptions import InvalidConfigException
+from rasa.shared.nlu.training_data.training_data import TrainingData
 
 
 def _convert_lookup_tables_to_regex(

rasa/nlu/utils/spacy_utils.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import dataclasses
-import typing
 import logging
+import typing
 from typing import Any, Dict, List, Optional, Text, Tuple
 
 from rasa.engine.graph import ExecutionContext, GraphComponent
@@ -10,10 +10,10 @@ from rasa.engine.recipes.default_recipe import DefaultV1Recipe
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
 from rasa.nlu.constants import DENSE_FEATURIZABLE_ATTRIBUTES, SPACY_DOCS
-from rasa.shared.nlu.training_data.message import Message
-from rasa.shared.nlu.training_data.training_data import TrainingData
 from rasa.nlu.model import InvalidModelError
 from rasa.shared.constants import DOCS_URL_COMPONENTS
+from rasa.shared.nlu.training_data.message import Message
+from rasa.shared.nlu.training_data.training_data import TrainingData
 
 logger = logging.getLogger(__name__)
 

rasa/plugin.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import argparse
 import functools
 import sys
-from typing import Any, List, Optional, TYPE_CHECKING, Text, Union
+from typing import TYPE_CHECKING, Any, List, Optional, Text, Union
 
 import pluggy
 
@@ -13,6 +13,7 @@ if TYPE_CHECKING:
     from rasa.core.brokers.broker import EventBroker
     from rasa.core.tracker_store import TrackerStore
     from rasa.shared.core.domain import Domain
+    from rasa.shared.core.trackers import DialogueStateTracker
     from rasa.utils.endpoints import EndpointConfig
 
 
@@ -88,3 +89,13 @@ def after_server_stop() -> None:
     Use this hook to de-initialize any resources that require explicit cleanup like,
     thread shutdown, closing connections, etc.
     """
+
+
+@hookspec  # type: ignore[misc]
+def after_new_user_message(tracker: "DialogueStateTracker") -> None:
+    """Hook specification for after a new user message is received."""
+
+
+@hookspec  # type: ignore[misc]
+def after_action_executed(tracker: "DialogueStateTracker") -> None:
+    """Hook specification for after an action is executed."""

rasa/server.py

@@ -60,11 +60,13 @@ from rasa.shared.constants import (
     DEFAULT_MODELS_PATH,
     DEFAULT_SENDER_ID,
     DOCS_BASE_URL,
+    DOCS_URL_FLOWS,
     DOCS_URL_TRAINING_DATA,
     TEST_STORIES_FILE_PREFIX,
 )
 from rasa.shared.core.domain import Domain, InvalidDomain
 from rasa.shared.core.events import Event
+from rasa.shared.core.flows.yaml_flows_io import YAMLFlowsReader
 from rasa.shared.core.trackers import (
     DialogueStateTracker,
     EventVerbosity,
@@ -72,6 +74,7 @@ from rasa.shared.core.trackers import (
 from rasa.shared.core.training_data.story_writer.yaml_story_writer import (
     YAMLStoryWriter,
 )
+from rasa.shared.exceptions import RasaException, YamlException
 from rasa.shared.importers.importer import TrainingDataImporter
 from rasa.shared.nlu.training_data.formats import RasaYAMLReader
 from rasa.shared.utils.schemas.events import EVENTS_SCHEMA
@@ -1566,7 +1569,8 @@ def _nlu_training_payload_from_json(
     )
 
 
-def _validate_yaml_training_payload(yaml_text: Text) -> None:
+def _validate_nlu_training_data_payload(yaml_text: str) -> None:
+    """Validate the NLU training data payload of the request body."""
     try:
         RasaYAMLReader().validate(yaml_text)
     except Exception as e:
@@ -1578,6 +1582,38 @@ def _validate_yaml_training_payload(yaml_text: Text) -> None:
         )
 
 
+def _validate_flows_payload(yaml_text: str) -> None:
+    """Validate the flows payload of the request body."""
+    try:
+        YAMLFlowsReader().read_from_string(yaml_text)
+    except (YamlException, RasaException) as exc:
+        # if the payload does not contain any flows, we can ignore the error
+        if (
+            hasattr(exc, "validation_errors")
+            and exc.validation_errors is not None
+            and any(
+                [
+                    "'flows' is a required property" in error.message
+                    for error in exc.validation_errors
+                ]
+            )
+        ):
+            return None
+
+        raise ErrorResponse(
+            HTTPStatus.BAD_REQUEST,
+            "BadRequest",
+            f"The request body does not contain valid YAML. Error: {exc}",
+            help_url=DOCS_URL_FLOWS,
+        )
+
+
+def _validate_yaml_training_payload(yaml_text: str) -> None:
+    """Validate the YAML training payload of the request body."""
+    _validate_nlu_training_data_payload(yaml_text)
+    _validate_flows_payload(yaml_text)
+
+
 def _extract_core_additional_arguments(request: Request) -> Dict[Text, Any]:
     return {
         "augmentation_factor": rasa.utils.endpoints.int_arg(request, "augmentation", 50)

rasa/shared/constants.py

@@ -19,6 +19,7 @@ DOCS_URL_GRAPH_COMPONENTS = DOCS_URL_CONCEPTS + "/components/custom-graph-compon
 DOCS_URL_GRAPH_RECIPE = DOCS_URL_CONCEPTS + "/components/graph-recipe"
 DOCS_URL_CATEGORICAL_SLOTS = DOCS_URL_CONCEPTS + "/domain#categorical-slot"
 DOCS_URL_DOMAIN = DOCS_URL_CONCEPTS + "/domain"
+DOCS_URL_FLOWS = DOCS_URL_CONCEPTS + "/flows"
 
 # Docs URLs for NLU-based assistants
 DOCS_URL_TRAINING_DATA = DOCS_URL_NLU_BASED + "/training-data-format"
@@ -161,7 +162,6 @@ AZURE_AD_TOKEN_ENV_VAR = "AZURE_AD_TOKEN"
 AZURE_API_BASE_ENV_VAR = "AZURE_API_BASE"
 AZURE_API_VERSION_ENV_VAR = "AZURE_API_VERSION"
 AZURE_API_TYPE_ENV_VAR = "AZURE_API_TYPE"
-AZURE_AD_SCOPES_ENV_VAR = "AZURE_AD_SCOPES"
 AZURE_SPEECH_API_KEY_ENV_VAR = "AZURE_SPEECH_API_KEY"
 
 DEEPGRAM_API_KEY_ENV_VAR = "DEEPGRAM_API_KEY"
@@ -198,6 +198,7 @@ MODEL_CONFIG_KEY = "model"
 MODEL_NAME_CONFIG_KEY = "model_name"
 PROMPT_CONFIG_KEY = "prompt"
 PROMPT_TEMPLATE_CONFIG_KEY = "prompt_template"
+
 STREAM_CONFIG_KEY = "stream"
 N_REPHRASES_CONFIG_KEY = "n"
 USE_CHAT_COMPLETIONS_ENDPOINT_CONFIG_KEY = "use_chat_completions_endpoint"
@@ -231,6 +232,12 @@ LITELLM_PARAMS_KEY = "litellm_params"
 LLM_API_HEALTH_CHECK_ENV_VAR = "LLM_API_HEALTH_CHECK"
 LLM_API_HEALTH_CHECK_DEFAULT_VALUE = "false"
 
+AZURE_API_KEY_ENV_VAR = "AZURE_API_KEY"
+AZURE_AD_TOKEN_ENV_VAR = "AZURE_AD_TOKEN"
+AZURE_API_BASE_ENV_VAR = "AZURE_API_BASE"
+AZURE_API_VERSION_ENV_VAR = "AZURE_API_VERSION"
+AZURE_API_TYPE_ENV_VAR = "AZURE_API_TYPE"
+
 AWS_REGION_NAME_CONFIG_KEY = "aws_region_name"
 AWS_ACCESS_KEY_ID_CONFIG_KEY = "aws_access_key_id"
 AWS_SECRET_ACCESS_KEY_CONFIG_KEY = "aws_secret_access_key"
@@ -266,11 +273,17 @@ RASA_PROVIDER = "rasa"
 SELF_HOSTED_VLLM_PREFIX = "hosted_vllm"
 SELF_HOSTED_VLLM_API_KEY_ENV_VAR = "HOSTED_VLLM_API_KEY"
 
+SELF_HOSTED_VLLM_PREFIX = "hosted_vllm"
+SELF_HOSTED_VLLM_API_KEY_ENV_VAR = "HOSTED_VLLM_API_KEY"
+
 VALID_PROVIDERS_FOR_API_TYPE_CONFIG_KEY = [
     OPENAI_PROVIDER,
     AZURE_OPENAI_PROVIDER,
 ]
 
+SELF_HOSTED_VLLM_PREFIX = "hosted_vllm"
+SELF_HOSTED_VLLM_API_KEY_ENV_VAR = "HOSTED_VLLM_API_KEY"
+
 AZURE_API_TYPE = "azure"
 OPENAI_API_TYPE = "openai"
 
@@ -308,4 +321,11 @@ SENSITIVE_DATA = [
     AWS_SESSION_TOKEN_CONFIG_KEY,
 ]
 
-AZURE_AD_KEY = "azure_ad"
+# Used for key values in BotUtterance.data
+TEXT = "text"
+ELEMENTS = "elements"
+QUICK_REPLIES = "quick_replies"
+BUTTONS = "buttons"
+ATTACHMENT = "attachment"
+IMAGE = "image"
+CUSTOM = "custom"

rasa/shared/core/command_payload_reader.py

@@ -4,7 +4,9 @@ from typing import List, Optional
 
 import structlog
 
+from rasa.dialogue_understanding.commands import Command
 from rasa.dialogue_understanding.commands.set_slot_command import SetSlotExtractor
+from rasa.dialogue_understanding.utils import add_commands_to_message_parse_data
 from rasa.shared.core.domain import Domain
 from rasa.shared.nlu.constants import COMMANDS, SET_SLOT_COMMAND, TEXT
 from rasa.shared.nlu.training_data.message import Message
@@ -78,13 +80,18 @@ class CommandPayloadReader:
             )
 
             # Create new SetSlot commands from the extracted attributes.
-            commands.append(
-                {
-                    "command": SET_SLOT_COMMAND,
-                    "name": slot_name,
-                    "value": slot_value,
-                    "extractor": entity_extractor_name,
-                }
+            command = {
+                "command": SET_SLOT_COMMAND,
+                "name": slot_name,
+                "value": slot_value,
+                "extractor": entity_extractor_name,
+            }
+            commands.append(command)
+
+            add_commands_to_message_parse_data(
+                message,
+                CommandPayloadReader.__name__,
+                [Command.command_from_json(command)],
             )
 
             structlogger.debug(
@@ -94,6 +101,7 @@ class CommandPayloadReader:
 
         # set the command(s) on the Message object
         message.set(COMMANDS, commands, add_to_output=True)
+
         return message
 
     @staticmethod

rasa/shared/core/constants.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
+
 from enum import Enum
 
 import rasa.shared.constants as constants
 
-
 DEFAULT_CATEGORICAL_SLOT_VALUE = "__other__"
 
 USER_INTENT_RESTART = "restart"
@@ -52,6 +52,9 @@ ACTION_RESET_ROUTING = "action_reset_routing"
 ACTION_HANGUP = "action_hangup"
 ACTION_REPEAT_BOT_MESSAGES = "action_repeat_bot_messages"
 
+ACTION_METADATA_EXECUTION_SUCCESS = "execution_success"
+ACTION_METADATA_EXECUTION_ERROR_MESSAGE = "execution_error_message"
+
 
 DEFAULT_ACTION_NAMES = [
     ACTION_LISTEN_NAME,

rasa/shared/core/conversation.py

@@ -1,8 +1,7 @@
-from typing import Dict, List, Text, Any, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Dict, List, Text
 
 import rasa.shared.core.events
 
-
 if TYPE_CHECKING:
     from rasa.shared.core.events import Event
 

rasa/shared/core/events.py

@@ -2,68 +2,69 @@ import abc
 import copy
 import json
 import logging
-import structlog
 import re
-from abc import ABC
-
-import jsonpickle
 import time
 import uuid
-from dateutil import parser
+from abc import ABC
 from datetime import datetime
 from typing import (
-    List,
-    Dict,
-    Text,
-    Any,
-    Type,
-    Optional,
     TYPE_CHECKING,
+    Any,
+    Dict,
     Iterable,
-    cast,
+    List,
+    Optional,
+    Text,
     Tuple,
+    Type,
     TypeVar,
+    Union,
+    cast,
 )
 
+import jsonpickle
+import structlog
+from dateutil import parser
+
 import rasa.shared.utils.common
 import rasa.shared.utils.io
-from typing import Union
-
 from rasa.shared.constants import DOCS_URL_TRAINING_DATA
 from rasa.shared.core.constants import (
-    LOOP_NAME,
-    EXTERNAL_MESSAGE_PREFIX,
+    ACTION_LISTEN_NAME,
+    ACTION_METADATA_EXECUTION_ERROR_MESSAGE,
+    ACTION_METADATA_EXECUTION_SUCCESS,
     ACTION_NAME_SENDER_ID_CONNECTOR_STR,
+    ACTION_SESSION_START_NAME,
+    ENTITY_LABEL_SEPARATOR,
+    EXTERNAL_MESSAGE_PREFIX,
     IS_EXTERNAL,
-    USE_TEXT_FOR_FEATURIZATION,
     LOOP_INTERRUPTED,
-    ENTITY_LABEL_SEPARATOR,
-    ACTION_SESSION_START_NAME,
-    ACTION_LISTEN_NAME,
+    LOOP_NAME,
+    USE_TEXT_FOR_FEATURIZATION,
 )
 from rasa.shared.exceptions import UnsupportedFeatureException
 from rasa.shared.nlu.constants import (
-    ENTITY_ATTRIBUTE_TYPE,
-    INTENT,
-    TEXT,
-    ENTITIES,
-    COMMANDS,
-    ENTITY_ATTRIBUTE_VALUE,
-    ACTION_TEXT,
     ACTION_NAME,
-    INTENT_NAME_KEY,
-    ENTITY_ATTRIBUTE_ROLE,
-    ENTITY_ATTRIBUTE_GROUP,
-    PREDICTED_CONFIDENCE_KEY,
-    INTENT_RANKING_KEY,
-    ENTITY_ATTRIBUTE_TEXT,
-    ENTITY_ATTRIBUTE_START,
+    ACTION_TEXT,
+    COMMANDS,
+    ENTITIES,
     ENTITY_ATTRIBUTE_CONFIDENCE,
     ENTITY_ATTRIBUTE_END,
+    ENTITY_ATTRIBUTE_GROUP,
+    ENTITY_ATTRIBUTE_ROLE,
+    ENTITY_ATTRIBUTE_START,
+    ENTITY_ATTRIBUTE_TEXT,
+    ENTITY_ATTRIBUTE_TYPE,
+    ENTITY_ATTRIBUTE_VALUE,
     FULL_RETRIEVAL_INTENT_NAME_KEY,
+    INTENT,
+    INTENT_NAME_KEY,
+    INTENT_RANKING_KEY,
+    PREDICTED_CONFIDENCE_KEY,
+    PROMPTS,
+    TEXT,
 )
 
-
 if TYPE_CHECKING:
     from typing_extensions import TypedDict
 
@@ -98,6 +99,7 @@ if TYPE_CHECKING:
             ENTITIES: List[EntityPrediction],
             "message_id": Optional[Text],
             "metadata": Dict,
+            PROMPTS: Dict,
         },
         total=False,
     )
@@ -147,8 +149,8 @@ def format_message(
         Message with entities annotated inline, e.g.
         `I am from [Berlin]{`"`entity`"`: `"`city`"`}`.
     """
-    from rasa.shared.nlu.training_data.formats.readerwriter import TrainingDataWriter
     from rasa.shared.nlu.training_data import entities_parser
+    from rasa.shared.nlu.training_data.formats.readerwriter import TrainingDataWriter
 
     message_from_md = entities_parser.parse_training_example(text, intent)
     deserialised_entities = deserialise_entities(entities)
@@ -1704,7 +1706,15 @@ class ActionExecuted(Event):
         super().__init__(timestamp, metadata)
 
     def __members__(self) -> Tuple[Optional[Text], Optional[Text], Text]:
-        meta_no_nones = {k: v for k, v in self.metadata.items() if v is not None}
+        items_to_ignore = [
+            ACTION_METADATA_EXECUTION_SUCCESS,
+            ACTION_METADATA_EXECUTION_ERROR_MESSAGE,
+        ]
+        meta_no_nones = {
+            k: v
+            for k, v in self.metadata.items()
+            if v is not None and k not in items_to_ignore
+        }
         return (self.action_name, self.action_text, jsonpickle.encode(meta_no_nones))
 
     def __repr__(self) -> Text:

rasa/shared/core/flows/__init__.py

@@ -2,6 +2,5 @@ from .flow import Flow
 from .flow_step import FlowStep
 from .flows_list import FlowsList
 
-
 # to make ruff happy and use the imported names
 all_classes = [FlowStep, Flow, FlowsList]

rasa/shared/core/flows/flow.py

@@ -4,33 +4,33 @@ import copy
 from dataclasses import dataclass, field
 from functools import cached_property
 from pathlib import Path
-from typing import Text, Optional, Dict, Any, List, Set, Union
+from typing import Any, Dict, List, Optional, Set, Text, Union
 
 import structlog
 from pypred import Predicate
 
 import rasa.shared.utils.io
 from rasa.shared.constants import RASA_DEFAULT_FLOW_PATTERN_PREFIX
-from rasa.shared.core.flows.flow_path import PathNode, FlowPath, FlowPathsList
+from rasa.shared.core.flows.flow_path import FlowPath, FlowPathsList, PathNode
 from rasa.shared.core.flows.flow_step import FlowStep
 from rasa.shared.core.flows.flow_step_links import (
+    ElseFlowStepLink,
     FlowStepLink,
-    StaticFlowStepLink,
     IfFlowStepLink,
-    ElseFlowStepLink,
+    StaticFlowStepLink,
 )
 from rasa.shared.core.flows.flow_step_sequence import FlowStepSequence
 from rasa.shared.core.flows.nlu_trigger import NLUTriggers
 from rasa.shared.core.flows.steps import (
+    ActionFlowStep,
     CollectInformationFlowStep,
     EndFlowStep,
     StartFlowStep,
-    ActionFlowStep,
 )
 from rasa.shared.core.flows.steps.constants import (
     CONTINUE_STEP_PREFIX,
-    START_STEP,
     END_STEP,
+    START_STEP,
 )
 from rasa.shared.core.flows.steps.continuation import ContinueFlowStep
 from rasa.shared.core.slots import Slot
@@ -79,7 +79,7 @@ class Flow:
         Returns:
             A Flow object.
         """
-        step_sequence = FlowStepSequence.from_json(data.get("steps"))
+        step_sequence = FlowStepSequence.from_json(flow_id, data.get("steps"))
         nlu_triggers = NLUTriggers.from_json(data.get("nlu_trigger"))
 
         if file_path and isinstance(file_path, Path):
@@ -185,13 +185,13 @@ class Flow:
             return None
 
         if step_id == START_STEP:
-            return StartFlowStep(self.first_step_in_flow().id)
+            return StartFlowStep(self.id, self.first_step_in_flow().id)
 
         if step_id == END_STEP:
-            return EndFlowStep()
+            return EndFlowStep(self.id)
 
         if step_id.startswith(CONTINUE_STEP_PREFIX):
-            return ContinueFlowStep(step_id[len(CONTINUE_STEP_PREFIX) :])
+            return ContinueFlowStep(self.id, step_id[len(CONTINUE_STEP_PREFIX) :])
 
         for step in self.steps_with_calls_resolved:
             if step.id == step_id:
@@ -371,7 +371,7 @@ class Flow:
             True if dynamic literals are present, False otherwise.
         """
         from pypred import ast
-        from pypred.tiler import tile, SimplePattern
+        from pypred.tiler import SimplePattern, tile
 
         if not self.guard_condition:
             return False