rasa-pro 3.11.15__py3-none-any.whl → 3.11.16__py3-none-any.whl

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/dialogue_understanding/commands/pattern_to_command_mapping.py

@@ -0,0 +1,45 @@
+from typing import Dict, Type
+
+from rasa.dialogue_understanding.commands import (
+    CancelFlowCommand,
+    CannotHandleCommand,
+    ChitChatAnswerCommand,
+    Command,
+    HumanHandoffCommand,
+    KnowledgeAnswerCommand,
+    SessionStartCommand,
+    SkipQuestionCommand,
+    RestartCommand,
+)
+from rasa.dialogue_understanding.commands.user_silence_command import UserSilenceCommand
+from rasa.dialogue_understanding.patterns.cancel import CancelPatternFlowStackFrame
+from rasa.dialogue_understanding.patterns.cannot_handle import (
+    CannotHandlePatternFlowStackFrame,
+)
+from rasa.dialogue_understanding.patterns.chitchat import ChitchatPatternFlowStackFrame
+from rasa.dialogue_understanding.patterns.human_handoff import (
+    HumanHandoffPatternFlowStackFrame,
+)
+from rasa.dialogue_understanding.patterns.restart import RestartPatternFlowStackFrame
+from rasa.dialogue_understanding.patterns.search import SearchPatternFlowStackFrame
+from rasa.dialogue_understanding.patterns.session_start import (
+    SessionStartPatternFlowStackFrame,
+)
+from rasa.dialogue_understanding.patterns.skip_question import (
+    SkipQuestionPatternFlowStackFrame,
+)
+from rasa.dialogue_understanding.patterns.user_silence import (
+    UserSilencePatternFlowStackFrame,
+)
+
+triggerable_pattern_to_command_class: Dict[str, Type[Command]] = {
+    SessionStartPatternFlowStackFrame.flow_id: SessionStartCommand,
+    UserSilencePatternFlowStackFrame.flow_id: UserSilenceCommand,
+    CancelPatternFlowStackFrame.flow_id: CancelFlowCommand,
+    ChitchatPatternFlowStackFrame.flow_id: ChitChatAnswerCommand,
+    HumanHandoffPatternFlowStackFrame.flow_id: HumanHandoffCommand,
+    SearchPatternFlowStackFrame.flow_id: KnowledgeAnswerCommand,
+    SkipQuestionPatternFlowStackFrame.flow_id: SkipQuestionCommand,
+    CannotHandlePatternFlowStackFrame.flow_id: CannotHandleCommand,
+    RestartPatternFlowStackFrame.flow_id: RestartCommand,
+}

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/dialogue_understanding/commands/utils.py

@@ -1,45 +1,26 @@
-from typing import Dict, Type
+from typing import List
+from rasa.shared.core.flows import FlowsList
 
-from rasa.dialogue_understanding.commands import (
-    CancelFlowCommand,
-    CannotHandleCommand,
-    ChitChatAnswerCommand,
-    Command,
-    HumanHandoffCommand,
-    KnowledgeAnswerCommand,
-    SessionStartCommand,
-    SkipQuestionCommand,
-    RestartCommand,
-)
-from rasa.dialogue_understanding.commands.user_silence_command import UserSilenceCommand
-from rasa.dialogue_understanding.patterns.cancel import CancelPatternFlowStackFrame
-from rasa.dialogue_understanding.patterns.cannot_handle import (
-    CannotHandlePatternFlowStackFrame,
-)
-from rasa.dialogue_understanding.patterns.chitchat import ChitchatPatternFlowStackFrame
-from rasa.dialogue_understanding.patterns.human_handoff import (
-    HumanHandoffPatternFlowStackFrame,
-)
-from rasa.dialogue_understanding.patterns.restart import RestartPatternFlowStackFrame
-from rasa.dialogue_understanding.patterns.search import SearchPatternFlowStackFrame
-from rasa.dialogue_understanding.patterns.session_start import (
-    SessionStartPatternFlowStackFrame,
-)
-from rasa.dialogue_understanding.patterns.skip_question import (
-    SkipQuestionPatternFlowStackFrame,
-)
-from rasa.dialogue_understanding.patterns.user_silence import (
-    UserSilencePatternFlowStackFrame,
-)
 
-triggerable_pattern_to_command_class: Dict[str, Type[Command]] = {
-    SessionStartPatternFlowStackFrame.flow_id: SessionStartCommand,
-    UserSilencePatternFlowStackFrame.flow_id: UserSilenceCommand,
-    CancelPatternFlowStackFrame.flow_id: CancelFlowCommand,
-    ChitchatPatternFlowStackFrame.flow_id: ChitChatAnswerCommand,
-    HumanHandoffPatternFlowStackFrame.flow_id: HumanHandoffCommand,
-    SearchPatternFlowStackFrame.flow_id: KnowledgeAnswerCommand,
-    SkipQuestionPatternFlowStackFrame.flow_id: SkipQuestionCommand,
-    CannotHandlePatternFlowStackFrame.flow_id: CannotHandleCommand,
-    RestartPatternFlowStackFrame.flow_id: RestartCommand,
-}
+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/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/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/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"

