rasa-pro 3.12.0.dev13__py3-none-any.whl → 3.12.0rc1__py3-none-any.whl

rasa/core/channels/voice_stream/tts/cartesia.py

@@ -24,6 +24,7 @@ structlogger = structlog.get_logger()
 class CartesiaTTSConfig(TTSEngineConfig):
     model_id: Optional[str] = None
     version: Optional[str] = None
+    endpoint: Optional[str] = None
 
 
 class CartesiaTTS(TTSEngine[CartesiaTTSConfig]):
@@ -38,11 +39,6 @@ class CartesiaTTS(TTSEngine[CartesiaTTSConfig]):
         if self.__class__.session is None or self.__class__.session.closed:
             self.__class__.session = aiohttp.ClientSession(timeout=timeout)
 
-    @staticmethod
-    def get_tts_endpoint() -> str:
-        """Create the endpoint string for cartesia."""
-        return "https://api.cartesia.ai/tts/sse"
-
     @staticmethod
     def get_request_body(text: str, config: CartesiaTTSConfig) -> Dict:
         """Create the request body for cartesia."""
@@ -79,7 +75,7 @@ class CartesiaTTS(TTSEngine[CartesiaTTSConfig]):
         config = self.config.merge(config)
         payload = self.get_request_body(text, config)
         headers = self.get_request_headers(config)
-        url = self.get_tts_endpoint()
+        url = self.config.endpoint
         if self.session is None:
             raise ConnectionException("Client session is not initialized")
         try:
@@ -101,13 +97,22 @@ class CartesiaTTS(TTSEngine[CartesiaTTSConfig]):
                                     channel_bytes
                                 )
                     return
+                elif response.status == 401:
+                    structlogger.error(
+                        "cartesia.synthesize.rest.unauthorized",
+                        status_code=response.status,
+                    )
+                    raise TTSError(
+                        "Unauthorized. Please make sure you have the correct API key."
+                    )
                 else:
+                    response_text = await response.text()
                     structlogger.error(
                         "cartesia.synthesize.rest.failed",
                         status_code=response.status,
-                        msg=response.text(),
+                        msg=response_text,
                     )
-                    raise TTSError(f"TTS failed: {response.text()}")
+                    raise TTSError(f"TTS failed: {response_text}")
         except ClientConnectorError as e:
             raise TTSError(e)
         except TimeoutError as e:
@@ -125,6 +130,7 @@ class CartesiaTTS(TTSEngine[CartesiaTTSConfig]):
             timeout=10,
             model_id="sonic-english",
             version="2024-06-10",
+            endpoint="https://api.cartesia.ai/tts/sse",
         )
 
     @classmethod

rasa/core/channels/voice_stream/voice_channel.py

@@ -148,6 +148,19 @@ class VoiceOutputChannel(OutputChannel):
         await self.voice_websocket.send(marker_message)
         self.latest_message_id = mark_id
 
+    async def send_start_marker(self, recipient_id: str) -> None:
+        """Send a marker message before the first audio chunk."""
+        # Default implementation uses the generic marker message
+        await self.send_marker_message(recipient_id)
+
+    async def send_intermediate_marker(self, recipient_id: str) -> None:
+        """Send a marker message during audio streaming."""
+        await self.send_marker_message(recipient_id)
+
+    async def send_end_marker(self, recipient_id: str) -> None:
+        """Send a marker message after the last audio chunk."""
+        await self.send_marker_message(recipient_id)
+
     def update_silence_timeout(self) -> None:
         """Updates the silence timeout for the session."""
         if self.tracker_state:
@@ -173,6 +186,13 @@ class VoiceOutputChannel(OutputChannel):
         cached_audio_bytes = self.tts_cache.get(text)
         collected_audio_bytes = RasaAudioBytes(b"")
         seconds_marker = -1
