rasa-pro 3.10.15__tar.gz → 3.10.17__tar.gz

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rasa-pro
-Version: 3.10.15
+Version: 3.10.17
 Summary: State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development.
 Home-page: https://rasa.com
 Keywords: nlp,machine-learning,machine-learning-library,bot,bots,botkit,rasa conversational-agents,conversational-ai,chatbot,chatbot-framework,bot-framework
@@ -57,7 +57,7 @@ Requires-Dist: importlib-resources (==6.1.3)
 Requires-Dist: jieba (>=0.42.1,<0.43) ; extra == "jieba" or extra == "full"
 Requires-Dist: jinja2 (>=3.1.4,<4.0.0)
 Requires-Dist: jsonpatch (>=1.33,<2.0)
-Requires-Dist: jsonpickle (>=3.0,<3.1)
+Requires-Dist: jsonpickle (>=3.3.0,<3.4)
 Requires-Dist: jsonschema (>=4.22)
 Requires-Dist: keras (==2.14.0)
 Requires-Dist: langchain (>=0.2.0,<0.3.0)
@@ -88,7 +88,7 @@ Requires-Dist: pycountry (>=22.3.5,<23.0.0)
 Requires-Dist: pydantic (>=2.0,<3.0)
 Requires-Dist: pydot (>=1.4,<1.5)
 Requires-Dist: pykwalify (>=1.8,<1.9)
-Requires-Dist: pymilvus (<2.4.2)
+Requires-Dist: pymilvus (>=2.4.0,<2.4.2)
 Requires-Dist: pymongo[srv,tls] (>=4.6.3,<4.7)
 Requires-Dist: pypred (>=0.4.0,<0.5.0)
 Requires-Dist: python-dateutil (>=2.8.2,<2.9.0)

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.10.15"
+version = "3.10.17"
 description = "State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development."
 authors = [ "Rasa Technologies GmbH <hi@rasa.com>",]
 maintainers = [ "Tom Bocklisch <tom@rasa.com>",]
@@ -94,7 +94,7 @@ azure-storage-blob = ">=12.16.0, <12.17.0"
 requests = "~2.31.0"
 matplotlib = ">=3.7,<3.8"
 attrs = ">=23.1,<23.2"
-jsonpickle = ">=3.0,<3.1"
+jsonpickle = ">=3.3.0,<3.4"
 redis = ">=4.6.0, <6.0"
 absl-py = ">=2.0,<2.1"
 apscheduler = ">=3.10,<3.11"
@@ -178,7 +178,7 @@ python-keycloak = "^3.12.0"
 tiktoken = "~0.7.0"
 faiss-cpu = "^1.7.4"
 pycountry = "^22.3.5"
-pymilvus = "<2.4.2" # pinned because 2.4.2 introduces milvus-lite dependency that fails on windows
+pymilvus = ">=2.4.0,<2.4.2" # pinned because 2.4.2 introduces milvus-lite dependency that fails on windows
 qdrant-client = "^1.9.0"
 psutil = "^5.9.5"
 tenacity = "~8.4.1" # pinned down because of langchain

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/cli/llm_fine_tuning.py

@@ -22,6 +22,7 @@ from rasa.cli.e2e_test import (
 )
 from rasa.core.exceptions import AgentNotReady
 from rasa.core.utils import AvailableEndpoints
+from rasa.dialogue_understanding.generator import SingleStepLLMCommandGenerator
 from rasa.e2e_test.e2e_test_runner import E2ETestRunner
 from rasa.llm_fine_tuning.annotation_module import annotate_e2e_tests
 from rasa.llm_fine_tuning.llm_data_preparation_module import convert_to_fine_tuning_data
@@ -44,6 +45,9 @@ from rasa.shared.constants import (
     DEFAULT_MODELS_PATH,
     LLM_CONFIG_KEY,
 )
+from rasa.shared.utils.llm import (
+    combine_custom_and_default_config,
+)
 from rasa.shared.utils.yaml import read_config_file
 from rasa.utils.beta import ensure_beta_feature_is_enabled
 
