rasa-pro 3.12.0rc1__tar.gz → 3.12.0rc2__tar.gz

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rasa-pro
-Version: 3.12.0rc1
+Version: 3.12.0rc2
 Summary: State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development.
 Home-page: https://rasa.com
 Keywords: nlp,machine-learning,machine-learning-library,bot,bots,botkit,rasa conversational-agents,conversational-ai,chatbot,chatbot-framework,bot-framework
@@ -64,6 +64,7 @@ Requires-Dist: jsonschema (>=4.22)
 Requires-Dist: keras (==2.14.0)
 Requires-Dist: langchain (>=0.2.0,<0.3.0)
 Requires-Dist: langchain-community (>=0.2.0,<0.3.0)
+Requires-Dist: langcodes (>=3.5.0,<4.0.0)
 Requires-Dist: litellm (>=1.52.6,<1.53.0)
 Requires-Dist: matplotlib (>=3.7,<3.8)
 Requires-Dist: mattermostwrapper (>=2.2,<2.3)
@@ -157,15 +158,14 @@ Description-Content-Type: text/markdown
 
 <div align="center">
 
-[![Build Status](https://github.com/RasaHQ/rasa-private/workflows/Continuous%20Integration/badge.svg)](https://github.com/RasaHQ/rasa-private/actions)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=RasaHQ_rasa&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=RasaHQ_rasa)
-[![Documentation Status](https://img.shields.io/badge/docs-stable-brightgreen.svg)](https://rasa.com/docs/rasa-pro/)
+[![Documentation Status](https://img.shields.io/badge/docs-stable-brightgreen.svg)](https://rasa.com/docs/docs/pro/intro)
+![Python version support](https://img.shields.io/pypi/pyversions/rasa-pro)
 
 </div>
 
 <hr />
 
-
 Rasa Pro is a framework for building scalable, dynamic conversational AI assistants that integrate large language models (LLMs) to enable more contextually aware and agentic interactions. Whether you’re new to conversational AI or an experienced developer, Rasa Pro offers enhanced flexibility, control, and performance for mission-critical applications.
 
 Building on the foundation of Rasa Open Source, Rasa Pro adds advanced features like CALM (Conversational AI with Language Models) and Dialogue Understanding (DU), which enable developers to shift from traditional intent-driven systems to LLM-based agents. This allows for more robust, responsive interactions that adhere strictly to business logic, while reducing risks like prompt injection and minimizing hallucinations.
@@ -178,20 +178,18 @@ Building on the foundation of Rasa Open Source, Rasa Pro adds advanced features
 - **Robustness and Control:** Maintain strict adherence to business logic, preventing unwanted behaviors like prompt injection and hallucinations, leading to more reliable responses and secure interactions.
 - **Built-in Security:** Safeguard sensitive data, control access, and ensure secure deployment, essential for production environments that demand high levels of security and compliance.
 
+A [free developer license](https://rasa.com/docs/pro/intro/#who-rasa-pro-is-for) is available so you can explore and get to know Rasa Pro. It allows you to take your assistant live in production a limited capacity. A paid license is required for larger-scale production use, but all code is visible and can be customized as needed.
 
+To get started right now, you can
 
-A [free developer license](https://rasa.com/docs/rasa-pro/developer-edition/) is available so you can explore and get to know Rasa Pro. For small production deployments, the Extended Developer License allows you to take your assistant live in a limited capacity. A paid license is required for larger-scale production use, but all code is visible and can be customized as needed.
-
-To get started right now, you can 
-
-`pip install rasa-pro` 
+`pip install rasa-pro`
 
-Check out our 
+Check out our
 
-- [Rasa-pro Quickstart](https://rasa.com/docs/rasa-pro/installation/quickstart/),
-- [Conversational AI with Language Models (CALM) conceptual rundown](https://rasa.com/docs/rasa-pro/calm/),
-- [Rasa Pro / CALM tutorial](https://rasa.com/docs/rasa-pro/tutorial), and
-- [Rasa pro changelog](https://rasa.com/docs/rasa/rasa-pro-changelog/)
+- [Rasa-pro Quickstart](https://rasa.com/docs/learn/quickstart/pro),
+- [Conversational AI with Language Models (CALM) conceptual rundown](https://rasa.com/docs/learn/concepts/calm),
+- [Rasa Pro / CALM tutorial](https://rasa.com/docs/pro/tutorial), and
+- [Rasa pro changelog](https://rasa.com/docs/reference/changelogs/rasa-pro-changelog)
 
 for more. Also feel free to reach out to us on the [Rasa forum](https://forum.rasa.com/).
 

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/README.md

@@ -2,15 +2,14 @@
 
 <div align="center">
 
-[![Build Status](https://github.com/RasaHQ/rasa-private/workflows/Continuous%20Integration/badge.svg)](https://github.com/RasaHQ/rasa-private/actions)
 [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=RasaHQ_rasa&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=RasaHQ_rasa)
-[![Documentation Status](https://img.shields.io/badge/docs-stable-brightgreen.svg)](https://rasa.com/docs/rasa-pro/)
+[![Documentation Status](https://img.shields.io/badge/docs-stable-brightgreen.svg)](https://rasa.com/docs/docs/pro/intro)
+![Python version support](https://img.shields.io/pypi/pyversions/rasa-pro)
 
 </div>
 
 <hr />
 
-
 Rasa Pro is a framework for building scalable, dynamic conversational AI assistants that integrate large language models (LLMs) to enable more contextually aware and agentic interactions. Whether you’re new to conversational AI or an experienced developer, Rasa Pro offers enhanced flexibility, control, and performance for mission-critical applications.
 
 Building on the foundation of Rasa Open Source, Rasa Pro adds advanced features like CALM (Conversational AI with Language Models) and Dialogue Understanding (DU), which enable developers to shift from traditional intent-driven systems to LLM-based agents. This allows for more robust, responsive interactions that adhere strictly to business logic, while reducing risks like prompt injection and minimizing hallucinations.
@@ -23,19 +22,17 @@ Building on the foundation of Rasa Open Source, Rasa Pro adds advanced features
 - **Robustness and Control:** Maintain strict adherence to business logic, preventing unwanted behaviors like prompt injection and hallucinations, leading to more reliable responses and secure interactions.
 - **Built-in Security:** Safeguard sensitive data, control access, and ensure secure deployment, essential for production environments that demand high levels of security and compliance.
 
+A [free developer license](https://rasa.com/docs/pro/intro/#who-rasa-pro-is-for) is available so you can explore and get to know Rasa Pro. It allows you to take your assistant live in production a limited capacity. A paid license is required for larger-scale production use, but all code is visible and can be customized as needed.
 
+To get started right now, you can
 
-A [free developer license](https://rasa.com/docs/rasa-pro/developer-edition/) is available so you can explore and get to know Rasa Pro. For small production deployments, the Extended Developer License allows you to take your assistant live in a limited capacity. A paid license is required for larger-scale production use, but all code is visible and can be customized as needed.
-
-To get started right now, you can 
-
-`pip install rasa-pro` 
+`pip install rasa-pro`
 
-Check out our 
+Check out our
 
-- [Rasa-pro Quickstart](https://rasa.com/docs/rasa-pro/installation/quickstart/),
-- [Conversational AI with Language Models (CALM) conceptual rundown](https://rasa.com/docs/rasa-pro/calm/),
-- [Rasa Pro / CALM tutorial](https://rasa.com/docs/rasa-pro/tutorial), and
-- [Rasa pro changelog](https://rasa.com/docs/rasa/rasa-pro-changelog/)
+- [Rasa-pro Quickstart](https://rasa.com/docs/learn/quickstart/pro),
+- [Conversational AI with Language Models (CALM) conceptual rundown](https://rasa.com/docs/learn/concepts/calm),
+- [Rasa Pro / CALM tutorial](https://rasa.com/docs/pro/tutorial), and
+- [Rasa pro changelog](https://rasa.com/docs/reference/changelogs/rasa-pro-changelog)
 
 for more. Also feel free to reach out to us on the [Rasa forum](https://forum.rasa.com/).

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.12.0rc1"
+version = "3.12.0rc2"
 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>",]
@@ -194,6 +194,7 @@ scipy = "~1.13.1"
 scikit-learn = "~1.5.1"
 demoji = "^1.1.0"
 azure-identity = "~1.19.0"
+langcodes = "^3.5.0"
 
 [[tool.poetry.dependencies.tensorflow-io-gcs-filesystem]]
 version = "==0.31" # newer versions don't provide wheels for Windows
@@ -362,4 +363,3 @@ types-protobuf = "^4.24.0"
 types-toml = "^0.10.8.7"
 swagger-coverage = "^3.5.1"
 types-werkzeug = "^1.0.9"
-langcodes = "^3.5.0"

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/cli/project_templates/calm/domain/list_contacts.yml

@@ -7,8 +7,7 @@ slots:
   contacts_list:
     type: text
     mappings:
-      - type: custom
-        action: list_contacts
+      - type: controlled
 
 responses:
   utter_no_contacts:

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/cli/project_templates/calm/domain/remove_contact.yml

@@ -7,8 +7,7 @@ slots:
   remove_contact_name:
     type: text
     mappings:
-      - type: custom
-        action: remove_contact
+      - type: controlled
   remove_contact_handle:
     type: text
     mappings:

rasa_pro-3.12.0rc2/rasa/cli/project_templates/calm/domain/shared.yml

@@ -0,0 +1,7 @@
+version: "3.1"
+
+slots:
+  return_value:
+    type: any
+    mappings:
+      - type: controlled

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/core/actions/action_handle_digressions.py

@@ -18,6 +18,10 @@ from rasa.dialogue_understanding.stack.frames.flow_stack_frame import (
     FlowStackFrameType,
     UserFlowStackFrame,
 )
+from rasa.dialogue_understanding.stack.utils import (
+    remove_digression_from_stack,
+    user_flows_on_the_stack,
+)
 from rasa.shared.core.constants import (
     ACTION_BLOCK_DIGRESSION,
     ACTION_CONTINUE_DIGRESSION,
@@ -55,16 +59,24 @@ class ActionBlockDigressions(Action):
         frame_type = FlowStackFrameType.REGULAR
 
         stack = tracker.stack
-        stack.push(
-            UserFlowStackFrame(flow_id=blocked_flow_id, frame_type=frame_type), 0
-        )
-        stack.push(
-            ContinueInterruptedPatternFlowStackFrame(
-                previous_flow_name=blocked_flow_id
-            ),
-            1,
-        )
-        events = tracker.create_stack_updated_events(stack)
+
+        if blocked_flow_id in user_flows_on_the_stack(stack):
+            structlogger.debug(
+                "action_block_digressions.already_blocked_flow",
+                blocked_flow_id=blocked_flow_id,
+            )
+            events = []
+        else:
+            stack.push(
+                UserFlowStackFrame(flow_id=blocked_flow_id, frame_type=frame_type), 0
+            )
+            stack.push(
+                ContinueInterruptedPatternFlowStackFrame(
+                    previous_flow_name=blocked_flow_id
+                ),
+                1,
+            )
+            events = tracker.create_stack_updated_events(stack)
 
         utterance = "utter_block_digressions"
         message = await nlg.generate(
@@ -109,10 +121,20 @@ class ActionContinueDigression(Action):
         if not isinstance(top_frame, HandleDigressionsPatternFlowStackFrame):
             return []
 
-        blocked_flow_id = top_frame.interrupting_flow_id
-        frame_type = FlowStackFrameType.INTERRUPT
+        interrupting_flow_id = top_frame.interrupting_flow_id
         stack = tracker.stack
-        stack.push(UserFlowStackFrame(flow_id=blocked_flow_id, frame_type=frame_type))
+
+        if interrupting_flow_id in user_flows_on_the_stack(stack):
+            structlogger.debug(
+                "action_continue_digression.interrupting_flow_id_already_on_the_stack",
+                interrupting_flow_id=interrupting_flow_id,
+            )
+            stack = remove_digression_from_stack(stack, interrupting_flow_id)
+
+        frame_type = FlowStackFrameType.INTERRUPT
+        stack.push(
+            UserFlowStackFrame(flow_id=interrupting_flow_id, frame_type=frame_type)
+        )
 
         events = [
             FlowInterrupted(

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/core/policies/flows/flow_executor.py

@@ -287,8 +287,13 @@ def trigger_pattern_clarification(
     if not isinstance(current_frame, UserFlowStackFrame):
         return None
 
-    if current_frame.frame_type == FlowStackFrameType.CALL:
-        # we want to return to the flow that called the current flow
+    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 = [

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/core/processor.py

@@ -1553,7 +1553,6 @@ class MessageProcessor:
             tracker,
             prior_tracker_events,
             should_break=True,
-            update_corrected_slots=True,
         )
 
         return tracker, validate_frames

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/dialogue_understanding/commands/can_not_handle_command.py

@@ -99,7 +99,7 @@ class CannotHandleCommand(Command):
     def regex_pattern() -> str:
         mapper = {
             CommandSyntaxVersion.v1: r"CannotHandle\(\)",
-            CommandSyntaxVersion.v2: r"^[^\w]*cannot handle$",
+            CommandSyntaxVersion.v2: r"""^[\s\W\d]*cannot handle['"`]*$""",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/dialogue_understanding/commands/cancel_flow_command.py

@@ -166,7 +166,7 @@ class CancelFlowCommand(Command):
     def regex_pattern() -> str:
         mapper = {
             CommandSyntaxVersion.v1: r"CancelFlow\(\)",
-            CommandSyntaxVersion.v2: r"^[^\w]*cancel flow$",
+            CommandSyntaxVersion.v2: r"""^[\s\W\d]*cancel flow['"`]*$""",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/dialogue_understanding/commands/change_flow_command.py

@@ -70,7 +70,7 @@ class ChangeFlowCommand(Command):
     def regex_pattern() -> str:
         mapper = {
             CommandSyntaxVersion.v1: r"ChangeFlow\(\)",
-            CommandSyntaxVersion.v2: r"^[^\w]*change$",
+            CommandSyntaxVersion.v2: r"""^[\s\W\d]*change['"`]*$""",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/dialogue_understanding/commands/chit_chat_answer_command.py

@@ -81,7 +81,7 @@ class ChitChatAnswerCommand(FreeFormAnswerCommand):
     def regex_pattern() -> str:
         mapper = {
             CommandSyntaxVersion.v1: r"ChitChat\(\)",
-            CommandSyntaxVersion.v2: r"^[^\w]*offtopic reply$",
+            CommandSyntaxVersion.v2: r"""^[\s\W\d]*offtopic reply['"`]*$""",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/dialogue_understanding/commands/clarify_command.py

@@ -119,7 +119,7 @@ class ClarifyCommand(Command):
         mapper = {
             CommandSyntaxVersion.v1: r"Clarify\(([\"\'a-zA-Z0-9_, ]*)\)",
             CommandSyntaxVersion.v2: (
-                r"^[^\w]*disambiguate flows ([\"\'a-zA-Z0-9_, ]*)$"
+                r"""^[\s\W\d]*disambiguate flows (["'a-zA-Z0-9_, ]*)['"`]*$"""
             ),
         }
         return mapper.get(

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/dialogue_understanding/commands/command_syntax_manager.py

@@ -30,7 +30,7 @@ class CommandSyntaxManager:
         syntax version remains consistent throughout the lifetime of the generator.
         """
         if cls._version:
-            structlogger.warn(
+            structlogger.debug(
                 "command_syntax_manager.syntax_version_already_set",
                 event_info=(
                     f"The command syntax version has already been set. Overwriting "

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/dialogue_understanding/commands/handle_digressions_command.py

@@ -14,7 +14,6 @@ from rasa.dialogue_understanding.patterns.handle_digressions import (
 )
 from rasa.dialogue_understanding.stack.utils import (
     top_flow_frame,
-    user_flows_on_the_stack,
 )
 from rasa.shared.core.events import Event
 from rasa.shared.core.flows import FlowsList
@@ -71,12 +70,7 @@ class HandleDigressionsCommand(Command):
         stack = tracker.stack
         original_stack = original_tracker.stack
 
-        if self.flow in user_flows_on_the_stack(stack):
-            structlogger.debug(
-                "command_executor.skip_command.already_started_flow", command=self
-            )
-            return []
-        elif self.flow not in all_flows.flow_ids:
+        if self.flow not in all_flows.flow_ids:
             structlogger.debug(
                 "command_executor.push_cannot_handle.start_invalid_flow_id",
                 command=self,

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/dialogue_understanding/commands/human_handoff_command.py

@@ -88,7 +88,7 @@ class HumanHandoffCommand(Command):
     def regex_pattern() -> str:
         mapper = {
             CommandSyntaxVersion.v1: r"HumanHandoff\(\)",
-            CommandSyntaxVersion.v2: r"^[^\w]*hand over$",
+            CommandSyntaxVersion.v2: r"""^[\s\W\d]*hand over['"`]*$""",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/dialogue_understanding/commands/knowledge_answer_command.py

@@ -81,7 +81,7 @@ class KnowledgeAnswerCommand(FreeFormAnswerCommand):
     def regex_pattern() -> str:
         mapper = {
             CommandSyntaxVersion.v1: r"SearchAndReply\(\)",
-            CommandSyntaxVersion.v2: r"^[^\w]*provide info$",
+            CommandSyntaxVersion.v2: r"""^[\s\W\d]*provide info['"`]*$""",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/dialogue_understanding/commands/repeat_bot_messages_command.py

@@ -82,7 +82,7 @@ class RepeatBotMessagesCommand(Command):
     def regex_pattern() -> str:
         mapper = {
             CommandSyntaxVersion.v1: r"RepeatLastBotMessages\(\)",
-            CommandSyntaxVersion.v2: r"^[^\w]*repeat message$",
+            CommandSyntaxVersion.v2: r"""^[\s\W\d]*repeat message['"`]*$""",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/dialogue_understanding/commands/set_slot_command.py

@@ -189,7 +189,7 @@ class SetSlotCommand(Command):
                 r"""SetSlot\(['"]?([a-zA-Z_][a-zA-Z0-9_-]*)['"]?, ?['"]?(.*)['"]?\)"""
             ),
             CommandSyntaxVersion.v2: (
-                r"""^[^\w]*set slot ['"]?([a-zA-Z_][a-zA-Z0-9_-]*)['"]? ['"]?(.+?)['"]?$"""  # noqa: E501
+                r"""^[\s\W\d]*set slot ['"`]?([a-zA-Z_][a-zA-Z0-9_-]*)['"`]? ['"`]?(.+?)['"`]*$"""  # noqa: E501
             ),
         }
         return mapper.get(

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/dialogue_understanding/commands/skip_question_command.py

@@ -97,7 +97,7 @@ class SkipQuestionCommand(Command):
     def regex_pattern() -> str:
         mapper = {
             CommandSyntaxVersion.v1: r"SkipQuestion\(\)",
-            CommandSyntaxVersion.v2: r"^[^\w]*skip question$",
+            CommandSyntaxVersion.v2: r"""^[\s\W\d]*skip question['"`]*$""",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/dialogue_understanding/commands/start_flow_command.py

@@ -141,7 +141,9 @@ class StartFlowCommand(Command):
     def regex_pattern() -> str:
         mapper = {
             CommandSyntaxVersion.v1: r"StartFlow\(['\"]?([a-zA-Z0-9_-]+)['\"]?\)",
-            CommandSyntaxVersion.v2: r"^[^\w]*start flow ['\"]?([a-zA-Z0-9_-]+)['\"]?",
+            CommandSyntaxVersion.v2: (
+                r"""^[\s\W\d]*start flow ['"`]?([a-zA-Z0-9_-]+)['"`]*"""
+            ),
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/dialogue_understanding/commands/utils.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Any, List, Optional, Tuple, Union
+from typing import TYPE_CHECKING, List, Optional, Tuple, Union
 
 import structlog
 
@@ -100,7 +100,6 @@ def create_validate_frames_from_slot_set_events(
     events: List[Event],
     validate_frames: List[ValidateSlotPatternFlowStackFrame] = [],
     should_break: bool = False,
-    update_corrected_slots: bool = False,
 ) -> Tuple[DialogueStateTracker, List[ValidateSlotPatternFlowStackFrame]]:
     """Process SlotSet events and create validation frames.
 
@@ -111,8 +110,6 @@ def create_validate_frames_from_slot_set_events(
             if True, break out of the event loop as soon as the first non-SlotSet
             event is encountered.
             if False, continue processing the events until the end.
-        update_corrected_slots: whether or not corrected slots in the last
-            correction frame need to be updated.
 
     Returns:
         Tuple of (updated tracker, list of validation frames).
@@ -130,29 +127,5 @@ def create_validate_frames_from_slot_set_events(
 
         if frame:
             validate_frames.append(frame)
-            if update_corrected_slots:
-                tracker = update_corrected_slots_in_correction_frame(
-                    tracker, event.key, event.value
-                )
 
     return tracker, validate_frames
-
-
-def update_corrected_slots_in_correction_frame(
-    tracker: DialogueStateTracker, slot_name: str, slot_value: Any
-) -> DialogueStateTracker:
-    """Update the corrected_slots and new_slot_values of the
-    CorrectionPatternFlowStackFrame with only valid values.
-    """
-    stack = tracker.stack
-    top_frame = stack.top()
-    del top_frame.corrected_slots[slot_name]  # type: ignore[union-attr]
-    top_frame.new_slot_values.remove(slot_value)  # type: ignore[union-attr]
-
-    # since we can't directly modify a stack we have to pop first
-    # and then push back the updated frame
-    stack.pop()
-    stack.push(top_frame)
-    new_events = tracker.create_stack_updated_events(stack)
-    tracker.update_with_events(new_events)
-    return tracker

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/dialogue_understanding/generator/multi_step/multi_step_llm_command_generator.py

@@ -226,7 +226,7 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
             # be completed, "predict" the ErrorCommand
             commands = [ErrorCommand()]
 
-        if not commands:
+        if not commands and not prior_commands:
             # if for any reason the final list of commands is empty,
             # "predict" CannotHandle
             commands = [CannotHandleCommand()]

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/dialogue_understanding/generator/single_step/compact_llm_command_generator.py

@@ -72,10 +72,63 @@ MODEL_PROMPT_MAPPER = {
     ),
 }
 
-
 DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME = "command_prompt_v2_default.jinja2"
 
 
+class CommandParserValidatorSingleton:
+    """Singleton class to validate the command parser.
+
+    This class is used to validate the command parser. It keeps track of the number of
+    consecutive turns where no commands are parsed by the command parser. If the
+    number of consecutive turns exceeds a certain threshold, a warning is logged.
+    The prompt can use a DSL syntax that can be incompatible with the command syntax
+    used by the command parser. This class helps to detect such incompatibilities.
+    """
+
+    MAX_CONSECUTIVE_TURNS_NO_COMMAND_PREDICTED = 5
+    _NO_COMMAND_PREDICTED_TURN_COUNTER = 0
+    _command_parser_validated = False
+
+    @classmethod
+    def get_no_command_predicted_turn_counter(cls) -> int:
+        return cls._NO_COMMAND_PREDICTED_TURN_COUNTER
+
+    @classmethod
+    def should_validate_command_parser(cls) -> bool:
+        return not cls._command_parser_validated
+
+    @classmethod
+    def reset_command_parser_validation(cls) -> None:
+        cls._NO_COMMAND_PREDICTED_TURN_COUNTER = 0
+        cls._command_parser_validated = False
+
+    @classmethod
+    def validate_if_commands_are_parsed_from_llm_response(
+        cls, commands: List[Command], llm_response: str
+    ) -> None:
+        if llm_response and not commands:
+            cls._NO_COMMAND_PREDICTED_TURN_COUNTER += 1
+        else:
+            # Reset the counter if commands are generated, and mark
+            # the command parser as validated.
+            cls._NO_COMMAND_PREDICTED_TURN_COUNTER = 0
+            cls._command_parser_validated = True
+            return
+
+        if (
+            cls._NO_COMMAND_PREDICTED_TURN_COUNTER
+            >= cls.MAX_CONSECUTIVE_TURNS_NO_COMMAND_PREDICTED
+        ):
+            structlogger.warning(
+                "llm_command_generator.predict_commands.command_parser_not_working",
+                event_info=(
+                    f"No commands were generated by the command parser for the last "
+                    f"{cls._NO_COMMAND_PREDICTED_TURN_COUNTER} times. Check if you "
+                    "are running incompatible prompt and LLM command generator."
+                ),
+            )
+
+
 @DefaultV1Recipe.register(
     [
         DefaultV1Recipe.ComponentType.COMMAND_GENERATOR,
@@ -103,12 +156,14 @@ class CompactLLMCommandGenerator(LLMBasedCommandGenerator):
 
         # Get the default prompt template based on the model name
         default_command_prompt_template = get_default_prompt_template_based_on_model(
-            config, MODEL_PROMPT_MAPPER, DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME
+            self.config.get(LLM_CONFIG_KEY, {}) or {},
+            MODEL_PROMPT_MAPPER,
+            DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME,
         )
 
         # Set the prompt template either from the config or the default prompt template.
         self.prompt_template = prompt_template or get_prompt_template(
-            config.get(PROMPT_TEMPLATE_CONFIG_KEY),
+            self.config.get(PROMPT_TEMPLATE_CONFIG_KEY),
             default_command_prompt_template,
         )
 
@@ -230,7 +285,7 @@ class CompactLLMCommandGenerator(LLMBasedCommandGenerator):
             structlogger.warning(
                 "llm_command_generator.predict_commands",
                 message="No commands were predicted as the LLM response could "
-                "not be parsed or the LLM responded with an invalid command."
+                "not be parsed or the LLM responded with an invalid command. "
                 "Returning a CannotHandleCommand instead.",
             )
             commands = [CannotHandleCommand()]
@@ -306,6 +361,11 @@ class CompactLLMCommandGenerator(LLMBasedCommandGenerator):
 
         commands = self.parse_commands(action_list, tracker, flows)
 
+        if CommandParserValidatorSingleton.should_validate_command_parser():
+            CommandParserValidatorSingleton.validate_if_commands_are_parsed_from_llm_response(
+                commands, action_list
+            )
+
         self._update_message_parse_data_for_fine_tuning(message, commands, flow_prompt)
         add_commands_to_message_parse_data(message, self.__class__.__name__, commands)
         add_prompt_to_message_parse_data(
@@ -350,8 +410,8 @@ class CompactLLMCommandGenerator(LLMBasedCommandGenerator):
         """
         commands = parse_commands_using_command_parsers(actions, flows)
         if not commands:
-            structlogger.debug(
-                f"{cls.__class__.__name__}.parse_commands",
+            structlogger.warning(
+                f"{cls.__name__}.parse_commands",
                 message="No commands were parsed from the LLM actions.",
                 actions=actions,
             )
@@ -441,13 +501,6 @@ class CompactLLMCommandGenerator(LLMBasedCommandGenerator):
     def fingerprint_addon(cls: Any, config: Dict[str, Any]) -> Optional[str]:
         """Add a fingerprint for the graph."""
         # Get the default prompt template based on the model name
-        default_command_prompt_template = get_default_prompt_template_based_on_model(
-            config, MODEL_PROMPT_MAPPER, DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME
-        )
-        prompt_template = get_prompt_template(
-            config.get(PROMPT_TEMPLATE_CONFIG_KEY),
-            default_command_prompt_template,
-        )
         llm_config = resolve_model_client_config(
             config.get(LLM_CONFIG_KEY), CompactLLMCommandGenerator.__name__
         )
@@ -455,6 +508,15 @@ class CompactLLMCommandGenerator(LLMBasedCommandGenerator):
             config.get(FLOW_RETRIEVAL_KEY, {}).get(EMBEDDINGS_CONFIG_KEY),
             FlowRetrieval.__name__,
         )
+        default_command_prompt_template = get_default_prompt_template_based_on_model(
+            llm_config or {},
+            MODEL_PROMPT_MAPPER,
+            DEFAULT_COMMAND_PROMPT_TEMPLATE_FILE_NAME,
+        )
+        prompt_template = get_prompt_template(
+            config.get(PROMPT_TEMPLATE_CONFIG_KEY),
+            default_command_prompt_template,
+        )
         return deep_container_fingerprint(
             [prompt_template, llm_config, embedding_config]
         )

{rasa_pro-3.12.0rc1 → rasa_pro-3.12.0rc2}/rasa/dialogue_understanding/processor/command_processor.py

@@ -263,10 +263,10 @@ def execute_commands(
         events.extend(new_events)
         tracker.update_with_events(new_events)
 
-        new_events = push_stack_frames_to_follow_commands(
-            tracker, stack_frames_to_follow_commands
-        )
-        events.extend(new_events)
+    new_events = push_stack_frames_to_follow_commands(
+        tracker, stack_frames_to_follow_commands
+    )
+    events.extend(new_events)
 
     return remove_duplicated_set_slots(events)