rasa-pro 3.12.6.dev2__py3-none-any.whl → 3.12.7.dev1__py3-none-any.whl

rasa/dialogue_understanding/commands/cancel_flow_command.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import copy
 import re
 from dataclasses import dataclass
 from typing import Any, Dict, List
@@ -13,10 +12,11 @@ from rasa.dialogue_understanding.commands.command_syntax_manager import (
     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.flow_stack_frame import FlowStackFrameType
+from rasa.dialogue_understanding.stack.frames.flow_stack_frame import (
+    FlowStackFrameType,
+    UserFlowStackFrame,
+)
 from rasa.dialogue_understanding.stack.utils import top_user_flow_frame
 from rasa.shared.core.events import Event, FlowCancelled
 from rasa.shared.core.flows import FlowsList
@@ -95,8 +95,6 @@ class CancelFlowCommand(Command):
         original_stack = original_tracker.stack
 
         applied_events: List[Event] = []
-        # capture the top frame before we push new frames onto the stack
-        initial_top_frame = stack.top()
         user_frame = top_user_flow_frame(original_stack)
         current_flow = user_frame.flow(all_flows) if user_frame else None
 
@@ -123,21 +121,6 @@ class CancelFlowCommand(Command):
         if user_frame:
             applied_events.append(FlowCancelled(user_frame.flow_id, user_frame.step_id))
 
-        if initial_top_frame and isinstance(
-            initial_top_frame, ClarifyPatternFlowStackFrame
-        ):
-            structlogger.debug(
-                "command_executor.cancel_flow.cancel_clarification_options",
-                clarification_options=initial_top_frame.clarification_options,
-            )
-            applied_events += cancel_all_pending_clarification_options(
-                initial_top_frame,
-                original_stack,
-                canceled_frames,
-                all_flows,
-                stack,
-            )
-
         return applied_events + tracker.create_stack_updated_events(stack)
 
     def __hash__(self) -> int:
@@ -172,41 +155,3 @@ class CancelFlowCommand(Command):
             CommandSyntaxManager.get_syntax_version(),
             mapper[CommandSyntaxManager.get_default_syntax_version()],
         )
-
-
-def cancel_all_pending_clarification_options(
-    initial_top_frame: ClarifyPatternFlowStackFrame,
-    original_stack: DialogueStack,
-    canceled_frames: List[str],
-    all_flows: FlowsList,
-    stack: DialogueStack,
-) -> List[FlowCancelled]:
-    """Cancel all pending clarification options.
-
-    This is a special case when the assistant asks the user to clarify
-    which pending digression flow to start after the completion of an active flow.
-    If the user chooses to cancel all options, this function takes care of
-    updating the stack by removing all pending flow stack frames
-    listed as clarification options.
-    """
-    clarification_names = set(initial_top_frame.names)
-    to_be_canceled_frames = []
-    applied_events = []
-    for frame in reversed(original_stack.frames):
-        if frame.frame_id in canceled_frames:
-            continue
-
-        to_be_canceled_frames.append(frame.frame_id)
-        if isinstance(frame, UserFlowStackFrame):
-            readable_flow_name = frame.flow(all_flows).readable_name()
-            if readable_flow_name in clarification_names:
-                stack.push(
-                    CancelPatternFlowStackFrame(
-                        canceled_name=readable_flow_name,
-                        canceled_frames=copy.deepcopy(to_be_canceled_frames),
-                    )
-                )
-                applied_events.append(FlowCancelled(frame.flow_id, frame.step_id))
-                to_be_canceled_frames.clear()
-
-    return applied_events

rasa/dialogue_understanding/commands/start_flow_command.py

@@ -11,11 +11,6 @@ from rasa.dialogue_understanding.commands.command_syntax_manager import (
     CommandSyntaxManager,
     CommandSyntaxVersion,
 )
-from rasa.dialogue_understanding.patterns.clarify import FLOW_PATTERN_CLARIFICATION
-from rasa.dialogue_understanding.patterns.continue_interrupted import (
-    ContinueInterruptedPatternFlowStackFrame,
-)
-from rasa.dialogue_understanding.stack.dialogue_stack import DialogueStack
 from rasa.dialogue_understanding.stack.frames.flow_stack_frame import (
     FlowStackFrameType,
     UserFlowStackFrame,
@@ -77,10 +72,6 @@ class StartFlowCommand(Command):
         applied_events: List[Event] = []
 
         if self.flow in user_flows_on_the_stack(stack):
-            top_frame = stack.top()
-            if top_frame is not None and top_frame.type() == FLOW_PATTERN_CLARIFICATION:
-                return self.change_flow_frame_position_in_the_stack(stack, tracker)
-
             structlogger.debug(
                 "command_executor.skip_command.already_started_flow", command=self
             )
@@ -149,35 +140,3 @@ class StartFlowCommand(Command):
             CommandSyntaxManager.get_syntax_version(),
             mapper[CommandSyntaxManager.get_default_syntax_version()],
         )
-
-    def change_flow_frame_position_in_the_stack(
-        self, stack: DialogueStack, tracker: DialogueStateTracker
-    ) -> List[Event]:
-        """Changes the position of the flow frame in the stack.
-
-        This is a special case when pattern clarification is the active flow and
-        the same flow is selected to start. In this case, the existing flow frame
-        should be moved up in the stack.
-        """
-        frames = stack.frames[:]
-
-        for idx, frame in enumerate(frames):
-            if isinstance(frame, UserFlowStackFrame) and frame.flow_id == self.flow:
-                structlogger.debug(
-                    "command_executor.change_flow_position_during_clarification",
-                    command=self,
-                    index=idx,
-                )
-                # pop the continue interrupted flow frame if it exists
-                next_frame = frames[idx + 1] if idx + 1 < len(frames) else None
-                if (
-                    isinstance(next_frame, ContinueInterruptedPatternFlowStackFrame)
-                    and next_frame.previous_flow_name == self.flow
-                ):
-                    stack.frames.pop(idx + 1)
-                # move up the existing flow from the stack
-                stack.frames.pop(idx)
-                stack.push(frame)
-                return tracker.create_stack_updated_events(stack)
-
-        return []

rasa/dialogue_understanding/generator/command_generator.py

@@ -4,6 +4,7 @@ from typing import Any, Dict, List, Optional, Set, Text, Tuple
 import structlog
 
 from rasa.dialogue_understanding.commands import (
+    CannotHandleCommand,
     Command,
     CorrectSlotsCommand,
     ErrorCommand,
@@ -107,6 +108,14 @@ class CommandGenerator:
             commands = self._check_commands_against_startable_flows(
                 commands, startable_flows
             )
+
+            # During force slot filling, keep only the command that sets the
+            # slot asked by the active collect step.
+            # Or return a CannotHandleCommand if no matching command is found.
+            commands = self._filter_commands_during_force_slot_filling(
+                commands, available_flows, tracker
+            )
+
             commands_dicts = [command.as_dict() for command in commands]
             message.set(COMMANDS, commands_dicts, add_to_output=True)
 
@@ -370,6 +379,64 @@ class CommandGenerator:
             Command.command_from_json(command) for command in message.get(COMMANDS, [])
         ]
 
+    @staticmethod
+    def _filter_commands_during_force_slot_filling(
+        commands: List[Command],
+        available_flows: FlowsList,
+        tracker: Optional[DialogueStateTracker] = None,
+    ) -> List[Command]:
+        """Filter commands during a collect step that has set `force_slot_filling`.
+
+        Args:
+            commands: The commands to filter.
+            available_flows: The available flows.
+            tracker: The tracker.
+
+        Returns:
+            The filtered commands.
+        """
+        from rasa.dialogue_understanding.processor.command_processor import (
+            get_current_collect_step,
+        )
+
+        if tracker is None:
+            structlogger.error(
+                "command_generator.filter_commands_during_force_slot_filling.tracker_not_found",
+            )
+            return commands
+
+        stack = tracker.stack
+        step = get_current_collect_step(stack, available_flows)
+
+        if step is None or not step.force_slot_filling:
+            return commands
+
+        # Retain only the command that sets the slot asked by
+        # the active collect step
+        filtered_commands: List[Command] = [
+            command
+            for command in commands
+            if (isinstance(command, SetSlotCommand) and command.name == step.collect)
+        ]
+
+        if not filtered_commands:
+            # If no commands were predicted, we need to return a CannotHandleCommand
+            structlogger.debug(
+                "command_generator.filter_commands_during_force_slot_filling.no_commands",
+                event_info=f"The command generator did not find any SetSlot "
+                f"command at the collect step for the slot '{step.collect}'. "
+                f"Returning a CannotHandleCommand instead.",
+            )
+            return [CannotHandleCommand()]
+
+        structlogger.debug(
+            "command_generator.filter_commands_during_force_slot_filling.filtered_commands",
+            slot_name=step.collect,
+            filtered_commands=filtered_commands,
+        )
+
+        return filtered_commands
+
 
 def gather_slot_names(commands: List[Command]) -> Set[str]:
     """Gather all slot names from the commands."""

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
@@ -49,7 +46,6 @@ from rasa.shared.utils.llm import (
     llm_factory,
     resolve_model_client_config,
 )
-from rasa.utils.licensing import get_human_readable_licence_owner
 from rasa.utils.log_utils import log_llm
 
 structlogger = structlog.get_logger()
@@ -93,8 +89,6 @@ class LLMBasedCommandGenerator(
         else:
             self.flow_retrieval = None
 
-        self.user_id = get_human_readable_licence_owner()
-
     ### Abstract methods
     @staticmethod
     @abstractmethod
@@ -334,9 +328,7 @@ class LLMBasedCommandGenerator(
 
     @measure_llm_latency
     async def invoke_llm(
-        self,
-        prompt: Union[List[dict], List[str], str],
-        metadata: Optional[Dict[str, Any]] = None,
+        self, prompt: Union[List[dict], List[str], str]
     ) -> Optional[LLMResponse]:
         """Use LLM to generate a response.
 
@@ -349,7 +341,6 @@ class LLMBasedCommandGenerator(
                 - a list of messages. Each message is a string and will be formatted
                     as a user message.
                 - a single message as a string which will be formatted as user message.
-            metadata: Optional metadata to be passed to the LLM call.
 
         Returns:
             An LLMResponse object.
@@ -361,7 +352,7 @@ class LLMBasedCommandGenerator(
             self.config.get(LLM_CONFIG_KEY), self.get_default_llm_config()
         )
         try:
-            return await llm.acompletion(prompt, metadata)
+            return await llm.acompletion(prompt)
         except Exception as e:
             # unfortunately, langchain does not wrap LLM exceptions which means
             # we have to catch all exceptions here
@@ -616,16 +607,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/llm_command_generator.py

@@ -55,9 +55,7 @@ class LLMCommandGenerator(SingleStepLLMCommandGenerator):
         )
 
     async def invoke_llm(
-        self,
-        prompt: Union[List[dict], List[str], str],
-        metadata: Optional[Dict[str, Any]] = None,
+        self, prompt: Union[List[dict], List[str], str]
     ) -> Optional[LLMResponse]:
         try:
             return await super().invoke_llm(prompt)

rasa/dialogue_understanding/generator/single_step/compact_llm_command_generator.py

@@ -47,10 +47,6 @@ from rasa.shared.constants import (
     AWS_BEDROCK_PROVIDER,
     AZURE_OPENAI_PROVIDER,
     EMBEDDINGS_CONFIG_KEY,
-    LANGFUSE_CUSTOM_METADATA_DICT,
-    LANGFUSE_METADATA_SESSION_ID,
-    LANGFUSE_METADATA_USER_ID,
-    LANGFUSE_TAGS,
     MAX_TOKENS_CONFIG_KEY,
     PROMPT_TEMPLATE_CONFIG_KEY,
     ROUTE_TO_CALM_SLOT,
@@ -366,14 +362,7 @@ class CompactLLMCommandGenerator(LLMBasedCommandGenerator):
             prompt=flow_prompt,
         )
 
-        metadata = {
-            LANGFUSE_METADATA_USER_ID: self.user_id,
-            LANGFUSE_METADATA_SESSION_ID: tracker.sender_id if tracker else "",
-            LANGFUSE_CUSTOM_METADATA_DICT: {"component": self.__class__.__name__},
-            LANGFUSE_TAGS: [self.__class__.__name__],
-        }
-
-        response = await self.invoke_llm(flow_prompt, metadata)
+        response = await self.invoke_llm(flow_prompt)
         llm_response = LLMResponse.ensure_llm_response(response)
         # The check for 'None' maintains compatibility with older versions
         # of LLMCommandGenerator. In previous implementations, 'invoke_llm'

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: