rasa-pro 3.11.18__py3-none-any.whl → 3.11.19__py3-none-any.whl

rasa/dialogue_understanding/commands/correct_slots_command.py

@@ -260,7 +260,21 @@ class CorrectSlotsCommand(Command):
             )
             return []
 
-        structlogger.debug("command_executor.correct_slots", command=self)
+        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(
@@ -285,3 +299,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

@@ -31,8 +31,9 @@ from rasa.dialogue_understanding.stack.frames import (
     BaseFlowStackFrame,
 )
 from rasa.dialogue_understanding.stack.utils import (
-    filled_slots_for_active_flow,
     top_flow_frame,
+    filled_slots_for_active_flow,
+    top_user_flow_frame,
 )
 from rasa.engine.graph import ExecutionContext
 from rasa.shared.constants import (
@@ -113,8 +114,9 @@ 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",
-            commands=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.")
 
@@ -124,8 +126,9 @@ 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",
-            commands=commands,
+            "command_processor.validate_state_of_commands."
+            "free_form_answer_commands_not_at_beginning",
+            commands=[command.__class__.__name__ for command in commands],
         )
         raise ValueError(
             "Free form answer commands must be at start of the predicted command list."
@@ -134,8 +137,9 @@ 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",
-            commands=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.")
 
@@ -218,15 +222,13 @@ 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)
 
     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
         )
@@ -354,19 +356,14 @@ def clean_up_commands(
     """
     domain = domain if domain else Domain.empty()
 
-    slots_so_far, active_flow = 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)}
-    )
+    _, active_flow = filled_slots_for_active_flow(tracker, all_flows)
 
     clean_commands: List[Command] = []
 
     for command in commands:
         if isinstance(command, SetSlotCommand):
             clean_commands = clean_up_slot_command(
-                clean_commands, command, tracker, all_flows, slots_so_far
+                clean_commands, command, tracker, all_flows
             )
 
         elif isinstance(command, CancelFlowCommand) and contains_command(
@@ -422,7 +419,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:
@@ -446,6 +444,25 @@ def clean_up_commands(
     return clean_commands
 
 
+def _get_slots_eligible_for_correction(tracker: DialogueStateTracker) -> Set[str]:
+    """Get all slots that are eligible for correction.
+
+    # We consider all slots, which are not None, that were set in the tracker
+    # eligible for correction.
+    # In the correct_slot_command we will check if a slot should actually be
+    # corrected.
+    """
+    # get all slots that were set in the tracker
+    slots_so_far = set(
+        [event.key for event in tracker.events if isinstance(event, SlotSet)]
+    )
+
+    # filter out slots that are set to None (None = empty value)
+    slots_so_far = {slot for slot in slots_so_far if tracker.get_slot(slot) is not None}
+
+    return slots_so_far
+
+
 def ensure_max_number_of_command_type(
     commands: List[Command], command_type: Type[Command], n: int
 ) -> List[Command]:
@@ -505,7 +522,6 @@ def clean_up_slot_command(
     command: SetSlotCommand,
     tracker: DialogueStateTracker,
     all_flows: FlowsList,
-    slots_so_far: Set[str],
 ) -> List[Command]:
     """Clean up a slot command.
 
@@ -518,16 +534,15 @@ def clean_up_slot_command(
         command: The command to clean up.
         tracker: The dialogue state tracker.
         all_flows: All flows.
-        slots_so_far: The slots that have been filled so far.
 
     Returns:
         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",
@@ -540,6 +555,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):
         cannot_handle = CannotHandleCommand(
             reason="A command generator attempted to set a slot with a value extracted "
@@ -550,7 +566,13 @@ def clean_up_slot_command(
 
         return resulting_commands
 
-    if command.name in slots_so_far and command.name != ROUTE_TO_CALM_SLOT:
+    # get all slots that were set in the tracker and are eligible for correction
+    slots_eligible_for_correction = _get_slots_eligible_for_correction(tracker)
+
+    if (
+        command.name in slots_eligible_for_correction
+        and command.name != ROUTE_TO_CALM_SLOT
+    ):
         current_collect_info = get_current_collect_step(stack, all_flows)
 
         if current_collect_info and current_collect_info.collect == command.name:
@@ -558,49 +580,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)
-        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:
+        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)
+    for c in resulting_commands:
+        if isinstance(c, CorrectSlotsCommand):
+            c.corrected_slots.append(corrected_slot)
+            break
     else:
-        resulting_commands.append(command)
+        resulting_commands.append(CorrectSlotsCommand(corrected_slots=[corrected_slot]))
 
     return resulting_commands
 
@@ -659,8 +703,9 @@ 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=resulting_commands[0],
+            "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,
         )
@@ -736,3 +781,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

@@ -206,14 +206,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/version.py

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