{rasa_pro-3.11.15.dist-info → rasa_pro-3.11.16.dist-info}/METADATA

@@ -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.dist-info → rasa_pro-3.11.16.dist-info}/RECORD

@@ -336,7 +336,7 @@ rasa/core/policies/policy.py,sha256=HeVtIaV0dA1QcAG3vjdn-4g7-oUEJPL4u01ETJt78YA,
 rasa/core/policies/rule_policy.py,sha256=YNDPZUZkpKFCvZwKe1kSfP6LQnDL9CQ6JU69JRwdmWw,50729
 rasa/core/policies/ted_policy.py,sha256=_DHiDH5Upx1yFNzMXBA3SGdHBRfsitTLlr7howUHPoo,87750
 rasa/core/policies/unexpected_intent_policy.py,sha256=5pGe9EMS-NLHIDDhqY6KCH_Kv7_TGMzSbe_GsjuKH1w,39649
-rasa/core/processor.py,sha256=vB9YpzGzn74lyqPn1Y-lIAxmaJd0xfPGMHxwyqeMHkg,55571
+rasa/core/processor.py,sha256=Dbr40giQRL8k039CPC9DMKMxqu8Ue6cqNskLMjMwenY,57221
 rasa/core/run.py,sha256=NxZ2iZm_nYhaxEN7jvWSVxMAMqZTHj0m2Y7dqCxb3Pw,11653
 rasa/core/secrets_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/core/secrets_manager/constants.py,sha256=dTDHenvG1JBVi34QIR6FpdO5RDOXQwAjAxLlgJ2ZNEI,1193
@@ -375,15 +375,16 @@ rasa/dialogue_understanding/commands/handle_code_change_command.py,sha256=pKaj8E
 rasa/dialogue_understanding/commands/human_handoff_command.py,sha256=viSzL3Zmudm2WEjWmOS2s0zfOTXNsWoVU2pS-JXDFlU,1928
 rasa/dialogue_understanding/commands/knowledge_answer_command.py,sha256=JPiWQC5qWJmryE7DgApDlf9AdGVMazuU9TXx44gc78w,1773
 rasa/dialogue_understanding/commands/noop_command.py,sha256=302wi-pPXnraqclTDXug6_IYucEZCwDtP032OhPv1JY,1476
+rasa/dialogue_understanding/commands/pattern_to_command_mapping.py,sha256=OiyLFGEsrfFSIJcvBY6lTIIXqDY9OxaikVGtcl4Kokk,1911
 rasa/dialogue_understanding/commands/repeat_bot_messages_command.py,sha256=9hbDrTruhe2NogR8Xtt0SVcJUAlN2sQTzmynCaB_-ns,1858
 rasa/dialogue_understanding/commands/restart_command.py,sha256=lUGO8iAyHH6esuWi7sKZQzZIfzYipx4Vo58-B9U20gg,1678
 rasa/dialogue_understanding/commands/session_end_command.py,sha256=xMVOZJv7J3WAShGzJywQPcd5w263w6K_eYSROwpHUsk,1808
 rasa/dialogue_understanding/commands/session_start_command.py,sha256=k5cGcE4Usxwfua1sE-KY-qWdwHlHZKgVx5XPDt_-RFY,1742
-rasa/dialogue_understanding/commands/set_slot_command.py,sha256=jsiG3K0SYqsx3bah9mxBw0DR5EliaiZ8iMsDzv2wTxw,5187
+rasa/dialogue_understanding/commands/set_slot_command.py,sha256=7HLw7iSXxygLG5v1ppV-iCkEDfg4ODvSIqV30rmW3jo,5537
 rasa/dialogue_understanding/commands/skip_question_command.py,sha256=bSrUFOHUz1ozdaHma-KAaAArhP59RB3W8CEEBQaPIkA,2251
 rasa/dialogue_understanding/commands/start_flow_command.py,sha256=a0Yk8xpBpFgC3Hkh4J8kAudz4s4ZLQWuoDq_a63lQXM,3309
 rasa/dialogue_understanding/commands/user_silence_command.py,sha256=QtqsMU5mrbUp5dla2yGSpxXfIfi_h6Eu72mTDZQ_aTU,1724