@@ -275,20 +279,19 @@ def _get_llm_command_generator_config(e2e_test_runner: E2ETestRunner) -> Dict[st
 
     train_schema = e2e_test_runner.agent.processor.model_metadata.train_schema  # type: ignore
 
-    for node in train_schema.nodes:
-        if "SingleStepLLMCommandGenerator" in node:
-            return {
-                **DEFAULT_LLM_CONFIG,
-                **train_schema.nodes[node].config.get(LLM_CONFIG_KEY),
-            }
+    for node_name, node in train_schema.nodes.items():
+        if node.matches_type(SingleStepLLMCommandGenerator, include_subtypes=True):
+            return combine_custom_and_default_config(
+                node.config.get(LLM_CONFIG_KEY, {}), DEFAULT_LLM_CONFIG
+            )
 
     rasa.shared.utils.cli.print_error(
-        "The provided model was not trained with the 'SingleStepLLMCommandGenerator'."
-        "Without the 'SingleStepLLMCommandGenerator' no data for fine-tuning can be "
-        "created. Please add the 'SingleStepLLMCommandGenerator' to your config and"
-        "train your model."
+        "The provided model is not trained using 'SingleStepLLMCommandGenerator' or "
+        "its subclasses. Without it, no data for fine-tuning can be generated. To "
+        "resolve this, please include 'SingleStepLLMCommandGenerator' or its subclass "
+        "in your config and train your model."
     )
-    sys.exit(0)
+    sys.exit(1)
 
 
 def log_start_of_module(module_name: str) -> None:

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/core/channels/inspector/dist/index.html

@@ -17,6 +17,7 @@
   <script>
     const chatDiv = document.getElementById("rasa-chat-widget");
     const websocketUrl = window.location.origin.replace("http", "ws");
+    const initialPayload = "/session_start";
     const maxHeight = document.documentElement.scrollHeight - 130;
     // 21 and 25 are the rem number we're using for the columns. We add 0.75rem for the padding
     // A potential improvement would be to add a onresize event for both width and height
@@ -28,6 +29,7 @@
     const columnWidth = remReference * parseFloat(getComputedStyle(document.documentElement).fontSize);
 
     chatDiv.setAttribute("data-websocket-url", websocketUrl);
+    chatDiv.setAttribute("data-initial-payload", initialPayload);
     chatDiv.setAttribute("data-close-on-outside-click", false);
     chatDiv.setAttribute("data-height", maxHeight);
     chatDiv.setAttribute("data-width", columnWidth);

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/core/channels/inspector/index.html

@@ -15,6 +15,7 @@
   <script>
     const chatDiv = document.getElementById("rasa-chat-widget");
     const websocketUrl = window.location.origin.replace("http", "ws");
+    const initialPayload = "/session_start";
     const maxHeight = document.documentElement.scrollHeight - 130;
     // 21 and 25 are the rem number we're using for the columns. We add 0.75rem for the padding
     // A potential improvement would be to add a onresize event for both width and height
@@ -26,6 +27,7 @@
     const columnWidth = remReference * parseFloat(getComputedStyle(document.documentElement).fontSize);
 
     chatDiv.setAttribute("data-websocket-url", websocketUrl);
+    chatDiv.setAttribute("data-initial-payload", initialPayload);
     chatDiv.setAttribute("data-close-on-outside-click", false);
     chatDiv.setAttribute("data-height", maxHeight);
     chatDiv.setAttribute("data-width", columnWidth);

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/dialogue_understanding/patterns/continue_interrupted.py

@@ -40,3 +40,12 @@ class ContinueInterruptedPatternFlowStackFrame(PatternFlowStackFrame):
             step_id=data["step_id"],
             previous_flow_name=data["previous_flow_name"],
         )
+
+    def __eq__(self, other: Any) -> bool:
+        if not isinstance(other, ContinueInterruptedPatternFlowStackFrame):
+            return False
+        return (
+            self.flow_id == other.flow_id
+            and self.step_id == other.step_id
+            and self.previous_flow_name == other.previous_flow_name
+        )

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/dialogue_understanding/stack/utils.py