+
+        # Send start marker before first chunk
+        try:
+            await self.send_start_marker(recipient_id)
+        except (WebsocketClosed, ServerError):
+            call_state.connection_failed = True  # type: ignore[attr-defined]
+
         if cached_audio_bytes:
             audio_stream = self.chunk_audio(cached_audio_bytes)
         else:
@@ -189,15 +209,16 @@ class VoiceOutputChannel(OutputChannel):
                 await self.send_audio_bytes(recipient_id, audio_bytes)
                 full_seconds_of_audio = len(collected_audio_bytes) // HERTZ
                 if full_seconds_of_audio > seconds_marker:
-                    await self.send_marker_message(recipient_id)
+                    await self.send_intermediate_marker(recipient_id)
                     seconds_marker = full_seconds_of_audio
 
             except (WebsocketClosed, ServerError):
                 # ignore sending error, and keep collecting and caching audio bytes
                 call_state.connection_failed = True  # type: ignore[attr-defined]
             collected_audio_bytes = RasaAudioBytes(collected_audio_bytes + audio_bytes)
+
         try:
-            await self.send_marker_message(recipient_id)
+            await self.send_end_marker(recipient_id)
         except (WebsocketClosed, ServerError):
             # ignore sending error
             pass

rasa/core/constants.py

@@ -110,3 +110,5 @@ UTTER_SOURCE_METADATA_KEY = "utter_source"
 DOMAIN_GROUND_TRUTH_METADATA_KEY = "domain_ground_truth"
 ACTIVE_FLOW_METADATA_KEY = "active_flow"
 STEP_ID_METADATA_KEY = "step_id"
+KEY_IS_CALM_SYSTEM = "is_calm_system"
+KEY_IS_COEXISTENCE_ASSISTANT = "is_coexistence_assistant"

rasa/core/nlg/contextual_response_rephraser.py

