rasa-pro 3.9.17__tar.gz → 3.9.19__tar.gz

{rasa_pro-3.9.17 → rasa_pro-3.9.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rasa-pro
-Version: 3.9.17
+Version: 3.9.19
 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
@@ -54,7 +54,7 @@ Requires-Dist: importlib-resources (>=6.1.1,<7.0.0)
 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.20,<4.21)
 Requires-Dist: keras (==2.14.0)
 Requires-Dist: langchain (>=0.0.329,<0.0.330)
@@ -157,39 +157,35 @@ Description-Content-Type: text/markdown
 
 <hr />
 
-<img align="right" height="255" src="https://www.rasa.com/assets/img/sara/sara-open-source-2.0.png" alt="An image of Sara, the Rasa mascot bird, holding a flag that reads Open Source with one wing, and a wrench in the other" title="Rasa Pro">
 
-Rasa Pro is an open core product that extends Rasa Open Source. With over 50 million downloads, Rasa Open Source is the most popular open source framework for building chat and voice-based AI assistants.
+Rasa Pro is a framework for building scalable, dynamic conversational AI assistants that integrate large language models (LLMs) to enable more contextually aware and agentic interactions. Whether you’re new to conversational AI or an experienced developer, Rasa Pro offers enhanced flexibility, control, and performance for mission-critical applications.
 
-Rasa Pro introduces CALM, a generative AI-native approach to developing assistants, combined with enterprise-ready analytics, security, and observability capabilities. A paid license is required to run Rasa Pro, but all Rasa Pro code is visible to end users and can be customized as needed.
+Building on the foundation of Rasa Open Source, Rasa Pro adds advanced features like CALM (Conversational AI with Language Models) and Dialogue Understanding (DU), which enable developers to shift from traditional intent-driven systems to LLM-based agents. This allows for more robust, responsive interactions that adhere strictly to business logic, while reducing risks like prompt injection and minimizing hallucinations.
 
-Rasa Pro is the pro-code component of our enterprise solution, Rasa Platform, for implementing resilient and trustworthy AI assistants at scale. Rasa Studio complements Rasa Pro with a low-code user interface, enabling anyone on your team to create and improve your assistant.
+**Key Features:**
 