@@ -77,6 +77,7 @@ def top_user_flow_frame(dialogue_stack: DialogueStack) -> Optional[UserFlowStack
         if (
             isinstance(frame, UserFlowStackFrame)
             and frame.frame_type != FlowStackFrameType.CALL
+            and frame.frame_type != FlowStackFrameType.LINK
         ):
             return frame
     return None

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/e2e_test/utils/e2e_yaml_utils.py

@@ -45,7 +45,7 @@ class E2ETestYAMLWriter:
 
         yaml_data = ruamel.yaml.safe_load(tests)
 
-        test_cases_yaml = [{KEY_TEST_CASES: yaml_data}]
+        test_cases_yaml = {KEY_TEST_CASES: yaml_data}
         with open(output_file, "w") as outfile:
             yaml = ruamel.yaml.YAML()
             yaml.dump(test_cases_yaml, outfile)

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/engine/graph.py

@@ -67,6 +67,14 @@ class SchemaNode:
     is_input: bool = False
     resource: Optional[Resource] = None
 
+    def matches_type(self, node_type: Type, include_subtypes: bool = True) -> bool:
+        """Checks if schema node's 'uses' is of specified node type.
+        By default, it also checks for subtypes of the specified node type.
+        """
+        return (self.uses is node_type) or (
+            include_subtypes and issubclass(self.uses, node_type)
+        )
+
 
 @dataclass
 class GraphSchema:
@@ -166,9 +174,7 @@ class GraphSchema:
         By default, it also checks for subtypes of the specified node type.
         """
         for node in self.nodes.values():
-            if (node.uses is node_type) or (
-                include_subtypes and issubclass(node.uses, node_type)
-            ):
+            if node.matches_type(node_type, include_subtypes):
                 return True
         return False
 

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/nlu/classifiers/fallback_classifier.py

@@ -1,5 +1,4 @@
 from __future__ import annotations
-import copy
 import logging
 from typing import Any, List, Text, Dict, Type, Union, Tuple, Optional
 
@@ -185,8 +184,6 @@ def undo_fallback_prediction(prediction: Dict[Text, Any]) -> Dict[Text, Any]:
     if len(intent_ranking) < 2:
         return prediction
 
-    prediction = copy.deepcopy(prediction)
     prediction[INTENT] = intent_ranking[1]
     prediction[INTENT_RANKING_KEY] = prediction[INTENT_RANKING_KEY][1:]
-
     return prediction

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/shared/core/flows/flow.py

@@ -77,7 +77,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):
@@ -180,13 +180,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:

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/shared/core/flows/flow_step.py

@@ -20,10 +20,11 @@ if TYPE_CHECKING:
 structlogger = structlog.get_logger()
 
 
-def step_from_json(data: Dict[Text, Any]) -> FlowStep:
+def step_from_json(flow_id: Text, data: Dict[Text, Any]) -> FlowStep:
     """Create a specific FlowStep from serialized data.
 
     Args:
+        flow_id: The id of the flow that contains the step.
         data: data for a specific FlowStep object in a serialized data format.
 
     Returns:
@@ -39,17 +40,17 @@ def step_from_json(data: Dict[Text, Any]) -> FlowStep:
     )
 
     if "action" in data:
-        return ActionFlowStep.from_json(data)
+        return ActionFlowStep.from_json(flow_id, data)
     if "collect" in data:
-        return CollectInformationFlowStep.from_json(data)
+        return CollectInformationFlowStep.from_json(flow_id, data)
     if "link" in data:
-        return LinkFlowStep.from_json(data)
+        return LinkFlowStep.from_json(flow_id, data)
     if "call" in data:
-        return CallFlowStep.from_json(data)
+        return CallFlowStep.from_json(flow_id, data)
     if "set_slots" in data:
-        return SetSlotsFlowStep.from_json(data)
+        return SetSlotsFlowStep.from_json(flow_id, data)
     if "noop" in data:
-        return NoOperationFlowStep.from_json(data)
+        return NoOperationFlowStep.from_json(flow_id, data)
     raise RasaException(f"Failed to parse step from json. Unknown type for {data}.")
 
 
@@ -67,12 +68,15 @@ class FlowStep:
     """Additional, unstructured information about this flow step."""
     next: FlowStepLinks
     """The next steps of the flow step."""
+    flow_id: Text
+    """The id of the flow that contains the step."""
 
     @classmethod