@@ -64,7 +64,7 @@ DEFAULT_LLM_CONFIG = {
 DEFAULT_RESPONSE_VARIATION_PROMPT_TEMPLATE = """The following is a conversation with
 an AI assistant. The assistant is helpful, creative, clever, and very friendly.
 Rephrase the suggested AI response staying close to the original message and retaining
-its meaning. Use simple english.
+its meaning. Use simple {{language}}.
 
 Context / previous conversation with the user:
 {{history}}
@@ -164,6 +164,22 @@ class ContextualResponseRephraser(
         response[PROMPTS] = prompts
         return response
 
+    @staticmethod
+    def get_language_label(tracker: DialogueStateTracker) -> str:
+        """Fetches the label of the language to be used for the rephraser.
+
+        Args:
+            tracker: The tracker to get the language from.
+
+        Returns:
+            The label of the current language, or "English" if no language is set.
+        """
+        return (
+            tracker.current_language.label
+            if tracker.current_language
+            else tracker.default_language.label
+        )
+
     def _last_message_if_human(self, tracker: DialogueStateTracker) -> Optional[str]:
         """Returns the latest message from the tracker.
 
@@ -281,6 +297,7 @@ class ContextualResponseRephraser(
             suggested_response=response_text,
             current_input=current_input,
             slots=tracker.current_slot_values(),
+            language=self.get_language_label(tracker),
         )
         log_llm(
             logger=structlogger,

rasa/core/nlg/generator.py

@@ -1,6 +1,9 @@
-import logging
 from typing import Any, Dict, List, Optional, Text, Union
 
+import structlog
+from jinja2 import Template
+from pypred import Predicate
+
 import rasa.shared.utils.common
 import rasa.shared.utils.io
 from rasa.shared.constants import CHANNEL, RESPONSE_CONDITION
@@ -8,7 +11,7 @@ from rasa.shared.core.domain import Domain
 from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.utils.endpoints import EndpointConfig
 
-logger = logging.getLogger(__name__)
+structlogger = structlog.get_logger()
 
 
 class NaturalLanguageGenerator:
@@ -74,7 +77,11 @@ def _create_from_endpoint_config(
     else:
         nlg = _load_from_module_name_in_endpoint_config(endpoint_config, domain)
 
-    logger.debug(f"Instantiated NLG to '{nlg.__class__.__name__}'.")
+    structlogger.debug(
+        "rasa.core.nlg.generator.create",
+        nlg_class_name=nlg.__class__.__name__,
+        event_info=f"Instantiated NLG to '{nlg.__class__.__name__}'.",
+    )
     return nlg
 
 
@@ -112,18 +119,15 @@ class ResponseVariationFilter:
     ) -> bool:
         """Checks if the conditional response variation matches the filled slots."""
         constraints = response.get(RESPONSE_CONDITION, [])
-        for constraint in constraints:
-            name = constraint["name"]
-            value = constraint["value"]
-            filled_slots_value = filled_slots.get(name)
-            if isinstance(filled_slots_value, str) and isinstance(value, str):
-                if filled_slots_value.casefold() != value.casefold():
+        if isinstance(constraints, str) and not _evaluate_predicate(
+            constraints, filled_slots
+        ):
+            return False
+
+        elif isinstance(constraints, list):
+            for constraint in constraints:
+                if not _evaluate_and_deprecate_condition(constraint, filled_slots):
                     return False
-            # slot values can be of different data types
-            # such as int, float, bool, etc. hence, this check
-            # executes when slot values are not strings
-            elif filled_slots_value != value:
-                return False
 
         return True
 
@@ -180,7 +184,21 @@ class ResponseVariationFilter:
         if conditional_no_channel:
             return conditional_no_channel
 
-        return default_no_channel
+        if default_no_channel:
+            return default_no_channel
+
+        # if there is no response variation selected,
+        # return the internal error response to prevent
+        # the bot from staying silent
+        structlogger.error(
+            "rasa.core.nlg.generator.responses_for_utter_action.no_response",
+            utter_action=utter_action,
+            event_info=f"No response variation selected for the predicted "
+            f"utterance {utter_action}. Please check you have provided "
+            f"a default variation and that all the conditions are valid. "
+            f"Returning the internal error response.",
+        )
+        return self.responses.get("utter_internal_error_rasa", [])
 
     def get_response_variation_id(
         self,
@@ -228,3 +246,53 @@ class ResponseVariationFilter:
             response_ids.add(response_variation_id)
 
         return True
+
+
+def _evaluate_and_deprecate_condition(
+    constraint: Dict[Text, Any], filled_slots: Dict[Text, Any]
+) -> bool:
+    """Evaluates the condition of a response variation."""
+    rasa.shared.utils.io.raise_deprecation_warning(
+        "Using a dictionary as a condition in a response variation is deprecated. "
+        "Please use a pypred string predicate instead. "
+        "Dictionary conditions will be removed in Rasa Open Source 4.0.0 .",
+        warn_until_version="4.0.0",
+    )
+
+    name = constraint["name"]
+    value = constraint["value"]
+    filled_slots_value = filled_slots.get(name)
+    if isinstance(filled_slots_value, str) and isinstance(value, str):
+        if filled_slots_value.casefold() != value.casefold():
+            return False
+    # slot values can be of different data types
+    # such as int, float, bool, etc. hence, this check
+    # executes when slot values are not strings
+    elif filled_slots_value != value:
+        return False
+
+    return True
+
+
+def _evaluate_predicate(constraint: str, filled_slots: Dict[Text, Any]) -> bool:
+    """Evaluates the condition of a response variation."""
+    context = {"slots": filled_slots}
+    document = context.copy()
+    try:
+        rendered_template = Template(constraint).render(context)
+        predicate = Predicate(rendered_template)
+        result = predicate.evaluate(document)
+        structlogger.debug(
+            "rasa.core.nlg.generator.evaluate_conditional_response_predicate",
+            predicate=predicate.description(),
+            result=result,
+        )
+        return result
+    except (TypeError, Exception) as e:
+        structlogger.error(
+            "rasa.core.nlg.generator.evaluate_conditional_response_predicate.error",
+            predicate=constraint,
+            document=document,
+            error=str(e),
+        )
+        return False

rasa/core/nlg/response.py

@@ -49,9 +49,12 @@ class TemplatedNaturalLanguageGenerator(NaturalLanguageGenerator):
                 selected_response = np.random.choice(suitable_responses)
                 condition = selected_response.get(RESPONSE_CONDITION)
                 if condition:
-                    formatted_response_conditions = self._format_response_conditions(
-                        condition
-                    )
+                    if isinstance(condition, list):
+                        formatted_response_conditions = (
+                            self._format_response_conditions(condition)
+                        )
+                    else:
+                        formatted_response_conditions = condition
                     logger.debug(
                         "Selecting response variation with conditions:"
                         f"{formatted_response_conditions}"

rasa/core/nlg/translate.py

@@ -0,0 +1,55 @@
+from typing import Any, Dict, List, Optional, Text
+
+from rasa.engine.language import Language
+from rasa.shared.core.flows.constants import KEY_TRANSLATION
+
+
+def get_translated_text(
+    text: Optional[Text],
+    translation: Dict[Text, Any],
+    language: Optional[Language] = None,
+) -> Optional[Text]:
+    """Get the translated text from the message.
+
+    Args:
+        text: The default text to use if no translation is found.
+        translation: The translations for the text.
+        language: The language to use for the translation.
+
+    Returns:
+        The translated text if found, otherwise the default text.
+    """
+    language_code = language.code if language else None
+    return translation.get(language_code, text)
+
+
+def get_translated_buttons(
+    buttons: Optional[List[Dict[Text, Any]]], language: Optional[Language] = None
+) -> Optional[List[Dict[Text, Any]]]:
+    """Get the translated buttons from the message.
+
+    Args:
+        buttons: The default buttons to use if no translation is found.
+        language: The language to use for the translation.
+
+    Returns:
+        The translated buttons if found; otherwise, the default buttons.
+    """
+    if buttons is None:
+        return None
+
+    language_code = language.code if language else None
+    translated_buttons = []
+    for button in buttons:
+        translation = button.get(KEY_TRANSLATION, {})
+        language_translation = translation.get(language_code, {})
+
+        # Maintain the original key order to ensure
+        # accurate comparisons of BotUtter events.
+        translated_button = {
+            key: language_translation.get(key, button.get(key))
+            for key, value in button.items()
+            if key != KEY_TRANSLATION
+        }
+        translated_buttons.append(translated_button)
+    return translated_buttons

rasa/core/policies/enterprise_search_prompt_with_citation_template.jinja2

@@ -4,7 +4,7 @@ If the answer is not known or cannot be determined from the provided documents o
 Use the following documents to answer the question:
 {% for doc in docs %}
 {{ loop.cycle("*")}}. {{ doc.metadata }}
-{{ doc.page_content }}
+{{ doc.text }}
 {% endfor %}
 
 {% if citation_enabled %}

rasa/core/policies/flows/flow_executor.py

@@ -85,9 +85,8 @@ from rasa.shared.core.flows.steps import (
     NoOperationFlowStep,
     SetSlotsFlowStep,
 )
-from rasa.shared.core.flows.steps.collect import SlotRejection
 from rasa.shared.core.flows.steps.constants import START_STEP
-from rasa.shared.core.slots import Slot
+from rasa.shared.core.slots import Slot, SlotRejection
 from rasa.shared.core.trackers import (
     DialogueStateTracker,
 )
@@ -243,7 +242,10 @@ def events_for_collect_step_execution(
 
 
 def trigger_pattern_continue_interrupted(
-    current_frame: DialogueStackFrame, stack: DialogueStack, flows: FlowsList
+    current_frame: DialogueStackFrame,
+    stack: DialogueStack,
+    flows: FlowsList,
+    tracker: DialogueStateTracker,
 ) -> List[Event]:
     """Trigger the pattern to continue an interrupted flow if needed."""
     events: List[Event] = []
@@ -266,7 +268,9 @@ def trigger_pattern_continue_interrupted(
     ):
         stack.push(
             ContinueInterruptedPatternFlowStackFrame(
-                previous_flow_name=interrupted_user_flow.readable_name(),
+                previous_flow_name=interrupted_user_flow.readable_name(
+                    language=tracker.current_language
+                ),
             )
         )
         events.append(
@@ -309,6 +313,9 @@ def trigger_pattern_completed(
         or isinstance(current_frame, SearchPatternFlowStackFrame)
     ):
         completed_flow = current_frame.flow(flows)
+        if not completed_flow.run_pattern_completed:
+            return
+
         completed_flow_name = completed_flow.readable_name() if completed_flow else None
         stack.push(
             CompletedPatternFlowStackFrame(
@@ -670,7 +677,7 @@ def _run_end_step(
         trigger_pattern_clarification(current_frame, stack, flows)
     else:
         resumed_events = trigger_pattern_continue_interrupted(
-            current_frame, stack, flows
+            current_frame, stack, flows, tracker
         )
     reset_events: List[Event] = reset_scoped_slots(current_frame, flow, tracker)
     return ContinueFlowWithNextStep(

rasa/core/processor.py

@@ -25,6 +25,7 @@ from rasa.core.channels.channel import (
     OutputChannel,
     UserMessage,
 )
+from rasa.core.constants import KEY_IS_CALM_SYSTEM, KEY_IS_COEXISTENCE_ASSISTANT
 from rasa.core.http_interpreter import RasaNLUHttpInterpreter
 from rasa.core.lock_store import LockStore
 from rasa.core.nlg import NaturalLanguageGenerator
@@ -35,6 +36,12 @@ from rasa.dialogue_understanding.commands import (
     NoopCommand,
     SetSlotCommand,
 )
+from rasa.dialogue_understanding.commands.utils import (
+    create_validate_frames_from_slot_set_events,
+)
+from rasa.dialogue_understanding.patterns.validate_slot import (
+    ValidateSlotPatternFlowStackFrame,
+)
 from rasa.dialogue_understanding.utils import add_commands_to_message_parse_data
 from rasa.engine import loader
 from rasa.engine.constants import (
@@ -201,10 +208,7 @@ class MessageProcessor:
             )
             return None
 
-        if not self.message_contains_commands(tracker.latest_message):
-            tracker = await self.run_action_extract_slots(
-                message.output_channel, tracker
-            )
+        tracker = await self.run_action_extract_slots(message.output_channel, tracker)
 
         await self._run_prediction_loop(message.output_channel, tracker)
 
@@ -218,7 +222,9 @@ class MessageProcessor:
         return None
 
     async def run_action_extract_slots(
-        self, output_channel: OutputChannel, tracker: DialogueStateTracker
+        self,
+        output_channel: OutputChannel,
+        tracker: DialogueStateTracker,
     ) -> DialogueStateTracker:
         """Run action to extract slots and update the tracker accordingly.
 
@@ -233,6 +239,10 @@ class MessageProcessor:
             ACTION_EXTRACT_SLOTS, self.domain, self.action_endpoint
         )
         metadata = await self._add_flows_to_metadata()
+        metadata[KEY_IS_CALM_SYSTEM] = self.message_contains_commands(
+            tracker.latest_message
+        )
+        metadata[KEY_IS_COEXISTENCE_ASSISTANT] = self._is_coexistence_assistant(tracker)
 
         extraction_events = await action_extract_slots.run(
             output_channel, self.nlg, tracker, self.domain, metadata
@@ -1251,6 +1261,12 @@ class MessageProcessor:
         # events and return values are used to update
         # the tracker state after an action has been taken
         try:
+            validate_frames: List[ValidateSlotPatternFlowStackFrame] = []
+            # check if the last action was a correction action
+            # before validating the corrected slots
+            if tracker.latest_action_name == ACTION_CORRECT_FLOW_SLOT:
+                tracker, validate_frames = self.validate_corrected_slots(tracker)
+
             # Use temporary tracker as we might need to discard the policy events in
             # case of a rejection.
             temporary_tracker = tracker.copy()
@@ -1262,6 +1278,12 @@ class MessageProcessor:
 
                 if isinstance(action, FormAction):
                     flows_metadata = await self._add_flows_to_metadata()
+                    flows_metadata[KEY_IS_CALM_SYSTEM] = self.message_contains_commands(
+                        temporary_tracker.latest_message
+                    )
+                    flows_metadata[KEY_IS_COEXISTENCE_ASSISTANT] = (
+                        self._is_coexistence_assistant(temporary_tracker)
+                    )
                     metadata = prediction.action_metadata or {}
                     metadata.update(flows_metadata)
 
@@ -1276,6 +1298,14 @@ class MessageProcessor:
                 events = await action.run(
                     output_channel, nlg, temporary_tracker, self.domain
                 )
+
+            if validate_frames:
+                stack = tracker.stack
+                for frame in validate_frames:
+                    stack.push(frame)
+                new_events = tracker.create_stack_updated_events(stack)
+                tracker.update_with_events(new_events)
+
             self._log_action_and_events_on_tracker(tracker, action, events, prediction)
         except ActionExecutionRejection:
             events = [
@@ -1479,18 +1509,51 @@ class MessageProcessor:
         Returns:
             bool: True if any node in the graph schema uses `FlowPolicy`.
         """
+        flow_policy_class_path = "rasa.core.policies.flow_policy.FlowPolicy"
+        return self._is_component_present_in_graph_nodes(flow_policy_class_path)
+
+    @staticmethod
+    def _is_coexistence_assistant(tracker: DialogueStateTracker) -> bool:
+        """Inspect the tracker to decide if we are in coexistence.
+
+        Returns:
+            bool: True if the tracker contains the routine slot.
+        """
+        return tracker.slots.get(ROUTE_TO_CALM_SLOT) is not None
+
+    def _is_component_present_in_graph_nodes(self, component_path: Text) -> bool:
+        """Check if a component is present in the graph nodes.
+
+        Args:
+            component_path: The path of the component to check for.
+
+        Returns:
+            `True` if the component is present in the graph nodes, `False` otherwise.
+        """
         # Get the graph schema's nodes from the graph runner.
         nodes: dict[str, Any] = self.graph_runner._graph_schema.nodes  # type: ignore[attr-defined]
 
-        flow_policy_class_path = "rasa.core.policies.flow_policy.FlowPolicy"
-        # Iterate over the nodes and check if any node uses `FlowPolicy`.
         for node_name, schema_node in nodes.items():
             if (
                 schema_node.uses is not None
                 and f"{schema_node.uses.__module__}.{schema_node.uses.__name__}"
-                == flow_policy_class_path
+                == component_path
             ):
                 return True
 
-        # Return False if no node is found using `FlowPolicy`.
         return False
+
+    def validate_corrected_slots(
+        self,
+        tracker: DialogueStateTracker,
+    ) -> Tuple[DialogueStateTracker, List[ValidateSlotPatternFlowStackFrame]]:
+        """Validate the slots that were corrected in the tracker."""
+        prior_tracker_events = list(reversed(tracker.events))
+        tracker, validate_frames = create_validate_frames_from_slot_set_events(
+            tracker,
+            prior_tracker_events,
+            should_break=True,
+            update_corrected_slots=True,
+        )
+
+        return tracker, validate_frames

rasa/dialogue_understanding/commands/can_not_handle_command.py

@@ -5,6 +5,10 @@ from dataclasses import dataclass
 from typing import Any, Dict, List, Optional, Text
 
 from rasa.dialogue_understanding.commands.command import Command
+from rasa.dialogue_understanding.commands.command_syntax_manager import (
+    CommandSyntaxManager,
+    CommandSyntaxVersion,
+)
 from rasa.dialogue_understanding.patterns.cannot_handle import (
     CannotHandlePatternFlowStackFrame,
 )
@@ -74,7 +78,14 @@ class CannotHandleCommand(Command):
 
     def to_dsl(self) -> str:
         """Converts the command to a DSL string."""
-        return "CannotHandle()"
+        mapper = {
+            CommandSyntaxVersion.v1: "CannotHandle()",
+            CommandSyntaxVersion.v2: "cannot handle",
+        }
+        return mapper.get(
+            CommandSyntaxManager.get_syntax_version(),
+            mapper[CommandSyntaxManager.get_default_syntax_version()],
+        )
 
     @classmethod
     def from_dsl(cls, match: re.Match, **kwargs: Any) -> CannotHandleCommand:
@@ -86,4 +97,11 @@ class CannotHandleCommand(Command):
 
     @staticmethod
     def regex_pattern() -> str:
-        return r"CannotHandle\(\)"
+        mapper = {
+            CommandSyntaxVersion.v1: r"CannotHandle\(\)",
+            CommandSyntaxVersion.v2: r"^[^\w]*cannot handle$",
+        }
+        return mapper.get(
+            CommandSyntaxManager.get_syntax_version(),
+            mapper[CommandSyntaxManager.get_default_syntax_version()],
+        )

rasa/dialogue_understanding/commands/cancel_flow_command.py

@@ -8,12 +8,14 @@ from typing import Any, Dict, List
 import structlog
 
 from rasa.dialogue_understanding.commands.command import Command
+from rasa.dialogue_understanding.commands.command_syntax_manager import (
+    CommandSyntaxManager,
+    CommandSyntaxVersion,
+)
 from rasa.dialogue_understanding.patterns.cancel import CancelPatternFlowStackFrame
 from rasa.dialogue_understanding.patterns.clarify import ClarifyPatternFlowStackFrame
 from rasa.dialogue_understanding.stack.dialogue_stack import DialogueStack
-from rasa.dialogue_understanding.stack.frames import (
-    UserFlowStackFrame,
-)
+from rasa.dialogue_understanding.stack.frames import UserFlowStackFrame
 from rasa.dialogue_understanding.stack.frames.flow_stack_frame import FlowStackFrameType
 from rasa.dialogue_understanding.stack.utils import top_user_flow_frame
 from rasa.shared.core.events import Event, FlowCancelled
@@ -111,7 +113,9 @@ class CancelFlowCommand(Command):
 
         stack.push(
             CancelPatternFlowStackFrame(
-                canceled_name=current_flow.readable_name(),
+                canceled_name=current_flow.readable_name(
+                    language=tracker.current_language
+                ),
                 canceled_frames=canceled_frames,
             )
         )
@@ -144,7 +148,14 @@ class CancelFlowCommand(Command):
 
     def to_dsl(self) -> str:
         """Converts the command to a DSL string."""
-        return "CancelFlow()"
+        mapper = {
+            CommandSyntaxVersion.v1: "CancelFlow()",
+            CommandSyntaxVersion.v2: "cancel flow",
+        }
+        return mapper.get(
+            CommandSyntaxManager.get_syntax_version(),
+            mapper[CommandSyntaxManager.get_default_syntax_version()],
+        )
 
     @classmethod
     def from_dsl(cls, match: re.Match, **kwargs: Any) -> CancelFlowCommand:
@@ -153,7 +164,14 @@ class CancelFlowCommand(Command):
 
     @staticmethod
     def regex_pattern() -> str:
-        return r"CancelFlow\(\)"
+        mapper = {
+            CommandSyntaxVersion.v1: r"CancelFlow\(\)",
+            CommandSyntaxVersion.v2: r"^[^\w]*cancel flow$",
+        }
+        return mapper.get(
+            CommandSyntaxManager.get_syntax_version(),
+            mapper[CommandSyntaxManager.get_default_syntax_version()],
+        )
 
 
 def cancel_all_pending_clarification_options(