rasa-pro 3.12.18.dev1__py3-none-any.whl → 3.13.0a1.dev2__py3-none-any.whl

rasa/core/training/interactive.py

@@ -47,8 +47,8 @@ import rasa.shared.utils.io
 import rasa.utils.io as io_utils
 from rasa import telemetry
 from rasa.core import run, utils
+from rasa.core.available_endpoints import AvailableEndpoints
 from rasa.core.constants import DEFAULT_SERVER_FORMAT, DEFAULT_SERVER_PORT
-from rasa.core.utils import AvailableEndpoints
 from rasa.shared.constants import (
     DEFAULT_SENDER_ID,
     DOCS_URL_NLU_BASED_POLICIES,

rasa/core/utils.py

@@ -2,7 +2,7 @@ import logging
 import os
 from pathlib import Path
 from socket import SOCK_DGRAM, SOCK_STREAM
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Set, Text, Tuple, Union
+from typing import TYPE_CHECKING, Any, Dict, Optional, Set, Text, Tuple, Union
 
 import numpy as np
 import structlog
@@ -11,6 +11,7 @@ from sanic import Sanic
 import rasa.cli.utils as cli_utils
 import rasa.shared.utils.io
 from rasa.constants import DEFAULT_SANIC_WORKERS, ENV_SANIC_WORKERS
+from rasa.core.available_endpoints import AvailableEndpoints
 from rasa.core.constants import (
     ACTIVE_FLOW_METADATA_KEY,
     DOMAIN_GROUND_TRUTH_METADATA_KEY,
@@ -19,12 +20,12 @@ 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.constants import (
+    SlotMappingType,
+)
 from rasa.shared.core.trackers import DialogueStateTracker
 from rasa.utils.endpoints import (
     EndpointConfig,
-    read_endpoint_config,
-    read_property_config_from_endpoints_file,
 )
 from rasa.utils.io import write_yaml
 
@@ -36,6 +37,25 @@ if TYPE_CHECKING:
 structlogger = structlog.get_logger()
 
 
+def read_endpoints_from_path(
+    endpoints_path: Optional[Union[Path, str]] = None,
+) -> AvailableEndpoints:
+    """Get `AvailableEndpoints` object from specified path.
+
+    Args:
+        endpoints_path: Path of the endpoints file to be read. If `None` the
+            default path for that file is used (`endpoints.yml`).
+
+    Returns:
+        `AvailableEndpoints` object read from endpoints file.
+
+    """
+    endpoints_config_path = cli_utils.get_validated_path(
+        endpoints_path, "endpoints", DEFAULT_ENDPOINTS_PATH, True
+    )
+    return AvailableEndpoints.get_instance(endpoints_config_path)
+
+
 def configure_file_logging(
     logger_obj: logging.Logger,
     log_file: Optional[Text],
@@ -177,97 +197,6 @@ def is_limit_reached(num_messages: int, limit: Optional[int]) -> bool:
     return limit is not None and num_messages >= limit
 
 
-class AvailableEndpoints:
-    """Collection of configured endpoints."""
-
-    _instance = None
-
-    @classmethod
-    def read_endpoints(cls, endpoint_file: Text) -> "AvailableEndpoints":
-        """Read the different endpoints from a yaml file."""
-        nlg = read_endpoint_config(endpoint_file, endpoint_type="nlg")
-        nlu = read_endpoint_config(endpoint_file, endpoint_type="nlu")
-        action = read_endpoint_config(endpoint_file, endpoint_type="action_endpoint")
-        model = read_endpoint_config(endpoint_file, endpoint_type="models")
-        tracker_store = read_endpoint_config(
-            endpoint_file, endpoint_type="tracker_store"
-        )
-        lock_store = read_endpoint_config(endpoint_file, endpoint_type="lock_store")
-        event_broker = read_endpoint_config(endpoint_file, endpoint_type="event_broker")
-        vector_store = read_endpoint_config(endpoint_file, endpoint_type="vector_store")
-        model_groups = read_property_config_from_endpoints_file(
-            endpoint_file, property_name="model_groups"
-        )
-
-        return cls(
-            nlg,
-            nlu,
-            action,
-            model,
-            tracker_store,
-            lock_store,
-            event_broker,
-            vector_store,
-            model_groups,
-        )
-
-    def __init__(
-        self,
-        nlg: Optional[EndpointConfig] = None,
-        nlu: Optional[EndpointConfig] = None,
-        action: Optional[EndpointConfig] = None,
-        model: Optional[EndpointConfig] = None,
-        tracker_store: Optional[EndpointConfig] = None,
-        lock_store: Optional[EndpointConfig] = None,
-        event_broker: Optional[EndpointConfig] = None,
-        vector_store: Optional[EndpointConfig] = None,
-        model_groups: Optional[List[Dict[str, Any]]] = None,
-    ) -> None:
-        """Create an `AvailableEndpoints` object."""
-        self.model = model
-        self.action = action
-        self.nlu = nlu
-        self.nlg = nlg
-        self.tracker_store = tracker_store
-        self.lock_store = lock_store
-        self.event_broker = event_broker
-        self.vector_store = vector_store
-        self.model_groups = model_groups
-
-    @classmethod
-    def get_instance(
-        cls, endpoint_file: Optional[Text] = DEFAULT_ENDPOINTS_PATH
-    ) -> "AvailableEndpoints":
-        """Get the singleton instance of AvailableEndpoints."""
-        # Ensure that the instance is initialized only once.
-        if cls._instance is None:
-            cls._instance = cls.read_endpoints(endpoint_file)
-        return cls._instance
-
-    @classmethod
-    def reset_instance(cls) -> None:
-        cls._instance = None
-
-
-def read_endpoints_from_path(
-    endpoints_path: Optional[Union[Path, Text]] = None,
-) -> AvailableEndpoints:
-    """Get `AvailableEndpoints` object from specified path.
-
-    Args:
-        endpoints_path: Path of the endpoints file to be read. If `None` the
-            default path for that file is used (`endpoints.yml`).
-
-    Returns:
-        `AvailableEndpoints` object read from endpoints file.
-
-    """
-    endpoints_config_path = cli_utils.get_validated_path(
-        endpoints_path, "endpoints", DEFAULT_ENDPOINTS_PATH, True
-    )
-    return AvailableEndpoints.get_instance(endpoints_config_path)
-
-
 def _lock_store_is_multi_worker_compatible(
     lock_store: Union[EndpointConfig, LockStore, None],
 ) -> bool:

rasa/dialogue_understanding/coexistence/intent_based_router.py

@@ -143,7 +143,8 @@ class IntentBasedRouter(GraphComponent):
         if route_session_to_calm is None:
             commands = self._generate_command_using_intent(message, flows, tracker)
             structlogger.info(
-                "intent_based_router.predicated_commands", commands=commands
+                "intent_based_router.predicated_commands",
+                commands=commands,  # doesn't contain PII
             )
             return commands
         elif route_session_to_calm is True:

rasa/dialogue_understanding/coexistence/llm_based_router.py

@@ -15,9 +15,7 @@ from rasa.dialogue_understanding.coexistence.constants import (
 )
 from rasa.dialogue_understanding.commands import Command, SetSlotCommand
 from rasa.dialogue_understanding.commands.noop_command import NoopCommand
-from rasa.dialogue_understanding.generator.constants import (
-    LLM_CONFIG_KEY,
-)
+from rasa.dialogue_understanding.generator.constants import LLM_CONFIG_KEY
 from rasa.engine.graph import ExecutionContext, GraphComponent
 from rasa.engine.recipes.default_recipe import DefaultV1Recipe
 from rasa.engine.storage.resource import Resource
@@ -28,6 +26,7 @@ from rasa.shared.constants import (
     MODEL_CONFIG_KEY,
     OPENAI_PROVIDER,
     PROMPT_CONFIG_KEY,
+    PROMPT_TEMPLATE_CONFIG_KEY,
     PROVIDER_CONFIG_KEY,
     ROUTE_TO_CALM_SLOT,
     TEMPERATURE_CONFIG_KEY,
@@ -46,6 +45,7 @@ from rasa.shared.utils.health_check.llm_health_check_mixin import LLMHealthCheck
 from rasa.shared.utils.io import deep_container_fingerprint
 from rasa.shared.utils.llm import (
     DEFAULT_OPENAI_CHAT_MODEL_NAME,
+    check_prompt_config_keys_and_warn_if_deprecated,
     get_prompt_template,
     llm_factory,
     resolve_model_client_config,
@@ -90,7 +90,7 @@ class LLMBasedRouter(LLMHealthCheckMixin, GraphComponent):
     def get_default_config() -> Dict[str, Any]:
         """The component's default config (see parent class for full docstring)."""
         return {
-            PROMPT_CONFIG_KEY: None,
+            PROMPT_TEMPLATE_CONFIG_KEY: None,  # TODO: remove in Rasa 4.0.0
             CALM_ENTRY: {STICKY: None},
             NLU_ENTRY: {
                 NON_STICKY: "handles chitchat",
@@ -111,10 +111,13 @@ class LLMBasedRouter(LLMHealthCheckMixin, GraphComponent):
             self.config.get(LLM_CONFIG_KEY), LLMBasedRouter.__name__
         )
 
+        # Warn if the prompt config key is used to set the prompt template
+        check_prompt_config_keys_and_warn_if_deprecated(config, "llm_based_router")
+
         self.prompt_template = (
             prompt_template
             or get_prompt_template(
-                config.get(PROMPT_CONFIG_KEY),
+                config.get(PROMPT_TEMPLATE_CONFIG_KEY) or config.get(PROMPT_CONFIG_KEY),
                 DEFAULT_COMMAND_PROMPT_TEMPLATE,
                 log_source_component=LLMBasedRouter.__name__,
                 log_source_method=LOG_COMPONENT_SOURCE_METHOD_INIT,
@@ -171,6 +174,7 @@ class LLMBasedRouter(LLMHealthCheckMixin, GraphComponent):
         **kwargs: Any,
     ) -> "LLMBasedRouter":
         """Loads trained component (see parent class for full docstring)."""
+
         # Perform health check on the resolved LLM client config
         llm_config = resolve_model_client_config(config.get(LLM_CONFIG_KEY, {}))
         cls.perform_llm_health_check(
@@ -326,7 +330,7 @@ class LLMBasedRouter(LLMHealthCheckMixin, GraphComponent):
     def fingerprint_addon(cls, config: Dict[str, Any]) -> Optional[str]:
         """Add a fingerprint of llm based router for the graph."""
         prompt_template = get_prompt_template(
-            config.get(PROMPT_CONFIG_KEY),
+            config.get(PROMPT_TEMPLATE_CONFIG_KEY) or config.get(PROMPT_CONFIG_KEY),
             DEFAULT_COMMAND_PROMPT_TEMPLATE,
             log_source_component=LLMBasedRouter.__name__,
             log_source_method=LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON,

rasa/dialogue_understanding/commands/can_not_handle_command.py

@@ -81,6 +81,7 @@ class CannotHandleCommand(Command):
         mapper = {
             CommandSyntaxVersion.v1: "CannotHandle()",
             CommandSyntaxVersion.v2: "cannot handle",
+            CommandSyntaxVersion.v3: "cannot handle",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),
@@ -100,6 +101,7 @@ class CannotHandleCommand(Command):
         mapper = {
             CommandSyntaxVersion.v1: r"CannotHandle\(\)",
             CommandSyntaxVersion.v2: r"""^[\s\W\d]*cannot handle['"`]*$""",
+            CommandSyntaxVersion.v3: r"""^[\s\W\d]*cannot handle['"`]*$""",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),

rasa/dialogue_understanding/commands/cancel_flow_command.py

@@ -95,7 +95,9 @@ class CancelFlowCommand(Command):
         original_stack = original_tracker.stack
 
         applied_events: List[Event] = []
-        user_frame = top_user_flow_frame(original_stack)
+        user_frame = top_user_flow_frame(
+            original_stack, ignore_call_and_link_frames=False
+        )
         current_flow = user_frame.flow(all_flows) if user_frame else None
 
         if not current_flow:
@@ -134,6 +136,7 @@ class CancelFlowCommand(Command):
         mapper = {
             CommandSyntaxVersion.v1: "CancelFlow()",
             CommandSyntaxVersion.v2: "cancel flow",
+            CommandSyntaxVersion.v3: "cancel flow",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),
@@ -150,6 +153,7 @@ class CancelFlowCommand(Command):
         mapper = {
             CommandSyntaxVersion.v1: r"CancelFlow\(\)",
             CommandSyntaxVersion.v2: r"""^[\s\W\d]*cancel flow['"`]*$""",
+            CommandSyntaxVersion.v3: r"""^[\s\W\d]*cancel flow['"`]*$""",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),

rasa/dialogue_understanding/commands/chit_chat_answer_command.py

@@ -66,6 +66,7 @@ class ChitChatAnswerCommand(FreeFormAnswerCommand):
         mapper = {
             CommandSyntaxVersion.v1: "ChitChat()",
             CommandSyntaxVersion.v2: "offtopic reply",
+            CommandSyntaxVersion.v3: "offtopic reply",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),
@@ -82,6 +83,7 @@ class ChitChatAnswerCommand(FreeFormAnswerCommand):
         mapper = {
             CommandSyntaxVersion.v1: r"ChitChat\(\)",
             CommandSyntaxVersion.v2: r"""^[\s\W\d]*offtopic reply['"`]*$""",
+            CommandSyntaxVersion.v3: r"""^[\s\W\d]*offtopic reply['"`]*$""",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),

rasa/dialogue_understanding/commands/clarify_command.py

@@ -102,6 +102,7 @@ class ClarifyCommand(Command):
         mapper = {
             CommandSyntaxVersion.v1: f"Clarify({', '.join(self.options)})",
             CommandSyntaxVersion.v2: f"disambiguate flows {' '.join(self.options)}",
+            CommandSyntaxVersion.v3: f"disambiguate flows {' '.join(self.options)}",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),
@@ -121,6 +122,9 @@ class ClarifyCommand(Command):
             CommandSyntaxVersion.v2: (
                 r"""^[\s\W\d]*disambiguate flows (["'a-zA-Z0-9_, -]*)[\W]*$"""
             ),
+            CommandSyntaxVersion.v3: (
+                r"""^[\s\W\d]*disambiguate flows (["'a-zA-Z0-9_, -]*)[\W]*$"""
+            ),
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),

rasa/dialogue_understanding/commands/command_syntax_manager.py

@@ -9,6 +9,7 @@ class CommandSyntaxVersion(Enum):
 
     v1 = "v1"
     v2 = "v2"
+    v3 = "v3"
 
 
 structlogger = structlog.get_logger()

rasa/dialogue_understanding/commands/correct_slots_command.py

@@ -274,9 +274,7 @@ class CorrectSlotsCommand(Command):
             # we shouldn't end up here as a correction shouldn't be triggered
             # if we are not in any flow. but just in case we do, we
             # just skip the command.
-            structlogger.warning(
-                "command_executor.correct_slots.no_active_flow", command=self
-            )
+            structlogger.warning("command_executor.correct_slots.no_active_flow")
             return []
 
         structlogger.debug("command_executor.correct_slots", command=self)

rasa/dialogue_understanding/commands/human_handoff_command.py

@@ -73,6 +73,7 @@ class HumanHandoffCommand(Command):
         mapper = {
             CommandSyntaxVersion.v1: "HumanHandoff()",
             CommandSyntaxVersion.v2: "hand over",
+            CommandSyntaxVersion.v3: "hand over",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),
@@ -89,6 +90,7 @@ class HumanHandoffCommand(Command):
         mapper = {
             CommandSyntaxVersion.v1: r"HumanHandoff\(\)",
             CommandSyntaxVersion.v2: r"""^[\s\W\d]*hand over['"`]*$""",
+            CommandSyntaxVersion.v3: r"""^[\s\W\d]*hand over['"`]*$""",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),

rasa/dialogue_understanding/commands/knowledge_answer_command.py

@@ -66,6 +66,7 @@ class KnowledgeAnswerCommand(FreeFormAnswerCommand):
         mapper = {
             CommandSyntaxVersion.v1: "SearchAndReply()",
             CommandSyntaxVersion.v2: "provide info",
+            CommandSyntaxVersion.v3: "search and reply",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),
@@ -82,6 +83,7 @@ class KnowledgeAnswerCommand(FreeFormAnswerCommand):
         mapper = {
             CommandSyntaxVersion.v1: r"SearchAndReply\(\)",
             CommandSyntaxVersion.v2: r"""^[\s\W\d]*provide info['"`]*$""",
+            CommandSyntaxVersion.v3: r"""^[\s\W\d]*search and reply['"`]*$""",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),

rasa/dialogue_understanding/commands/repeat_bot_messages_command.py

@@ -67,6 +67,7 @@ class RepeatBotMessagesCommand(Command):
         mapper = {
             CommandSyntaxVersion.v1: "RepeatLastBotMessages()",
             CommandSyntaxVersion.v2: "repeat message",
+            CommandSyntaxVersion.v3: "repeat message",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),
@@ -83,6 +84,7 @@ class RepeatBotMessagesCommand(Command):
         mapper = {
             CommandSyntaxVersion.v1: r"RepeatLastBotMessages\(\)",
             CommandSyntaxVersion.v2: r"""^[\s\W\d]*repeat message['"`]*$""",
+            CommandSyntaxVersion.v3: r"""^[\s\W\d]*repeat message['"`]*$""",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),

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
@@ -170,6 +176,7 @@ class SetSlotCommand(Command):
         mapper = {
             CommandSyntaxVersion.v1: f"SetSlot({self.name}, {self.value})",
             CommandSyntaxVersion.v2: f"set slot {self.name} {self.value}",
+            CommandSyntaxVersion.v3: f"set slot {self.name} {self.value}",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),
@@ -192,6 +199,9 @@ class SetSlotCommand(Command):
             CommandSyntaxVersion.v2: (
                 r"""^[\s\W\d]*set slot ['"`]?([a-zA-Z_][a-zA-Z0-9_-]*)['"`]? ['"`]?(.+?)[\W]*$"""  # noqa: E501
             ),
+            CommandSyntaxVersion.v3: (
+                r"""^[\s\W\d]*set slot ['"`]?([a-zA-Z_][a-zA-Z0-9_-]*)['"`]? ['"`]?(.+?)[\W]*$"""  # noqa: E501
+            ),
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),

rasa/dialogue_understanding/commands/skip_question_command.py

@@ -82,6 +82,7 @@ class SkipQuestionCommand(Command):
         mapper = {
             CommandSyntaxVersion.v1: "SkipQuestion()",
             CommandSyntaxVersion.v2: "skip question",
+            CommandSyntaxVersion.v3: "skip question",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),
@@ -98,6 +99,7 @@ class SkipQuestionCommand(Command):
         mapper = {
             CommandSyntaxVersion.v1: r"SkipQuestion\(\)",
             CommandSyntaxVersion.v2: r"""^[\s\W\d]*skip question['"`]*$""",
+            CommandSyntaxVersion.v3: r"""^[\s\W\d]*skip question['"`]*$""",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),

rasa/dialogue_understanding/commands/start_flow_command.py

@@ -117,6 +117,7 @@ class StartFlowCommand(Command):
         mapper = {
             CommandSyntaxVersion.v1: f"StartFlow({self.flow})",
             CommandSyntaxVersion.v2: f"start flow {self.flow}",
+            CommandSyntaxVersion.v3: f"start flow {self.flow}",
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),
@@ -135,6 +136,9 @@ class StartFlowCommand(Command):
             CommandSyntaxVersion.v2: (
                 r"""^[\s\W\d]*start flow ['"`]?([a-zA-Z0-9_-]+)['"`]*"""
             ),
+            CommandSyntaxVersion.v3: (
+                r"""^[\s\W\d]*start flow ['"`]?([a-zA-Z0-9_-]+)['"`]*"""
+            ),
         }
         return mapper.get(
             CommandSyntaxManager.get_syntax_version(),

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/dialogue_understanding/generator/__init__.py

@@ -8,8 +8,13 @@ from rasa.dialogue_understanding.generator.llm_command_generator import (
 from rasa.dialogue_understanding.generator.multi_step.multi_step_llm_command_generator import (  # noqa: E501
     MultiStepLLMCommandGenerator,
 )
-from rasa.dialogue_understanding.generator.single_step.single_step_llm_command_generator import (  # noqa: E501
+from rasa.dialogue_understanding.generator.single_step.compact_llm_command_generator import (  # noqa: E501
     CompactLLMCommandGenerator,
+)
+from rasa.dialogue_understanding.generator.single_step.search_ready_llm_command_generator import (  # noqa: E501
+    SearchReadyLLMCommandGenerator,
+)
+from rasa.dialogue_understanding.generator.single_step.single_step_llm_command_generator import (  # noqa: E501
     SingleStepLLMCommandGenerator,
 )
 
@@ -20,4 +25,5 @@ __all__ = [
     "MultiStepLLMCommandGenerator",
     "SingleStepLLMCommandGenerator",
     "CompactLLMCommandGenerator",
+    "SearchReadyLLMCommandGenerator",
 ]

rasa/dialogue_understanding/generator/command_generator.py

@@ -321,7 +321,10 @@ class CommandGenerator:
         if commands and len(checked_commands) != len(commands):
             structlogger.info(
                 "command_generator.check_commands_against_startable_flows.startable_commands",
-                commands=checked_commands,
+                commands=[
+                    checked_command.__class__.__name__
+                    for checked_command in checked_commands
+                ],
             )
 
         return checked_commands
@@ -357,7 +360,6 @@ class CommandGenerator:
             "command_generator.evaluate_message.error",
             event_info="Invalid message",
             errors=[e.as_dict() for e in errors],
-            message=message.get(TEXT),
         )
         return errors
 

rasa/dialogue_understanding/generator/command_parser.py

@@ -81,7 +81,7 @@ def _get_additional_parsing_logic(
 
 def validate_custom_commands(command_classes: List[Type[PromptCommand]]) -> None:
     clz_not_inheriting_from_command_clz = [
-        command_clz
+        command_clz.__name__
         for command_clz in command_classes
         if not issubclass(command_clz, Command)
     ]
@@ -99,7 +99,7 @@ def validate_custom_commands(command_classes: List[Type[PromptCommand]]) -> None
         sys.exit(1)
 
     clz_not_adhering_to_prompt_command_protocol = [
-        command_clz
+        command_clz.__name__
         for command_clz in command_classes
         if not isinstance(command_clz, PromptCommand)
     ]

rasa/dialogue_understanding/generator/command_parser_validator.py

@@ -0,0 +1,63 @@
+from typing import List
+
+import structlog
+
+from rasa.dialogue_understanding.commands import (
+    Command,
+)
+
+structlogger = structlog.get_logger()
+
+
+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."
+                ),
+            )