rasa-pro 3.13.4__py3-none-any.whl → 3.13.6__py3-none-any.whl

rasa/core/nlg/contextual_response_rephraser.py

@@ -24,6 +24,7 @@ from rasa.shared.constants import (
 )
 from rasa.shared.core.domain import KEY_RESPONSES_TEXT, Domain
 from rasa.shared.core.events import BotUttered, UserUttered
+from rasa.shared.core.flows.constants import KEY_TRANSLATION
 from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.shared.nlu.constants import (
     KEY_COMPONENT_NAME,
@@ -305,22 +306,23 @@ class ContextualResponseRephraser(
         Returns:
             The response with the rephrased text.
         """
-        if not (response_text := response.get(KEY_RESPONSES_TEXT)):
+        translation_response = response.get(KEY_TRANSLATION) or {}
+        lang_code = getattr(tracker.current_language, "code", None)
+        response_text = translation_response.get(
+            lang_code, response.get(KEY_RESPONSES_TEXT)
+        )
+        if not response_text:
             return response
 
         prompt_template_text = self._template_for_response_rephrasing(response)
-
-        # Last user message (=current input) should always be in prompt if available
         last_message_by_user = getattr(tracker.latest_message, "text", "")
         current_input = (
             f"{USER}: {last_message_by_user}" if last_message_by_user else ""
         )
 
-        # Only summarise conversation history if flagged
         if self.summarize_history:
             history = await self._create_history(tracker)
         else:
-            # Count multiple utterances by bot/user as single turn
             turns_wrapper = (
                 _count_multiple_utterances_as_single_turn
                 if self.count_multiple_utterances_as_single_turn
@@ -363,16 +365,20 @@ class ContextualResponseRephraser(
         )
 
         if not (llm_response and llm_response.choices and llm_response.choices[0]):
-            # If the LLM fails to generate a response, return the original response.
             return response
 
         updated_text = llm_response.choices[0]
+
+        if lang_code in translation_response:
+            response[KEY_TRANSLATION][lang_code] = updated_text
+        else:
+            response[KEY_RESPONSES_TEXT] = updated_text
+
         structlogger.debug(
             "nlg.rewrite.complete",
             response_text=response_text,
             updated_text=updated_text,
         )
-        response[KEY_RESPONSES_TEXT] = updated_text
         return response
 
     def does_response_allow_rephrasing(self, template: Dict[Text, Any]) -> bool:

rasa/dialogue_understanding/commands/correct_slots_command.py

@@ -269,6 +269,20 @@ class CorrectSlotsCommand(Command):
             return []
 
         structlogger.debug("correct_slots_command", command=self)
+
+        # check if the correct slot is referring to a slot of a flow on the stack
+        # the slot also needs to be part of a collect step in any of those flows
+        # if this is not the case, we don't want to correct the slot
+        for slot in self.corrected_slots:
+            if not self.should_correct_slot(slot, tracker, all_flows):
+                structlogger.warning(
+                    "correct_slots_command.skip_correct_slot",
+                    correct_slot=slot,
+                    reason="The slot is not part of a collect step in any of the flows "
+                    "on the stack. Skipping correction.",
+                )
+                return []
+
         proposed_slots = self.corrected_slots_dict(tracker)
 
         correction_frame = self.create_correction_frame(
@@ -293,3 +307,27 @@ class CorrectSlotsCommand(Command):
             return False
 
         return True
+
+    def should_correct_slot(
+        self, slot: CorrectedSlot, tracker: DialogueStateTracker, all_flows: FlowsList
+    ) -> bool:
+        """Checks if the slot should be corrected.
+
+        Args:
+            slot: The slot to check.
+            tracker: The tracker.
+            all_flows: All flows in the assistant.
+        """
+        # get all flows on the stack
+        flows_on_stack = utils.user_flows_on_the_stack(tracker.stack)
+
+        # check if the slot is part of a collect step in any of the flows on the stack
+        for flow_id in flows_on_stack:
+            flow = all_flows.flow_by_id(flow_id)
+            if flow is None:
+                continue
+            for collect_step in flow.get_collect_steps():
+                if collect_step.collect == slot.name:
+                    return True
+
+        return False

rasa/dialogue_understanding/processor/command_processor.py

@@ -37,7 +37,6 @@ from rasa.dialogue_understanding.stack.frames import (
     BaseFlowStackFrame,
 )
 from rasa.dialogue_understanding.stack.utils import (
-    filled_slots_for_active_flow,
     top_flow_frame,
     top_user_flow_frame,
 )
@@ -125,7 +124,8 @@ def validate_state_of_commands(commands: List[Command]) -> None:
     # check that there is only at max one cancel flow command
     if sum(isinstance(c, CancelFlowCommand) for c in commands) > 1:
         structlogger.error(
-            "command_processor.validate_state_of_commands.multiple_cancel_flow_commands",
+            "command_processor.validate_state_of_commands."
+            "multiple_cancel_flow_commands",
             commands=[command.__class__.__name__ for command in commands],
         )
         raise ValueError("There can only be one cancel flow command.")
@@ -136,7 +136,8 @@ def validate_state_of_commands(commands: List[Command]) -> None:
     ]
     if free_form_answer_commands != commands[: len(free_form_answer_commands)]:
         structlogger.error(
-            "command_processor.validate_state_of_commands.free_form_answer_commands_not_at_beginning",
+            "command_processor.validate_state_of_commands."
+            "free_form_answer_commands_not_at_beginning",
             commands=[command.__class__.__name__ for command in commands],
         )
         raise ValueError(
@@ -146,7 +147,8 @@ def validate_state_of_commands(commands: List[Command]) -> None:
     # check that there is at max only one correctslots command
     if sum(isinstance(c, CorrectSlotsCommand) for c in commands) > 1:
         structlogger.error(
-            "command_processor.validate_state_of_commands.multiple_correct_slots_commands",
+            "command_processor.validate_state_of_commands."
+            "multiple_correct_slots_commands",
             commands=[command.__class__.__name__ for command in commands],
         )
         raise ValueError("There can only be one correct slots command.")
@@ -230,11 +232,9 @@ def execute_commands(
 
     events: List[Event] = flow_hash_events
 
-    # commands need to be reversed to make sure they end up in the right order
-    # on the stack. e.g. if there multiple start flow commands, the first one
-    # should be on top of the stack. this is achieved by reversing the list
-    # and then pushing the commands onto the stack in the reversed order.
-    reversed_commands = list(reversed(commands))
+    # reorder commands: in case there is no active flow, we want to make sure to
+    # run the start flow commands first.
+    final_commands = reorder_commands(commands, tracker)
 
     # we need to keep track of the ValidateSlotPatternFlowStackFrame that
     # should be pushed onto the stack before executing the StartFlowCommands.
@@ -245,7 +245,7 @@ def execute_commands(
 
     validate_state_of_commands(commands)
 
-    for command in reversed_commands:
+    for command in final_commands:
         new_events = command.run_command_on_tracker(
             tracker, all_flows, original_tracker
         )
@@ -398,11 +398,11 @@ def clean_up_commands(
     """
     domain = domain if domain else Domain.empty()
 
-    slots_so_far, _ = filled_slots_for_active_flow(tracker, all_flows)
-
-    # update the slots so far with the slots that were set in the tracker
-    slots_so_far.update(
-        {event.key for event in tracker.events if isinstance(event, SlotSet)}
+    # we consider all slots that were set in the tracker for potential corrections
+    # in the correct_slot_command we will check if a slot should actually be
+    # corrected
+    slots_so_far = set(
+        [event.key for event in tracker.events if isinstance(event, SlotSet)]
     )
 
     clean_commands: List[Command] = []
@@ -444,7 +444,8 @@ def clean_up_commands(
                 # drop a start flow command if the starting flow is equal
                 # to the currently active flow
                 structlogger.debug(
-                    "command_processor.clean_up_commands.skip_command_flow_already_active",
+                    "command_processor.clean_up_commands."
+                    "skip_command_flow_already_active",
                     command=command,
                 )
                 continue
@@ -475,7 +476,8 @@ def clean_up_commands(
             clean_commands = clean_up_clarify_command(clean_commands, commands, command)
             if command not in clean_commands:
                 structlogger.debug(
-                    "command_processor.clean_up_commands.drop_clarify_given_other_commands",
+                    "command_processor.clean_up_commands."
+                    "drop_clarify_given_other_commands",
                     command=command,
                 )
         else:
@@ -577,10 +579,10 @@ def clean_up_slot_command(
         The cleaned up commands.
     """
     stack = tracker.stack
-
     resulting_commands = commands_so_far[:]
-
     slot = tracker.slots.get(command.name)
+
+    # if the slot is not in the domain, we cannot set it
     if slot is None:
         structlogger.debug(
             "command_processor.clean_up_slot_command.skip_command_slot_not_in_domain",
@@ -593,6 +595,7 @@ def clean_up_slot_command(
         )
         return resulting_commands
 
+    # check if the slot should be set by the command
     if not should_slot_be_set(slot, command, resulting_commands):
         structlogger.debug(
             "command_processor.clean_up_slot_command.skip_command.extractor_"
@@ -618,6 +621,7 @@ def clean_up_slot_command(
 
         return resulting_commands
 
+    # check if the slot can be corrected by the LLM
     if (
         slot.filled_by == SetSlotExtractor.NLU.value
         and command.extractor == SetSlotExtractor.LLM.value
@@ -646,49 +650,71 @@ def clean_up_slot_command(
             resulting_commands.append(command)
             return resulting_commands
 
-        if (slot := tracker.slots.get(command.name)) is not None and str(
-            slot.value
-        ) == str(command.value):
-            # the slot is already set, we don't need to set it again
-            structlogger.debug(
-                "command_processor.clean_up_slot_command.skip_command_slot_already_set",
-                command=command,
-            )
+        if should_slot_be_corrected(command, tracker, stack, all_flows):
+            # if the slot was already set before, we need to convert it into
+            # a correction
+            return convert_set_slot_to_correction(command, resulting_commands)
+        else:
             return resulting_commands
 
-        top = top_flow_frame(stack)
-        if isinstance(top, CorrectionPatternFlowStackFrame):
-            already_corrected_slots = top.corrected_slots
-        else:
-            already_corrected_slots = {}
+    resulting_commands.append(command)
+    return resulting_commands
 
-        if command.name in already_corrected_slots and str(
-            already_corrected_slots[command.name]
-        ) == str(command.value):
-            structlogger.debug(
-                "command_processor.clean_up_slot_command"
-                ".skip_command_slot_already_corrected",
-                command=command,
-            )
-            return resulting_commands
 
+def should_slot_be_corrected(
+    command: SetSlotCommand,
+    tracker: DialogueStateTracker,
+    stack: DialogueStack,
+    all_flows: FlowsList,
+) -> bool:
+    """Check if a slot should be corrected."""
+    if (slot := tracker.slots.get(command.name)) is not None and str(slot.value) == str(
+        command.value
+    ):
+        # the slot is already set to the same value, we don't need to set it again
         structlogger.debug(
-            "command_processor.clean_up_slot_command.convert_command_to_correction",
+            "command_processor.clean_up_slot_command.skip_command_slot_already_set",
             command=command,
         )
+        return False
 
-        # Group all corrections into one command
-        corrected_slot = CorrectedSlot(command.name, command.value, command.extractor)
-        for c in resulting_commands:
-            if isinstance(c, CorrectSlotsCommand):
-                c.corrected_slots.append(corrected_slot)
-                break
-        else:
-            resulting_commands.append(
-                CorrectSlotsCommand(corrected_slots=[corrected_slot])
-            )
+    top = top_flow_frame(stack)
+    if isinstance(top, CorrectionPatternFlowStackFrame):
+        already_corrected_slots = top.corrected_slots
     else:
-        resulting_commands.append(command)
+        already_corrected_slots = {}
+
+    if command.name in already_corrected_slots and str(
+        already_corrected_slots[command.name]
+    ) == str(command.value):
+        structlogger.debug(
+            "command_processor.clean_up_slot_command"
+            ".skip_command_slot_already_corrected",
+            command=command,
+        )
+        return False
+
+    return True
+
+
+def convert_set_slot_to_correction(
+    command: SetSlotCommand,
+    resulting_commands: List[Command],
+) -> List[Command]:
+    """Convert a set slot command to a correction command."""
+    structlogger.debug(
+        "command_processor.convert_set_slot_to_correction",
+        command=command,
+    )
+
+    # Group all corrections into one command
+    corrected_slot = CorrectedSlot(command.name, command.value, command.extractor)
+    for c in resulting_commands:
+        if isinstance(c, CorrectSlotsCommand):
+            c.corrected_slots.append(corrected_slot)
+            break
+    else:
+        resulting_commands.append(CorrectSlotsCommand(corrected_slots=[corrected_slot]))
 
     return resulting_commands
 
@@ -747,7 +773,8 @@ def clean_up_chitchat_command(
             0, CannotHandleCommand(RASA_PATTERN_CANNOT_HANDLE_CHITCHAT)
         )
         structlogger.warn(
-            "command_processor.clean_up_chitchat_command.replace_chitchat_answer_with_cannot_handle",
+            "command_processor.clean_up_chitchat_command."
+            "replace_chitchat_answer_with_cannot_handle",
             command=resulting_commands[0],  # no PII
             pattern_chitchat_uses_action_trigger_chitchat=has_action_trigger_chitchat,
             defined_intentless_policy_in_config=defines_intentless_policy,
@@ -850,3 +877,49 @@ def filter_cannot_handle_command(
         for command in clean_commands
         if not isinstance(command, CannotHandleCommand)
     ]
+
+
+def reorder_commands(
+    commands: List[Command], tracker: DialogueStateTracker
+) -> List[Command]:
+    """Reorder commands.
+
+    In case there is no active flow, we want to make sure to run the start flow
+    commands first.
+    """
+    reordered_commands = commands
+
+    top_flow_frame = top_user_flow_frame(tracker.stack)
+
+    if top_flow_frame is None:
+        # no active flow, we want to make sure to run the start flow commands first
+        start_flow_commands: List[Command] = [
+            command for command in commands if isinstance(command, StartFlowCommand)
+        ]
+
+        # if there are no start flow commands, we can return the commands as they are
+        if not start_flow_commands:
+            reordered_commands = commands
+
+        # if there is just one start flow command, we want to run it first
+        # as the order of commands is reserved later,
+        # we need to add it to the end of the list
+        elif len(start_flow_commands) == 1:
+            reordered_commands = [
+                command for command in commands if command not in start_flow_commands
+            ] + start_flow_commands
+
+        # if there are multiple start flow commands,
+        # we just make sure to move the first start flow command to the end of the list
+        # (due to the reverse execution order of commands) and keep the other commands
+        # as they are.
+        else:
+            reordered_commands = [
+                command for command in commands if command != start_flow_commands[-1]
+            ] + [start_flow_commands[-1]]
+
+    # commands need to be reversed to make sure they end up in the right order
+    # on the stack. e.g. if there multiple start flow commands, the first one
+    # should be on top of the stack. this is achieved by reversing the list
+    # and then pushing the commands onto the stack in the reversed order.
+    return list(reversed(reordered_commands))

rasa/dialogue_understanding/stack/utils.py

@@ -209,14 +209,24 @@ def get_collect_steps_excluding_ask_before_filling_for_active_flow(
         All collect steps that are part of the current active flow,
         excluding the collect steps that have to be asked before filling.
     """
-    active_frame = top_user_flow_frame(
+    active_primary_frame = top_user_flow_frame(dialogue_stack)
+    any_active_frame = top_user_flow_frame(
         dialogue_stack, ignore_call_and_link_frames=False
     )
-    if active_frame is None:
+
+    active_flows = []
+    if any_active_frame:
+        active_flows.append(any_active_frame.flow(all_flows))
+
+    if active_primary_frame and active_primary_frame != any_active_frame:
+        active_flows.append(active_primary_frame.flow(all_flows))
+
+    if not active_flows:
         return set()
-    active_flow = active_frame.flow(all_flows)
+
     return set(
         step.collect
+        for active_flow in active_flows
         for step in active_flow.get_collect_steps()
         if not step.ask_before_filling
     )

rasa/studio/utils.py

@@ -1,33 +1,44 @@
 import argparse
 from pathlib import Path
+from typing import List
 
 import rasa.shared.utils.cli
-from rasa.shared.constants import (
-    DEFAULT_CONFIG_PATH,
-    DEFAULT_DATA_PATH,
-    DEFAULT_ENDPOINTS_PATH,
-)
-from rasa.studio.constants import DOMAIN_FILENAME
+
+DOMAIN_FILENAME = "domain.yml"
+DEFAULT_CONFIG_PATH = "config.yml"
+DEFAULT_ENDPOINTS_PATH = "endpoints.yml"
+DEFAULT_DATA_PATH = "data"
 
 
 def validate_argument_paths(args: argparse.Namespace) -> None:
-    """Validates the paths provided in the command line arguments.
+    """Validate every path passed via CLI arguments.
 
     Args:
-        args: The command line arguments containing paths to validate.
+        args: CLI arguments containing paths to validate.
+
+    Raises:
+        rasa.shared.utils.cli.PrintErrorAndExit: If any path does not exist.
     """
+    invalid_paths: List[str] = []
+
+    def collect_invalid_paths(arg_name: str, default: str) -> None:
+        value = getattr(args, arg_name, None)
+        path_values = value if isinstance(value, list) else [value]
+        for path_value in path_values:
+            if not path_value or path_value == default:
+                continue
+
+            if not Path(path_value).resolve().exists():
+                invalid_paths.append(f"{arg_name}: '{path_value}'")
+
+    collect_invalid_paths("domain", DOMAIN_FILENAME)
+    collect_invalid_paths("config", DEFAULT_CONFIG_PATH)
+    collect_invalid_paths("endpoints", DEFAULT_ENDPOINTS_PATH)
+    collect_invalid_paths("data", DEFAULT_DATA_PATH)
 
-    def validate_path(arg_name: str, default: str) -> None:
-        path_value = getattr(args, arg_name, None)
-        if path_value and path_value != default:
-            resolved_path = Path(path_value).resolve()
-            if not resolved_path.exists():
-                rasa.shared.utils.cli.print_error_and_exit(
-                    f"{arg_name.capitalize()} file or directory "
-                    f"'{path_value}' does not exist."
-                )
-
-    validate_path("domain", DOMAIN_FILENAME)
-    validate_path("config", DEFAULT_CONFIG_PATH)
-    validate_path("endpoints", DEFAULT_ENDPOINTS_PATH)
-    validate_path("data", DEFAULT_DATA_PATH)
+    if invalid_paths:
+        message = (
+            "The following files or directories do not exist:\n  - "
+            + "\n  - ".join(invalid_paths)
+        )
+        rasa.shared.utils.cli.print_error_and_exit(message)

rasa/version.py

@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "3.13.4"
+__version__ = "3.13.6"

{rasa_pro-3.13.4.dist-info → rasa_pro-3.13.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.13.4
+Version: 3.13.6
 Summary: State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development.
 Keywords: nlp,machine-learning,machine-learning-library,bot,bots,botkit,rasa conversational-agents,conversational-ai,chatbot,chatbot-framework,bot-framework
 Author: Rasa Technologies GmbH