-    def from_json(cls, data: Dict[Text, Any]) -> FlowStep:
+    def from_json(cls, flow_id: Text, data: Dict[Text, Any]) -> FlowStep:
         """Create a FlowStep object from data in a serialized format.
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: The data for a FlowStep object in a serialized format.
 
         Returns:
@@ -87,7 +91,8 @@ class FlowStep:
             custom_id=data.get("id"),
             description=data.get("description"),
             metadata=data.get("metadata", {}),
-            next=FlowStepLinks.from_json(data.get("next", [])),
+            next=FlowStepLinks.from_json(flow_id, data.get("next", [])),
+            flow_id=flow_id,
         )
 
     def does_allow_for_next_step(self) -> bool:
@@ -125,7 +130,7 @@ class FlowStep:
     @property
     def default_id(self) -> str:
         """Returns the default id of the flow step."""
-        return f"{self.idx}_{self.default_id_postfix}"
+        return f"{self.flow_id}_{self.idx}_{self.default_id_postfix}"
 
     @property
     def default_id_postfix(self) -> str:

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/shared/core/flows/flow_step_links.py

@@ -17,10 +17,13 @@ class FlowStepLinks:
     links: List[FlowStepLink]
 
     @staticmethod
-    def from_json(data: Union[str, List[Dict[Text, Any]]]) -> FlowStepLinks:
+    def from_json(
+        flow_id: Text, data: Union[str, List[Dict[Text, Any]]]
+    ) -> FlowStepLinks:
         """Create a FlowStepLinks object from a serialized data format.
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for a FlowStepLinks object in a serialized format.
 
         Returns:
@@ -30,11 +33,11 @@ class FlowStepLinks:
             return FlowStepLinks(links=[])
 
         if isinstance(data, str):
