rasa-pro 3.12.17__tar.gz → 3.12.18__tar.gz

{rasa_pro-3.12.17 → rasa_pro-3.12.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.12.17
+Version: 3.12.18
 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.12.17 → rasa_pro-3.12.18}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.12.17"
+version = "3.12.18"
 description = "State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development."
 authors = [ "Rasa Technologies GmbH <hi@rasa.com>",]
 maintainers = [ "Tom Bocklisch <tom@rasa.com>",]
@@ -372,6 +372,7 @@ convention = "google"
 
 
 
+
 [tool.poetry.group.dev.dependencies]
 ruff = ">=0.3.5,<0.4.0"
 docker = "~7.1.0"

{rasa_pro-3.12.17 → rasa_pro-3.12.18}/rasa/core/actions/action.py

@@ -1137,15 +1137,12 @@ class ActionSendText(Action):
         tracker: "DialogueStateTracker",
         domain: "Domain",
         metadata: Optional[Dict[Text, Any]] = None,
-        create_bot_uttered_event: bool = True,
     ) -> List[Event]:
         """Runs action. Please see parent class for the full docstring."""
         fallback = {"text": ""}
         metadata_copy = copy.deepcopy(metadata) if metadata else {}
         message = metadata_copy.get("message", fallback)
-        if create_bot_uttered_event:
-            return [create_bot_utterance(message)]
-        return []
+        return [create_bot_utterance(message)]
 
 
 class ActionExtractSlots(Action):

{rasa_pro-3.12.17 → rasa_pro-3.12.18}/rasa/core/processor.py

@@ -34,6 +34,9 @@ from rasa.dialogue_understanding.commands import (
     CannotHandleCommand,
     Command,
     NoopCommand,
+    RestartCommand,
+    SessionEndCommand,
+    SessionStartCommand,
     SetSlotCommand,
 )
 from rasa.dialogue_understanding.commands.utils import (
@@ -880,19 +883,61 @@ class MessageProcessor:
                 tracker.has_coexistence_routing_slot
                 and tracker.get_slot(ROUTE_TO_CALM_SLOT) is None
             ):
-                # if we are currently not routing to either CALM or dm1
-                # we make a sticky routing to CALM if there are any commands
-                # from the trigger intent parsing
-                # or a sticky routing to dm1 if there are no commands
+                # If we are currently not routing to either CALM or DM1:
+                # - Sticky route to CALM if there are any commands
+                #   from the trigger intent parsing
+                # - Sticky route to DM1 if there are no commands present
+                route_to_calm_slot_value = self._determine_route_to_calm_slot_value(
+                    nlu_adapted_commands
+                )
                 commands += [
                     SetSlotCommand(
-                        ROUTE_TO_CALM_SLOT, len(nlu_adapted_commands) > 0
+                        ROUTE_TO_CALM_SLOT, route_to_calm_slot_value
                     ).as_dict()
                 ]
 
         parse_data[COMMANDS] = commands
         return parse_data
 
+    def _determine_route_to_calm_slot_value(
+        self, nlu_adapted_commands: List[Dict[str, Any]]
+    ) -> Optional[bool]:
+        """Determines what value should be assigned to `ROUTE_TO_CALM_SLOT`.
+
+        Returns:
+            - True: If any command other than:
+                - SessionStartCommand
+                - SessionEndCommand
+                - RestartCommand
+              is present.
+            - None: If only ignored system commands are present.
+            - False If no commands at all.
+        """
+        system_commands_to_ignore = [
+            SessionStartCommand.command(),
+            SessionEndCommand.command(),
+            RestartCommand.command(),
+        ]
+
+        # Exclude the system commands, as it doesn't originate from the user's
+        # input intent and shouldn't influence the decision for setting
+        # ROUTE_TO_CALM_SLOT.
+        intent_triggered_commands = [
+            command
+            for command in nlu_adapted_commands
+            if command.get("command") not in system_commands_to_ignore
+        ]
+
+        if len(intent_triggered_commands) > 0:
+            # There are commands other than system commands present - route to CALM
+            return True
+        elif len(nlu_adapted_commands) > 0:
+            # Only system command is present — defer routing decision
+            return None
+        else:
+            # No commands at all — route to DM1
+            return False
+
     def _update_full_retrieval_intent(self, parse_data: Dict[Text, Any]) -> None:
         """Update the parse data with the full retrieval intent.
 

{rasa_pro-3.12.17 → rasa_pro-3.12.18}/rasa/dialogue_understanding/commands/set_slot_command.py

@@ -13,6 +13,7 @@ from rasa.dialogue_understanding.commands.command_syntax_manager import (
 )
 from rasa.dialogue_understanding.commands.utils import (
     clean_extracted_value,
+    find_default_flows_collecting_slot,
     get_nullable_slot_value,
 )
 from rasa.dialogue_understanding.patterns.collect_information import (
@@ -136,6 +137,11 @@ class SetSlotCommand(Command):
         ):
             # Get the other predicted flows from the most recent message on the tracker.
             predicted_flows = get_flows_predicted_to_start_from_tracker(tracker)
+            if not predicted_flows:
+                # If no predicted flows, check for default flows collecting the slot.
+                predicted_flows = find_default_flows_collecting_slot(
+                    self.name, all_flows
+                )
             use_slot_fill = any(
                 step.collect == self.name and not step.ask_before_filling
                 for flow in all_flows.underlying_flows

{rasa_pro-3.12.17 → rasa_pro-3.12.18}/rasa/dialogue_understanding/commands/utils.py

@@ -7,18 +7,18 @@ from rasa.dialogue_understanding.patterns.validate_slot import (
 )
 from rasa.shared.constants import ACTION_ASK_PREFIX, UTTER_ASK_PREFIX
 from rasa.shared.core.events import Event, SlotSet
+from rasa.shared.core.flows import FlowsList
 from rasa.shared.core.slots import Slot
 from rasa.shared.core.trackers import DialogueStateTracker
 
 if TYPE_CHECKING:
     from rasa.dialogue_understanding.commands import StartFlowCommand
-    from rasa.shared.core.flows import FlowsList
 
 structlogger = structlog.get_logger()
 
 
 def start_flow_by_name(
-    flow_name: str, flows: "FlowsList"
+    flow_name: str, flows: FlowsList
 ) -> Optional["StartFlowCommand"]:
     from rasa.dialogue_understanding.commands import StartFlowCommand
 
@@ -126,3 +126,27 @@ def create_validate_frames_from_slot_set_events(
             validate_frames.append(frame)
 
     return tracker, validate_frames
+
+
+def find_default_flows_collecting_slot(
+    slot_name: str, all_flows: FlowsList
+) -> List[str]:
+    """Find default flows that have collect steps matching the specified slot name.
+
+    Args:
+        slot_name: The name of the slot to search for.
+        all_flows: All flows in the assistant.
+
+    Returns:
+        List of flow IDs for default flows that collect the specified slot
+        without asking before filling.
+    """
+    return [
+        flow.id
+        for flow in all_flows.underlying_flows
+        if flow.is_rasa_default_flow
+        and any(
+            step.collect == slot_name and not step.ask_before_filling
+            for step in flow.get_collect_steps()
+        )
+    ]

{rasa_pro-3.12.17 → rasa_pro-3.12.18}/rasa/dialogue_understanding/stack/frames/flow_stack_frame.py

@@ -53,7 +53,8 @@ class FlowStackFrameType(str, Enum):
             typ: The string to create the `FlowStackFrameType` from.
 
         Returns:
-            The created `FlowStackFrameType`."""
+        The created `FlowStackFrameType`.
+        """
         if typ is None:
             return FlowStackFrameType.REGULAR
         elif typ == FlowStackFrameType.INTERRUPT.value:
@@ -107,7 +108,8 @@ class BaseFlowStackFrame(DialogueStackFrame):
             all_flows: All flows in the assistant.
 
         Returns:
-            The current flow."""
+        The current flow.
+        """
         flow = all_flows.flow_by_id(self.flow_id)
         if not flow:
             # we shouldn't ever end up with a frame that belongs to a non
@@ -122,9 +124,20 @@ class BaseFlowStackFrame(DialogueStackFrame):
             all_flows: All flows in the assistant.
 
         Returns:
-            The current flow step."""
+            The current flow step.
+        """
         flow = self.flow(all_flows)
-        step = flow.step_by_id(self.step_id)
+
+        step_id = self.step_id
+        # in 3.11.4 we added the flow_id as a prefix to the step_id
+        # this causes issues when loading old dialogues as the prefix is missing
+        # (see https://rasahq.atlassian.net/jira/software/c/projects/ENG/boards/43?selectedIssue=ENG-1939)
+        # so we try to find the step by adding the flow prefix to old step_ids as well
+        # TODO: remove this in 4.0.0
+        alternative_step_id = f"{self.flow_id}_{self.step_id}"
+
+        step = flow.step_by_id(step_id) or flow.step_by_id(alternative_step_id)
+
         if not step:
             # we shouldn't ever end up with a frame that belongs to a non
             # existing step, but if we do, we should raise an error

{rasa_pro-3.12.17 → rasa_pro-3.12.18}/rasa/dialogue_understanding/utils.py

@@ -1,7 +1,9 @@
 from contextlib import contextmanager
 from typing import Any, Dict, Generator, List, Optional, Text
 
-from rasa.dialogue_understanding.commands import Command
+import structlog
+
+from rasa.dialogue_understanding.commands import Command, NoopCommand, SetSlotCommand
 from rasa.dialogue_understanding.constants import (
     RASA_RECORD_COMMANDS_AND_PROMPTS_ENV_VAR_NAME,
 )
@@ -16,7 +18,6 @@ from rasa.shared.nlu.constants import (
     KEY_USER_PROMPT,
     PREDICTED_COMMANDS,
     PROMPTS,
-    SET_SLOT_COMMAND,
 )
 from rasa.shared.nlu.training_data.message import Message
 from rasa.shared.providers.llm.llm_response import LLMResponse
@@ -26,6 +27,8 @@ record_commands_and_prompts = get_bool_env_variable(
     RASA_RECORD_COMMANDS_AND_PROMPTS_ENV_VAR_NAME, False
 )
 
+structlogger = structlog.get_logger()
+
 
 @contextmanager
 def set_record_commands_and_prompts() -> Generator:
@@ -144,21 +147,74 @@ def _handle_via_nlu_in_coexistence(
     if not tracker:
         return False
 
+    commands = message.get(COMMANDS, [])
+
+    # If coexistence routing slot is not active, this setup doesn't
+    # support dual routing -> default to CALM
     if not tracker.has_coexistence_routing_slot:
+        structlogger.debug(
+            "utils.handle_via_nlu_in_coexistence"
+            ".tracker_missing_route_session_to_calm_slot",
+            event_info=(
+                f"Tracker doesn't have the '{ROUTE_TO_CALM_SLOT}' slot."
+                f"Routing to CALM."
+            ),
+            route_session_to_calm=commands,
+        )
         return False
 
+    # Check if the routing decision is stored in the tracker slot
+    # If slot is true -> route to CALM
+    # If slot is false -> route to DM1
     value = tracker.get_slot(ROUTE_TO_CALM_SLOT)
     if value is not None:
+        structlogger.debug(
+            "utils.handle_via_nlu_in_coexistence"
+            ".tracker_route_session_to_calm_slot_value",
+            event_info=(
+                f"Tracker slot '{ROUTE_TO_CALM_SLOT}' set to '{value}'. "
+                f"Routing to "
+                f"{'CALM' if value else 'NLU system'}."
+            ),
+            route_session_to_calm_value_in_tracker=value,
+        )
         return not value
 
-    # routing slot has been reset so we need to check
-    # the command issued by the Router component
-    if message.get(COMMANDS):
-        for command in message.get(COMMANDS):
-            if (
-                command.get("command") == SET_SLOT_COMMAND
-                and command.get("name") == ROUTE_TO_CALM_SLOT
-            ):
-                return not command.get("value")
-
+    # Non-sticky routing to DM1 is only allowed if NoopCommand is the sole predicted
+    # command. In that case, route to DM1
+    if len(commands) == 1 and commands[0].get("command") == NoopCommand.command():
+        structlogger.debug(
+            "utils.handle_via_nlu_in_coexistence.noop_command_detected",
+            event_info="NoopCommand found. Routing to NLU system non-sticky.",
+            commands=commands,
+        )
+        return True
+
+    # If the slot was reset (e.g. new session), try to infer routing from
+    # attached commands. Look for a SetSlotCommand targeting the ROUTE_TO_CALM_SLOT
+    for command in message.get(COMMANDS, []):
+        # If slot is true -> route to CALM
+        # If slot is false -> route to DM1
+        if (
+            command.get("command") == SetSlotCommand.command()
+            and command.get("name") == ROUTE_TO_CALM_SLOT
+        ):
+            structlogger.debug(
+                "utils.handle_via_nlu_in_coexistence.set_slot_command_detected",
+                event_info=(
+                    f"SetSlotCommand setting the '{ROUTE_TO_CALM_SLOT}' to "
+                    f"'{command.get('value')}'. "
+                    f"Routing to "
+                    f"{'CALM' if command.get('value') else 'NLU system'}."
+                ),
+                commands=commands,
+            )
+            return not command.get("value")
+
+    # If no routing info is available -> default to CALM
+    structlogger.debug(
+        "utils.handle_via_nlu_in_coexistence.no_routing_info_available",
+        event_info="No routing info available. Routing to CALM.",
+        commands=commands,
+    )
     return False

{rasa_pro-3.12.17 → rasa_pro-3.12.18}/rasa/dialogue_understanding_test/du_test_schema.yml

@@ -5,12 +5,12 @@ mapping:
     sequence:
       - type: map
         mapping:
-          regex;(^[a-zA-Z_]+[a-zA-Z0-9_]*$):
+          regex;(^[a-zA-Z_]+[a-zA-Z0-9_\-]*$):
             type: "seq"
             sequence:
               - type: map
                 mapping:
-                  regex;(^[a-zA-Z_]+[a-zA-Z0-9_]*$):
+                  regex;(^[a-zA-Z_]+[a-zA-Z0-9_\-]*$):
                     type: any
 
   metadata:
@@ -129,7 +129,7 @@ mapping:
             type: "seq"
             sequence:
               - type: "str"
-                pattern: ^[a-zA-Z_]+[a-zA-Z0-9_]*$
+                pattern: ^[a-zA-Z_]+[a-zA-Z0-9_\-]*$
           metadata:
             type: "str"
             pattern: ^[a-zA-Z_]+[a-zA-Z0-9_]*$

{rasa_pro-3.12.17 → rasa_pro-3.12.18}/rasa/e2e_test/e2e_test_schema.yml

@@ -5,12 +5,12 @@ mapping:
     sequence:
       - type: map
         mapping:
-          regex;(^[a-zA-Z_]+[a-zA-Z0-9_]*$):
+          regex;(^[a-zA-Z_]+[a-zA-Z0-9_\-]*$):
             type: "seq"
             sequence:
               - type: map
                 mapping:
-                  regex;(^[a-zA-Z_]+[a-zA-Z0-9_]*$):
+                  regex;(^[a-zA-Z_]+[a-zA-Z0-9_\-]*$):
                     type: any
 
   metadata:
@@ -129,7 +129,7 @@ mapping:
             type: "seq"
             sequence:
               - type: "str"
-                pattern: ^[a-zA-Z_]+[a-zA-Z0-9_]*$
+                pattern: ^[a-zA-Z_]+[a-zA-Z0-9_\-]*$
           metadata:
             type: "str"
             pattern: ^[a-zA-Z_]+[a-zA-Z0-9_]*$

{rasa_pro-3.12.17 → rasa_pro-3.12.18}/rasa/version.py

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