{rasa_pro-3.11.18.dist-info → rasa_pro-3.11.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.11.18
+Version: 3.11.19
 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

{rasa_pro-3.11.18.dist-info → rasa_pro-3.11.19.dist-info}/RECORD

@@ -368,7 +368,7 @@ rasa/dialogue_understanding/commands/change_flow_command.py,sha256=0s3g-3InNZs2e
 rasa/dialogue_understanding/commands/chit_chat_answer_command.py,sha256=jl8em1Xw867VAj5EogeuOjWK93uoT71IhjHU076c2mg,1773
 rasa/dialogue_understanding/commands/clarify_command.py,sha256=OzkqVRZrQo20cveqUoQGZE96DdRLLPgfPxJhroubIQw,2822
 rasa/dialogue_understanding/commands/command.py,sha256=oUP7cZHz2ew6JIrauzfkOntomNvgJfpMBhsuYh7cHo4,2528
-rasa/dialogue_understanding/commands/correct_slots_command.py,sha256=93h5vaaZKCyPQuwrOArQdLXfwcVmCY9oPKcXXwHHFzQ,10039
+rasa/dialogue_understanding/commands/correct_slots_command.py,sha256=BEPhDRxibXtmgayrV2L6APVVMKdlIogj0FDrH5--BGI,11543
 rasa/dialogue_understanding/commands/error_command.py,sha256=w4HMcwzEpLUirmFGXzY2Xu_ZVIdlYRONGOvjr1eod4Q,2428
 rasa/dialogue_understanding/commands/free_form_answer_command.py,sha256=uvQj4IZDgB1MCpoZ7rV8jMf98M_M5ANpja5b4foQSt8,215
 rasa/dialogue_understanding/commands/handle_code_change_command.py,sha256=pKaj8EsD4hw5Ity3bGMpwSb0ui3Fwi1S3XEFakUDP5Y,2184
@@ -420,7 +420,7 @@ rasa/dialogue_understanding/patterns/session_start.py,sha256=yglhIEkkquRf0YppZ4C
 rasa/dialogue_understanding/patterns/skip_question.py,sha256=rvZuVUxulikwUhP01MAIgkcHZ4Si7mzxNedH6QBPdX4,1214
 rasa/dialogue_understanding/patterns/user_silence.py,sha256=uwpCJRkRmeSvFDZQBZnEL4rumweF6mQ8ht_WqrTPVKU,1140
 rasa/dialogue_understanding/processor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rasa/dialogue_understanding/processor/command_processor.py,sha256=E1MLR2pdghBoJ3TWpA-43I3Z3TDZiiyPecbzBcWwPXw,26272
+rasa/dialogue_understanding/processor/command_processor.py,sha256=wW7s8a_D_KdOfLWeNOccGZLOggY07-LBfZuNDQQWna8,29496
 rasa/dialogue_understanding/processor/command_processor_component.py,sha256=rkErI_Uo7s3LsEojUSGSRbWGyGaX7GtGOYSJn0V-TI4,1650
 rasa/dialogue_understanding/stack/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/dialogue_understanding/stack/dialogue_stack.py,sha256=j8MnLCyv6cAZVpKRaUVM-Z5HqgWP-scrnaiQXzLNBwY,5243
@@ -430,7 +430,7 @@ rasa/dialogue_understanding/stack/frames/dialogue_stack_frame.py,sha256=rmG09a66
 rasa/dialogue_understanding/stack/frames/flow_stack_frame.py,sha256=HRlR5YCkoOlI1DWCkgl_ak3YjFQEbmgwvzC16elkK54,5578
 rasa/dialogue_understanding/stack/frames/pattern_frame.py,sha256=EVrYWv5dCP7XTvNV-HqtOOrseP-IkF0jD2_JacAvIYw,235
 rasa/dialogue_understanding/stack/frames/search_frame.py,sha256=rJ9og28k_udUIjP-2Z5xeb_2T5HvCzwDCnxVG9K7lws,728
-rasa/dialogue_understanding/stack/utils.py,sha256=PWA4b1EgRGVZx5uWWa1ZVM45WhJ5tr0C9Md5TA7pxpU,8019
+rasa/dialogue_understanding/stack/utils.py,sha256=w1p4aHGCQr-fb0B1npwSSJFDuqTJ0LCCl2SZws6sJPM,8328
 rasa/e2e_test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/e2e_test/aggregate_test_stats_calculator.py,sha256=XMI7t5xEP7Mo-F8cCCZx2w5ckUKa5sDvyitl6bk6hc8,4924
 rasa/e2e_test/assertions.py,sha256=ofn2CbnW2wR3OZ3-PPmD_07YqlGQ_tWL1TSv95vxKy0,45428
@@ -782,9 +782,9 @@ rasa/utils/train_utils.py,sha256=f1NWpp5y6al0dzoQyyio4hc4Nf73DRoRSHDzEK6-C4E,212
 rasa/utils/url_tools.py,sha256=JQcHL2aLqLHu82k7_d9imUoETCm2bmlHaDpOJ-dKqBc,1218
 rasa/utils/yaml.py,sha256=KjbZq5C94ZP7Jdsw8bYYF7HASI6K4-C_kdHfrnPLpSI,2000
 rasa/validator.py,sha256=O1wjCeV7ITJ0luvb3GCWy8x1fGgzWVbClEMlPnLBowQ,67265
-rasa/version.py,sha256=R2GTBnXJtjPMcBfO4VZ4K5Y8bnCDKXZNa733hyUb6uM,118
-rasa_pro-3.11.18.dist-info/METADATA,sha256=RX51RxspkqamCV9WP3okb88GIe2Olmq__auPJbFVW48,10725
-rasa_pro-3.11.18.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
-rasa_pro-3.11.18.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rasa_pro-3.11.18.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
-rasa_pro-3.11.18.dist-info/RECORD,,
+rasa/version.py,sha256=pmdere9Uxlv-iH9Zkey9rE9fLvCleo8Dv113M6CzMy0,118
+rasa_pro-3.11.19.dist-info/METADATA,sha256=5NFTwELfaCiJSYY2jzOWNJK-_BGfmOp14Ire827htvw,10725
+rasa_pro-3.11.19.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
+rasa_pro-3.11.19.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rasa_pro-3.11.19.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
+rasa_pro-3.11.19.dist-info/RECORD,,