-            return FlowStepLinks(links=[StaticFlowStepLink.from_json(data)])
+            return FlowStepLinks(links=[StaticFlowStepLink.from_json(flow_id, data)])
 
         return FlowStepLinks(
             links=[
-                BranchingFlowStepLink.from_json(link_config)
+                BranchingFlowStepLink.from_json(flow_id, link_config)
                 for link_config in data
                 if link_config
             ]
@@ -94,10 +97,11 @@ class FlowStepLink:
         raise NotImplementedError()
 
     @staticmethod
-    def from_json(data: Any) -> FlowStepLink:
+    def from_json(flow_id: Text, data: Any) -> FlowStepLink:
         """Create a FlowStepLink object from a serialized data format.
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for a FlowStepLink object in a serialized format.
 
         Returns:
@@ -163,19 +167,20 @@ class BranchingFlowStepLink(FlowStepLink):
             return self.target_reference
 
     @staticmethod
-    def from_json(data: Dict[Text, Any]) -> BranchingFlowStepLink:
+    def from_json(flow_id: Text, data: Dict[Text, Any]) -> BranchingFlowStepLink:
         """Create a BranchingFlowStepLink object from a serialized data format.
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for a BranchingFlowStepLink object in a serialized format.
 
         Returns:
             a BranchingFlowStepLink object.
         """
         if "if" in data:
-            return IfFlowStepLink.from_json(data)
+            return IfFlowStepLink.from_json(flow_id, data)
         else:
-            return ElseFlowStepLink.from_json(data)
+            return ElseFlowStepLink.from_json(flow_id, data)
 
     def depth_in_tree(self) -> int:
         """Returns the depth in the tree."""
@@ -198,10 +203,11 @@ class IfFlowStepLink(BranchingFlowStepLink):
     """The condition that needs to be satisfied to follow this flow step link."""
 
     @staticmethod
-    def from_json(data: Dict[Text, Any]) -> IfFlowStepLink:
+    def from_json(flow_id: Text, data: Dict[Text, Any]) -> IfFlowStepLink:
         """Create an IfFlowStepLink object from a serialized data format.
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for a IfFlowStepLink in a serialized format.
 
         Returns:
@@ -213,7 +219,7 @@ class IfFlowStepLink(BranchingFlowStepLink):
             return IfFlowStepLink(target_reference=data["then"], condition=data["if"])
         else:
             return IfFlowStepLink(
-                target_reference=FlowStepSequence.from_json(data["then"]),
+                target_reference=FlowStepSequence.from_json(flow_id, data["then"]),
                 condition=data["if"],
             )
 
@@ -238,10 +244,11 @@ class ElseFlowStepLink(BranchingFlowStepLink):
     """A flow step link that is taken when conditional flow step links weren't taken."""
 
     @staticmethod
-    def from_json(data: Dict[Text, Any]) -> ElseFlowStepLink:
+    def from_json(flow_id: Text, data: Dict[Text, Any]) -> ElseFlowStepLink:
         """Create an ElseFlowStepLink object from serialized data.
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for an ElseFlowStepLink in a serialized format
 
         Returns:
@@ -253,7 +260,7 @@ class ElseFlowStepLink(BranchingFlowStepLink):
             return ElseFlowStepLink(target_reference=data["else"])
         else:
             return ElseFlowStepLink(
-                target_reference=FlowStepSequence.from_json(data["else"])
+                target_reference=FlowStepSequence.from_json(flow_id, data["else"])
             )
 
     def as_json(self) -> Dict[Text, Any]:
@@ -279,10 +286,11 @@ class StaticFlowStepLink(FlowStepLink):
     """The id of the linked step."""
 
     @staticmethod
-    def from_json(data: Text) -> StaticFlowStepLink:
+    def from_json(flow_id: Text, data: Text) -> StaticFlowStepLink:
         """Create a StaticFlowStepLink from serialized data
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for a StaticFlowStepLink in a serialized format
 
         Returns:

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/shared/core/flows/flow_step_sequence.py

@@ -14,17 +14,19 @@ class FlowStepSequence:
     child_steps: List[FlowStep]
 
     @staticmethod
-    def from_json(data: List[Dict[Text, Any]]) -> FlowStepSequence:
+    def from_json(flow_id: Text, data: List[Dict[Text, Any]]) -> FlowStepSequence:
         """Create a FlowStepSequence object from serialized data
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for a StepSequence in a serialized format
 
         Returns:
             A StepSequence object including its flow step objects.
         """
-
-        flow_steps: List[FlowStep] = [step_from_json(config) for config in data]
+        flow_steps: List[FlowStep] = [
+            step_from_json(flow_id, config) for config in data
+        ]
 
         return FlowStepSequence(child_steps=flow_steps)
 

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/shared/core/flows/steps/action.py

@@ -15,16 +15,17 @@ class ActionFlowStep(FlowStep):
     """The action of the flow step."""
 
     @classmethod
-    def from_json(cls, data: Dict[Text, Any]) -> ActionFlowStep:
+    def from_json(cls, flow_id: Text, data: Dict[Text, Any]) -> ActionFlowStep:
         """Create an ActionFlowStep object from serialized data
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for an ActionFlowStep object in a serialized format
 
         Returns:
             An ActionFlowStep object
         """
-        base = super().from_json(data)
+        base = super().from_json(flow_id, data)
         return ActionFlowStep(
             action=data["action"],
             **base.__dict__,

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/shared/core/flows/steps/call.py

@@ -18,16 +18,17 @@ class CallFlowStep(FlowStep):
     called_flow_reference: Optional["Flow"] = None
 
     @classmethod
-    def from_json(cls, data: Dict[Text, Any]) -> CallFlowStep:
+    def from_json(cls, flow_id: Text, data: Dict[Text, Any]) -> CallFlowStep:
         """Used to read flow steps from parsed YAML.
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: The parsed YAML as a dictionary.
 
         Returns:
             The parsed flow step.
         """
-        base = super().from_json(data)
+        base = super().from_json(flow_id, data)
         return CallFlowStep(
             call=data.get("call", ""),
             **base.__dict__,
@@ -47,7 +48,6 @@ class CallFlowStep(FlowStep):
         self, should_resolve_calls: bool = True
     ) -> Generator[FlowStep, None, None]:
         """Returns the steps in the tree of the flow step."""
-
         yield self
 
         if should_resolve_calls:

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/shared/core/flows/steps/collect.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Dict, Any, List, Set
+from typing import Dict, Any, List, Set, Text
 
 from rasa.shared.constants import UTTER_ASK_PREFIX, ACTION_ASK_PREFIX
 from rasa.shared.core.flows.flow_step import FlowStep
@@ -61,16 +61,19 @@ class CollectInformationFlowStep(FlowStep):
     """Whether to reset the slot value at the end of the flow."""
 
     @classmethod
-    def from_json(cls, data: Dict[str, Any]) -> CollectInformationFlowStep:
+    def from_json(
+        cls, flow_id: Text, data: Dict[str, Any]
+    ) -> CollectInformationFlowStep:
         """Create a CollectInformationFlowStep object from serialized data.
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for a CollectInformationFlowStep object in a serialized format
 
         Returns:
             A CollectInformationFlowStep object
         """
-        base = super().from_json(data)
+        base = super().from_json(flow_id, data)
         return CollectInformationFlowStep(
             collect=data["collect"],
             utter=data.get("utter", f"{UTTER_ASK_PREFIX}{data['collect']}"),

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/shared/core/flows/steps/continuation.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
+from typing import Text
 
 from rasa.shared.core.flows.flow_step_links import FlowStepLinks, StaticFlowStepLink
 from rasa.shared.core.flows.steps.constants import (
@@ -14,7 +15,7 @@ from rasa.shared.core.flows.steps.internal import InternalFlowStep
 class ContinueFlowStep(InternalFlowStep):
     """A flow step that is dynamically introduced to jump to other flow steps."""
 
-    def __init__(self, target_step_id: str) -> None:
+    def __init__(self, flow_id: Text, target_step_id: str) -> None:
         """Initializes a continue-step flow step."""
         super().__init__(
             idx=UNSET_FLOW_STEP_ID,
@@ -29,6 +30,7 @@ class ContinueFlowStep(InternalFlowStep):
             # This is why the continue step links to the step that should be
             # continued.
             next=FlowStepLinks(links=[StaticFlowStepLink(target_step_id)]),
+            flow_id=flow_id,
         )
 
     @staticmethod

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/shared/core/flows/steps/end.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
+from typing import Text
 
 from rasa.shared.core.flows.flow_step_links import FlowStepLinks
 from rasa.shared.core.flows.steps.constants import END_STEP, UNSET_FLOW_STEP_ID
@@ -11,7 +12,7 @@ from rasa.shared.core.flows.steps.internal import InternalFlowStep
 class EndFlowStep(InternalFlowStep):
     """A dynamically added flow step that marks the end of a flow."""
 
-    def __init__(self) -> None:
+    def __init__(self, flow_id: Text) -> None:
         """Initializes an end flow step."""
         super().__init__(
             idx=UNSET_FLOW_STEP_ID,
@@ -19,4 +20,5 @@ class EndFlowStep(InternalFlowStep):
             description=None,
             metadata={},
             next=FlowStepLinks(links=[]),
+            flow_id=flow_id,
         )

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/shared/core/flows/steps/internal.py

@@ -13,10 +13,11 @@ class InternalFlowStep(FlowStep):
     """
 
     @classmethod
-    def from_json(cls, data: Dict[Text, Any]) -> InternalFlowStep:
+    def from_json(cls, flow_id: Text, data: Dict[Text, Any]) -> InternalFlowStep:
         """Create an InternalFlowStep object from serialized data.
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for an InternalFlowStep in a serialized format
 
         Returns:

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/shared/core/flows/steps/link.py

@@ -16,20 +16,22 @@ class LinkFlowStep(FlowStep):
     def does_allow_for_next_step(self) -> bool:
         """Returns whether this step allows for following steps.
 
-        Link steps need to be terminal steps, so can't have a next step."""
+        Link steps need to be terminal steps, so can't have a next step.
+        """
         return False
 
     @classmethod
-    def from_json(cls, data: Dict[Text, Any]) -> LinkFlowStep:
+    def from_json(cls, flow_id: Text, data: Dict[Text, Any]) -> LinkFlowStep:
         """Create a LinkFlowStep from serialized data
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for a LinkFlowStep in a serialized format
 
         Returns:
             a LinkFlowStep object
         """
-        base = super().from_json(data)
+        base = super().from_json(flow_id, data)
         return LinkFlowStep(
             link=data["link"],
             **base.__dict__,

{rasa_pro-3.10.15 → rasa_pro-3.10.17}/rasa/shared/core/flows/steps/no_operation.py

@@ -11,22 +11,24 @@ class NoOperationFlowStep(FlowStep):
     """A step that doesn't do a thing.
 
     This is NOT a branching step (but it can branch - but in addition to that
-    it also does nothing)."""
+    it also does nothing).
+    """
 
     noop: Any
     """The id of the flow that should be started subsequently."""
 
     @classmethod
-    def from_json(cls, data: Dict[Text, Any]) -> NoOperationFlowStep:
+    def from_json(cls, flow_id: Text, data: Dict[Text, Any]) -> NoOperationFlowStep:
         """Create a NoOperationFlowStep from serialized data
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for a NoOperationFlowStep in a serialized format
 
         Returns:
             a NoOperationFlowStep object
         """
-        base = super().from_json(data)
+        base = super().from_json(flow_id, data)
         return NoOperationFlowStep(
             noop=data["noop"],
             **base.__dict__,