rasa-pro 3.13.0.dev1__py3-none-any.whl → 3.13.0.dev3__py3-none-any.whl

rasa/dialogue_understanding/generator/llm_based_command_generator.py

@@ -12,9 +12,6 @@ from rasa.dialogue_understanding.commands import (
     SetSlotCommand,
     StartFlowCommand,
 )
-from rasa.dialogue_understanding.commands.handle_digressions_command import (
-    HandleDigressionsCommand,
-)
 from rasa.dialogue_understanding.constants import KEY_MINIMIZE_NUM_CALLS
 from rasa.dialogue_understanding.generator import CommandGenerator
 from rasa.dialogue_understanding.generator._jinja_filters import to_json_escaped_string
@@ -609,16 +606,9 @@ class LLMBasedCommandGenerator(
     ) -> bool:
         """Check if the LLM current commands should be merged with the prior commands.
 
-        This can be done if there are no prior start flow commands and
-        no prior handle digressions commands.
+        This can be done if there are no prior start flow commands.
         """
-        prior_handle_digressions = [
-            command
-            for command in prior_commands
-            if isinstance(command, HandleDigressionsCommand)
-        ]
-
-        return not prior_start_flow_names and not prior_handle_digressions
+        return not prior_start_flow_names
 
     def _check_start_flow_command_overlap(
         self,

rasa/dialogue_understanding/generator/multi_step/multi_step_llm_command_generator.py

@@ -52,6 +52,10 @@ from rasa.shared.exceptions import ProviderClientAPIException
 from rasa.shared.nlu.constants import TEXT
 from rasa.shared.nlu.training_data.message import Message
 from rasa.shared.providers.llm.llm_response import LLMResponse
+from rasa.shared.utils.constants import (
+    LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON,
+    LOG_COMPONENT_SOURCE_METHOD_INIT,
+)
 from rasa.shared.utils.io import deep_container_fingerprint, raise_deprecation_warning
 from rasa.shared.utils.llm import (
     allowed_values_for_slot,
@@ -330,6 +334,8 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
         return get_prompt_template(
             config.get("prompt_templates", {}).get(key, {}).get(FILE_PATH_KEY),
             default_value,
+            log_source_component=MultiStepLLMCommandGenerator.__name__,
+            log_source_method=LOG_COMPONENT_SOURCE_METHOD_INIT,
         )
 
     @classmethod
@@ -786,17 +792,24 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
     @classmethod
     def fingerprint_addon(cls, config: Dict[str, Any]) -> Optional[str]:
         """Add a fingerprint for the graph."""
+        get_prompt_template_log_params = {
+            "log_source_component": MultiStepLLMCommandGenerator.__name__,
+            "log_source_method": LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON,
+        }
+
         handle_flows_template = get_prompt_template(
             config.get("prompt_templates", {})
             .get(HANDLE_FLOWS_KEY, {})
             .get(FILE_PATH_KEY),
             DEFAULT_HANDLE_FLOWS_TEMPLATE,
+            **get_prompt_template_log_params,
         )
         fill_slots_template = get_prompt_template(
             config.get("prompt_templates", {})
             .get(FILL_SLOTS_KEY, {})
             .get(FILE_PATH_KEY),
             DEFAULT_FILL_SLOTS_TEMPLATE,
+            **get_prompt_template_log_params,
         )
 
         llm_config = resolve_model_client_config(

rasa/dialogue_understanding/generator/prompt_templates/command_prompt_v2_claude_3_5_sonnet_20240620_template.jinja2

@@ -8,7 +8,7 @@ Your task is to analyze the current conversation context and generate a list of
 * `set slot slot_name slot_value`: Slot setting. For example, `set slot transfer_money_recipient Freddy`. Can be used to correct and change previously set values.
 * `cancel flow`: Cancelling the current flow.
 * `disambiguate flows flow_name1 flow_name2 ... flow_name_n`: Disambiguate which flow should be started when user input is ambiguous by listing the potential flows as options. For example, `disambiguate flows list_contacts add_contact remove_contact ...` if the user just wrote "contacts".
-* `search and reply`: Responding to the user's questions by supplying relevant information, such as answering FAQs or explaining services.
+* `provide info`: Responding to the user's questions by supplying relevant information, such as answering FAQs or explaining services.
 * `offtopic reply`: Responding to casual or social user messages that are unrelated to any flows, engaging in friendly conversation and addressing off-topic remarks.
 * `hand over`: Handing over to a human, in case the user seems frustrated or explicitly asks to speak to one.
 

rasa/dialogue_understanding/generator/prompt_templates/command_prompt_v2_gpt_4o_2024_11_20_template.jinja2

@@ -16,7 +16,7 @@ Use the following structured data:
 * `set slot slot_name slot_value`: Slot setting. For example, `set slot transfer_money_recipient Freddy`. Can be used to correct and change previously set values.
 * `cancel flow`: Cancelling the current flow.
 * `disambiguate flows flow_name1 flow_name2 ... flow_name_n`: Disambiguate which flow should be started when user input is ambiguous by listing the potential flows as options. For example, `disambiguate flows list_contacts add_contact remove_contact ...` if the user just wrote "contacts".
-* `search and reply`: Responding to the user's message by accessing and supplying relevant information from the knowledge base to address their inquiry effectively.
+* `provide info`: Responding to the user's questions by supplying relevant information, such as answering FAQs or explaining services.
 * `offtopic reply`: Responding to casual or social user messages that are unrelated to any flows, engaging in friendly conversation and addressing off-topic remarks.
 * `hand over`: Handing over to a human, in case the user seems frustrated or explicitly asks to speak to one.
 
@@ -27,11 +27,8 @@ Use the following structured data:
 * For categorical slots try to match the user message with allowed slot values. Use "other" if you cannot match it.
 * Set the boolean slots based on the user response. Map positive responses to `True`, and negative to `False`.
 * Extract text slot values exactly as provided by the user. Avoid assumptions, format changes, or partial extractions.
-* Use clarification in ambiguous cases.
-* Use `disambiguate flows` only when multiple flows could fit the same message (e.g., "card" could mean `block_card` or `replace_card`).
-* A user asking a question does not automatically imply that they want `search and reply`. The objective is to help them complete a business process if its possible to do so via a flow.
-* **Flow Priority**: If a user message can be addressed by starting a flow (even if it looks like a general question), ALWAYS start the flow first. Example: If the user says "How do I activate my card?", use `start flow activate_card` instead of `search and reply`. Only use `search and reply` if no flow matches the request.
 * Only use information provided by the user.
+* Use clarification in ambiguous cases.
 * Multiple flows can be started. If a user wants to digress into a second flow, you do not need to cancel the current flow.
 * Do not cancel the flow unless the user explicitly requests it.
 * Strictly adhere to the provided action format.

rasa/dialogue_understanding/generator/single_step/compact_llm_command_generator.py

@@ -1,5 +1,5 @@
 import copy
-from typing import Any, Dict, List, Optional, Text
+from typing import Any, Dict, List, Literal, Optional, Text
 
 import structlog
 
@@ -58,6 +58,10 @@ from rasa.shared.exceptions import ProviderClientAPIException
 from rasa.shared.nlu.constants import LLM_COMMANDS, LLM_PROMPT, TEXT
 from rasa.shared.nlu.training_data.message import Message
 from rasa.shared.providers.llm.llm_response import LLMResponse
+from rasa.shared.utils.constants import (
+    LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON,
+    LOG_COMPONENT_SOURCE_METHOD_INIT,
+)
 from rasa.shared.utils.io import deep_container_fingerprint
 from rasa.shared.utils.llm import (
     allowed_values_for_slot,
@@ -187,8 +191,8 @@ class CompactLLMCommandGenerator(LLMBasedCommandGenerator):
         )
 
         # Get the prompt template from the config or the default prompt template.
-        self.prompt_template = self.resolve_component_prompt_template(
-            self.config, prompt_template
+        self.prompt_template = self._resolve_component_prompt_template(
+            self.config, prompt_template, log_context=LOG_COMPONENT_SOURCE_METHOD_INIT
         )
 
         # Set the command syntax version to v2
@@ -539,7 +543,9 @@ class CompactLLMCommandGenerator(LLMBasedCommandGenerator):
         # and update the llm config with the resolved llm config.
         _config_copy = copy.deepcopy(config)
         _config_copy[LLM_CONFIG_KEY] = llm_config
-        prompt_template = cls.resolve_component_prompt_template(_config_copy)
+        prompt_template = cls._resolve_component_prompt_template(
+            _config_copy, log_context=LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON
+        )
 
         return deep_container_fingerprint(
             [prompt_template, llm_config, embedding_config]
@@ -555,20 +561,26 @@ class CompactLLMCommandGenerator(LLMBasedCommandGenerator):
         return CommandSyntaxVersion.v2
 
     @staticmethod
-    def resolve_component_prompt_template(
-        config: Dict[str, Any], prompt_template: Optional[str] = None
+    def _resolve_component_prompt_template(
+        config: Dict[str, Any],
+        prompt_template: Optional[str] = None,
+        log_context: Optional[Literal["init", "fingerprint_addon"]] = None,
     ) -> Optional[str]:
         """Get the prompt template from the config or the default prompt template."""
         # Get the default prompt template based on the model name.
         default_command_prompt_template = get_default_prompt_template_based_on_model(
-            config.get(LLM_CONFIG_KEY, {}) or {},
-            MODEL_PROMPT_MAPPER,
-            DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME,
-            FALLBACK_COMMAND_PROMPT_TEMPLATE_FILE_NAME,
+            llm_config=config.get(LLM_CONFIG_KEY, {}) or {},
+            model_prompt_mapping=MODEL_PROMPT_MAPPER,
+            default_prompt_path=DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME,
+            fallback_prompt_path=FALLBACK_COMMAND_PROMPT_TEMPLATE_FILE_NAME,
+            log_source_component=CompactLLMCommandGenerator.__name__,
+            log_source_method=log_context,
         )
 
         # Return the prompt template either from the config or the default prompt.
         return prompt_template or get_prompt_template(
             config.get(PROMPT_TEMPLATE_CONFIG_KEY),
             default_command_prompt_template,
+            log_source_component=CompactLLMCommandGenerator.__name__,
+            log_source_method=log_context,
         )

rasa/dialogue_understanding/generator/single_step/single_step_llm_command_generator.py

@@ -1,5 +1,5 @@
 import importlib.resources
-from typing import Any, Dict, Optional, Text
+from typing import Any, Dict, Literal, Optional, Text
 
 import structlog
 
@@ -25,8 +25,12 @@ from rasa.shared.constants import (
     PROMPT_CONFIG_KEY,
     PROMPT_TEMPLATE_CONFIG_KEY,
 )
+from rasa.shared.utils.constants import LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON
 from rasa.shared.utils.io import deep_container_fingerprint
-from rasa.shared.utils.llm import get_prompt_template, resolve_model_client_config
+from rasa.shared.utils.llm import (
+    get_prompt_template,
+    resolve_model_client_config,
+)
 
 DEFAULT_COMMAND_PROMPT_TEMPLATE = importlib.resources.read_text(
     "rasa.dialogue_understanding.generator.prompt_templates",
@@ -72,9 +76,6 @@ class SingleStepLLMCommandGenerator(CompactLLMCommandGenerator):
                     "Please use the config parameter 'prompt_template' instead. "
                 ),
             )
-        self.prompt_template = self.resolve_component_prompt_template(
-            config, prompt_template
-        )
 
         # Set the command syntax version to v1
         CommandSyntaxManager.set_syntax_version(
@@ -95,7 +96,9 @@ class SingleStepLLMCommandGenerator(CompactLLMCommandGenerator):
     @classmethod
     def fingerprint_addon(cls: Any, config: Dict[str, Any]) -> Optional[str]:
         """Add a fingerprint for the graph."""
-        prompt_template = cls.resolve_component_prompt_template(config)
+        prompt_template = cls._resolve_component_prompt_template(
+            config, log_context=LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON
+        )
         llm_config = resolve_model_client_config(
             config.get(LLM_CONFIG_KEY), SingleStepLLMCommandGenerator.__name__
         )
@@ -117,17 +120,29 @@ class SingleStepLLMCommandGenerator(CompactLLMCommandGenerator):
         return CommandSyntaxVersion.v1
 
     @staticmethod
-    def resolve_component_prompt_template(
-        config: Dict[str, Any], prompt_template: Optional[str] = None
+    def _resolve_component_prompt_template(
+        config: Dict[str, Any],
+        prompt_template: Optional[str] = None,
+        log_context: Optional[Literal["init", "fingerprint_addon"]] = None,
     ) -> Optional[str]:
         """Get the prompt template from the config or the default prompt template."""
-        # Get the default prompt template based on the model name.
-        config_prompt = (
+        # Case when model is being loaded
+        if prompt_template is not None:
+            return prompt_template
+
+        # The prompt can be configured in the config via the "prompt" (deprecated) or
+        # "prompt_template" properties
+        prompt_template_path = (
             config.get(PROMPT_CONFIG_KEY)
             or config.get(PROMPT_TEMPLATE_CONFIG_KEY)
             or None
         )
-        return prompt_template or get_prompt_template(
-            config_prompt,
+
+        # Try to load the template from the given path or fallback to the default for
+        # the component
+        return get_prompt_template(
+            prompt_template_path,
             DEFAULT_COMMAND_PROMPT_TEMPLATE,
+            log_source_component=SingleStepLLMCommandGenerator.__name__,
+            log_source_method=log_context,
         )

rasa/dialogue_understanding/patterns/default_flows_for_patterns.yml

@@ -1,17 +1,6 @@
 version: "3.1"
 responses:
 
-  utter_ask_continue_previous_flow:
-    - text: "Confirm if you would like to continue with the initial topic: {{context.interrupted_flow_id}}?"
-      metadata:
-        rephrase: True
-        template: jinja
-      buttons:
-        - title: Continue with the previous topic.
-          payload: /SetSlots(continue_previous_flow=True)
-        - title: Switch to new topic.
-          payload: /SetSlots(continue_previous_flow=False)
-
   utter_ask_rephrase:
     - text: I’m sorry I am unable to understand you, could you please rephrase?
 
@@ -20,20 +9,6 @@ responses:
       metadata:
         rephrase: True
 
-  utter_block_digressions:
-    - text: "We can look into {{ context.interrupting_flow_id }} later. Let's focus on the current topic: {{ context.interrupted_flow_id }}."
-      metadata:
-        rephrase: True
-        template: jinja
-    - text: "Let's continue with the current topic: {{ context.interrupted_flow_id }}."
-      condition:
-        - type: slot
-          name: continue_previous_flow
-          value: True
-      metadata:
-        rephrase: True
-        template: jinja
-
   utter_boolean_slot_rejection:
     - text: "Sorry, the value you provided, `{{value}}`, is not valid. Please respond with a valid value."
       metadata:
@@ -60,12 +35,6 @@ responses:
         rephrase: True
         template: jinja
 
-  utter_continue_interruption:
-    - text: "Let's continue with the chosen topic instead: {{ context.interrupting_flow_id }}."
-      metadata:
-        rephrase: True
-        template: jinja
-
   utter_corrected_previous_input:
     - text: "Ok, I am updating {{ context.corrected_slots.keys()|join(', ') }} to {{ context.new_slot_values | join(', ') }} respectively."
       metadata:
@@ -150,10 +119,6 @@ slots:
     type: float
     initial_value: 0.0
     max_value: 1000000
-  continue_previous_flow:
-    type: bool
-    mappings:
-      - type: from_llm
 
 flows:
   pattern_cancel_flow:
@@ -197,7 +162,6 @@ flows:
     steps:
       - action: action_clarify_flows
       - action: utter_clarification_options_rasa
-      - action: action_listen
 
   pattern_code_change:
     description: Conversation repair flow for cleaning the stack after an assistant update
@@ -247,31 +211,6 @@ flows:
                 next: END
           - else: END
 
-  pattern_handle_digressions:
-    description: Conversation repair flow for handling digressions
-    name: pattern handle digressions
-    steps:
-      - noop: true
-        id: branching
-        next:
-          - if: context.ask_confirm_digressions contains context.interrupting_flow_id
-            then: continue_previous_flow
-          - if: context.block_digressions contains context.interrupting_flow_id
-            then: block_digression
-          - else: continue_digression
-      - id: continue_previous_flow
-        collect: continue_previous_flow
-        next:
-          - if: slots.continue_previous_flow
-            then: block_digression
-          - else: continue_digression
-      - id: block_digression
-        action: action_block_digression
-        next: END
-      - id: continue_digression
-        action: action_continue_digression
-        next: END
-
   pattern_human_handoff:
     description: Conversation repair flow for switching users to a human agent if their request can't be handled
     name: pattern human handoff

rasa/dialogue_understanding/processor/command_processor.py

@@ -18,9 +18,6 @@ from rasa.dialogue_understanding.commands import (
 from rasa.dialogue_understanding.commands.handle_code_change_command import (
     HandleCodeChangeCommand,
 )
-from rasa.dialogue_understanding.commands.handle_digressions_command import (
-    HandleDigressionsCommand,
-)
 from rasa.dialogue_understanding.commands.set_slot_command import SetSlotExtractor
 from rasa.dialogue_understanding.commands.utils import (
     create_validate_frames_from_slot_set_events,
@@ -454,21 +451,7 @@ def clean_up_commands(
                 )
                 continue
 
-            if should_add_handle_digressions_command(tracker, all_flows, top_flow_id):
-                handle_digression_command = HandleDigressionsCommand(flow=command.flow)
-                if handle_digression_command in clean_commands:
-                    structlogger.debug(
-                        "command_processor.clean_up_commands.skip_handle_digressions.command_already_present",
-                        command=handle_digression_command,
-                    )
-                    continue
-                clean_commands.append(handle_digression_command)
-                structlogger.debug(
-                    "command_processor.clean_up_commands.push_handle_digressions",
-                    command=command,
-                )
-            else:
-                clean_commands.append(command)
+            clean_commands.append(command)
 
         # handle chitchat command differently from other free-form answer commands
         elif isinstance(command, ChitChatAnswerCommand):
@@ -503,21 +486,9 @@ def clean_up_commands(
     # when coexistence is enabled, by default there will be a SetSlotCommand
     # for the ROUTE_TO_CALM_SLOT slot.
     if tracker.has_coexistence_routing_slot and len(clean_commands) > 2:
-        clean_commands = filter_cannot_handle_command_for_skipped_slots(clean_commands)
+        clean_commands = filter_cannot_handle_command(clean_commands)
     elif not tracker.has_coexistence_routing_slot and len(clean_commands) > 1:
-        clean_commands = filter_cannot_handle_command_for_skipped_slots(clean_commands)
-
-    # remove cancel flow when there is a handle digression command
-    # otherwise the cancel command will cancel the active flow which defined a specific
-    # behavior for the digression
-    if contains_command(clean_commands, HandleDigressionsCommand) and contains_command(
-        clean_commands, CancelFlowCommand
-    ):
-        clean_commands = [
-            command
-            for command in clean_commands
-            if not isinstance(command, CancelFlowCommand)
-        ]
+        clean_commands = filter_cannot_handle_command(clean_commands)
 
     clean_commands = ensure_max_number_of_command_type(
         clean_commands, RepeatBotMessagesCommand, 1
@@ -857,12 +828,12 @@ def should_slot_be_set(
     return True
 
 
-def filter_cannot_handle_command_for_skipped_slots(
+def filter_cannot_handle_command(
     clean_commands: List[Command],
 ) -> List[Command]:
-    """Filter out a 'cannot handle' command for skipped slots.
+    """Filter out a 'cannot handle' command.
 
-    This is used to filter out a 'cannot handle' command for skipped slots
+    This is used to filter out a 'cannot handle' command
     in case other commands are present.
 
     Returns:
@@ -871,34 +842,5 @@ def filter_cannot_handle_command_for_skipped_slots(
     return [
         command
         for command in clean_commands
-        if not (
-            isinstance(command, CannotHandleCommand)
-            and command.reason
-            and CANNOT_HANDLE_REASON == command.reason
-        )
+        if not isinstance(command, CannotHandleCommand)
     ]
-
-
-def should_add_handle_digressions_command(
-    tracker: DialogueStateTracker, all_flows: FlowsList, top_flow_id: str
-) -> bool:
-    """Check if a handle digressions command should be added to the commands.
-
-    The command should replace a StartFlow command only if we are at a collect step of
-    a flow and a new flow is predicted by the command generator to start.
-    """
-    current_flow = all_flows.flow_by_id(top_flow_id)
-    current_flow_condition = current_flow and (
-        current_flow.ask_confirm_digressions or current_flow.block_digressions
-    )
-
-    collect_info = get_current_collect_step(tracker.stack, all_flows)
-
-    if collect_info and (
-        collect_info.ask_confirm_digressions
-        or collect_info.block_digressions
-        or current_flow_condition
-    ):
-        return True
-
-    return False

rasa/dialogue_understanding/stack/utils.py

@@ -4,9 +4,6 @@ from typing import List, Optional, Set, Tuple
 from rasa.dialogue_understanding.patterns.collect_information import (
     CollectInformationPatternFlowStackFrame,
 )
-from rasa.dialogue_understanding.patterns.continue_interrupted import (
-    ContinueInterruptedPatternFlowStackFrame,
-)
 from rasa.dialogue_understanding.stack.dialogue_stack import DialogueStack
 from rasa.dialogue_understanding.stack.frames import (
     BaseFlowStackFrame,
@@ -221,38 +218,3 @@ def get_collect_steps_excluding_ask_before_filling_for_active_flow(
         for step in active_flow.get_collect_steps()
         if not step.ask_before_filling
     )
-
-
-def remove_digression_from_stack(stack: DialogueStack, flow_id: str) -> DialogueStack:
-    """Remove a specific flow frame from the stack and other frames that reference it.
-
-    The main use-case is to prevent duplicate digressions from being added to the stack.
-
-    Args:
-        stack: The dialogue stack.
-        flow_id: The flow to remove.
-
-    Returns:
-        The updated dialogue stack.
-    """
-    updated_stack = stack.copy()
-    original_frames = updated_stack.frames[:]
-    found_digression_index = -1
-    for index, frame in enumerate(original_frames):
-        if isinstance(frame, BaseFlowStackFrame) and frame.flow_id == flow_id:
-            updated_stack.frames.pop(index)
-            found_digression_index = index
-
-        # we also need to remove the `ContinueInterruptedPatternFlowStackFrame`
-        elif (
-            isinstance(frame, ContinueInterruptedPatternFlowStackFrame)
-            and frame.previous_flow_name == flow_id
-            and found_digression_index + 1 == index
-        ):
-            # we know that this frame is always added after the digressing flow frame
-            # that was blocked previously by action_block_digressions,
-            # so this check would occur after the digressing flow was popped.
-            # Therefore, we need to update the index dynamically before popping.
-            updated_stack.frames.pop(index - 1)
-
-    return updated_stack

rasa/e2e_test/utils/validation.py

@@ -7,6 +7,7 @@ import structlog
 import rasa.shared.utils.io
 from rasa.e2e_test.constants import SCHEMA_FILE_PATH
 from rasa.e2e_test.e2e_test_case import Fixture, Metadata
+from rasa.exceptions import ModelNotFound
 from rasa.shared.utils.yaml import read_schema_file
 
 if TYPE_CHECKING:
@@ -152,10 +153,9 @@ def validate_model_path(model_path: Optional[str], parameter: str, default: str)
         return model_path
 
     if model_path and not Path(model_path).exists():
-        rasa.shared.utils.io.raise_warning(
+        raise ModelNotFound(
             f"The provided model path '{model_path}' could not be found. "
-            f"Using default location '{default}' instead.",
-            UserWarning,
+            "Provide an existing model path."
         )
 
     elif model_path is None:

rasa/llm_fine_tuning/paraphrasing/conversation_rephraser.py

@@ -19,6 +19,7 @@ from rasa.shared.constants import (
 )
 from rasa.shared.exceptions import ProviderClientAPIException
 from rasa.shared.providers.mappings import OPENAI_PROVIDER
+from rasa.shared.utils.constants import LOG_COMPONENT_SOURCE_METHOD_INIT
 from rasa.shared.utils.llm import (
     USER,
     get_prompt_template,
@@ -54,6 +55,8 @@ class ConversationRephraser:
         self.prompt_template = get_prompt_template(
             self.config.get(PROMPT_TEMPLATE_CONFIG_KEY),
             DEFAULT_REPHRASING_PROMPT_TEMPLATE,
+            log_source_component=ConversationRephraser.__name__,
+            log_source_method=LOG_COMPONENT_SOURCE_METHOD_INIT,
         )
 
     @staticmethod

rasa/shared/core/constants.py

@@ -52,8 +52,6 @@ ACTION_TRIGGER_CHITCHAT = "action_trigger_chitchat"
 ACTION_RESET_ROUTING = "action_reset_routing"
 ACTION_HANGUP = "action_hangup"
 ACTION_REPEAT_BOT_MESSAGES = "action_repeat_bot_messages"
-ACTION_BLOCK_DIGRESSION = "action_block_digression"
-ACTION_CONTINUE_DIGRESSION = "action_continue_digression"
 
 ACTION_METADATA_EXECUTION_SUCCESS = "execution_success"
 ACTION_METADATA_EXECUTION_ERROR_MESSAGE = "execution_error_message"
@@ -84,8 +82,6 @@ DEFAULT_ACTION_NAMES = [
     ACTION_RESET_ROUTING,
     ACTION_HANGUP,
     ACTION_REPEAT_BOT_MESSAGES,
-    ACTION_BLOCK_DIGRESSION,
-    ACTION_CONTINUE_DIGRESSION,
 ]
 
 ACTION_SHOULD_SEND_DOMAIN = "send_domain"
@@ -205,8 +201,4 @@ CLASSIFIER_NAME_FALLBACK = "FallbackClassifier"
 
 POLICIES_THAT_EXTRACT_ENTITIES = {"TEDPolicy"}
 
-# digression constants
-KEY_ASK_CONFIRM_DIGRESSIONS = "ask_confirm_digressions"
-KEY_BLOCK_DIGRESSIONS = "block_digressions"
-
 ERROR_CODE_KEY = "error_code"

rasa/shared/core/domain.py

@@ -1678,6 +1678,14 @@ class Domain:
         """Write domain to a file."""
         as_yaml = self.as_yaml()
         rasa.shared.utils.io.write_text_file(as_yaml, filename)
+        # run the check again on the written domain to catch any errors
+        # that may have been missed in the user defined domain files
+        structlogger.info(
+            "domain.persist.domain_written_to_file",
+            event_info="The entire domain content has been written to file.",
+            filename=filename,
+        )
+        Domain.is_domain_file(filename)
 
     def as_yaml(self) -> Text:
         """Dump the `Domain` object as a YAML string.
@@ -1972,17 +1980,18 @@ class Domain:
 
         try:
             content = read_yaml_file(filename, expand_env_vars=cls.expand_env_vars)
-        except (RasaException, YamlSyntaxException):
-            structlogger.warning(
+        except (RasaException, YamlSyntaxException) as error:
+            structlogger.error(
                 "domain.cannot_load_domain_file",
                 file=filename,
+                error=error,
                 event_info=(
                     f"The file {filename} could not be loaded as domain file. "
                     f"You can use https://yamlchecker.com/ to validate "
                     f"the YAML syntax of your file."
                 ),
             )
-            return False
+            raise RasaException(f"Domain could not be loaded: {error}")
 
         return any(key in content for key in ALL_DOMAIN_KEYS)
 

rasa/shared/core/flows/flow.py

@@ -13,10 +13,6 @@ from pypred import Predicate
 import rasa.shared.utils.io
 from rasa.engine.language import Language
 from rasa.shared.constants import RASA_DEFAULT_FLOW_PATTERN_PREFIX
-from rasa.shared.core.constants import (
-    KEY_ASK_CONFIRM_DIGRESSIONS,
-    KEY_BLOCK_DIGRESSIONS,
-)
 from rasa.shared.core.flows.constants import (
     KEY_ALWAYS_INCLUDE_IN_PROMPT,
     KEY_DESCRIPTION,
@@ -52,7 +48,6 @@ from rasa.shared.core.flows.steps.constants import (
     START_STEP,
 )
 from rasa.shared.core.flows.steps.continuation import ContinueFlowStep
-from rasa.shared.core.flows.utils import extract_digression_prop
 from rasa.shared.core.slots import Slot
 
 structlogger = structlog.get_logger()
@@ -94,10 +89,6 @@ class Flow:
     """The path to the file where the flow is stored."""
     persisted_slots: List[str] = field(default_factory=list)
     """The list of slots that should be persisted after the flow ends."""
-    ask_confirm_digressions: List[str] = field(default_factory=list)
-    """The flow ids for which the assistant should ask for confirmation."""
-    block_digressions: List[str] = field(default_factory=list)
-    """The flow ids that the assistant should block from digressing to."""
     run_pattern_completed: bool = True
     """Whether the pattern_completed flow should be run after the flow ends."""
 
@@ -138,10 +129,6 @@ class Flow:
             # data. When the model is trained, take the provided file_path.
             file_path=data.get(KEY_FILE_PATH) if KEY_FILE_PATH in data else file_path,
             persisted_slots=data.get(KEY_PERSISTED_SLOTS, []),
-            ask_confirm_digressions=extract_digression_prop(
-                KEY_ASK_CONFIRM_DIGRESSIONS, data
-            ),
-            block_digressions=extract_digression_prop(KEY_BLOCK_DIGRESSIONS, data),
             run_pattern_completed=data.get(KEY_RUN_PATTERN_COMPLETED, True),
             translation=extract_translations(
                 translation_data=data.get(KEY_TRANSLATION, {})
@@ -220,10 +207,6 @@ class Flow:
             data[KEY_FILE_PATH] = self.file_path
         if self.persisted_slots:
             data[KEY_PERSISTED_SLOTS] = self.persisted_slots
-        if self.ask_confirm_digressions:
-            data[KEY_ASK_CONFIRM_DIGRESSIONS] = self.ask_confirm_digressions
-        if self.block_digressions:
-            data[KEY_BLOCK_DIGRESSIONS] = self.block_digressions
         if self.run_pattern_completed is not None:
             data["run_pattern_completed"] = self.run_pattern_completed
         if self.translation: