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

rasa/cli/run.py

@@ -64,12 +64,16 @@ def run_actions(args: argparse.Namespace) -> None:
 
 def _validate_model_path(model_path: Text, parameter: Text, default: Text) -> Text:
     if model_path is not None and not os.path.exists(model_path):
-        reason_str = f"'{model_path}' not found."
-        if model_path is None:
-            reason_str = f"Parameter '{parameter}' not set."
-
-        logger.debug(f"{reason_str} Using default location '{default}' instead.")
-
+        raise ModelNotFound(
+            f"The provided model path '{model_path}' could not be found. "
+            "Provide an existing model path."
+        )
+
+    if model_path is None:
+        logger.debug(
+            f"Parameter '{parameter}' not set. "
+            "Using default location '{default}' instead."
+        )
         os.makedirs(default, exist_ok=True)
         model_path = default
 

rasa/cli/utils.py

@@ -14,6 +14,7 @@ import structlog
 import rasa.shared.utils.cli
 import rasa.shared.utils.io
 from rasa import telemetry
+from rasa.exceptions import ModelNotFound
 from rasa.shared.constants import (
     ASSISTANT_ID_DEFAULT_VALUE,
     ASSISTANT_ID_KEY,
@@ -77,6 +78,12 @@ def get_validated_path(
     if current and os.path.exists(current):
         return current
 
+    if parameter == "model":
+        raise ModelNotFound(
+            f"The provided model path '{current}' could not be found. "
+            "Provide an existing model path."
+        )
+
     # try to find a valid option among the defaults
     if isinstance(default, str) or isinstance(default, Path):
         default_options = [str(default)]

rasa/core/actions/action.py

@@ -105,10 +105,6 @@ logger = logging.getLogger(__name__)
 def default_actions(action_endpoint: Optional[EndpointConfig] = None) -> List["Action"]:
     """List default actions."""
     from rasa.core.actions.action_clean_stack import ActionCleanStack
-    from rasa.core.actions.action_handle_digressions import (
-        ActionBlockDigressions,
-        ActionContinueDigression,
-    )
     from rasa.core.actions.action_hangup import ActionHangup
     from rasa.core.actions.action_repeat_bot_messages import ActionRepeatBotMessages
     from rasa.core.actions.action_run_slot_rejections import ActionRunSlotRejections
@@ -143,8 +139,6 @@ def default_actions(action_endpoint: Optional[EndpointConfig] = None) -> List["A
         ActionResetRouting(),
         ActionHangup(),
         ActionRepeatBotMessages(),
-        ActionBlockDigressions(),
-        ActionContinueDigression(),
     ]
 
 

rasa/core/channels/voice_ready/audiocodes.py

@@ -115,11 +115,21 @@ class Conversation:
     async def handle_activities(
         self,
         message: Dict[Text, Any],
+        input_channel_name: str,
         output_channel: OutputChannel,
         on_new_message: Callable[[UserMessage], Awaitable[Any]],
     ) -> None:
         """Handle activities sent by Audiocodes."""
         structlogger.debug("audiocodes.handle.activities")
+        if input_channel_name == "":
+            structlogger.warning(
+                "audiocodes.handle.activities.empty_input_channel_name",
+                event_info=(
+                    "Audiocodes input channel name is empty "
+                    f"for conversation {self.conversation_id}"
+                ),
+            )
+
         for activity in message["activities"]:
             text = None
             if activity[ACTIVITY_ID_KEY] in self.activity_ids:
@@ -143,6 +153,7 @@ class Conversation:
             metadata = self.get_metadata(activity)
             user_msg = UserMessage(
                 text=text,
+                input_channel=input_channel_name,
                 output_channel=output_channel,
                 sender_id=self.conversation_id,
                 metadata=metadata,
@@ -394,7 +405,12 @@ class AudiocodesInput(InputChannel):
             # start a background task to handle activities
             self._create_task(
                 conversation_id,
-                conversation.handle_activities(request.json, ac_output, on_new_message),
+                conversation.handle_activities(
+                    request.json,
+                    input_channel_name=self.name(),
+                    output_channel=ac_output,
+                    on_new_message=on_new_message,
+                ),
             )
             return response.json(response_json)
 
@@ -407,23 +423,9 @@ class AudiocodesInput(InputChannel):
             Example of payload:
             {"conversation": <conversation_id>, "reason": Optional[Text]}.
             """
-            self._get_conversation(request.token, conversation_id)
-            reason = {"reason": request.json.get("reason")}
-            await on_new_message(
-                UserMessage(
-                    text=f"{INTENT_MESSAGE_PREFIX}session_end",
-                    output_channel=None,
-                    sender_id=conversation_id,
-                    metadata=reason,
-                )
-            )
-            del self.conversations[conversation_id]
-            structlogger.debug(
-                "audiocodes.disconnect",
-                conversation=conversation_id,
-                request=request.json,
+            return await self._handle_disconnect(
+                request, conversation_id, on_new_message
             )
-            return response.json({})
 
         @ac_webhook.route("/conversation/<conversation_id>/keepalive", methods=["POST"])
         async def keepalive(request: Request, conversation_id: Text) -> HTTPResponse:
@@ -438,6 +440,32 @@ class AudiocodesInput(InputChannel):
 
         return ac_webhook
 
+    async def _handle_disconnect(
+        self,
+        request: Request,
+        conversation_id: Text,
+        on_new_message: Callable[[UserMessage], Awaitable[Any]],
+    ) -> HTTPResponse:
+        """Triggered when the call is disconnected."""
+        self._get_conversation(request.token, conversation_id)
+        reason = {"reason": request.json.get("reason")}
+        await on_new_message(
+            UserMessage(
+                text=f"{INTENT_MESSAGE_PREFIX}session_end",
+                input_channel=self.name(),
+                output_channel=None,
+                sender_id=conversation_id,
+                metadata=reason,
+            )
+        )
+        del self.conversations[conversation_id]
+        structlogger.debug(
+            "audiocodes.disconnect",
+            conversation=conversation_id,
+            request=request.json,
+        )
+        return response.json({})
+
 
 class AudiocodesOutput(OutputChannel):
     @classmethod
@@ -445,6 +473,7 @@ class AudiocodesOutput(OutputChannel):
         return CHANNEL_NAME
 
     def __init__(self) -> None:
+        super().__init__()
         self.messages: List[Dict] = []
 
     async def add_message(self, message: Dict) -> None:

rasa/core/policies/flows/flow_executor.py

@@ -23,7 +23,6 @@ from rasa.core.policies.flows.flow_step_result import (
 )
 from rasa.dialogue_understanding.commands import CancelFlowCommand
 from rasa.dialogue_understanding.patterns.cancel import CancelPatternFlowStackFrame
-from rasa.dialogue_understanding.patterns.clarify import ClarifyPatternFlowStackFrame
 from rasa.dialogue_understanding.patterns.collect_information import (
     CollectInformationPatternFlowStackFrame,
 )
@@ -51,7 +50,6 @@ from rasa.dialogue_understanding.stack.frames.flow_stack_frame import (
 )
 from rasa.dialogue_understanding.stack.utils import (
     top_user_flow_frame,
-    user_flows_on_the_stack,
 )
 from rasa.shared.constants import RASA_PATTERN_HUMAN_HANDOFF
 from rasa.shared.core.constants import (
@@ -280,33 +278,6 @@ def trigger_pattern_continue_interrupted(
     return events
 
 
-def trigger_pattern_clarification(
-    current_frame: DialogueStackFrame, stack: DialogueStack, flows: FlowsList
-) -> None:
-    """Trigger the pattern to clarify which topic to continue if needed."""
-    if not isinstance(current_frame, UserFlowStackFrame):
-        return None
-
-    if current_frame.frame_type in [
-        FlowStackFrameType.CALL,
-        FlowStackFrameType.INTERRUPT,
-    ]:
-        # we want to return to the flow that called
-        # the current flow or the flow that was interrupted
-        # by the current flow
-        return None
-
-    pending_flows = [
-        flows.flow_by_id(frame.flow_id)
-        for frame in stack.frames
-        if isinstance(frame, UserFlowStackFrame)
-        and frame.flow_id != current_frame.flow_id
-    ]
-
-    flow_names = [flow.readable_name() for flow in pending_flows if flow is not None]
-    stack.push(ClarifyPatternFlowStackFrame(names=flow_names))
-
-
 def trigger_pattern_completed(
     current_frame: DialogueStackFrame, stack: DialogueStack, flows: FlowsList
 ) -> None:
@@ -675,15 +646,9 @@ def _run_end_step(
     structlogger.debug("flow.step.run.flow_end")
     current_frame = stack.pop()
     trigger_pattern_completed(current_frame, stack, flows)
-    resumed_events = []
-    if len(user_flows_on_the_stack(stack)) > 1:
-        # if there are more user flows on the stack,
-        # we need to trigger the pattern clarify
-        trigger_pattern_clarification(current_frame, stack, flows)
-    else:
-        resumed_events = trigger_pattern_continue_interrupted(
-            current_frame, stack, flows, tracker
-        )
+    resumed_events = trigger_pattern_continue_interrupted(
+        current_frame, stack, flows, tracker
+    )
     reset_events: List[Event] = reset_scoped_slots(current_frame, flow, tracker)
     return ContinueFlowWithNextStep(
         events=initial_events + reset_events + resumed_events, has_flow_ended=True

rasa/core/processor.py

@@ -76,6 +76,7 @@ from rasa.shared.core.constants import (
     SLOT_SILENCE_TIMEOUT,
     USER_INTENT_RESTART,
     USER_INTENT_SILENCE_TIMEOUT,
+    SetSlotExtractor,
 )
 from rasa.shared.core.events import (
     ActionExecuted,
@@ -766,13 +767,26 @@ class MessageProcessor:
         if self.http_interpreter:
             parse_data = await self.http_interpreter.parse(message)
         else:
-            regex_reader = create_regex_pattern_reader(message, self.domain)
-
             processed_message = Message({TEXT: message.text})
-            if regex_reader:
-                processed_message = regex_reader.unpack_regex_message(
-                    message=processed_message, domain=self.domain
+
+            all_flows = await self.get_flows()
+            should_force_slot_command, slot_name = (
+                rasa.core.utils.should_force_slot_filling(tracker, all_flows)
+            )
+
+            if should_force_slot_command:
+                command = SetSlotCommand(
+                    name=slot_name,
+                    value=message.text,
+                    extractor=SetSlotExtractor.COMMAND_PAYLOAD_READER.value,
                 )
+                processed_message.set(COMMANDS, [command.as_dict()], add_to_output=True)
+            else:
+                regex_reader = create_regex_pattern_reader(message, self.domain)
+                if regex_reader:
+                    processed_message = regex_reader.unpack_regex_message(
+                        message=processed_message, domain=self.domain
+                    )
 
             # Invalid use of slash syntax, sanitize the message before passing
             # it to the graph

rasa/core/utils.py

@@ -19,6 +19,7 @@ from rasa.core.constants import (
 )
 from rasa.core.lock_store import InMemoryLockStore, LockStore, RedisLockStore
 from rasa.shared.constants import DEFAULT_ENDPOINTS_PATH, TCP_PROTOCOL
+from rasa.shared.core.constants import SlotMappingType
 from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.utils.endpoints import (
     EndpointConfig,
@@ -30,6 +31,7 @@ from rasa.utils.io import write_yaml
 if TYPE_CHECKING:
     from rasa.core.nlg import NaturalLanguageGenerator
     from rasa.shared.core.domain import Domain
+    from rasa.shared.core.flows.flows_list import FlowsList
 
 structlogger = structlog.get_logger()
 
@@ -364,3 +366,54 @@ def add_bot_utterance_metadata(
         ]
 
     return message
+
+
+def should_force_slot_filling(
+    tracker: Optional[DialogueStateTracker], flows: "FlowsList"
+) -> Tuple[bool, Optional[str]]:
+    """Check if the flow should force slot filling.
+
+    This is only valid when the flow is at a collect information step which
+    has set `force_slot_filling` to true and the slot has a valid `from_text` mapping.
+
+    Args:
+        tracker: The dialogue state tracker.
+        flows: The list of flows.
+
+    Returns:
+        A tuple of a boolean indicating if the flow should force slot filling
+        and the name of the slot if applicable.
+    """
+    from rasa.dialogue_understanding.processor.command_processor import (
+        get_current_collect_step,
+    )
+
+    if tracker is None:
+        structlogger.error(
+            "slot.force_slot_filling.error",
+            event_info="Tracker is None. Cannot force slot filling.",
+        )
+        return False, None
+
+    stack = tracker.stack
+    step = get_current_collect_step(stack, flows)
+    if step is None or not step.force_slot_filling:
+        return False, None
+
+    slot_name = step.collect
+    slot = tracker.slots.get(slot_name)
+
+    if not slot:
+        structlogger.debug(
+            "slot.force_slot_filling.error",
+            event_info=f"Slot '{slot_name}' not found in tracker. "
+            f"Cannot force slot filling. "
+            f"Please check if the slot is defined in the domain.",
+        )
+        return False, None
+
+    for slot_mapping in slot.mappings:
+        if slot_mapping.type == SlotMappingType.FROM_TEXT:
+            return True, slot_name
+
+    return False, None

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
@@ -610,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,