-rasa/dialogue_understanding/commands/utils.py,sha256=OiyLFGEsrfFSIJcvBY6lTIIXqDY9OxaikVGtcl4Kokk,1911
+rasa/dialogue_understanding/commands/utils.py,sha256=GA3J3K2fLhMJNtbul8Es9UdkIAmm8zT2MP9GBM9gITI,766
 rasa/dialogue_understanding/generator/__init__.py,sha256=Ykeb2wQ1DuiUWAWO0hLIPSTK1_Ktiq9DZXF6D3ugN78,764
 rasa/dialogue_understanding/generator/command_generator.py,sha256=woJ4-59Iarugyxy0fT0zM0QnF8el8m2bBSpy-9Gh8U0,11945
 rasa/dialogue_understanding/generator/constants.py,sha256=KhvcY7rP8x3oWOSqFqE6JYoHzfYIqDFT-o4KbrDUPTY,811
@@ -395,7 +396,7 @@ rasa/dialogue_understanding/generator/multi_step/__init__.py,sha256=47DEQpj8HBSa
 rasa/dialogue_understanding/generator/multi_step/fill_slots_prompt.jinja2,sha256=Y0m673tAML3cFPaLM-urMXDsBYUUcXIw9YUpkAhGUuA,2933
 rasa/dialogue_understanding/generator/multi_step/handle_flows_prompt.jinja2,sha256=8l93_QBKBYnqLICVdiTu5ejZDE8F36BU8-qwba0px44,1927
 rasa/dialogue_understanding/generator/multi_step/multi_step_llm_command_generator.py,sha256=jo3hZO2SYDgUdwYGKAqiJJC2uYTwyBrOQo9o6u1mq0c,32670
-rasa/dialogue_understanding/generator/nlu_command_adapter.py,sha256=wEqoSVUtr00lhbE9L9WqKfZkMKOvm7UGe_E5aqXgn6I,9210
+rasa/dialogue_understanding/generator/nlu_command_adapter.py,sha256=AcmzRZZM0x3_mauIverkbKRykg7xHSh_dggVqlAVD6c,9231
 rasa/dialogue_understanding/generator/single_step/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rasa/dialogue_understanding/generator/single_step/command_prompt_template.jinja2,sha256=nMayu-heJYH1QmcL1cFmXb8SeiJzfdDR_9Oy5IRUXsM,3937
 rasa/dialogue_understanding/generator/single_step/single_step_llm_command_generator.py,sha256=UqbbuFCPaNHVL6Q-8XB_bMWYbQ07awlRPjH7nIoMatk,18170
@@ -426,7 +427,7 @@ rasa/dialogue_understanding/stack/dialogue_stack.py,sha256=j8MnLCyv6cAZVpKRaUVM-
 rasa/dialogue_understanding/stack/frames/__init__.py,sha256=CXLs8I_eeJ-d2tQmS19V26OM6CHy3VN5whH5uHBodj4,656
 rasa/dialogue_understanding/stack/frames/chit_chat_frame.py,sha256=bfMCyeTK69SB3KP9TUCfdBGNDmNbblfDNWM_ll3ppPc,736
 rasa/dialogue_understanding/stack/frames/dialogue_stack_frame.py,sha256=rmG09a66PerYiuoWiG-Jlb4Oi6bct1OIHAJGTMN_F2M,4126
-rasa/dialogue_understanding/stack/frames/flow_stack_frame.py,sha256=W4mEmihIN5Bih2C9KDpKf-rxCHjLCzK9TcT6JslhW7g,5047
+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=UpcxXwbneAMrvc94Fi1__r17UU2BAZQQ_RYI25Mek_c,7710
@@ -780,9 +781,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=EsBzcOqFP6_X23ASpuMHkDkUXvmi7_xZPzmDvVKOSlM,118
-rasa_pro-3.11.15.dist-info/METADATA,sha256=zrSODCD6rUjW_RSBrLNkg4SkOuCTw_K5dlVIbZk7f0A,10725
-rasa_pro-3.11.15.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
-rasa_pro-3.11.15.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-rasa_pro-3.11.15.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
-rasa_pro-3.11.15.dist-info/RECORD,,
+rasa/version.py,sha256=1OhUrE3ydSBvU5lzZL8po4_LIKZ-ySwIUiLohg8FuUY,118
+rasa_pro-3.11.16.dist-info/METADATA,sha256=kOuNIjNCxtsxyHs1Pe9w0sd2gm8VCgJdgnj5y_a38sI,10725
+rasa_pro-3.11.16.dist-info/NOTICE,sha256=7HlBoMHJY9CL2GlYSfTQ-PZsVmLmVkYmMiPlTjhuCqA,218
+rasa_pro-3.11.16.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
+rasa_pro-3.11.16.dist-info/entry_points.txt,sha256=ckJ2SfEyTPgBqj_I6vm_tqY9dZF_LAPJZA335Xp0Q9U,43
+rasa_pro-3.11.16.dist-info/RECORD,,