----
-- 🤓 [Read The Docs](https://rasa.com/docs/rasa-pro/)
+- **Flows for Business Logic:** Easily define business logic through Flows, a simplified way to describe how your AI assistant should handle conversations. Flows help streamline the development process, focusing on key tasks and reducing the complexity involved in managing conversations.
+- **Automatic Conversation Repair:** Ensure seamless interactions by automatically handling interruptions or unexpected inputs. Developers have full control to customize these repairs based on specific use cases.
+- **Customizable and Open:** Fully customizable code that allows developers to modify Rasa Pro to meet specific requirements, ensuring flexibility and adaptability to various conversational AI needs.
+- **Robustness and Control:** Maintain strict adherence to business logic, preventing unwanted behaviors like prompt injection and hallucinations, leading to more reliable responses and secure interactions.
+- **Built-in Security:** Safeguard sensitive data, control access, and ensure secure deployment, essential for production environments that demand high levels of security and compliance.
 
-- 😁 [Install Rasa Pro](https://rasa.com/docs/rasa-pro/installation/python/installation)
 
----
 
-## README Contents:
-- [Development Internals](#development-internals)
-- [Releases](#releases)
-- [Troubleshooting](#troubleshooting)
+A [free developer license](https://rasa.com/docs/rasa-pro/developer-edition/) is available so you can explore and get to know Rasa Pro. For small production deployments, the Extended Developer License allows you to take your assistant live in a limited capacity. A paid license is required for larger-scale production use, but all code is visible and can be customized as needed.
 
-## Development Internals
+To get started right now, you can 
 
-### Installing Poetry
+`pip install rasa-pro` 
 
-Rasa uses Poetry for packaging and dependency management. If you want to build it from source,
-you have to install Poetry first. Please follow
-[the official guide](https://python-poetry.org/docs/#installation) to see all possible options.
+Check out our 
 
-To update an existing poetry version to the [version](.github/poetry_version.txt), currently used in rasa, run:
-```shell
-    poetry self update <version>
-```
+- [Rasa-pro Quickstart](https://rasa.com/docs/rasa-pro/installation/quickstart/),
+- [Conversational AI with Language Models (CALM) conceptual rundown](https://rasa.com/docs/rasa-pro/calm/),
+- [Rasa Pro / CALM tutorial](https://rasa.com/docs/rasa-pro/tutorial), and
+- [Rasa pro changelog](https://rasa.com/docs/rasa/rasa-pro-changelog/)
 
+<<<<<<< HEAD
 ### Managing environments
 
 The official [Poetry guide](https://python-poetry.org/docs/managing-environments/) suggests to use
@@ -561,4 +557,7 @@ Please refer to the [Rasa Product Release and Maintenance Policy](https://rasa.c
   ```
 
   For more information on this command, please see the [Official Docker Documentation](https://docs.docker.com/engine/reference/commandline/system_prune/).
+=======
+for more. Also feel free to reach out to us on the [Rasa forum](https://forum.rasa.com/).
+>>>>>>> 2c5cd7bc639 (update readme.md from main branch on 3.10.x (#1597))
 

{rasa_pro-3.9.17 → rasa_pro-3.9.19}/README.md

@@ -10,39 +10,35 @@
 
 <hr />
 
-<img align="right" height="255" src="https://www.rasa.com/assets/img/sara/sara-open-source-2.0.png" alt="An image of Sara, the Rasa mascot bird, holding a flag that reads Open Source with one wing, and a wrench in the other" title="Rasa Pro">
 
-Rasa Pro is an open core product that extends Rasa Open Source. With over 50 million downloads, Rasa Open Source is the most popular open source framework for building chat and voice-based AI assistants.
+Rasa Pro is a framework for building scalable, dynamic conversational AI assistants that integrate large language models (LLMs) to enable more contextually aware and agentic interactions. Whether you’re new to conversational AI or an experienced developer, Rasa Pro offers enhanced flexibility, control, and performance for mission-critical applications.
 
-Rasa Pro introduces CALM, a generative AI-native approach to developing assistants, combined with enterprise-ready analytics, security, and observability capabilities. A paid license is required to run Rasa Pro, but all Rasa Pro code is visible to end users and can be customized as needed.
+Building on the foundation of Rasa Open Source, Rasa Pro adds advanced features like CALM (Conversational AI with Language Models) and Dialogue Understanding (DU), which enable developers to shift from traditional intent-driven systems to LLM-based agents. This allows for more robust, responsive interactions that adhere strictly to business logic, while reducing risks like prompt injection and minimizing hallucinations.
 
-Rasa Pro is the pro-code component of our enterprise solution, Rasa Platform, for implementing resilient and trustworthy AI assistants at scale. Rasa Studio complements Rasa Pro with a low-code user interface, enabling anyone on your team to create and improve your assistant.
+**Key Features:**
 
----
-- 🤓 [Read The Docs](https://rasa.com/docs/rasa-pro/)
+- **Flows for Business Logic:** Easily define business logic through Flows, a simplified way to describe how your AI assistant should handle conversations. Flows help streamline the development process, focusing on key tasks and reducing the complexity involved in managing conversations.
+- **Automatic Conversation Repair:** Ensure seamless interactions by automatically handling interruptions or unexpected inputs. Developers have full control to customize these repairs based on specific use cases.
+- **Customizable and Open:** Fully customizable code that allows developers to modify Rasa Pro to meet specific requirements, ensuring flexibility and adaptability to various conversational AI needs.
+- **Robustness and Control:** Maintain strict adherence to business logic, preventing unwanted behaviors like prompt injection and hallucinations, leading to more reliable responses and secure interactions.
+- **Built-in Security:** Safeguard sensitive data, control access, and ensure secure deployment, essential for production environments that demand high levels of security and compliance.
 
-- 😁 [Install Rasa Pro](https://rasa.com/docs/rasa-pro/installation/python/installation)
 
----
 
-## README Contents:
-- [Development Internals](#development-internals)
-- [Releases](#releases)
-- [Troubleshooting](#troubleshooting)
+A [free developer license](https://rasa.com/docs/rasa-pro/developer-edition/) is available so you can explore and get to know Rasa Pro. For small production deployments, the Extended Developer License allows you to take your assistant live in a limited capacity. A paid license is required for larger-scale production use, but all code is visible and can be customized as needed.
 
-## Development Internals
+To get started right now, you can 
 
-### Installing Poetry
+`pip install rasa-pro` 
 
-Rasa uses Poetry for packaging and dependency management. If you want to build it from source,
-you have to install Poetry first. Please follow
-[the official guide](https://python-poetry.org/docs/#installation) to see all possible options.
+Check out our 
 
-To update an existing poetry version to the [version](.github/poetry_version.txt), currently used in rasa, run:
-```shell
-    poetry self update <version>
-```
+- [Rasa-pro Quickstart](https://rasa.com/docs/rasa-pro/installation/quickstart/),
+- [Conversational AI with Language Models (CALM) conceptual rundown](https://rasa.com/docs/rasa-pro/calm/),
+- [Rasa Pro / CALM tutorial](https://rasa.com/docs/rasa-pro/tutorial), and
+- [Rasa pro changelog](https://rasa.com/docs/rasa/rasa-pro-changelog/)
 
+<<<<<<< HEAD
 ### Managing environments
 
 The official [Poetry guide](https://python-poetry.org/docs/managing-environments/) suggests to use
@@ -414,3 +410,6 @@ Please refer to the [Rasa Product Release and Maintenance Policy](https://rasa.c
   ```
 
   For more information on this command, please see the [Official Docker Documentation](https://docs.docker.com/engine/reference/commandline/system_prune/).
+=======
+for more. Also feel free to reach out to us on the [Rasa forum](https://forum.rasa.com/).
+>>>>>>> 2c5cd7bc639 (update readme.md from main branch on 3.10.x (#1597))

{rasa_pro-3.9.17 → rasa_pro-3.9.19}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.9.17"
+version = "3.9.19"
 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"

{rasa_pro-3.9.17 → rasa_pro-3.9.19}/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.9.17 → rasa_pro-3.9.19}/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.9.17 → rasa_pro-3.9.19}/rasa/core/policies/flows/flow_executor.py

@@ -476,7 +476,8 @@ def validate_collect_step(
     step: CollectInformationFlowStep,
     stack: DialogueStack,
     available_actions: List[str],
-    slots: Dict[Text, Slot],
+    slots: Dict[str, Slot],
+    flow_name: str,
 ) -> bool:
     """Validate that a collect step can be executed.
 
@@ -498,12 +499,12 @@ def validate_collect_step(
         slot_name=step.collect,
     )
 
-    cancel_flow_and_push_internal_error(stack)
+    cancel_flow_and_push_internal_error(stack, flow_name)
 
     return False
 
 
-def cancel_flow_and_push_internal_error(stack: DialogueStack) -> None:
+def cancel_flow_and_push_internal_error(stack: DialogueStack, flow_name: str) -> None:
     """Cancel the top user flow and push the internal error pattern."""
     top_frame = stack.top()
 
@@ -515,7 +516,7 @@ def cancel_flow_and_push_internal_error(stack: DialogueStack) -> None:
         canceled_frames = CancelFlowCommand.select_canceled_frames(stack)
         stack.push(
             CancelPatternFlowStackFrame(
-                canceled_name=top_frame.flow_id,
+                canceled_name=flow_name,
                 canceled_frames=canceled_frames,
             )
         )
@@ -527,6 +528,7 @@ def validate_custom_slot_mappings(
     stack: DialogueStack,
     tracker: DialogueStateTracker,
     available_actions: List[str],
+    flow_name: str,
 ) -> bool:
     """Validate a slot with custom mappings.
 
@@ -547,7 +549,7 @@ def validate_custom_slot_mappings(
                     action=step.collect_action,
                     collect=step.collect,
                 )
-                cancel_flow_and_push_internal_error(stack)
+                cancel_flow_and_push_internal_error(stack, flow_name)
                 return False
 
     return True
@@ -586,30 +588,15 @@ def run_step(
         initial_events.append(FlowStarted(flow.id))
 
     if isinstance(step, CollectInformationFlowStep):
-        is_step_valid = validate_collect_step(
-            step, stack, available_actions, tracker.slots
-        )
-        if not is_step_valid:
-            # if we return any other FlowStepResult, the assistant will stay silent
-            # instead of triggering the internal error pattern
-            return ContinueFlowWithNextStep(events=initial_events)
-
-        is_mapping_valid = validate_custom_slot_mappings(
-            step, stack, tracker, available_actions
-        )
-        if not is_mapping_valid:
-            # if we return any other FlowStepResult, the assistant will stay silent
-            # instead of triggering the internal error pattern
-            return ContinueFlowWithNextStep(events=initial_events)
-
-        structlogger.debug("flow.step.run.collect")
-        trigger_pattern_ask_collect_information(
-            step.collect, stack, step.rejections, step.utter, step.collect_action
+        return _run_collect_information_step(
+            available_actions,
+            initial_events,
+            stack,
+            step,
+            tracker,
+            flow.readable_name(),
         )
 
-        events: List[Event] = events_for_collect_step_execution(step, tracker)
-        return ContinueFlowWithNextStep(events=initial_events + events)
-
     elif isinstance(step, ActionFlowStep):
         if not step.action:
             raise FlowException(f"Action not specified for step {step}")
@@ -682,3 +669,37 @@ def run_step(
 
     else:
         raise FlowException(f"Unknown flow step type {type(step)}")
+
+
+def _run_collect_information_step(
+    available_actions: List[str],
+    initial_events: List[Event],
+    stack: DialogueStack,
+    step: CollectInformationFlowStep,
+    tracker: DialogueStateTracker,
+    flow_name: str,
+) -> FlowStepResult:
+    is_step_valid = validate_collect_step(
+        step, stack, available_actions, tracker.slots, flow_name
+    )
+
+    if not is_step_valid:
+        # if we return any other FlowStepResult, the assistant will stay silent
+        # instead of triggering the internal error pattern
+        return ContinueFlowWithNextStep(events=initial_events)
+    is_mapping_valid = validate_custom_slot_mappings(
+        step, stack, tracker, available_actions, flow_name
+    )
+
+    if not is_mapping_valid:
+        # if we return any other FlowStepResult, the assistant will stay silent
+        # instead of triggering the internal error pattern
+        return ContinueFlowWithNextStep(events=initial_events)
+
+    structlogger.debug("flow.step.run.collect")
+    trigger_pattern_ask_collect_information(
+        step.collect, stack, step.rejections, step.utter, step.collect_action
+    )
+
+    events: List[Event] = events_for_collect_step_execution(step, tracker)
+    return ContinueFlowWithNextStep(events=initial_events + events)

{rasa_pro-3.9.17 → rasa_pro-3.9.19}/rasa/core/processor.py

@@ -1260,11 +1260,13 @@ class MessageProcessor:
             tracker.update(events[0])
             return self.should_predict_another_action(action.name())
         except Exception:
-            logger.exception(
-                f"Encountered an exception while running action '{action.name()}'."
-                "Bot will continue, but the actions events are lost. "
-                "Please check the logs of your action server for "
-                "more information."
+            structlogger.exception(
+                "rasa.core.processor.run_action.exception",
+                event_info=f"Encountered an exception while "
+                f"running action '{action.name()}'."
+                f"Bot will continue, but the actions events are lost. "
+                f"Please check the logs of your action server for "
+                f"more information.",
             )
             events = []
 

{rasa_pro-3.9.17 → rasa_pro-3.9.19}/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.9.17 → rasa_pro-3.9.19}/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.9.17 → rasa_pro-3.9.19}/rasa/e2e_test/e2e_test_runner.py

@@ -103,8 +103,11 @@ class E2ETestRunner:
         turns: TEST_TURNS_TYPE = {}
         event_cursor = 0
 
-        tracker = await self.agent.processor.fetch_tracker_with_initial_session(  # type: ignore[union-attr]
-            sender_id
+        if not self.agent.processor:
+            return turns
+
+        tracker = await self.agent.processor.fetch_tracker_with_initial_session(
+            sender_id, output_channel=collector
         )
         # turn -1 i used to contain events that happen during
         # the start of the session and before the first user message
@@ -157,7 +160,7 @@ class E2ETestRunner:
                     f"An exception occurred while handling "
                     f"user message '{step.text}'."
                 )
-            tracker = await self.agent.tracker_store.retrieve(sender_id)
+            tracker = await self.agent.tracker_store.retrieve(sender_id)  # type: ignore[assignment]
             turns[position], event_cursor = self.get_actual_step_output(
                 tracker, step, event_cursor
             )
@@ -592,8 +595,11 @@ class E2ETestRunner:
         """
         if not fixtures:
             return
-        tracker = await self.agent.processor.fetch_tracker_with_initial_session(  # type: ignore[union-attr]
-            sender_id
+        if not self.agent.processor:
+            return
+
+        tracker = await self.agent.processor.fetch_tracker_with_initial_session(
+            sender_id, output_channel=CollectingOutputChannel()
         )
 
         for fixture in fixtures:

{rasa_pro-3.9.17 → rasa_pro-3.9.19}/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.9.17 → rasa_pro-3.9.19}/rasa/shared/core/flows/flow.py

@@ -63,7 +63,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"))
 
         return Flow(
@@ -153,13 +153,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.9.17 → rasa_pro-3.9.19}/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.9.17 → rasa_pro-3.9.19}/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: