rasa-pro 3.11.15__tar.gz → 3.11.16__tar.gz

{rasa_pro-3.11.15 → rasa_pro-3.11.16}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.11.15"
+version = "3.11.16"
 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>",]
@@ -377,6 +377,7 @@ convention = "google"
 
 
 
+
 [tool.poetry.group.dev.dependencies]
 ruff = ">=0.3.5,<0.4.0"
 docker = "~7.1.0"

{rasa_pro-3.11.15 → rasa_pro-3.11.16}/rasa/core/processor.py

@@ -17,6 +17,9 @@ from rasa.dialogue_understanding.commands import (
     NoopCommand,
     SetSlotCommand,
     CannotHandleCommand,
+    SessionStartCommand,
+    SessionEndCommand,
+    RestartCommand,
 )
 from rasa.engine import loader
 from rasa.engine.constants import (
@@ -855,19 +858,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.11.15 → rasa_pro-3.11.16}/rasa/dialogue_understanding/commands/set_slot_command.py

@@ -6,6 +6,9 @@ from typing import Any, Dict, List
 
 import structlog
 from rasa.dialogue_understanding.commands import Command
+from rasa.dialogue_understanding.commands.utils import (
+    find_default_flows_collecting_slot,
+)
 from rasa.dialogue_understanding.patterns.collect_information import (
     CollectInformationPatternFlowStackFrame,
 )
@@ -135,6 +138,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.11.16/rasa/dialogue_understanding/commands/utils.py

@@ -0,0 +1,26 @@
+from typing import List
+from rasa.shared.core.flows import FlowsList
+
+
+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.11.15 → rasa_pro-3.11.16}/rasa/dialogue_understanding/generator/nlu_command_adapter.py

@@ -8,7 +8,7 @@ from rasa.dialogue_understanding.commands import (
     SetSlotCommand,
 )
 from rasa.dialogue_understanding.commands.set_slot_command import SetSlotExtractor
-from rasa.dialogue_understanding.commands.utils import (
+from rasa.dialogue_understanding.commands.pattern_to_command_mapping import (
     triggerable_pattern_to_command_class,
 )
 from rasa.dialogue_understanding.generator import CommandGenerator

{rasa_pro-3.11.15 → rasa_pro-3.11.16}/rasa/dialogue_understanding/stack/frames/flow_stack_frame.py

@@ -50,7 +50,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:
@@ -104,7 +105,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
@@ -119,9 +121,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.11.15 → rasa_pro-3.11.16}/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.15"
+__version__ = "3.11.16"